bai 3 лет назад
Родитель
Сommit
bad8bf3d95

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

@@ -7,8 +7,8 @@ import androidx.room.ColumnInfo
  */
 interface BaseEntity {
     val id: String               // id
-    var valid: Int               // 有效标识, // 1 正常 0 删除
-    var state: Int               // 数据状态:-1 默认, 0:本地创建,1:修改过的网络数据 2:已上传的本地数据或者从网络来的数据
+    var valid: Int               // 有效标识: 1 保留, 0 删除
+    var state: Int               // 数据状态:-1 默认, 0:本地创建, 1:修改过的网络数据 2:已上传的本地数据或者从网络来的数据
     val projectId: String?       // 项目id
     val buildingId: String?      // 建筑id
     val floorId: String?         // 楼层id

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

@@ -13,5 +13,5 @@ data class ComponentEntity(
     @ColumnInfo(name = "comp_code") val compCode: String,       // 构件编码
     @ColumnInfo(name = "comp_name") val compName: String?,      // 构件名称
     @ColumnInfo(name = "system_code") val systemCode: String,   // 系统编码
-    @ColumnInfo(name = "class_code") val classCode: String     // 类型编码
+    @ColumnInfo(name = "class_code") val classCode: String      // 类型编码
 )

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

@@ -12,7 +12,7 @@ import com.google.gson.JsonElement
 @Entity(tableName = "config")
 data class ConfigEntity(
     @PrimaryKey val id: String,
-    @ColumnInfo(name = "name") val name: String,   // 配置项名称
-    @ColumnInfo(name = "code") val code: String,   // 配置项代
-    @ColumnInfo(name = "data") val data: JsonElement? = null,  // 配置项的具体内容, 内容是 Json 格式,
+    @ColumnInfo(name = "name") val name: String,               // 配置项名称
+    @ColumnInfo(name = "code") val code: String,               // 配置项编
+    @ColumnInfo(name = "data") val data: JsonElement? = null,  // 配置项内容
 )

+ 2 - 2
demo/src/main/java/com/framework/mvvm/model/db/entity/dict/ContainerConfigEntity.kt

@@ -10,6 +10,6 @@ import androidx.room.PrimaryKey
 @Entity(tableName = "container_config")
 data class ContainerConfigEntity(
     @PrimaryKey val id: String,
-    @ColumnInfo(name = "container_code") var containerCode: String, // 容器设备类型
-    @ColumnInfo(name = "widget_code") var widgetCode: String        // 容器设备内部支持的无模型设备类型代
+    @ColumnInfo(name = "container_code") var containerCode: String, // 容器设备类型
+    @ColumnInfo(name = "widget_code") var widgetCode: String        // 无模型设备类型编
 )

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

@@ -13,7 +13,7 @@ data class EquipmentEntity(
     @ColumnInfo(name = "project_id") val projectId: String?,         // 项目 id
     @ColumnInfo(name = "code") val code: String?,                    // 设备编码
     @ColumnInfo(name = "name") val name: String?,                    // 设备名称
-    @ColumnInfo(name = "obj_type") val objType: String?,             // 对象类型 "system"
+    @ColumnInfo(name = "obj_type") val objType: String?,             // 对象类型
     @ColumnInfo(name = "group_code") val groupCode: String?,         // 集团编码
     @ColumnInfo(name = "major_code") val majorCode: String?,         // 专业编码
     @ColumnInfo(name = "system_code") val systemCode: String?,       // 系统编码

+ 2 - 11
demo/src/main/java/com/framework/mvvm/model/db/entity/dict/InfosConfigEntity.kt

@@ -11,20 +11,11 @@ import com.google.gson.JsonElement
 @Entity(tableName = "infos_config")
 data class InfosConfigEntity(
     @PrimaryKey val id: String,
-    @ColumnInfo(name = "name") val name: String?,                // 对象类型名称
+    @ColumnInfo(name = "name") val name: String?,               // 对象类型名称
     @ColumnInfo(name = "obj_type") val objType: String?,        // 对象类型(space|equipment)
     @ColumnInfo(name = "class_code") val classCode: String?,    // 对象class_code
     @ColumnInfo(name = "major_code") val majorCode: String?,    // 专业代码(类型为设备时)
     @ColumnInfo(name = "system_code") val systemCode: String?,  // 系统代码(类型为设备时)
-    @ColumnInfo(name = "project_id") val projectId: String?,    // 对象类型的信息详情点配置
+    @ColumnInfo(name = "project_id") val projectId: String?,    // 项目id
     @ColumnInfo(name = "infos") val infos: JsonElement? = null  // 对象类型的信息详情点配置
-)
-
-//{"code": "serve_area", "group": "静态信息", "label": "服务区域", "dataType": "string", "inputType": "edit:serve_area"}
-data class Info(
-    val code: String,
-    val dataType: String,
-    val group: String,
-    val inputType: String,
-    val label: String
 )

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

@@ -14,7 +14,7 @@ data class MajorEntity(
     @ColumnInfo(name = "code") val code: String,               // 专业编码
     @ColumnInfo(name = "type") val type: String,               // 专业类型
     @ColumnInfo(name = "order_num") val orderNum: Int,         // 序号
-    @ColumnInfo(name = "dict_type_id") val dictTypeId: String, //字典类型id
+    @ColumnInfo(name = "dict_type_id") val dictTypeId: String, // 字典类型id
     @ColumnInfo(name = "valid") var valid: Int?,               // 有效标识: 1 正常 0 删除
     @ColumnInfo(name = "remark") var remark: String?,          // 备注
 )

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

@@ -15,9 +15,9 @@ data class RelConfigEntity(
     @ColumnInfo(name = "obj_type_to") val objTypeTo: String?,          //  to  端对象类型(space|equipment)
     @ColumnInfo(name = "class_code_from") val classCodeFrom: String?,  // from 端对象class_code
     @ColumnInfo(name = "class_code_to") val classCodeTo: String?,      //  to  端对象class_code
-    @ColumnInfo(name = "graph_code") val graphCode: String?,           // 关系的图类型
+    @ColumnInfo(name = "graph_code") val graphCode: String?,           // 关系的图类型
     @ColumnInfo(name = "graph_name") val graphName: String?,           // 关系的图类型名称
-    @ColumnInfo(name = "rel_code") val relCode: String?,               // 关系的边类型
-    @ColumnInfo(name = "rel_name") val relName: String?,               // 关系的边类型代码
+    @ColumnInfo(name = "rel_code") val relCode: String?,               // 关系的边类型
+    @ColumnInfo(name = "rel_name") val relName: String?,               // 关系的边类型名称
     @ColumnInfo(name = "direction") val direction: String?,            // 关系方向(fixed|optional|none)
 )

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

@@ -19,7 +19,7 @@ data class RelationDictEntity(
     @ColumnInfo(name = "fromObjType") val fromObjType: String?,
     @ColumnInfo(name = "toObjType") val toObjType: String?,
     @ColumnInfo(name = "remark") val remark: String?,
-    @ColumnInfo(name = "valid") var valid: Int?,                    // 有效标识, // 1 正常 0 删除
+    @ColumnInfo(name = "valid") var valid: Int?,                   // 有效标识, // 1 正常 0 删除
     //@ColumnInfo(name = "before_cal_rels") val beforeCalRels: String?,
     //@ColumnInfo(name = "calRules") val calRules: String?,
 )

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

@@ -24,20 +24,20 @@ data class ObjectEntity(
     @ColumnInfo(name = "valid") override var valid: Int = 1,
     @ColumnInfo(name = "ts") override val ts: Long = 0L,
     @ColumnInfo(name = "name") val name: String? = "",
-    @ColumnInfo(name = "obj_type") val objType: String? = "",             // 对象类型
-    @ColumnInfo(name = "class_code") var classCode: String? = "",         // 对象类型编码
-    @ColumnInfo(name = "local_id") var localId: String? = "",             // 对象位置编码
-    @ColumnInfo(name = "local_name") val localName: String? = "",         // 对象位置名称
-    @ColumnInfo(name = "group_code") val groupCode: String? = "",         // 集团编码
-    @ColumnInfo(name = "grouping") val grouping: Int = 1,                 // 1 表示单个对象,2 表示对象组
-    @ColumnInfo(name = "client_device") val clientDevice: String? = "",   // 标识客户端设备
-    @ColumnInfo(name = "client_id") val clientId: String? = "",           // 客户端生成id
-    @ColumnInfo(name = "delivery_state") val deliveryState: Int? = null,  // BDTP交付状态: 1 已交付, 0 待交付
-    @ColumnInfo(name = "d2m_state") val d2mState: Int? = null,            // 逆向数据的数模同步状态(0:未同步;1:已同步)
-    @ColumnInfo(name = "virtual_codes") val virtualCodes: String? = "",   // 虚点清单: Json 数据格式
-    @ColumnInfo(name = "infos") var infos: JsonElement? = null,           // 信息点数据: Json 数据格式
-    @ColumnInfo(name = "floor_map") var floorMap: String? = "",           // 楼层地图
-    @ColumnInfo(name = "container_id") var containerId: String? = ""      // 无模型设备的上级设备id
+    @ColumnInfo(name = "obj_type") val objType: String? = "",                   // 对象类型
+    @ColumnInfo(name = "class_code") var classCode: String? = "",               // 对象类型编码
+    @ColumnInfo(name = "local_id") var localId: String? = "",                   // 对象位置编码
+    @ColumnInfo(name = "local_name") val localName: String? = "",               // 对象位置名称
+    @ColumnInfo(name = "group_code") val groupCode: String? = "",               // 集团编码
+    @ColumnInfo(name = "grouping") val grouping: Int = 1,                       // 1 表示单个对象,2 表示对象组
+    @ColumnInfo(name = "client_device") val clientDevice: String? = "",         // 标识客户端设备
+    @ColumnInfo(name = "client_id") val clientId: String? = "",                 // 客户端生成id
+    @ColumnInfo(name = "delivery_state") val deliveryState: Int? = null,        // BDTP交付状态: 1 已交付, 0 待交付
+    @ColumnInfo(name = "d2m_state") val d2mState: Int? = null,                  // 逆向数据的数模同步状态(0:未同步;1:已同步)
+    @ColumnInfo(name = "virtual_codes") val virtualCodes: JsonElement? = null,  // 虚点清单: Json 数据格式
+    @ColumnInfo(name = "infos") var infos: JsonElement? = null,                 // 信息点数据: Json 数据格式
+    @ColumnInfo(name = "floor_map") var floorMap: String? = "",                 // 楼层地图
+    @ColumnInfo(name = "container_id") var containerId: String? = ""            // 无模型设备的上级设备id
 ) : BaseEntity
 
 

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

@@ -18,17 +18,17 @@ data class PipeEntity(
     @ColumnInfo(name = "valid") override var valid: Int = 1,
     @ColumnInfo(name = "state") override var state: Int = -1,
     @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端对象
-    @ColumnInfo(name = "type_to") val typeTo: String? = "",                // to端对象类型(equipment:设备;pipe:管道)
-    @ColumnInfo(name = "direction") val direction: Int? = null,            // 管道方向(1:正向from->to;-1:反向to->from;0:无方向
-    @ColumnInfo(name = "pipe_type") val pipeType: String? = "",            // 管道的数据字典类型(OTLAPL: 液体管道|OTAAPL: 气体管道)'
-    @ColumnInfo(name = "pipe_sub_type") val pipeSubType: String? = "",     // 管道用途
-    @ColumnInfo(name = "route") val route: JsonElement? = null,            // 管道路由(坐标列表格式:[{x:1,y:1,z:1}])
-    @ColumnInfo(name = "infos") val infos: JsonElement? = null,            // 管道的信息点
-    @ColumnInfo(name = "d2m_state") val d2mState: String? = null,                 // 逆向数据的数模同步状态(0:未同步;1:已同步)
-    @ColumnInfo(name = "delivery_state") val deliveryState: String? = null,       // 交付BDTP状态:1已交付,0待交付
+    @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端对象
+    @ColumnInfo(name = "type_to") val typeTo: String? = "",                  // to端对象类型(equipment:设备;pipe:管道)
+    @ColumnInfo(name = "direction") val direction: Int? = null,              // 管道方向(1:正向from->to;-1:反向to->from;0:无方向
+    @ColumnInfo(name = "pipe_type") val pipeType: String? = "",              // 管道的数据字典类型(OTLAPL: 液体管道|OTAAPL: 气体管道)'
+    @ColumnInfo(name = "pipe_sub_type") val pipeSubType: String? = "",       // 管道用途
+    @ColumnInfo(name = "route") val route: JsonElement? = null,              // 管道路由(坐标列表格式:[{x:1,y:1,z:1}])
+    @ColumnInfo(name = "infos") val infos: JsonElement? = null,              // 管道的信息点
+    @ColumnInfo(name = "d2m_state") val d2mState: String? = null,            // 逆向数据的数模同步状态(0:未同步;1:已同步)
+    @ColumnInfo(name = "delivery_state") val deliveryState: String? = null,  // 交付BDTP状态:1已交付,0待交付
     var objFromLocalId: String? = "",
     var objToLocalId: String? = "",
 ) : BaseEntity

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

@@ -22,6 +22,6 @@ data class ProblemArchEntity(
     @ColumnInfo(name = "work_id") val workId: String? = "",            // 交付工作流程id
     @ColumnInfo(name = "problem_type") val problemType: String? = "",  // 问题类型
     @ColumnInfo(name = "problem_state") var problemState: Int? = null, // 建筑结构核查任务状态(0:删除;1:有效;2:已解决)
-    @ColumnInfo(name = "message") val message: String? = "",                // 问题描述
-    @ColumnInfo(name = "geom") val geom: JsonElement? = null,                 // 问题记录的几何数据(Json)
+    @ColumnInfo(name = "message") val message: String? = "",           // 问题描述
+    @ColumnInfo(name = "geom") val geom: JsonElement? = null,          // 问题记录的几何数据(Json)
 ) : BaseEntity

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

@@ -17,9 +17,9 @@ data class ProblemEquipEntity(
     @ColumnInfo(name = "state") override var state: Int = -1,
     @ColumnInfo(name = "valid") override var valid: Int = 1,
     @ColumnInfo(name = "ts") override val ts: Long = 0L,
-    @ColumnInfo(name = "equip_id") val equipId: String,            // 设备id
-    @ColumnInfo(name = "work_id") val workId: String? = null,             // 交付工作流程id
-    @ColumnInfo(name = "problem_type") val problemType: String? = null,   // 问题类型
-    @ColumnInfo(name = "problem_state") val problemState: Int? = null,    // 建筑结构核查任务状态(0:删除;1:有效;2:已解决)
-    @ColumnInfo(name = "message") val message: String? = null,            // 问题描述
+    @ColumnInfo(name = "equip_id") val equipId: String,                  // 设备id
+    @ColumnInfo(name = "work_id") val workId: String? = null,            // 交付工作流程id
+    @ColumnInfo(name = "problem_type") val problemType: String? = null,  // 问题类型
+    @ColumnInfo(name = "problem_state") val problemState: Int? = null,   // 建筑结构核查任务状态(0:删除;1:有效;2:已解决)
+    @ColumnInfo(name = "message") val message: String? = null,           // 问题描述
 ) : BaseEntity

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

@@ -18,8 +18,8 @@ data class QrCodeEntity(
     @ColumnInfo(name = "state") override var state: Int = -1,
     @ColumnInfo(name = "valid") override var valid: Int = 1,
     @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? = "",                       // 描述信息
-    @ColumnInfo(name = "location") val location: JsonElement? = null,                   // 位置坐标({x:1,y:1,z:1})
+    @ColumnInfo(name = "qr_code") val qrCode: String = "",              // 二维码数据值
+    @ColumnInfo(name = "obj_id") val objId: String = "",                // 二维码对应的对象id
+    @ColumnInfo(name = "remark") val remark: String? = "",              // 描述信息
+    @ColumnInfo(name = "location") val location: JsonElement? = null,   // 位置坐标({x:1,y:1,z:1})
 ) : BaseEntity

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

@@ -18,7 +18,7 @@ data class ServeAreaEntity(
     @ColumnInfo(name = "state") override var state: Int = -1,
     @ColumnInfo(name = "valid") override var valid: Int = 1,
     @ColumnInfo(name = "ts") override val ts: Long = 0L,
-    @ColumnInfo(name = "obj_id") var objId: String? = "",            // 服务该区域提供的设备id
+    @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对应对象(圆心半径))
     @ColumnInfo(name = "serve_type") var serveType: String? = "",    // 服务的类型,照明回路等,暂时为空