Browse Source

@task: Refactoring Entity

bai 3 years ago
parent
commit
6bfa32bc6f
71 changed files with 344 additions and 329 deletions
  1. 1 2
      demo/src/main/java/com/framework/di/Di.kt
  2. 2 0
      demo/src/main/java/com/framework/mvvm/model/db/AdmDatabase.kt
  3. 18 0
      demo/src/main/java/com/framework/mvvm/model/db/converter/JsonArrayConverter.kt
  4. 2 2
      demo/src/main/java/com/framework/mvvm/model/db/dao/ComponentDao.kt
  5. 1 1
      demo/src/main/java/com/framework/mvvm/model/db/dao/ConfigDao.kt
  6. 1 1
      demo/src/main/java/com/framework/mvvm/model/db/dao/EquipmentDao.kt
  7. 1 1
      demo/src/main/java/com/framework/mvvm/model/db/dao/FileDao.kt
  8. 1 1
      demo/src/main/java/com/framework/mvvm/model/db/dao/InfosConfigDao.kt
  9. 1 1
      demo/src/main/java/com/framework/mvvm/model/db/dao/M2dEquipDao.kt
  10. 1 1
      demo/src/main/java/com/framework/mvvm/model/db/dao/MajorDao.kt
  11. 1 1
      demo/src/main/java/com/framework/mvvm/model/db/dao/ObjectDao.kt
  12. 1 2
      demo/src/main/java/com/framework/mvvm/model/db/dao/PipeConfigDao.kt
  13. 2 2
      demo/src/main/java/com/framework/mvvm/model/db/dao/PipeDao.kt
  14. 1 1
      demo/src/main/java/com/framework/mvvm/model/db/dao/ProblemArchDao.kt
  15. 1 1
      demo/src/main/java/com/framework/mvvm/model/db/dao/ProblemEquipDao.kt
  16. 1 1
      demo/src/main/java/com/framework/mvvm/model/db/dao/QrCodeDao.kt
  17. 1 1
      demo/src/main/java/com/framework/mvvm/model/db/dao/RelConfigDao.kt
  18. 1 1
      demo/src/main/java/com/framework/mvvm/model/db/dao/RelationDao.kt
  19. 1 1
      demo/src/main/java/com/framework/mvvm/model/db/dao/RelationDictDao.kt
  20. 1 1
      demo/src/main/java/com/framework/mvvm/model/db/dao/SpaceDao.kt
  21. 1 1
      demo/src/main/java/com/framework/mvvm/model/db/dao/SystemDao.kt
  22. 18 0
      demo/src/main/java/com/framework/mvvm/model/db/entity/BaseEntity.kt
  23. 0 17
      demo/src/main/java/com/framework/mvvm/model/db/entity/ComponentEntity.kt
  24. 0 34
      demo/src/main/java/com/framework/mvvm/model/db/entity/ProblemArchEntity.kt
  25. 0 30
      demo/src/main/java/com/framework/mvvm/model/db/entity/ProblemEquipEntity.kt
  26. 0 31
      demo/src/main/java/com/framework/mvvm/model/db/entity/QrCodeEntity.kt
  27. 17 0
      demo/src/main/java/com/framework/mvvm/model/db/entity/dict/ComponentEntity.kt
  28. 1 1
      demo/src/main/java/com/framework/mvvm/model/db/entity/ConfigEntity.kt
  29. 12 17
      demo/src/main/java/com/framework/mvvm/model/db/entity/EquipmentEntity.kt
  30. 10 3
      demo/src/main/java/com/framework/mvvm/model/db/entity/InfosConfigEntity.kt
  31. 7 7
      demo/src/main/java/com/framework/mvvm/model/db/entity/M2dEquipEntity.kt
  32. 4 3
      demo/src/main/java/com/framework/mvvm/model/db/entity/MajorEntity.kt
  33. 3 2
      demo/src/main/java/com/framework/mvvm/model/db/entity/PipeConfigEntity.kt
  34. 3 2
      demo/src/main/java/com/framework/mvvm/model/db/entity/RelConfigEntity.kt
  35. 11 14
      demo/src/main/java/com/framework/mvvm/model/db/entity/RelationDictEntity.kt
  36. 6 9
      demo/src/main/java/com/framework/mvvm/model/db/entity/SystemEntity.kt
  37. 2 2
      demo/src/main/java/com/framework/mvvm/model/db/entity/rel/MajorSysRelation.kt
  38. 14 13
      demo/src/main/java/com/framework/mvvm/model/db/entity/FileEntity.kt
  39. 20 19
      demo/src/main/java/com/framework/mvvm/model/db/entity/ObjectEntity.kt
  40. 15 15
      demo/src/main/java/com/framework/mvvm/model/db/entity/PipeEntity.kt
  41. 33 0
      demo/src/main/java/com/framework/mvvm/model/db/entity/task/ProblemArchEntity.kt
  42. 31 0
      demo/src/main/java/com/framework/mvvm/model/db/entity/task/ProblemEquipEntity.kt
  43. 31 0
      demo/src/main/java/com/framework/mvvm/model/db/entity/task/QrCodeEntity.kt
  44. 15 17
      demo/src/main/java/com/framework/mvvm/model/db/entity/RelationEntity.kt
  45. 16 17
      demo/src/main/java/com/framework/mvvm/model/db/entity/SpaceEntity.kt
  46. 2 0
      demo/src/main/java/com/framework/mvvm/model/repository/AdmRepository.kt
  47. 1 1
      demo/src/main/java/com/framework/mvvm/model/vo/Building.kt
  48. 1 1
      demo/src/main/java/com/framework/mvvm/model/vo/Dict.kt
  49. 1 1
      demo/src/main/java/com/framework/mvvm/model/vo/Frame.kt
  50. 1 1
      demo/src/main/java/com/framework/mvvm/mv/AdmViewModel.kt
  51. 2 3
      demo/src/main/java/com/sybotan/android/demo/activities/EquipDetailActivity.kt
  52. 1 1
      demo/src/main/java/com/sybotan/android/demo/activities/GraphyActivity.kt
  53. 1 1
      demo/src/main/java/com/sybotan/android/demo/activities/SpaceDetailActivity.kt
  54. 1 1
      demo/src/main/java/com/sybotan/android/demo/adapter/EquipListAdapter.java
  55. 2 3
      demo/src/main/java/com/sybotan/android/demo/adapter/PersonalSelectSingleAdapter.java
  56. 1 4
      demo/src/main/java/com/sybotan/android/demo/adapter/PipeExpandAdapter.kt
  57. 1 3
      demo/src/main/java/com/sybotan/android/demo/adapter/RelationExpandAdapter.kt
  58. 2 3
      demo/src/main/java/com/sybotan/android/demo/adapter/SelectPopListAdapter.java
  59. 2 5
      demo/src/main/java/com/sybotan/android/demo/adapter/StaticInfoAdapter.java
  60. 1 2
      demo/src/main/java/com/sybotan/android/demo/bean/PipeConfigEntityPackClass.java
  61. 1 1
      demo/src/main/java/com/sybotan/android/demo/bean/ReLoactionEventBus.java
  62. 1 3
      demo/src/main/java/com/sybotan/android/demo/bean/RelConfigEntityPackClass.java
  63. 1 1
      demo/src/main/java/com/sybotan/android/demo/bean/RelationPackClass.java
  64. 1 1
      demo/src/main/java/com/sybotan/android/demo/bean/result/SpaceJobModel.java
  65. 1 3
      demo/src/main/java/com/sybotan/android/demo/view/EquipListDialog.java
  66. 1 4
      demo/src/main/java/com/sybotan/android/demo/view/ObjectRelationDialog.java
  67. 1 3
      demo/src/main/java/com/sybotan/android/demo/view/PipeDialog.java
  68. 1 1
      demo/src/main/java/com/sybotan/android/demo/view/SelectListPopupWindow.java
  69. 1 5
      demo/src/main/java/com/sybotan/android/demo/view/SelectListSinglePopupWindow.java
  70. 1 1
      demo/src/main/java/com/sybotan/android/demo/viewmodel/BuildVM.kt
  71. 4 0
      demo/src/main/java/com/sybotan/android/demo/viewmodel/GraphyVM.kt

+ 1 - 2
demo/src/main/java/com/framework/di/Di.kt

@@ -47,8 +47,7 @@ val httpModule = DI.Module("netModule") {
         singleton {
             HttpLoggingInterceptor { message ->
                 try {
-                    val text: String = URLDecoder.decode(message, "utf-8")
-                    LogUtil.e("OKHttp-----", text)
+                    LogUtil.e("OKHttp-----", message)
                 } catch (e: UnsupportedEncodingException) {
                     e.printStackTrace()
                     LogUtil.e("OKHttp-----", message)

+ 2 - 0
demo/src/main/java/com/framework/mvvm/model/db/AdmDatabase.kt

@@ -8,6 +8,8 @@ import androidx.room.TypeConverters
 import com.framework.mvvm.model.db.converter.JsonConverter
 import com.framework.mvvm.model.db.dao.*
 import com.framework.mvvm.model.db.entity.*
+import com.framework.mvvm.model.db.entity.dict.*
+import com.framework.mvvm.model.db.entity.task.*
 
 @Database(
     entities = [

+ 18 - 0
demo/src/main/java/com/framework/mvvm/model/db/converter/JsonArrayConverter.kt

@@ -0,0 +1,18 @@
+package com.framework.mvvm.model.db.converter
+
+import androidx.room.TypeConverter
+import org.json.JSONArray
+import org.json.JSONObject
+
+class JsonArrayConverter {
+    @TypeConverter
+    fun jsonArrayToString(jsonArray: JSONArray?): String? {
+        return jsonArray?.toString()
+    }
+
+    @TypeConverter
+    fun stringToJsonArray(string: String?): JSONArray? {
+        if (string == null) return null
+        return JSONArray(string)
+    }
+}

+ 2 - 2
demo/src/main/java/com/framework/mvvm/model/db/dao/ComponentDao.kt

@@ -1,8 +1,8 @@
 package com.framework.mvvm.model.db.dao
 
 import androidx.room.*
-import com.framework.mvvm.model.db.entity.ComponentEntity
-import com.framework.mvvm.model.db.entity.ConfigEntity
+import com.framework.mvvm.model.db.entity.dict.ComponentEntity
+import com.framework.mvvm.model.db.entity.dict.ConfigEntity
 
 @Dao
 interface ComponentDao {

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/dao/ConfigDao.kt

@@ -1,7 +1,7 @@
 package com.framework.mvvm.model.db.dao
 
 import androidx.room.*
-import com.framework.mvvm.model.db.entity.ConfigEntity
+import com.framework.mvvm.model.db.entity.dict.ConfigEntity
 
 /**
  * 表 config Dao

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/dao/EquipmentDao.kt

@@ -1,7 +1,7 @@
 package com.framework.mvvm.model.db.dao
 
 import androidx.room.*
-import com.framework.mvvm.model.db.entity.EquipmentEntity
+import com.framework.mvvm.model.db.entity.dict.EquipmentEntity
 
 /**
  * 表 equipment Dao

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/dao/FileDao.kt

@@ -1,7 +1,7 @@
 package com.framework.mvvm.model.db.dao
 
 import androidx.room.*
-import com.framework.mvvm.model.db.entity.FileEntity
+import com.framework.mvvm.model.db.entity.task.FileEntity
 
 /**
  * 表 file Dao

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/dao/InfosConfigDao.kt

@@ -1,7 +1,7 @@
 package com.framework.mvvm.model.db.dao
 
 import androidx.room.*
-import com.framework.mvvm.model.db.entity.InfosConfigEntity
+import com.framework.mvvm.model.db.entity.dict.InfosConfigEntity
 
 /**
  * 表 infos_config Dao

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/dao/M2dEquipDao.kt

@@ -1,7 +1,7 @@
 package com.framework.mvvm.model.db.dao
 
 import androidx.room.*
-import com.framework.mvvm.model.db.entity.M2dEquipEntity
+import com.framework.mvvm.model.db.entity.dict.M2dEquipEntity
 
 /**
  * table m2d_equip Dao

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/dao/MajorDao.kt

@@ -1,7 +1,7 @@
 package com.framework.mvvm.model.db.dao
 
 import androidx.room.*
-import com.framework.mvvm.model.db.entity.MajorEntity
+import com.framework.mvvm.model.db.entity.dict.MajorEntity
 
 /**
  * 表 maj_dict Dao

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/dao/ObjectDao.kt

@@ -1,7 +1,7 @@
 package com.framework.mvvm.model.db.dao
 
 import androidx.room.*
-import com.framework.mvvm.model.db.entity.ObjectEntity
+import com.framework.mvvm.model.db.entity.task.ObjectEntity
 
 /**
  * 表 object Dao

+ 1 - 2
demo/src/main/java/com/framework/mvvm/model/db/dao/PipeConfigDao.kt

@@ -1,8 +1,7 @@
 package com.framework.mvvm.model.db.dao
 
 import androidx.room.*
-import com.framework.mvvm.model.db.entity.PipeConfigEntity
-import com.framework.mvvm.model.db.entity.RelConfigEntity
+import com.framework.mvvm.model.db.entity.dict.PipeConfigEntity
 
 /**
  * 表 pipe_config Dao

+ 2 - 2
demo/src/main/java/com/framework/mvvm/model/db/dao/PipeDao.kt

@@ -1,8 +1,8 @@
 package com.framework.mvvm.model.db.dao
 
 import androidx.room.*
-import com.framework.mvvm.model.db.entity.PipeConfigEntity
-import com.framework.mvvm.model.db.entity.PipeEntity
+import com.framework.mvvm.model.db.entity.dict.PipeConfigEntity
+import com.framework.mvvm.model.db.entity.task.PipeEntity
 
 /**
  * 管道表 Dao

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/dao/ProblemArchDao.kt

@@ -1,7 +1,7 @@
 package com.framework.mvvm.model.db.dao
 
 import androidx.room.*
-import com.framework.mvvm.model.db.entity.ProblemArchEntity
+import com.framework.mvvm.model.db.entity.task.ProblemArchEntity
 
 /**
  * 表 problem_arch Dao

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/dao/ProblemEquipDao.kt

@@ -1,7 +1,7 @@
 package com.framework.mvvm.model.db.dao
 
 import androidx.room.*
-import com.framework.mvvm.model.db.entity.ProblemEquipEntity
+import com.framework.mvvm.model.db.entity.task.ProblemEquipEntity
 
 /**
  * 表 problem_equip Dao

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/dao/QrCodeDao.kt

@@ -1,7 +1,7 @@
 package com.framework.mvvm.model.db.dao
 
 import androidx.room.*
-import com.framework.mvvm.model.db.entity.QrCodeEntity
+import com.framework.mvvm.model.db.entity.task.QrCodeEntity
 
 /**
  * 表 qr_code Dao

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/dao/RelConfigDao.kt

@@ -1,7 +1,7 @@
 package com.framework.mvvm.model.db.dao
 
 import androidx.room.*
-import com.framework.mvvm.model.db.entity.RelConfigEntity
+import com.framework.mvvm.model.db.entity.dict.RelConfigEntity
 
 /**
  * 表 rel_config Dao

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/dao/RelationDao.kt

@@ -1,7 +1,7 @@
 package com.framework.mvvm.model.db.dao
 
 import androidx.room.*
-import com.framework.mvvm.model.db.entity.RelationEntity
+import com.framework.mvvm.model.db.entity.task.RelationEntity
 
 /**
  * 表 relation Dao

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/dao/RelationDictDao.kt

@@ -1,7 +1,7 @@
 package com.framework.mvvm.model.db.dao
 
 import androidx.room.*
-import com.framework.mvvm.model.db.entity.RelationDictEntity
+import com.framework.mvvm.model.db.entity.dict.RelationDictEntity
 
 /**
  * 表 relation_dict Dao

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/dao/SpaceDao.kt

@@ -1,7 +1,7 @@
 package com.framework.mvvm.model.db.dao
 
 import androidx.room.*
-import com.framework.mvvm.model.db.entity.SpaceEntity
+import com.framework.mvvm.model.db.entity.task.SpaceEntity
 
 /**
  * 表 space Dao

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/dao/SystemDao.kt

@@ -4,7 +4,7 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import com.framework.mvvm.model.db.entity.SystemEntity
+import com.framework.mvvm.model.db.entity.dict.SystemEntity
 
 /**
  * 表 sys_dict Dao

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

@@ -0,0 +1,18 @@
+package com.framework.mvvm.model.db.entity
+
+/**
+ * 数据公共字段约束
+ */
+interface BaseEntity {
+    val id: String               // id
+    var valid: Int?              // 有效标识, // 1 正常 0 删除
+    var creator: String?         // 创建人
+    var creationTime: String?    // 创建时间
+    var modifier: String?        // 修改人
+    var modifiedTime: String?    // 修改时间
+    var uploadFlag: String?      // 设备唯一标识
+    var state: String            // 数据状态:0:未处理,1:已处理过 2:已上传
+    val projectId: String?       // 项目id
+    val buildingId: String?      // 建筑id
+    val floorId: String?         // 楼层id
+}

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

@@ -1,17 +0,0 @@
-package com.framework.mvvm.model.db.entity
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-/**
- * component 表
- */
-@Entity(tableName = "component")
-data class ComponentEntity(
-    @PrimaryKey val id: String,
-    @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 class_code: String
-)

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

@@ -1,34 +0,0 @@
-package com.framework.mvvm.model.db.entity
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import kotlinx.serialization.Contextual
-import kotlinx.serialization.Serializable
-import org.json.JSONObject
-
-/**
- * 结构问题  表
- */
-@Entity(tableName = "problem_arch")
-@Serializable
-data class ProblemArchEntity(
-    @PrimaryKey val id: String,
-    @ColumnInfo(name = "floor_id") val floorId: String,            // 问题所在楼层id
-    @ColumnInfo(name = "project_id") val projectId: String,        // 项目id
-    @ColumnInfo(name = "building_id") val buildingId: String,      // 建筑id
-    @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?,    // 问题类型
-    @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") var creationTime: String?,  // 创建时间
-    @ColumnInfo(name = "modifier") val modifier: 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)
-    @ColumnInfo(name = "strGeom") val strGeom: String?,                   // 问题记录的几何数据(Json)
-    @ColumnInfo(name = "state") var state: String? = "0"             // 数据状态:0:未处理,1:已处理 2:已上传
-)

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

@@ -1,30 +0,0 @@
-package com.framework.mvvm.model.db.entity
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import kotlinx.serialization.Serializable
-
-/**
- * 设备问题 表
- */
-@Entity(tableName = "problem_equip")
-@Serializable
-data class ProblemEquipEntity(
-    @PrimaryKey val id: String,
-    @ColumnInfo(name = "floor_id") val floorId: String,            // 问题所在楼层id
-    @ColumnInfo(name = "project_id") val projectId: String,        // 项目id
-    @ColumnInfo(name = "building_id") val buildingId: String,      // 建筑id
-    @ColumnInfo(name = "equip_id") val equipId: String,            // 设备id
-    @ColumnInfo(name = "work_id") val workId: String?,              // 交付工作流程id
-    @ColumnInfo(name = "problem_type") val problemType: String?,    // 问题类型
-    @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") var creationTime: String?,  // 创建时间
-    @ColumnInfo(name = "modifier") val modifier: 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:已上传
-)

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

@@ -1,31 +0,0 @@
-package com.framework.mvvm.model.db.entity
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import kotlinx.serialization.Serializable
-
-/**
- * 二维码表
- */
-@Entity(tableName = "qr_code")
-@Serializable
-data class QrCodeEntity(
-    @PrimaryKey val id: String,
-    @ColumnInfo(name = "qr_code") val qrCode: String,              // 二维码数据值
-    @ColumnInfo(name = "obj_id") val objId: String,                // 二维码对应的对象id
-    @ColumnInfo(name = "project_id") val projectId: String,        // 项目id
-    @ColumnInfo(name = "building_id") val buildingId: String,      // 建筑id
-    @ColumnInfo(name = "floor_id") val floorId: String,            // 楼层id
-    @ColumnInfo(name = "remark") val remark: String?,               // 描述信息
-    @ColumnInfo(name = "creator") val creator: 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?,                 // 合法标识
-    @ColumnInfo(name = "upload_flag") val uploadFlag: String?,      // app端上传数据标记
-    @ColumnInfo(name = "location") val location: String?,           // 位置坐标({x:1,y:1,z:1})
-    @ColumnInfo(name = "strLocation") val strLocation: String?,           // 位置坐标({x:1,y:1,z:1})
-    @ColumnInfo(name = "state") var state: String? = "0"             // 数据状态:0:未处理,1:已处理 2:已上传
-
-)

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

@@ -0,0 +1,17 @@
+package com.framework.mvvm.model.db.entity.dict
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+/**
+ * component 表
+ */
+@Entity(tableName = "component")
+data class ComponentEntity(
+    @PrimaryKey val id: String,
+    @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 class_code: String     // 类型编码
+)

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

@@ -1,4 +1,4 @@
-package com.framework.mvvm.model.db.entity
+package com.framework.mvvm.model.db.entity.dict
 
 
 import androidx.room.ColumnInfo

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

@@ -1,4 +1,4 @@
-package com.framework.mvvm.model.db.entity
+package com.framework.mvvm.model.db.entity.dict
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
@@ -10,23 +10,18 @@ import androidx.room.PrimaryKey
 @Entity(tableName = "equipment")
 data class EquipmentEntity(
     @PrimaryKey val id: String,
-    @ColumnInfo(name = "valid") val valid: Int,                  // 1 正常 0 删除
-    @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 = "group_code") val groupCode: String?,      // 集团编码
-    @ColumnInfo(name = "major_code") val majorCode: String?,      // 专业编码
+    @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 = "group_code") val groupCode: String?,         // 集团编码
+    @ColumnInfo(name = "major_code") val majorCode: String?,         // 专业编码
     @ColumnInfo(name = "system_code") val systemCode: String?,       // 系统编码
-    @ColumnInfo(name = "parent_code") val parentCode: String?,    // 父编码
+    @ColumnInfo(name = "parent_code") val parentCode: String?,       // 父编码
     @ColumnInfo(name = "equipment_code") val equipmentCode: String?, // 设备编码
-    @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 = "alias_code") val aliasCode: String?,      // 编码别名
-    @ColumnInfo(name = "alias_name") val aliasName: String?,      // 名称别名
+    @ColumnInfo(name = "alias_code") val aliasCode: String?,         // 编码别名
+    @ColumnInfo(name = "alias_name") val aliasName: String?,         // 名称别名
     @ColumnInfo(name = "version") val version: String?,              // 版本
-
     @ColumnInfo(name = "system_name") var systemName: String?,       // 系统编码
-)
+    @ColumnInfo(name = "valid") var valid: Int?,                     // 有效标识, // 1 正常 0 删除
+)

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

@@ -1,4 +1,4 @@
-package com.framework.mvvm.model.db.entity
+package com.framework.mvvm.model.db.entity.dict
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
@@ -13,7 +13,7 @@ import org.json.JSONObject
 @Entity(tableName = "infos_config")
 @Serializable
 data class InfosConfigEntity(
-    @PrimaryKey(autoGenerate = false) val id: String,
+    @PrimaryKey val id: 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
@@ -23,5 +23,12 @@ data class InfosConfigEntity(
     @ColumnInfo(name = "str_infos") val strInfos: String?,      // 对象类型的信息详情点配置
     @ColumnInfo(name = "infos")
     @Contextual val infos: JSONObject?                         // 对象类型的信息详情点配置
-
 )
+//{"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
+)

+ 7 - 7
demo/src/main/java/com/framework/mvvm/model/db/entity/M2dEquipEntity.kt

@@ -1,4 +1,4 @@
-package com.framework.mvvm.model.db.entity
+package com.framework.mvvm.model.db.entity.dict
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
@@ -11,10 +11,10 @@ import kotlinx.serialization.Serializable
 @Entity(tableName = "m2d_equip")
 @Serializable
 data class M2dEquipEntity(
-    @PrimaryKey(autoGenerate = false) val id: String,
-    @ColumnInfo(name = "name") val name: String,              //范围定义名称
-    @ColumnInfo(name = "major_code") val majorCode: String?,   //专业代
-    @ColumnInfo(name = "system_code") val systemCode: String?, //系统代
-    @ColumnInfo(name = "class_code") val classCode: String?,   //设备类代码
-    @ColumnInfo(name = "project_id") val projectId: String?,
+    @PrimaryKey val id: String,
+    @ColumnInfo(name = "name") val name: String,               // 设备名称
+    @ColumnInfo(name = "major_code") val majorCode: String?,   // 专业编
+    @ColumnInfo(name = "system_code") val systemCode: String?, // 系统编
+    @ColumnInfo(name = "class_code") val classCode: String?,   // 类型代码
+    @ColumnInfo(name = "project_id") val projectId: String?,   // 项目id
 )

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

@@ -1,4 +1,4 @@
-package com.framework.mvvm.model.db.entity
+package com.framework.mvvm.model.db.entity.dict
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
@@ -10,12 +10,13 @@ import kotlinx.serialization.Serializable
  */
 @Entity(tableName = "major")
 @Serializable
-class MajorEntity(
+data class MajorEntity(
     @PrimaryKey val id: String,
     @ColumnInfo(name = "label") val label: String,             // 专业标签
     @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 = "valid") val valid: Int,                // 有效标识
+    @ColumnInfo(name = "valid") var valid: Int?,               // 有效标识: 1 正常 0 删除
+    @ColumnInfo(name = "remark") var remark: String?,          // 备注
 )

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

@@ -1,4 +1,4 @@
-package com.framework.mvvm.model.db.entity
+package com.framework.mvvm.model.db.entity.dict
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
@@ -11,7 +11,8 @@ import kotlinx.serialization.Serializable
 @Entity(tableName = "pipe_config")
 @Serializable
 data class PipeConfigEntity(
-    @PrimaryKey(autoGenerate = false) val id: String,
+    @PrimaryKey val id: String,
+    @ColumnInfo(name = "project_id") val projectId: String?,             // 项目id
     @ColumnInfo(name = "class_code_from") val classCodeFrom: String?,    // from 端设备对象class_code
     @ColumnInfo(name = "class_code_to") val classCodeTo: String?,        //  to  端设备对象class_code
     @ColumnInfo(name = "pipe_type") val pipeType: String?,               // 管道类型(数据字典定义)

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

@@ -1,4 +1,4 @@
-package com.framework.mvvm.model.db.entity
+package com.framework.mvvm.model.db.entity.dict
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
@@ -12,6 +12,7 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class RelConfigEntity(
     @PrimaryKey val id: String,
+    @ColumnInfo(name = "project_id") val projectId: String?,           // 项目id
     @ColumnInfo(name = "obj_type_from") val objTypeFrom: String?,      // from 端对象类型(space|equipment)
     @ColumnInfo(name = "obj_type_to") val objTypeTo: String?,          //  to  端对象类型(space|equipment)
     @ColumnInfo(name = "class_code_from") val classCodeFrom: String?,  // from 端对象class_code
@@ -20,5 +21,5 @@ data class RelConfigEntity(
     @ColumnInfo(name = "graph_name") val graphName: String?,           // 关系的图类型名称
     @ColumnInfo(name = "rel_code") val relCode: String?,               // 关系的边类型代码
     @ColumnInfo(name = "rel_name") val relName: String?,               // 关系的边类型代码
-    @ColumnInfo(name = "direction") val direction: String?,               // 关系方向(fixed|optional|none)
+    @ColumnInfo(name = "direction") val direction: String?,            // 关系方向(fixed|optional|none)
 )

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

@@ -1,8 +1,9 @@
-package com.framework.mvvm.model.db.entity
+package com.framework.mvvm.model.db.entity.dict
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import com.framework.mvvm.model.db.entity.BaseEntity
 import kotlinx.serialization.Serializable
 
 /**
@@ -12,20 +13,16 @@ import kotlinx.serialization.Serializable
 @Serializable
 class RelationDictEntity(
     @PrimaryKey val id: String,
-    @ColumnInfo(name = "code") val code: String,                 // 关系编码
-    @ColumnInfo(name = "name") val name: String,                 // 关系名
+    @ColumnInfo(name = "code") val code: String,                  // 关系编码
+    @ColumnInfo(name = "name") val name: String,                  // 关系名
     @ColumnInfo(name = "graph_code") val graphCode: String,       // 图编码
-    @ColumnInfo(name = "valid") val valid: Int,                  // 有效标识
-    @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 = "directional") val directional: Int?,      // 方向
-    @ColumnInfo(name = "target_Objs") val targetObjs: String?,     // 目标对象
-    @ColumnInfo(name = "attribute") val attribute: String?,          // 属性
-    //@ColumnInfo(name = "before_cal_rels") val beforeCalRels: String?,
-    //@ColumnInfo(name = "calRules") val calRules: String?,
+    @ColumnInfo(name = "target_Objs") val targetObjs: String?,    // 目标对象
+    @ColumnInfo(name = "attribute") val attribute: String?,       // 属性
     @ColumnInfo(name = "fromObjType") val fromObjType: String?,
     @ColumnInfo(name = "toObjType") val toObjType: String?,
-    @ColumnInfo(name = "remark") val remark: String?
-)
+    @ColumnInfo(name = "remark") val remark: String?,
+    @ColumnInfo(name = "valid") var valid: Int?,                    // 有效标识, // 1 正常 0 删除
+    //@ColumnInfo(name = "before_cal_rels") val beforeCalRels: String?,
+    //@ColumnInfo(name = "calRules") val calRules: String?,
+)

+ 6 - 9
demo/src/main/java/com/framework/mvvm/model/db/entity/SystemEntity.kt

@@ -1,8 +1,9 @@
-package com.framework.mvvm.model.db.entity
+package com.framework.mvvm.model.db.entity.dict
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import com.framework.mvvm.model.db.entity.BaseEntity
 import kotlinx.serialization.Serializable
 
 /**
@@ -12,21 +13,17 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class SystemEntity(
     @PrimaryKey val id: String,
-    @ColumnInfo(name = "code") val code: String,                    // 系统编码
-    @ColumnInfo(name = "name") val name: String,                    // 系统名称
-    @ColumnInfo(name = "valid") val valid: Int?,                     // 1 正常 0 删除
+    @ColumnInfo(name = "code") val code: String,                     // 系统编码
+    @ColumnInfo(name = "name") val name: String,                     // 系统名称
     @ColumnInfo(name = "alias_code") val aliasCode: String?,         // 编码别名
     @ColumnInfo(name = "alias_name") val aliasName: String?,         // 名称别名
     @ColumnInfo(name = "project_id") val projectId: String?,         // 项目 id
-    @ColumnInfo(name = "obj_type") val objType: String,             // 对象类型 "system"
+    @ColumnInfo(name = "obj_type") val objType: String,              // 对象类型 "system"
     @ColumnInfo(name = "group_code") val groupCode: String?,         // 集团编码
     @ColumnInfo(name = "major_code") val majorCode: String?,         // 专业编码
     @ColumnInfo(name = "system_code") val systemCode: String?,       // 系统编码
     @ColumnInfo(name = "parent_code") val parentCode: String?,       // 父编码
     @ColumnInfo(name = "equipment_code") val equipmentCode: String?, // 设备编码
     @ColumnInfo(name = "version") val version: String?,              // 版本
-    @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 = "valid") var valid: Int?,                     // 有效标识, // 1 正常 0 删除
 )

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

@@ -3,8 +3,8 @@ package com.framework.mvvm.model.db.entity.rel
 import androidx.room.Embedded
 import androidx.room.Entity
 import androidx.room.Relation
-import com.framework.mvvm.model.db.entity.MajorEntity
-import com.framework.mvvm.model.db.entity.SystemEntity
+import com.framework.mvvm.model.db.entity.dict.MajorEntity
+import com.framework.mvvm.model.db.entity.dict.SystemEntity
 
 /**
  * 专业与系统一对多关系表

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

@@ -1,8 +1,9 @@
-package com.framework.mvvm.model.db.entity
+package com.framework.mvvm.model.db.entity.task
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import com.framework.mvvm.model.db.entity.BaseEntity
 import kotlinx.serialization.Serializable
 
 /**
@@ -11,7 +12,17 @@ import kotlinx.serialization.Serializable
 @Entity(tableName = "file")
 @Serializable
 data class FileEntity(
-    @PrimaryKey(autoGenerate = false) val id: String,
+    @PrimaryKey @ColumnInfo(name = "id") override val id: String,
+    @ColumnInfo(name = "project_id") override val projectId: String,
+    @ColumnInfo(name = "building_id") override val buildingId: String?,
+    @ColumnInfo(name = "floor_id") override val floorId: String?,
+    @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 = "creator") override var creator: String?,
+    @ColumnInfo(name = "creation_time") override var creationTime: String?,
+    @ColumnInfo(name = "modifier") override var modifier: String?,
+    @ColumnInfo(name = "modified_time") override var modifiedTime: String?,
     @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|...)
@@ -20,14 +31,4 @@ data class FileEntity(
     @ColumnInfo(name = "ref_info_code") val refInfoCode: String?,   // 关联的对象信息点code
     @ColumnInfo(name = "remark") val remark: String?,               // 描述
     @ColumnInfo(name = "order_num") val orderNum: Int?,             // 文件附件(照片)的排序序号
-    @ColumnInfo(name = "project_id") val projectId: String?,        // 项目id
-    @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") var creationTime: String?,  // 创建时间
-    @ColumnInfo(name = "modifier") val modifier: 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:已上传
-)
+) : BaseEntity

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

@@ -1,10 +1,11 @@
-package com.framework.mvvm.model.db.entity
+package com.framework.mvvm.model.db.entity.task
 
 import androidx.annotation.NonNull
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import cn.sagacloud.android.cadengine.types.PointZ
+import com.framework.mvvm.model.db.entity.BaseEntity
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.Serializable
 import org.json.JSONObject
@@ -17,38 +18,38 @@ import org.json.JSONObject
 @Entity(tableName = "object")
 @Serializable
 data class ObjectEntity(
-    @NonNull
-    @PrimaryKey val id: String,
+    @PrimaryKey @ColumnInfo(name = "id") override val id: String,
+    @ColumnInfo(name = "project_id") override val projectId: String,
+    @ColumnInfo(name = "building_id") override val buildingId: String?,
+    @ColumnInfo(name = "floor_id") override val floorId: String?,
+    @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 = "creator") override var creator: String?,
+    @ColumnInfo(name = "creation_time") override var creationTime: String?,
+    @ColumnInfo(name = "modifier") override var modifier: String?,
+    @ColumnInfo(name = "modified_time") override var modifiedTime: String?,
     @ColumnInfo(name = "name") val name: String,
-    @ColumnInfo(name = "project_id") val projectId: String,        // 项目id
-    @ColumnInfo(name = "obj_type") val objType: String,            // 对象类型
-    @ColumnInfo(name = "class_code") var classCode: 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 表示单个对象,2 表示对象组
-    @ColumnInfo(name = "building_id") val buildingId: String?,      // 建筑id
-    @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") var creationTime: String?,  // 创建时间
-    @ColumnInfo(name = "modifier") val modifier: String?,           // 修改人
-    @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?,        // 更新对象的应用
-    @ColumnInfo(name = "upload_flag") var uploadFlag: String?,      // app端上传数据标记
-    @ColumnInfo(name = "valid") var valid: Int?,                    // 合法标识: 1 合法, 0 非法
     @ColumnInfo(name = "delivery_state") val deliveryState: Int?,   // BDTP交付状态: 1 已交付, 0 待交付
     @ColumnInfo(name = "d2m_state") val d2mState: Int?,             // 逆向数据的数模同步状态(0:未同步;1:已同步)
-    @ColumnInfo(name = "virtual_codes") val virtualCodes: String?,   // 虚点清单: Json 数据格式
+    @ColumnInfo(name = "virtual_codes") val virtualCodes: String?,  // 虚点清单: Json 数据格式
     @ColumnInfo(name = "infos")
     @Contextual
     var infos: JSONObject?,               // 信息点数据: Json 数据格式
-    @ColumnInfo(name = "str_infos") var strInfos: String?,           // 信息点数据: Json 数据格式
-    @ColumnInfo(name = "floor_map") var floorMap: String?,           // 楼层地图
-    @ColumnInfo(name = "state") var state: String? = "0"              // 数据状态:0:未处理,1:已处理 2:已上传
-)
+    @ColumnInfo(name = "str_infos") var strInfos: String?,          // 信息点数据: Json 数据格式
+    @ColumnInfo(name = "floor_map") var floorMap: String?,          // 楼层地图
+
+) : BaseEntity
 
 
 data class Infos(

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

@@ -1,8 +1,9 @@
-package com.framework.mvvm.model.db.entity
+package com.framework.mvvm.model.db.entity.task
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import com.framework.mvvm.model.db.entity.BaseEntity
 import kotlinx.serialization.Serializable
 
 /**
@@ -11,10 +12,17 @@ import kotlinx.serialization.Serializable
 @Entity(tableName = "pipe")
 @Serializable
 data class PipeEntity(
-    @PrimaryKey val id: String,
-    @ColumnInfo(name = "floor_id") val floorId: String?,              // 楼层id
-    @ColumnInfo(name = "project_id") val projectId: String?,          // 项目id
-    @ColumnInfo(name = "building_id") val buildingId: String?,        // 建筑id
+    @PrimaryKey @ColumnInfo(name = "id") override val id: String,
+    @ColumnInfo(name = "floor_id") override val floorId: String?,
+    @ColumnInfo(name = "project_id") override val projectId: String?,
+    @ColumnInfo(name = "building_id") override val buildingId: String?,
+    @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 = "creator") override var creator: String?,
+    @ColumnInfo(name = "creation_time") override var creationTime: String?,
+    @ColumnInfo(name = "modifier") override var modifier: String?,
+    @ColumnInfo(name = "modified_time") override var modifiedTime: String?,
     @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端对象
@@ -24,16 +32,8 @@ data class PipeEntity(
     @ColumnInfo(name = "pipe_sub_type") val pipeSubType: String?,     // 管道用途
     @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") var creationTime: String?,      // 创建时间
-    @ColumnInfo(name = "modifier") val modifier: String?,             // 修改人
-    @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:已同步)
     @ColumnInfo(name = "delivery_state") val deliveryState: String?,  // 交付BDTP状态:1已交付,0待交付
-    @ColumnInfo(name = "state") var state: String? = "0",               // 数据状态:0:未处理,1:已处理 2:已上传
-
     var objFromLocalId: String?,
-    var objToLocalId: String?
-)
+    var objToLocalId: String?,
+) : BaseEntity

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

@@ -0,0 +1,33 @@
+package com.framework.mvvm.model.db.entity.task
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.framework.mvvm.model.db.entity.BaseEntity
+import kotlinx.serialization.Serializable
+
+/**
+ * 结构问题  表
+ */
+@Entity(tableName = "problem_arch")
+@Serializable
+data class ProblemArchEntity(
+    @PrimaryKey @ColumnInfo(name = "id") override val id: String,
+    @ColumnInfo(name = "floor_id") override val floorId: String,
+    @ColumnInfo(name = "project_id") override val projectId: String,
+    @ColumnInfo(name = "building_id") override val buildingId: String,
+    @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 = "creator") override var creator: String?,
+    @ColumnInfo(name = "creation_time") override var creationTime: String?,
+    @ColumnInfo(name = "modifier") override var modifier: String?,
+    @ColumnInfo(name = "modified_time") override var modifiedTime: String?,
+    @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?,   // 问题类型
+    @ColumnInfo(name = "problem_state") var problemState: Int?,    // 建筑结构核查任务状态(0:删除;1:有效;2:已解决)
+    @ColumnInfo(name = "message") val message: String?,            // 问题描述
+    @ColumnInfo(name = "geom") val geom: String?,                  // 问题记录的几何数据(Json)
+    @ColumnInfo(name = "strGeom") val strGeom: String?,            // 问题记录的几何数据(Json)
+) : BaseEntity

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

@@ -0,0 +1,31 @@
+package com.framework.mvvm.model.db.entity.task
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.framework.mvvm.model.db.entity.BaseEntity
+import kotlinx.serialization.Serializable
+
+/**
+ * 设备问题 表
+ */
+@Entity(tableName = "problem_equip")
+@Serializable
+data class ProblemEquipEntity(
+    @PrimaryKey @ColumnInfo(name = "id") override val id: String,
+    @ColumnInfo(name = "floor_id") override val floorId: String,
+    @ColumnInfo(name = "project_id") override val projectId: String,
+    @ColumnInfo(name = "building_id") override val buildingId: String,
+    @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 = "creator") override var creator: String?,
+    @ColumnInfo(name = "creation_time") override var creationTime: String?,
+    @ColumnInfo(name = "modifier") override var modifier: String?,
+    @ColumnInfo(name = "modified_time") override var modifiedTime: String?,
+    @ColumnInfo(name = "equip_id") val equipId: String,            // 设备id
+    @ColumnInfo(name = "work_id") val workId: String?,             // 交付工作流程id
+    @ColumnInfo(name = "problem_type") val problemType: String?,   // 问题类型
+    @ColumnInfo(name = "problem_state") val problemState: Int?,    // 建筑结构核查任务状态(0:删除;1:有效;2:已解决)
+    @ColumnInfo(name = "message") val message: String?,            // 问题描述
+) : BaseEntity

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

@@ -0,0 +1,31 @@
+package com.framework.mvvm.model.db.entity.task
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.framework.mvvm.model.db.entity.BaseEntity
+import kotlinx.serialization.Serializable
+
+/**
+ * 二维码表
+ */
+@Entity(tableName = "qr_code")
+@Serializable
+data class QrCodeEntity(
+    @PrimaryKey @ColumnInfo(name = "id") override val id: String,
+    @ColumnInfo(name = "project_id") override val projectId: String,
+    @ColumnInfo(name = "building_id") override val buildingId: String,
+    @ColumnInfo(name = "floor_id") override val floorId: String,
+    @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 = "creator") override var creator: String?,
+    @ColumnInfo(name = "creation_time") override var creationTime: String?,
+    @ColumnInfo(name = "modifier") override var modifier: String?,
+    @ColumnInfo(name = "modified_time") override var modifiedTime: String?,
+    @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: String?,                   // 位置坐标({x:1,y:1,z:1})
+    @ColumnInfo(name = "strLocation") val strLocation: String?,             // 位置坐标({x:1,y:1,z:1})
+) : BaseEntity

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

@@ -1,9 +1,10 @@
-package com.framework.mvvm.model.db.entity
+package com.framework.mvvm.model.db.entity.task
 
 import androidx.annotation.NonNull
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import com.framework.mvvm.model.db.entity.BaseEntity
 import kotlinx.serialization.Serializable
 
 /**
@@ -12,12 +13,17 @@ import kotlinx.serialization.Serializable
 @Entity(tableName = "relation")
 @Serializable
 data class RelationEntity(
-    @NonNull
-    @PrimaryKey(autoGenerate = false)
-    @ColumnInfo(name = "id") val id: String,                        // uuid
-    @ColumnInfo(name = "project_id") val projectId: String,         // 项目id
-    @ColumnInfo(name = "building_id") val buildingId: String?,         // 项目id
-    @ColumnInfo(name = "floor_id") val floorId: String?,             // 楼层id
+    @PrimaryKey @ColumnInfo(name = "id") override val id: String,
+    @ColumnInfo(name = "project_id") override val projectId: String?,
+    @ColumnInfo(name = "building_id") override val buildingId: String?,
+    @ColumnInfo(name = "floor_id") override val floorId: String?,
+    @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 = "creator") override var creator: String?,
+    @ColumnInfo(name = "creation_time") override var creationTime: String?,
+    @ColumnInfo(name = "modifier") override var modifier: String?,
+    @ColumnInfo(name = "modified_time") override var modifiedTime: String?,
     @ColumnInfo(name = "group_code") val groupCode: String?,         // 集团代码
     @ColumnInfo(name = "graph_id") val graphId: String?,             // 图id
     @ColumnInfo(name = "graph_code") val graphCode: String?,         // 图编码
@@ -27,18 +33,10 @@ data class RelationEntity(
     @ColumnInfo(name = "obj_to") val objTo: String?,                 // 关系目标对象
     @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") var creationTime: String?,   // 创建时间
-    @ColumnInfo(name = "modifier") val modifier: 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端上传数据标记
     @ColumnInfo(name = "delivery_state") val deliveryState: Int?,    // BDTP交付状态: 1 已交付, 0 待交付
-    @ColumnInfo(name = "valid") var valid: Int?,                     // 合法标识: 1 合法, 0 非法
     @ColumnInfo(name = "d2m_state") val d2mState: Int?,              // 逆向数据的数模同步状态(0:未同步;1:已同步)
-    @ColumnInfo(name = "state") var state: String? = "0",             // 逆向数据的数模同步状态(0:未同步;1:已同步)
-
     var objFromLocalId: String?,
-    var objToLocalId: String?
-)
+    var objToLocalId: String?,
+) : BaseEntity

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

@@ -1,12 +1,12 @@
-package com.framework.mvvm.model.db.entity
+package com.framework.mvvm.model.db.entity.task
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import com.framework.mvvm.model.db.entity.BaseEntity
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.Serializable
 import org.json.JSONObject
-import javax.persistence.Column
 
 /**
  * 工作空间表
@@ -14,28 +14,27 @@ import javax.persistence.Column
 @Entity(tableName = "space")
 @Serializable
 data class SpaceEntity(
-    @PrimaryKey val id: String,
-    @ColumnInfo(name = "space_id") val spaceId: String,              // 空间id
+    @PrimaryKey @ColumnInfo(name = "id") override val id: String,
+    @ColumnInfo(name = "project_id") override val projectId: String?,
+    @ColumnInfo(name = "building_id") override val buildingId: String?,
+    @ColumnInfo(name = "floor_id") override val floorId: String?,
+    @ColumnInfo(name = "state") override var state: String = "0",
+    @ColumnInfo(name = "valid") override var valid: Int?,
+    @ColumnInfo(name = "creator") override var creator: String?,
+    @ColumnInfo(name = "creation_time") override var creationTime: String?,
+    @ColumnInfo(name = "modifier") override var modifier: String?,
+    @ColumnInfo(name = "modified_time") override var modifiedTime: String?,
+    @ColumnInfo(name = "upload_flag") override var uploadFlag: String?,
+    @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 = "project_id") val projectId: String?,          // 项目id
-    @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") var creationTime: String?,    // 创建时间
-    @ColumnInfo(name = "modifier") val modifier: 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")
-    @Contextual
-    val outline: JSONObject?,               // 空间边界,模型更新空间变化时,用来做匹配计算
+    @Contextual val outline: JSONObject?,                             // 空间边界,模型更新空间变化时,用来做匹配计算
     @ColumnInfo(name = "strOutline") val strOutline: String?,         // 空间边界,模型更新空间变化时,用来做匹配计算
-    @ColumnInfo(name = "state") var state: String? = "0"               // 数据状态:0:未处理,1:已处理过 2:已上传
-)
+) : BaseEntity
 
 /*
 // 后期优化

+ 2 - 0
demo/src/main/java/com/framework/mvvm/model/repository/AdmRepository.kt

@@ -9,6 +9,8 @@ import com.framework.app.DEVICE_ID
 import com.framework.mvvm.model.data.*
 import com.framework.mvvm.model.db.AdmDatabase
 import com.framework.mvvm.model.db.entity.*
+import com.framework.mvvm.model.db.entity.dict.*
+import com.framework.mvvm.model.db.entity.task.*
 import com.framework.mvvm.model.vo.AdmRequest
 import com.framework.mvvm.model.vo.Building
 import com.framework.mvvm.model.vo.UploadBuilding

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/vo/Building.kt

@@ -1,6 +1,6 @@
 package com.framework.mvvm.model.vo
 
-import com.framework.mvvm.model.db.entity.*
+import com.framework.mvvm.model.db.entity.task.*
 import kotlinx.serialization.Serializable
 
 /**

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/vo/Dict.kt

@@ -1,6 +1,6 @@
 package com.framework.mvvm.model.vo
 
-import com.framework.mvvm.model.db.entity.*
+import com.framework.mvvm.model.db.entity.dict.*
 
 /**
  * 数据定义

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/vo/Frame.kt

@@ -1,6 +1,6 @@
 package com.framework.mvvm.model.vo
 
-import com.framework.mvvm.model.db.entity.ObjectEntity
+import com.framework.mvvm.model.db.entity.task.ObjectEntity
 import com.framework.mvvm.model.db.entity.ProjectEntity
 
 /**

+ 1 - 1
demo/src/main/java/com/framework/mvvm/mv/AdmViewModel.kt

@@ -9,7 +9,7 @@ import com.framework.app.IP
 import com.framework.app.DEVICE_ID
 import com.framework.app.pathDownloadMap
 import com.framework.app.timestamp
-import com.framework.mvvm.model.db.entity.ObjectEntity
+import com.framework.mvvm.model.db.entity.task.ObjectEntity
 import com.framework.mvvm.model.repository.AdmRepository
 import com.framework.mvvm.model.vo.AdmRequest
 import com.framework.mvvm.model.vo.FloorInfo

+ 2 - 3
demo/src/main/java/com/sybotan/android/demo/activities/EquipDetailActivity.kt

@@ -9,7 +9,6 @@ import android.util.Log
 import android.view.Gravity
 import android.view.MotionEvent
 import android.view.View
-import android.view.ViewGroup
 import android.widget.*
 import androidx.appcompat.widget.SwitchCompat
 import androidx.core.widget.NestedScrollView
@@ -20,7 +19,8 @@ import com.bumptech.glide.Glide
 import com.sybotan.android.demo.R
 import com.sybotan.android.demo.adapter.StaticInfoAdapter
 import cn.sagacloud.android.cadengine.types.Photos
-import com.framework.mvvm.model.db.entity.*
+import com.framework.mvvm.model.db.entity.task.*
+import com.framework.mvvm.model.db.entity.dict.EquipmentEntity
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.sybotan.android.demo.adapter.PictureAdapter
@@ -42,7 +42,6 @@ import com.yuyh.library.imgsel.ImgSelConfig
 import com.yuyh.library.imgsel.utils.LogUtils
 import io.reactivex.ObservableEmitter
 import org.greenrobot.eventbus.EventBus
-import org.jetbrains.anko.scrollView
 import org.json.JSONException
 import org.json.JSONObject
 import java.io.File

+ 1 - 1
demo/src/main/java/com/sybotan/android/demo/activities/GraphyActivity.kt

@@ -58,7 +58,7 @@ import com.arashivision.sdkcamera.camera.InstaCameraManager
 import com.arashivision.sdkcamera.camera.callback.ICameraChangedCallback
 import com.arashivision.sdkcamera.camera.callback.ICaptureStatusListener
 import com.bumptech.glide.Glide
-import com.framework.mvvm.model.db.entity.StrInfosforEquip
+import com.framework.mvvm.model.db.entity.task.StrInfosforEquip
 import com.framework.mvvm.mv.AdmViewModel
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken

+ 1 - 1
demo/src/main/java/com/sybotan/android/demo/activities/SpaceDetailActivity.kt

@@ -16,7 +16,7 @@ import com.sybotan.android.demo.R
 import com.sybotan.android.demo.adapter.StaticInfoAdapter
 import cn.sagacloud.android.cadengine.types.Photos
 import cn.sagacloud.android.cadengine.types.TunableSpace
-import com.framework.mvvm.model.db.entity.Infos
+import com.framework.mvvm.model.db.entity.task.Infos
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.sybotan.android.demo.retrofit.Constant

+ 1 - 1
demo/src/main/java/com/sybotan/android/demo/adapter/EquipListAdapter.java

@@ -2,7 +2,7 @@ package com.sybotan.android.demo.adapter;
 
 import android.content.Context;
 
-import com.framework.mvvm.model.db.entity.EquipmentEntity;
+import com.framework.mvvm.model.db.entity.dict.EquipmentEntity;
 import com.sybotan.android.demo.R;
 
 import java.util.List;

+ 2 - 3
demo/src/main/java/com/sybotan/android/demo/adapter/PersonalSelectSingleAdapter.java

@@ -6,15 +6,14 @@ import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CompoundButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.recyclerview.widget.RecyclerView;
 
 
-import com.framework.mvvm.model.db.entity.ObjectEntity;
-import com.framework.mvvm.model.db.entity.Options;
+import com.framework.mvvm.model.db.entity.task.ObjectEntity;
+import com.framework.mvvm.model.db.entity.task.Options;
 import com.sybotan.android.demo.R;
 import com.sybotan.android.demo.retrofit.Constant;
 

+ 1 - 4
demo/src/main/java/com/sybotan/android/demo/adapter/PipeExpandAdapter.kt

@@ -7,10 +7,7 @@ import android.view.ViewGroup
 import android.widget.BaseExpandableListAdapter
 import android.widget.ImageView
 import android.widget.TextView
-import com.framework.mvvm.model.db.entity.PipeConfigEntity
-import com.framework.mvvm.model.db.entity.PipeEntity
-import com.framework.mvvm.model.db.entity.RelConfigEntity
-import com.framework.mvvm.model.db.entity.RelationEntity
+import com.framework.mvvm.model.db.entity.task.PipeEntity
 import com.sybotan.android.demo.R
 import com.sybotan.android.demo.bean.PipeConfigEntityPackClass
 import java.lang.StringBuilder

+ 1 - 3
demo/src/main/java/com/sybotan/android/demo/adapter/RelationExpandAdapter.kt

@@ -7,12 +7,10 @@ import android.view.ViewGroup
 import android.widget.BaseExpandableListAdapter
 import android.widget.ImageView
 import android.widget.TextView
-import com.framework.mvvm.model.db.entity.RelConfigEntity
-import com.framework.mvvm.model.db.entity.RelationEntity
+import com.framework.mvvm.model.db.entity.task.RelationEntity
 import com.sybotan.android.demo.R
 import com.sybotan.android.demo.bean.RelConfigEntityPackClass
 import com.sybotan.android.demo.bean.RelationPackClass
-import com.yuyh.library.imgsel.utils.LogUtils
 import java.lang.StringBuilder
 
 

+ 2 - 3
demo/src/main/java/com/sybotan/android/demo/adapter/SelectPopListAdapter.java

@@ -10,14 +10,13 @@ import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.LinearLayout;
-import android.widget.RadioButton;
 import android.widget.TextView;
 
 import androidx.recyclerview.widget.RecyclerView;
 
 
-import com.framework.mvvm.model.db.entity.ObjectEntity;
-import com.framework.mvvm.model.db.entity.Options;
+import com.framework.mvvm.model.db.entity.task.ObjectEntity;
+import com.framework.mvvm.model.db.entity.task.Options;
 import com.sybotan.android.demo.R;
 import com.sybotan.android.demo.retrofit.Constant;
 

+ 2 - 5
demo/src/main/java/com/sybotan/android/demo/adapter/StaticInfoAdapter.java

@@ -8,9 +8,6 @@ import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.Gravity;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewTreeObserver;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
@@ -20,8 +17,8 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.bigkoo.pickerview.builder.TimePickerBuilder;
 import com.bigkoo.pickerview.view.TimePickerView;
-import com.framework.mvvm.model.db.entity.Infos;
-import com.framework.mvvm.model.db.entity.Options;
+import com.framework.mvvm.model.db.entity.task.Infos;
+import com.framework.mvvm.model.db.entity.task.Options;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.sybotan.android.demo.R;

+ 1 - 2
demo/src/main/java/com/sybotan/android/demo/bean/PipeConfigEntityPackClass.java

@@ -1,7 +1,6 @@
 package com.sybotan.android.demo.bean;
 
-import com.framework.mvvm.model.db.entity.PipeConfigEntity;
-import com.framework.mvvm.model.db.entity.RelConfigEntity;
+import com.framework.mvvm.model.db.entity.dict.PipeConfigEntity;
 
 import java.util.ArrayList;
 import java.util.Objects;

+ 1 - 1
demo/src/main/java/com/sybotan/android/demo/bean/ReLoactionEventBus.java

@@ -1,6 +1,6 @@
 package com.sybotan.android.demo.bean;
 
-import com.framework.mvvm.model.db.entity.ObjectEntity;
+import com.framework.mvvm.model.db.entity.task.ObjectEntity;
 
 /**
  * Created by lihao.

+ 1 - 3
demo/src/main/java/com/sybotan/android/demo/bean/RelConfigEntityPackClass.java

@@ -1,8 +1,6 @@
 package com.sybotan.android.demo.bean;
 
-import com.framework.mvvm.model.db.entity.RelConfigEntity;
-
-import org.jetbrains.annotations.Nullable;
+import com.framework.mvvm.model.db.entity.dict.RelConfigEntity;
 
 import java.util.ArrayList;
 import java.util.Objects;

+ 1 - 1
demo/src/main/java/com/sybotan/android/demo/bean/RelationPackClass.java

@@ -1,6 +1,6 @@
 package com.sybotan.android.demo.bean;
 
-import com.framework.mvvm.model.db.entity.RelationEntity;
+import com.framework.mvvm.model.db.entity.task.RelationEntity;
 
 /**
  * Created by lihao.

+ 1 - 1
demo/src/main/java/com/sybotan/android/demo/bean/result/SpaceJobModel.java

@@ -1,6 +1,6 @@
 package com.sybotan.android.demo.bean.result;
 
-import com.framework.mvvm.model.db.entity.ObjectEntity;
+import com.framework.mvvm.model.db.entity.task.ObjectEntity;
 import com.sybotan.android.demo.bean.BaseModel;
 
 import java.util.ArrayList;

+ 1 - 3
demo/src/main/java/com/sybotan/android/demo/view/EquipListDialog.java

@@ -1,6 +1,5 @@
 package com.sybotan.android.demo.view;
 
-import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -11,13 +10,12 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.framework.mvvm.model.db.entity.EquipmentEntity;
+import com.framework.mvvm.model.db.entity.dict.EquipmentEntity;
 import com.sybotan.android.demo.R;
 import com.sybotan.android.demo.adapter.BaseRecyclerViewAdapter;
 import com.sybotan.android.demo.adapter.EquipListAdapter;

+ 1 - 4
demo/src/main/java/com/sybotan/android/demo/view/ObjectRelationDialog.java

@@ -13,14 +13,11 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 
-import com.framework.mvvm.model.db.entity.ObjectEntity;
-import com.framework.mvvm.model.db.entity.RelConfigEntity;
+import com.framework.mvvm.model.db.entity.task.ObjectEntity;
 import com.sybotan.android.demo.R;
 import com.sybotan.android.demo.bean.RelConfigEntityPackClass;
 import com.sybotan.android.demo.tools.ToastUtils;
 
-import java.util.Objects;
-
 
 /**
  * 设备关系

+ 1 - 3
demo/src/main/java/com/sybotan/android/demo/view/PipeDialog.java

@@ -13,9 +13,7 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 
-import com.framework.mvvm.model.db.entity.ObjectEntity;
-import com.framework.mvvm.model.db.entity.PipeConfigEntity;
-import com.framework.mvvm.model.db.entity.RelConfigEntity;
+import com.framework.mvvm.model.db.entity.task.ObjectEntity;
 import com.sybotan.android.demo.R;
 import com.sybotan.android.demo.bean.PipeConfigEntityPackClass;
 import com.sybotan.android.demo.tools.ToastUtils;

+ 1 - 1
demo/src/main/java/com/sybotan/android/demo/view/SelectListPopupWindow.java

@@ -23,7 +23,7 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.framework.mvvm.model.db.entity.ObjectEntity;
+import com.framework.mvvm.model.db.entity.task.ObjectEntity;
 import com.sybotan.android.demo.R;
 import com.sybotan.android.demo.activities.BaseActivity;
 import com.sybotan.android.demo.adapter.SelectPopListAdapter;

+ 1 - 5
demo/src/main/java/com/sybotan/android/demo/view/SelectListSinglePopupWindow.java

@@ -4,9 +4,7 @@ package com.sybotan.android.demo.view;
  * Created by cunwen on 16/3/25.
  */
 
-import android.app.Activity;
 import android.content.Context;
-import android.graphics.drawable.ColorDrawable;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
@@ -17,7 +15,6 @@ import android.view.View.OnClickListener;
 import android.view.View.OnTouchListener;
 import android.view.ViewGroup.LayoutParams;
 import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
 import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.EditText;
@@ -30,8 +27,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 
-import com.framework.mvvm.model.db.entity.EquipmentEntity;
-import com.framework.mvvm.model.db.entity.ObjectEntity;
+import com.framework.mvvm.model.db.entity.task.ObjectEntity;
 import com.sybotan.android.demo.R;
 import com.sybotan.android.demo.activities.BaseActivity;
 import com.sybotan.android.demo.adapter.PersonalSelectSingleAdapter;

+ 1 - 1
demo/src/main/java/com/sybotan/android/demo/viewmodel/BuildVM.kt

@@ -3,7 +3,7 @@ package com.sybotan.android.demo.viewmodel
 import android.app.Application
 import android.text.TextUtils
 import androidx.lifecycle.viewModelScope
-import com.framework.mvvm.model.db.entity.StrInfosforBuild
+import com.framework.mvvm.model.db.entity.task.StrInfosforBuild
 import com.framework.mvvm.model.repository.AdmRepository
 import com.google.gson.Gson
 import com.sybotan.android.demo.activities.BaseActivity

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

@@ -12,6 +12,10 @@ import cn.sagacloud.android.cadengine.items.SpaceItem
 import cn.sagacloud.android.cadengine.items.TunableSpaceItem
 import cn.sagacloud.android.cadengine.types.*
 import com.framework.mvvm.model.db.entity.*
+import com.framework.mvvm.model.db.entity.task.*
+import com.framework.mvvm.model.db.entity.dict.EquipmentEntity
+import com.framework.mvvm.model.db.entity.dict.PipeConfigEntity
+import com.framework.mvvm.model.db.entity.dict.RelConfigEntity
 import com.framework.mvvm.model.repository.AdmRepository
 import com.sybotan.android.demo.bean.result.ProblemsModel
 import com.google.gson.Gson