Преглед на файлове

@task: update modifier time

bai преди 3 години
родител
ревизия
6ee68c7074

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

@@ -24,7 +24,7 @@ data class FileEntity(
     @ColumnInfo(name = "building_id") val buildingId: String?,      // 建筑id
     @ColumnInfo(name = "floor_id") val floorId: String?,            // 楼层id
     @ColumnInfo(name = "creator") val creator: String?,             // 创建人
-    @ColumnInfo(name = "creation_time") val creationTime: String?,  // 创建时间
+    @ColumnInfo(name = "creation_time") var creationTime: String?,  // 创建时间
     @ColumnInfo(name = "modifier") val modifier: String?,           // 修改人
     @ColumnInfo(name = "modified_time") var modifiedTime: String?,  // 修改时间
     @ColumnInfo(name = "valid") val valid: Int?,                    // 合法标识

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

@@ -31,7 +31,7 @@ data class ObjectEntity(
     @ColumnInfo(name = "floor_id") val floorId: String?,            // 建筑id
     @ColumnInfo(name = "creator") val creator: String?,             // 创建人
     @ColumnInfo(name = "create_app") val createApp: String?,        // 创建对象的应用
-    @ColumnInfo(name = "creation_time") val creationTime: String?,  // 创建时间
+    @ColumnInfo(name = "creation_time") var creationTime: String?,  // 创建时间
     @ColumnInfo(name = "modifier") val modifier: String?,           // 修改人
     @ColumnInfo(name = "modified_time") var modifiedTime: String?,   // 修改时间
     @ColumnInfo(name = "client_device") val clientDevice: String?,  // 标识客户端设备

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

@@ -25,7 +25,7 @@ data class PipeEntity(
     @ColumnInfo(name = "route") val route: String?,                   // 管道路由(坐标列表格式:[{x:1,y:1,z:1}])
     @ColumnInfo(name = "infos") val infos: String?,                   // 管道的信息点
     @ColumnInfo(name = "creator") val creator: String?,               // 创建人
-    @ColumnInfo(name = "creation_time") val creationTime: String?,      // 创建时间
+    @ColumnInfo(name = "creation_time") var creationTime: String?,      // 创建时间
     @ColumnInfo(name = "modifier") val modifier: String?,             // 修改人
     @ColumnInfo(name = "modified_time") var modifiedTime: String?,      // 修改时间
     @ColumnInfo(name = "valid") var valid: Int?,                      // 合法标识

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

@@ -23,7 +23,7 @@ data class ProblemArchEntity(
     @ColumnInfo(name = "problem_state") var problemState: Int?,     // 建筑结构核查任务状态(0:删除;1:有效;2:已解决)
     @ColumnInfo(name = "message") val message: String?,             // 问题描述
     @ColumnInfo(name = "creator") val creator: String?,             // 创建人
-    @ColumnInfo(name = "creation_time") val creationTime: String?,  // 创建时间
+    @ColumnInfo(name = "creation_time") var creationTime: String?,  // 创建时间
     @ColumnInfo(name = "modifier") val modifier: String?,           // 修改人
     @ColumnInfo(name = "modified_time") var modifiedTime: String?,  // 修改时间
     @ColumnInfo(name = "upload_flag") var uploadFlag: String?,      // app端上传数据标记

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

@@ -21,7 +21,7 @@ data class ProblemEquipEntity(
     @ColumnInfo(name = "problem_state") val problemState: Int?,     // 建筑结构核查任务状态(0:删除;1:有效;2:已解决)
     @ColumnInfo(name = "message") val message: String?,             // 问题描述
     @ColumnInfo(name = "creator") val creator: String?,             // 创建人
-    @ColumnInfo(name = "creation_time") val creationTime: String?,  // 创建时间
+    @ColumnInfo(name = "creation_time") var creationTime: String?,  // 创建时间
     @ColumnInfo(name = "modifier") val modifier: String?,           // 修改人
     @ColumnInfo(name = "modified_time") var modifiedTime: String?,  // 修改时间
     @ColumnInfo(name = "upload_flag") val uploadFlag: String?,      // app端上传数据标记

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

@@ -19,7 +19,7 @@ data class QrCodeEntity(
     @ColumnInfo(name = "floor_id") val floorId: String,            // 楼层id
     @ColumnInfo(name = "remark") val remark: String?,               // 描述信息
     @ColumnInfo(name = "creator") val creator: String?,             // 创建人
-    @ColumnInfo(name = "creation_time") val creationTime: String?,  // 创建时间
+    @ColumnInfo(name = "creation_time") var creationTime: String?,  // 创建时间
     @ColumnInfo(name = "modifier") val modifier: String?,           // 修改人
     @ColumnInfo(name = "modified_time") var modifiedTime: String?,  // 修改时间
     @ColumnInfo(name = "valid") val valid: Int?,                 // 合法标识

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

@@ -28,7 +28,7 @@ data class RelationEntity(
     @ColumnInfo(name = "create_app") val createApp: String?,         // 创建关系的App
     @ColumnInfo(name = "update_app") val updateApp: String?,         // 更新关系的App
     @ColumnInfo(name = "creator") val creator: String?,              // 创建人
-    @ColumnInfo(name = "creation_time") val creationTime: String?,   // 创建时间
+    @ColumnInfo(name = "creation_time") var creationTime: String?,   // 创建时间
     @ColumnInfo(name = "modifier") val modifier: String?,            // 更新人
     @ColumnInfo(name = "modified_time") var modifiedTime: String?,   // 修改时间
     @ColumnInfo(name = "client_id") val clientId: String?,           // 客户端生成id

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

@@ -25,7 +25,7 @@ data class SpaceEntity(
     @ColumnInfo(name = "building_id") val buildingId: String?,        // 建筑id
     @ColumnInfo(name = "floor_id") val floorId: String?,              // 楼层id
     @ColumnInfo(name = "creator") val creator: String?,               // 创建人
-    @ColumnInfo(name = "creation_time") val creationTime: String?,    // 创建时间
+    @ColumnInfo(name = "creation_time") var creationTime: String?,    // 创建时间
     @ColumnInfo(name = "modifier") val modifier: String?,             // 修改人
     @ColumnInfo(name = "modified_time") var modifiedTime: String?,    // 修改时间
     @ColumnInfo(name = "valid") val valid: Int?,                      // 合法标识

+ 32 - 10
demo/src/main/java/com/framework/mvvm/model/repository/AdmRepository.kt

@@ -11,8 +11,6 @@ import com.framework.mvvm.model.db.entity.*
 import com.framework.mvvm.model.vo.AdmRequest
 import com.framework.mvvm.model.vo.Building
 import com.framework.mvvm.model.vo.UploadBuilding
-import java.text.DateFormat
-import java.text.SimpleDateFormat
 
 class AdmRepository(
     private val api: Api,
@@ -391,42 +389,66 @@ class AdmRepository(
                     Log.e("AdmViewModel", "uploadBuilding success: $result")
                     files.forEach {
                         it.state = "2"
-                        it.modifiedTime = result.timestamp
+                        if (it.creationTime.isNullOrEmpty())
+                            it.creationTime = result.timestamp
+                        else
+                            it.modifiedTime = result.timestamp
                         fileDao.insFile(it)
                     }
                     pipes.forEach {
                         it.state = "2"
-                        it.modifiedTime = result.timestamp
+                        if (it.creationTime.isNullOrEmpty())
+                            it.creationTime = result.timestamp
+                        else
+                            it.modifiedTime = result.timestamp
                         pipeDao.insPipe(it)
                     }
                     spaces.forEach {
                         it.state = "2"
-                        it.modifiedTime = result.timestamp
+                        if (it.creationTime.isNullOrEmpty())
+                            it.creationTime = result.timestamp
+                        else
+                            it.modifiedTime = result.timestamp
                         spaceDao.insSpace(it)
                     }
                     objects.forEach {
                         it.state = "2"
-                        it.modifiedTime = result.timestamp
+                        if (it.creationTime.isNullOrEmpty())
+                            it.creationTime = result.timestamp
+                        else
+                            it.modifiedTime = result.timestamp
                         objectDao.insObject(it)
                     }
                     qrCodes.forEach {
                         it.state = "2"
-                        it.modifiedTime = result.timestamp
+                        if (it.creationTime.isNullOrEmpty())
+                            it.creationTime = result.timestamp
+                        else
+                            it.modifiedTime = result.timestamp
                         qrCodeDao.insQrCode(it)
                     }
                     relations.forEach {
                         it.state = "2"
-                        it.modifiedTime = result.timestamp
+                        if (it.creationTime.isNullOrEmpty())
+                            it.creationTime = result.timestamp
+                        else
+                            it.modifiedTime = result.timestamp
                         relationDao.insRelation(it)
                     }
                     problemArchs.forEach {
                         it.state = "2"
-                        it.modifiedTime = result.timestamp
+                        if (it.creationTime.isNullOrEmpty())
+                            it.creationTime = result.timestamp
+                        else
+                            it.modifiedTime = result.timestamp
                         problemArchDao.insProblem(it)
                     }
                     problemEquips.forEach {
                         it.state = "2"
-                        it.modifiedTime = result.timestamp
+                        if (it.creationTime.isNullOrEmpty())
+                            it.creationTime = result.timestamp
+                        else
+                            it.modifiedTime = result.timestamp
                         problemEquipDao.insProblem(it)
 
                     }

+ 13 - 13
demo/src/main/java/com/sybotan/android/demo/viewmodel/GraphyVM.kt

@@ -179,9 +179,9 @@ class GraphyVM(
                 problemState = 1,
                 message = content,
                 creator = "",
-                creationTime = time,
+                creationTime = "",
                 modifier = "android",
-                modifiedTime = null,
+                modifiedTime = "",
                 uploadFlag = "",
                 valid = 1,
                 strGeom = toJson,
@@ -216,7 +216,7 @@ class GraphyVM(
                         buildingId = buildingId,
                         floorId = floorId,
                         creator = "android",
-                        creationTime = time,
+                        creationTime = "",
                         modifier = "",
                         modifiedTime = null,
                         valid = 1,
@@ -342,9 +342,9 @@ class GraphyVM(
                 strLocation = toJson,
                 remark = "wall",
                 creator = "Anroid",
-                creationTime = time,
+                creationTime = "",
                 modifier = "Android",
-                modifiedTime = null,
+                modifiedTime = "",
                 valid = 1,
                 uploadFlag = "", state = "1", location = null
             )
@@ -740,9 +740,9 @@ class GraphyVM(
                     floorId = floorId,
                     creator = "Android",
                     createApp = "",
-                    creationTime = SimpleDateFormat("yyyyMMddHHmmss").format(Date(System.currentTimeMillis())),
+                    creationTime = "",
                     modifier = "Android",
-                    modifiedTime = null,
+                    modifiedTime = "",
                     clientDevice = "",
                     clientId = uuid,
                     updateApp = "",
@@ -1191,8 +1191,8 @@ class GraphyVM(
                 createApp = null,
                 updateApp = null,
                 creator = null,
-                creationTime = null,
-                modifiedTime = null,
+                creationTime = "",
+                modifiedTime = "",
                 modifier = null,
                 clientId = null,
                 clientDevice = null,
@@ -1237,8 +1237,8 @@ class GraphyVM(
                 objTo = objto,
 
                 creator = null,
-                creationTime = null,
-                modifiedTime = null,
+                creationTime = "",
+                modifiedTime = "",
                 modifier = null,
                 uploadFlag = null,
                 deliveryState = null,
@@ -1276,9 +1276,9 @@ class GraphyVM(
                         problemState = 1,
                         message = null,
                         creator = null,
-                        creationTime = null,
+                        creationTime = "",
                         modifier = null,
-                        modifiedTime = null,
+                        modifiedTime = "",
                         uploadFlag = null,
                         valid = 1, state = "1"
                     )