Quellcode durchsuchen

@task: create time

bai vor 3 Jahren
Ursprung
Commit
e427e867cb

+ 1 - 1
demo/src/main/java/com/framework/app/api/Api.kt

@@ -28,6 +28,6 @@ interface Api {
      * 上传建筑数据
      */
     @POST("adm/upload")
-    suspend fun uploadBuilding(@Body building: UploadBuilding): Model<Building>
+    suspend fun uploadBuilding(@Body building: UploadBuilding): Model<UploadResult>
 }
 

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/entity/FileEntity.kt

@@ -26,7 +26,7 @@ data class FileEntity(
     @ColumnInfo(name = "creator") val creator: String?,             // 创建人
     @ColumnInfo(name = "creation_time") val creationTime: String?,  // 创建时间
     @ColumnInfo(name = "modifier") val modifier: String?,           // 修改人
-    @ColumnInfo(name = "modified_time") val modifiedTime: String?,  // 修改时间
+    @ColumnInfo(name = "modified_time") var modifiedTime: String?,  // 修改时间
     @ColumnInfo(name = "valid") val valid: Int?,                    // 合法标识
     @ColumnInfo(name = "upload_flag") val uploadFlag: String?,      // app端上传数据标记
     @ColumnInfo(name = "state") var state: String? = "0"             // 数据状态:0:未处理,1:已处理 2:已上传

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/entity/ObjectEntity.kt

@@ -33,7 +33,7 @@ data class ObjectEntity(
     @ColumnInfo(name = "create_app") val createApp: String?,        // 创建对象的应用
     @ColumnInfo(name = "creation_time") val creationTime: Long?,  // 创建时间
     @ColumnInfo(name = "modifier") val modifier: String?,           // 修改人
-    @ColumnInfo(name = "modified_time") val modifiedTime: Long?,  // 修改时间
+    @ColumnInfo(name = "modified_time") var modifiedTime: String?,   // 修改时间
     @ColumnInfo(name = "client_device") val clientDevice: String?,  // 标识客户端设备
     @ColumnInfo(name = "client_id") val clientId: String?,          // 客户端生成id
     @ColumnInfo(name = "update_app") val updateApp: String?,        // 更新对象的应用

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/entity/PipeEntity.kt

@@ -27,7 +27,7 @@ data class PipeEntity(
     @ColumnInfo(name = "creator") val creator: String?,               // 创建人
     @ColumnInfo(name = "creation_time") val creationTime: Long?,      // 创建时间
     @ColumnInfo(name = "modifier") val modifier: String?,             // 修改人
-    @ColumnInfo(name = "modified_time") val modifiedTime: Long?,      // 修改时间
+    @ColumnInfo(name = "modified_time") var modifiedTime: String?,      // 修改时间
     @ColumnInfo(name = "valid") var valid: Int?,                      // 合法标识
     @ColumnInfo(name = "upload_flag") val uploadFlag: String?,        // app端上传数据标记
     @ColumnInfo(name = "d2m_state") val d2mState: String?,            // 逆向数据的数模同步状态(0:未同步;1:已同步)

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/entity/ProblemArchEntity.kt

@@ -25,7 +25,7 @@ data class ProblemArchEntity(
     @ColumnInfo(name = "creator") val creator: String?,             // 创建人
     @ColumnInfo(name = "creation_time") val creationTime: String?,  // 创建时间
     @ColumnInfo(name = "modifier") val modifier: String?,           // 修改人
-    @ColumnInfo(name = "modified_time") val modifiedTime: String?,  // 修改时间
+    @ColumnInfo(name = "modified_time") var modifiedTime: String?,  // 修改时间
     @ColumnInfo(name = "upload_flag") var uploadFlag: String?,      // app端上传数据标记
     @ColumnInfo(name = "valid") val valid: Int?,                    // 1 有效,2 无效
     @ColumnInfo(name = "geom") val geom: String?,                   // 问题记录的几何数据(Json)

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/entity/ProblemEquipEntity.kt

@@ -23,7 +23,7 @@ data class ProblemEquipEntity(
     @ColumnInfo(name = "creator") val creator: String?,             // 创建人
     @ColumnInfo(name = "creation_time") val creationTime: String?,  // 创建时间
     @ColumnInfo(name = "modifier") val modifier: String?,           // 修改人
-    @ColumnInfo(name = "modified_time") val modifiedTime: String?,  // 修改时间
+    @ColumnInfo(name = "modified_time") var modifiedTime: String?,  // 修改时间
     @ColumnInfo(name = "upload_flag") val uploadFlag: String?,      // app端上传数据标记
     @ColumnInfo(name = "valid") val valid: Int?,                    // 1 有效,2 无效
     @ColumnInfo(name = "state") var state: String? = "0"             // 数据状态:0:未处理,1:已处理 2:已上传

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/entity/QrCodeEntity.kt

@@ -21,7 +21,7 @@ data class QrCodeEntity(
     @ColumnInfo(name = "creator") val creator: String?,             // 创建人
     @ColumnInfo(name = "creation_time") val creationTime: String?,  // 创建时间
     @ColumnInfo(name = "modifier") val modifier: String?,           // 修改人
-    @ColumnInfo(name = "modified_time") val modifiedTime: String?,  // 修改时间
+    @ColumnInfo(name = "modified_time") var modifiedTime: String?,  // 修改时间
     @ColumnInfo(name = "valid") val valid: Int?,                 // 合法标识
     @ColumnInfo(name = "upload_flag") val uploadFlag: String?,      // app端上传数据标记
     @ColumnInfo(name = "location") val location: String?,           // 位置坐标({x:1,y:1,z:1})

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/entity/RelationEntity.kt

@@ -30,7 +30,7 @@ data class RelationEntity(
     @ColumnInfo(name = "creator") val creator: String?,              // 创建人
     @ColumnInfo(name = "creation_time") val creationTime: String?,   // 创建时间
     @ColumnInfo(name = "modifier") val modifier: String?,            // 更新人
-    @ColumnInfo(name = "modified_time") val modifiedTime: String?,   // 修改时间
+    @ColumnInfo(name = "modified_time") var modifiedTime: String?,   // 修改时间
     @ColumnInfo(name = "client_id") val clientId: String?,           // 客户端生成id
     @ColumnInfo(name = "client_device") val clientDevice: String?,   // 标识客户端设备
     @ColumnInfo(name = "upload_flag") val uploadFlag: String?,       // app端上传数据标记

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/entity/SpaceEntity.kt

@@ -27,7 +27,7 @@ data class SpaceEntity(
     @ColumnInfo(name = "creator") val creator: String?,               // 创建人
     @ColumnInfo(name = "creation_time") val creationTime: String?,    // 创建时间
     @ColumnInfo(name = "modifier") val modifier: String?,             // 修改人
-    @ColumnInfo(name = "modified_time") val modifiedTime: String?,    // 修改时间
+    @ColumnInfo(name = "modified_time") var modifiedTime: String?,    // 修改时间
     @ColumnInfo(name = "valid") val valid: Int?,                      // 合法标识
     @ColumnInfo(name = "upload_flag") val uploadFlag: String?,           // app端上传数据标记
     @ColumnInfo(name = "outline")

+ 43 - 18
demo/src/main/java/com/framework/mvvm/model/repository/AdmRepository.kt

@@ -385,24 +385,49 @@ class AdmRepository(
                     Log.e("AdmViewModel", "uploadBuilding fail:${response.msg}")
                 }
                 is SuccessResponse -> {
-                    Log.e("AdmViewModel", "uploadBuilding success")
-                    files.forEach { it.state = "2" }
-                    pipes.forEach { it.state = "2" }
-                    spaces.forEach { it.state = "2" }
-                    objects.forEach { it.state = "2" }
-                    qrCodes.forEach { it.state = "2" }
-                    relations.forEach { it.state = "2" }
-                    problemArchs.forEach { it.state = "2" }
-                    problemEquips.forEach { it.state = "2" }
-
-                    fileDao.updateFiles(files)
-                    pipeDao.updatePipes(pipes)
-                    spaceDao.updateSpaces(spaces)
-                    objectDao.updateObjects(objects)
-                    qrCodeDao.updateQrCodes(qrCodes)
-                    relationDao.updateRelations(relations)
-                    problemArchDao.updateProblems(problemArchs)
-                    problemEquipDao.updateProblems(problemEquips)
+                    val result = response.data
+                    Log.e("AdmViewModel", "uploadBuilding success: $result")
+                    files.forEach {
+                        it.state = "2"
+                        it.modifiedTime = result.timestamp
+                        fileDao.insFile(it)
+                    }
+                    pipes.forEach {
+                        it.state = "2"
+                        it.modifiedTime = result.timestamp
+                        pipeDao.insPipe(it)
+                    }
+                    spaces.forEach {
+                        it.state = "2"
+                        it.modifiedTime = result.timestamp
+                        spaceDao.insSpace(it)
+                    }
+                    objects.forEach {
+                        it.state = "2"
+                        it.modifiedTime = result.timestamp
+                        objectDao.insObject(it)
+                    }
+                    qrCodes.forEach {
+                        it.state = "2"
+                        it.modifiedTime = result.timestamp
+                        qrCodeDao.insQrCode(it)
+                    }
+                    relations.forEach {
+                        it.state = "2"
+                        it.modifiedTime = result.timestamp
+                        relationDao.insRelation(it)
+                    }
+                    problemArchs.forEach {
+                        it.state = "2"
+                        it.modifiedTime = result.timestamp
+                        problemArchDao.insProblem(it)
+                    }
+                    problemEquips.forEach {
+                        it.state = "2"
+                        it.modifiedTime = result.timestamp
+                        problemEquipDao.insProblem(it)
+
+                    }
                 }
             }
         } catch (e: Exception) {

+ 9 - 0
demo/src/main/java/com/framework/mvvm/model/vo/UploadResult.kt

@@ -0,0 +1,9 @@
+package com.framework.mvvm.model.vo
+
+import kotlinx.serialization.Serializable
+
+
+@Serializable
+data class UploadResult(
+    val timestamp: String?
+)