baifengji
/
profilometer_android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity
Browse Source

完成数据上传功能

master
白凤吉 4 months ago
parent
59d1b3e3f5
commit
163d3ed166
8 changed files with 58 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      app/src/main/java/com/iflytop/profilometer/api/measure/MeasureApi.java
  2. 11
      app/src/main/java/com/iflytop/profilometer/api/measure/MeasureRoutes.kt
  3. 3
      app/src/main/java/com/iflytop/profilometer/api/record/RecordApi.java
  4. 10
      app/src/main/java/com/iflytop/profilometer/core/db/helper/MyDatabaseHelper.java
  5. 55
      app/src/main/java/com/iflytop/profilometer/dao/ProfileRecordDao.java
  6. 6
      app/src/main/java/com/iflytop/profilometer/dao/SyncTaskDao.java
  7. 1
      app/src/main/java/com/iflytop/profilometer/model/entity/ProfileRecordDescription.java
  8. 9
      app/src/main/java/com/iflytop/profilometer/model/entity/SyncTask.java

4
app/src/main/java/com/iflytop/profilometer/api/measure/MeasureApi.java
View File

@ -87,8 +87,8 @@ public class MeasureApi {
profileRecordDescription.setMileage(params.get("mileage"));
profileRecordDescription.setUnitType(params.get("unitType"));
profileRecordDescription.setExtraDesc(params.get("extraDesc"));
profileRecordDescription.setExtraDesc(params.get("turnoutNum"));
profileRecordDescription.setExtraDesc(params.get("sleeperNum"));
profileRecordDescription.setTurnoutNum(params.get("turnoutNum"));
profileRecordDescription.setSleeperNum(params.get("sleeperNum"));
profileRecordDescription.setSyncStatus(SyncStatus.wait);
profileRecordDao.insertProfileRecord(profileRecordDescription);

11
app/src/main/java/com/iflytop/profilometer/api/measure/MeasureRoutes.kt
View File

@ -36,16 +36,5 @@ fun Routing.measureRoutes(context: Context) {
call.respondText(jsonResponse, ContentType.Application.Json)
}
/**
* 获取机构数据列表
*/
post("/api/measure/org-list") {
}
/**
* 获取车站数据列表
*/
post("/api/measure/station-list") {
}
}

3
app/src/main/java/com/iflytop/profilometer/api/record/RecordApi.java
View File

@ -63,6 +63,9 @@ public class RecordApi {
map.put("unitType", profileRecordDescription.getUnitType());
map.put("extraDesc", profileRecordDescription.getExtraDesc());
map.put("syncStatus", profileRecordDescription.getSyncStatus());
map.put("turnoutNum", profileRecordDescription.getTurnoutNum());
map.put("sleeperNum", profileRecordDescription.getSleeperNum());
map.put("radius", profileRecordDescription.getRadius());
map.put("leftPoints", pointSet.getLeftPoints());
map.put("rightPoints", pointSet.getRightPoints());

10
app/src/main/java/com/iflytop/profilometer/core/db/helper/MyDatabaseHelper.java
View File

@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteOpenHelper;
public class MyDatabaseHelper extends SQLiteOpenHelper {
private static final String DATABASE_NAME = "app.db";
private static final int DATABASE_VERSION = 5; // 升级版本号
private static final int DATABASE_VERSION = 8; // 升级版本号
// 表名
public static final String TABLE_APP_USER = "app_user";
@ -57,9 +57,11 @@ public class MyDatabaseHelper extends SQLiteOpenHelper {
+ "line_name TEXT, "
+ "location TEXT, "
+ "direction TEXT, "
+ "radius TEXT, "
+ "sync_status TEXT, "
+ "turnout_num TEXT, "
+ "sleeper_num TEXT"
+ "sleeper_num TEXT,"
+ "extraDesc TEXT"
+ ");";
@ -121,9 +123,11 @@ public class MyDatabaseHelper extends SQLiteOpenHelper {
+ "line_name TEXT, "
+ "location TEXT, "
+ "direction TEXT, "
+ "radius TEXT, "
+ "sync_status TEXT, "
+ "turnout_num TEXT, "
+ "sleeper_num TEXT"
+ "sleeper_num TEXT,"
+ "extraDesc TEXT"
+ ");";
// 新增：基础数据表建表语句

55
app/src/main/java/com/iflytop/profilometer/dao/ProfileRecordDao.java
View File

@ -53,6 +53,7 @@ public class ProfileRecordDao {
values.put("extra_desc", record.getExtraDesc());
values.put("turnout_num", record.getTurnoutNum());
values.put("sleeper_num", record.getSleeperNum());
values.put("radius", record.getRadius());
values.put("sync_status", record.getSyncStatus() != null ? record.getSyncStatus().name() : null);
long id = db.insert(MyDatabaseHelper.TABLE_PROFILE_RECORD, null, values);
db.close();
@ -82,6 +83,7 @@ public class ProfileRecordDao {
values.put("extra_desc", record.getExtraDesc());
values.put("turnout_num", record.getTurnoutNum());
values.put("sleeper_num", record.getSleeperNum());
values.put("radius", record.getRadius());
values.put("sync_status", record.getSyncStatus() != null ? record.getSyncStatus().name() : null);
int rows = db.update(MyDatabaseHelper.TABLE_PROFILE_RECORD, values, "id = ?", new String[]{String.valueOf(record.getId())});
db.close();
@ -124,6 +126,7 @@ public class ProfileRecordDao {
record.setExtraDesc(cursor.getString(cursor.getColumnIndex("extra_desc")));
record.setTurnoutNum(cursor.getString(cursor.getColumnIndex("turnout_num")));
record.setSleeperNum(cursor.getString(cursor.getColumnIndex("sleeper_num")));
record.setRadius(cursor.getString(cursor.getColumnIndex("radius")));
record.setCreateTime(LocalDateTime.parse(cursor.getString(cursor.getColumnIndex("create_time")), FORMATTER));
record.setUpdateTime(LocalDateTime.parse(cursor.getString(cursor.getColumnIndex("update_time")), FORMATTER));
String syncStatus = cursor.getString(cursor.getColumnIndex("sync_status"));
@ -178,6 +181,7 @@ public class ProfileRecordDao {
record.setExtraDesc(cursor.getString(cursor.getColumnIndex("extra_desc")));
record.setTurnoutNum(cursor.getString(cursor.getColumnIndex("turnout_num")));
record.setSleeperNum(cursor.getString(cursor.getColumnIndex("sleeper_num")));
record.setRadius(cursor.getString(cursor.getColumnIndex("radius")));
record.setCreateTime(LocalDateTime.parse(cursor.getString(cursor.getColumnIndex("create_time")), FORMATTER));
record.setUpdateTime(LocalDateTime.parse(cursor.getString(cursor.getColumnIndex("update_time")), FORMATTER));
String syncStatus = cursor.getString(cursor.getColumnIndex("sync_status"));
@ -219,38 +223,39 @@ public class ProfileRecordDao {
String recordsSql = "SELECT * FROM " + MyDatabaseHelper.TABLE_PROFILE_RECORD +
" WHERE strftime('%Y-%m-%d', create_time) = ? " +
"ORDER BY create_time DESC";
Cursor cursorRecords = db.rawQuery(recordsSql, new String[]{day});
Cursor cursor = db.rawQuery(recordsSql, new String[]{day});
List<ProfileRecordDescription> records = new ArrayList<>();
while (cursorRecords.moveToNext()) {
while (cursor.moveToNext()) {
ProfileRecordDescription record = new ProfileRecordDescription();
record.setId(cursorRecords.getLong(cursorRecords.getColumnIndex("id")));
record.setUuid(cursorRecords.getString(cursorRecords.getColumnIndex("uuid")));
record.setOperator(cursorRecords.getString(cursorRecords.getColumnIndex("operator")));
record.setName(cursorRecords.getString(cursorRecords.getColumnIndex("name")));
record.setTljCode(cursorRecords.getString(cursorRecords.getColumnIndex("tlj_code")));
record.setGwdCode(cursorRecords.getString(cursorRecords.getColumnIndex("gwd_code")));
record.setXmCode(cursorRecords.getString(cursorRecords.getColumnIndex("xm_code")));
record.setStationCode(cursorRecords.getString(cursorRecords.getColumnIndex("station_code")));
record.setDataType(cursorRecords.getString(cursorRecords.getColumnIndex("data_type")));
record.setDataSource(cursorRecords.getString(cursorRecords.getColumnIndex("data_source")));
record.setRailSize(cursorRecords.getString(cursorRecords.getColumnIndex("rail_size")));
record.setLineClassify(cursorRecords.getString(cursorRecords.getColumnIndex("line_classify")));
record.setBatch(cursorRecords.getString(cursorRecords.getColumnIndex("batch")));
record.setXbCode(cursorRecords.getString(cursorRecords.getColumnIndex("xb_code")));
record.setMileage(cursorRecords.getString(cursorRecords.getColumnIndex("mileage")));
record.setUnitType(cursorRecords.getString(cursorRecords.getColumnIndex("unit_type")));
record.setExtraDesc(cursorRecords.getString(cursorRecords.getColumnIndex("extra_desc")));
record.setTurnoutNum(cursorRecords.getString(cursorRecords.getColumnIndex("turnout_num")));
record.setSleeperNum(cursorRecords.getString(cursorRecords.getColumnIndex("sleeper_num")));
record.setCreateTime(LocalDateTime.parse(cursorRecords.getString(cursorRecords.getColumnIndex("create_time")), FORMATTER));
record.setUpdateTime(LocalDateTime.parse(cursorRecords.getString(cursorRecords.getColumnIndex("update_time")), FORMATTER));
String syncStatus = cursorRecords.getString(cursorRecords.getColumnIndex("sync_status"));
record.setId(cursor.getLong(cursor.getColumnIndex("id")));
record.setUuid(cursor.getString(cursor.getColumnIndex("uuid")));
record.setOperator(cursor.getString(cursor.getColumnIndex("operator")));
record.setName(cursor.getString(cursor.getColumnIndex("name")));
record.setTljCode(cursor.getString(cursor.getColumnIndex("tlj_code")));
record.setGwdCode(cursor.getString(cursor.getColumnIndex("gwd_code")));
record.setXmCode(cursor.getString(cursor.getColumnIndex("xm_code")));
record.setStationCode(cursor.getString(cursor.getColumnIndex("station_code")));
record.setDataType(cursor.getString(cursor.getColumnIndex("data_type")));
record.setDataSource(cursor.getString(cursor.getColumnIndex("data_source")));
record.setRailSize(cursor.getString(cursor.getColumnIndex("rail_size")));
record.setLineClassify(cursor.getString(cursor.getColumnIndex("line_classify")));
record.setBatch(cursor.getString(cursor.getColumnIndex("batch")));
record.setXbCode(cursor.getString(cursor.getColumnIndex("xb_code")));
record.setMileage(cursor.getString(cursor.getColumnIndex("mileage")));
record.setUnitType(cursor.getString(cursor.getColumnIndex("unit_type")));
record.setExtraDesc(cursor.getString(cursor.getColumnIndex("extra_desc")));
record.setTurnoutNum(cursor.getString(cursor.getColumnIndex("turnout_num")));
record.setSleeperNum(cursor.getString(cursor.getColumnIndex("sleeper_num")));
record.setRadius(cursor.getString(cursor.getColumnIndex("radius")));
record.setCreateTime(LocalDateTime.parse(cursor.getString(cursor.getColumnIndex("create_time")), FORMATTER));
record.setUpdateTime(LocalDateTime.parse(cursor.getString(cursor.getColumnIndex("update_time")), FORMATTER));
String syncStatus = cursor.getString(cursor.getColumnIndex("sync_status"));
if (syncStatus != null) {
record.setSyncStatus(SyncStatus.valueOf(syncStatus));
}
records.add(record);
}
cursorRecords.close();
cursor.close();
Map<String, Object> groupMap = new HashMap<>();
groupMap.put("date", day);

6
app/src/main/java/com/iflytop/profilometer/dao/SyncTaskDao.java
View File

@ -50,6 +50,7 @@ public class SyncTaskDao {
values.put("extra_desc", task.getExtraDesc());
values.put("turnout_num", task.getTurnoutNum());
values.put("sleeper_num", task.getSleeperNum());
values.put("radius", task.getRadius());
values.put("sync_status", task.getSyncStatus() != null ? task.getSyncStatus().name() : null);
@ -82,6 +83,7 @@ public class SyncTaskDao {
values.put("extra_desc", task.getExtraDesc());
values.put("turnout_num", task.getTurnoutNum());
values.put("sleeper_num", task.getSleeperNum());
values.put("radius", task.getRadius());
values.put("sync_status", task.getSyncStatus().name());
int rows = db.update(MyDatabaseHelper.TABLE_SYNC_TASK, values, "id = ?", new String[]{String.valueOf(task.getId())});
db.close();
@ -133,6 +135,7 @@ public class SyncTaskDao {
task.setExtraDesc(cursor.getString(cursor.getColumnIndex("extra_desc")));
task.setTurnoutNum(cursor.getString(cursor.getColumnIndex("turnout_num")));
task.setSleeperNum(cursor.getString(cursor.getColumnIndex("sleeper_num")));
task.setRadius(cursor.getString(cursor.getColumnIndex("radius")));
String syncStatus = cursor.getString(cursor.getColumnIndex("sync_status"));
if (syncStatus != null) {
@ -188,6 +191,7 @@ public class SyncTaskDao {
task.setExtraDesc(cursor.getString(cursor.getColumnIndex("extra_desc")));
task.setTurnoutNum(cursor.getString(cursor.getColumnIndex("turnout_num")));
task.setSleeperNum(cursor.getString(cursor.getColumnIndex("sleeper_num")));
task.setRadius(cursor.getString(cursor.getColumnIndex("radius")));
String syncStatus = cursor.getString(cursor.getColumnIndex("sync_status"));
if (syncStatus != null) {
@ -291,6 +295,7 @@ public class SyncTaskDao {
task.setSleeperNum(cursor.getString(cursor.getColumnIndex("sleeper_num")));
task.setTurnoutNum(cursor.getString(cursor.getColumnIndex("turnout_num")));
task.setSleeperNum(cursor.getString(cursor.getColumnIndex("sleeper_num")));
task.setRadius(cursor.getString(cursor.getColumnIndex("radius")));
String syncStatus = cursor.getString(cursor.getColumnIndex("sync_status"));
if (syncStatus != null) {
@ -335,6 +340,7 @@ public class SyncTaskDao {
task.setExtraDesc(cursor.getString(cursor.getColumnIndex("extra_desc")));
task.setTurnoutNum(cursor.getString(cursor.getColumnIndex("turnout_num")));
task.setSleeperNum(cursor.getString(cursor.getColumnIndex("sleeper_num")));
task.setRadius(cursor.getString(cursor.getColumnIndex("radius")));
String syncStatus = cursor.getString(cursor.getColumnIndex("sync_status"));
if (syncStatus != null) {

1
app/src/main/java/com/iflytop/profilometer/model/entity/ProfileRecordDescription.java
View File

@ -184,4 +184,5 @@ public class ProfileRecordDescription extends BaseEntity {
public void setSleeperNum(String sleeperNum) {
this.sleeperNum = sleeperNum;
}
}

9
app/src/main/java/com/iflytop/profilometer/model/entity/SyncTask.java
View File

@ -20,6 +20,7 @@ public class SyncTask extends BaseEntity {
private String mileage;
private String unitType;
private String extraDesc;
private String radius;
private String turnoutNum;
private String sleeperNum;
private SyncStatus syncStatus; // 同步状态字段
@ -175,4 +176,12 @@ public class SyncTask extends BaseEntity {
public void setSleeperNum(String sleeperNum) {
this.sleeperNum = sleeperNum;
}
public String getRadius() {
return radius;
}
public void setRadius(String radius) {
this.radius = radius;
}
}
Write Preview
Loading…
Cancel
Save