Browse Source

@task: add ts field

bai 3 năm trước cách đây
mục cha
commit
437a6470b7

+ 3 - 0
demo/src/main/java/com/framework/mvvm/model/db/entity/BaseEntity.kt

@@ -1,5 +1,7 @@
 package com.framework.mvvm.model.db.entity
 
+import androidx.room.ColumnInfo
+
 /**
  * 数据公共字段约束
  */
@@ -15,4 +17,5 @@ interface BaseEntity {
     val projectId: String?       // 项目id
     val buildingId: String?      // 建筑id
     val floorId: String?         // 楼层id
+    val ts: Long
 }

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

@@ -17,6 +17,7 @@ data class FileEntity(
     @ColumnInfo(name = "state") override var state: String? = "0",
     @ColumnInfo(name = "upload_flag") override var uploadFlag: String?,
     @ColumnInfo(name = "valid") override var valid: Int?,
+    @ColumnInfo(name = "ts") override val ts: Long = 0L,
     @ColumnInfo(name = "biz_type") val bizType: String?,            // 业务类型(object:对象附件|problem_arch:空间问题附件|problem_equip:设备问题附件)
     @ColumnInfo(name = "file_path") val filePath: String?,          // 文件存储路径
     @ColumnInfo(name = "file_type") val fileType: String?,          // 文件类型(photo|video|file|...)

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

@@ -18,11 +18,12 @@ data class JobSpaceEntity(
     @ColumnInfo(name = "state") override var state: String? = "0",
     @ColumnInfo(name = "valid") override var valid: Int?,
     @ColumnInfo(name = "upload_flag") override var uploadFlag: String?,
+    @ColumnInfo(name = "ts") override val ts: Long = 0L,
     @ColumnInfo(name = "space_id") val spaceId: String,               // 空间id
     @ColumnInfo(name = "work_id") val workId: String?,                // 交付工作流程id
     @ColumnInfo(name = "space_type") val spaceType: String?,          // 任务空间类型(base|sub)
     @ColumnInfo(name = "parent_space_id") val parentSpaceId: String?, // 父级空间id(空间类型为sub时)
     @ColumnInfo(name = "arch_state") var archState: Int?,             // 建筑结构核查任务状态(0:待核查;1:核查中;2:核查完毕)
     @ColumnInfo(name = "equip_state") var equipState: Int?,           // 设备勘测任务状态(0:待勘测;1:勘测中;2:勘测完毕)
-    @ColumnInfo(name = "outline") val outline: JsonElement? = null,           // 空间边界,模型更新空间变化时,用来做匹配计算
+    @ColumnInfo(name = "outline") val outline: JsonElement? = null    // 空间边界,模型更新空间变化时,用来做匹配计算
 ) : BaseEntity

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

@@ -24,6 +24,7 @@ data class ObjectEntity(
     @ColumnInfo(name = "upload_flag") override var uploadFlag: String?,
     @ColumnInfo(name = "valid") override var valid: Int?,
     @ColumnInfo(name = "name") val name: String?,
+    @ColumnInfo(name = "ts") override val ts: Long = 0L,
     @ColumnInfo(name = "obj_type") val objType: String?,             // 对象类型
     @ColumnInfo(name = "class_code") var classCode: String?,         // 对象类型编码
     @ColumnInfo(name = "local_id") var localId: String?,            // 对象位置编码

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

@@ -18,6 +18,7 @@ data class PipeEntity(
     @ColumnInfo(name = "valid") override var valid: Int?,
     @ColumnInfo(name = "state") override var state: String? = "0",
     @ColumnInfo(name = "upload_flag") override var uploadFlag: String?,
+    @ColumnInfo(name = "ts") override val ts: Long = 0L,
     @ColumnInfo(name = "obj_from") val objFrom: String?,              // 管道的from端对象
     @ColumnInfo(name = "type_from") val typeFrom: String?,            // from端对象类型(equipment:设备;pipe:管道)
     @ColumnInfo(name = "obj_to") val objTo: String?,                  // 管道的to端对象

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

@@ -18,6 +18,7 @@ data class ProblemArchEntity(
     @ColumnInfo(name = "state") override var state: String? = "0",
     @ColumnInfo(name = "upload_flag") override var uploadFlag: String?,
     @ColumnInfo(name = "valid") override var valid: Int?,
+    @ColumnInfo(name = "ts") override val ts: Long = 0L,
     @ColumnInfo(name = "geom_type") val geomType: String?,         // 问题记录的几何类型(point|line|polygon)
     @ColumnInfo(name = "work_id") val workId: String?,             // 交付工作流程id
     @ColumnInfo(name = "problem_type") val problemType: String?,   // 问题类型

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

@@ -17,6 +17,7 @@ data class ProblemEquipEntity(
     @ColumnInfo(name = "state") override var state: String? = "0",
     @ColumnInfo(name = "upload_flag") override var uploadFlag: String?,
     @ColumnInfo(name = "valid") override var valid: Int?,
+    @ColumnInfo(name = "ts") override val ts: Long = 0L,
     @ColumnInfo(name = "equip_id") val equipId: String,            // 设备id
     @ColumnInfo(name = "work_id") val workId: String?,             // 交付工作流程id
     @ColumnInfo(name = "problem_type") val problemType: String?,   // 问题类型

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

@@ -18,6 +18,7 @@ data class QrCodeEntity(
     @ColumnInfo(name = "state") override var state: String? = "0",
     @ColumnInfo(name = "upload_flag") override var uploadFlag: String?,
     @ColumnInfo(name = "valid") override var valid: Int?,
+    @ColumnInfo(name = "ts") override val ts: Long = 0L,
     @ColumnInfo(name = "qr_code") val qrCode: String,                       // 二维码数据值
     @ColumnInfo(name = "obj_id") val objId: String,                         // 二维码对应的对象id
     @ColumnInfo(name = "remark") val remark: String?,                       // 描述信息

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

@@ -17,6 +17,7 @@ data class RelationEntity(
     @ColumnInfo(name = "state") override var state: String? = "0",
     @ColumnInfo(name = "upload_flag") override var uploadFlag: String?,
     @ColumnInfo(name = "valid") override var valid: Int?,
+    @ColumnInfo(name = "ts") override val ts: Long = 0L,
     @ColumnInfo(name = "group_code") val groupCode: String?,         // 集团代码
     @ColumnInfo(name = "graph_id") val graphId: String?,             // 图id
     @ColumnInfo(name = "graph_code") val graphCode: String?,         // 图编码

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

@@ -18,6 +18,7 @@ data class ServeAreaEntity(
     @ColumnInfo(name = "state") override var state: String? = "0",
     @ColumnInfo(name = "upload_flag") override var uploadFlag: String?,
     @ColumnInfo(name = "valid") override var valid: Int?,
+    @ColumnInfo(name = "ts") override val ts: Long = 0L,
     @ColumnInfo(name = "obj_id") var objId: String?,            // 服务该区域提供的设备id
     @ColumnInfo(name = "geom_type") var geomType: String?,      // 服务区域的几何类型(polygon:多边形|circle:圆形|ellipse:椭圆)
     @ColumnInfo(name = "geom") var geom: JsonElement? = null,          // 服务区域的轮廓几何信息(polygon对应xy坐标数组, circle和ellipse对应对象(圆心半径))