@task: refactor format

demo/src/main/java/com/framework/mvvm/model/db/AdmDatabase.kt

@@ -28,6 +28,7 @@ import com.framework.mvvm.model.db.entity.*
         RelationEntity::class,
         ProblemArchEntity::class,
         ProblemEquipEntity::class,
+        ComponentEntity::class
     ], version = 1, exportSchema = true
 )
 @TypeConverters(JsonConverter::class)
@@ -49,6 +50,7 @@ abstract class AdmDatabase : RoomDatabase() {
     abstract fun relConfigDao(): RelConfigDao
     abstract fun spaceDao(): SpaceDao
     abstract fun systemDao(): SystemDao
+    abstract fun componentDao(): ComponentDao
 
     companion object {
         @Volatile

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

@@ -0,0 +1,23 @@
+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
+
+@Dao
+interface ComponentDao {
+    @Query("select * from component")
+    suspend fun getComponents(): List<ComponentEntity>
+
+    @Query("select * from component where id = :id")
+    suspend fun getComponentById(id: String): ComponentEntity
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insComponent(vararg comp: ComponentEntity)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insComponents( comps: List<ComponentEntity>)
+
+    @Delete
+    suspend fun delConfig(config: ConfigEntity)
+}

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

@@ -14,10 +14,7 @@ interface ConfigDao {
     @Query("select * from config where id = :id")
     suspend fun getConfigById(id: String): ConfigEntity
 
-    /*@Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insConfig(config: ConfigEntity)*/
-
- @Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insConfig(vararg config: ConfigEntity)
 
     @Delete

demo/src/main/java/com/framework/mvvm/model/db/entity/ComponentEntity.kt

@@ -0,0 +1,17 @@
+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
+)

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

@@ -4,7 +4,6 @@ package com.framework.mvvm.model.db.entity
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import org.json.JSONObject
 
 /**
  * 基本配置 表
@@ -14,6 +13,5 @@ data class ConfigEntity(
     @PrimaryKey val id: String,
     @ColumnInfo(name = "name") val name: String,   // 配置项名名称
     @ColumnInfo(name = "code") val code: String,   // 配置项代码
-    @ColumnInfo(name = "data") val data: JSONObject?,    // 配置项的具体内容， 内容是 Json 格式，
-    @ColumnInfo(name = "project_id") val project_id: String?
+    @ColumnInfo(name = "data") val data: String?,  // 配置项的具体内容， 内容是 Json 格式，
 )

demo/src/main/java/com/framework/mvvm/model/db/entity/InfosConfigEntity.kt

@@ -17,6 +17,6 @@ data class InfosConfigEntity(
     @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 = "infos") val infos: String?,             // 对象类型的信息详情点配置
     @ColumnInfo(name = "project_id") val projectId: String?,             // 对象类型的信息详情点配置
+    @ColumnInfo(name = "infos") val infos: String?,             // 对象类型的信息详情点配置
 )

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

@@ -42,7 +42,9 @@ data class ObjectEntity(
     @ColumnInfo(name = "d2m_state") val d2mState: Int?,             // 逆向数据的数模同步状态(0:未同步;1:已同步)
     @ColumnInfo(name = "virtual_codes") val virtualCodes: String?,   // 虚点清单: Json 数据格式
     @ColumnInfo(name = "infos")
-    @Contextual var infos: JSONObject?               // 信息点数据: Json 数据格式
+    @Contextual
+    var infos: JSONObject?,               // 信息点数据: Json 数据格式
+    @ColumnInfo(name = "str_infos") var strInfos: String?               // 信息点数据: Json 数据格式
 )
 
 /*

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

@@ -14,7 +14,6 @@ data class ProblemArchEntity(
     @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 = "geom") val geom: String?,                   // 问题记录的几何数据(Json)
     @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:已解决)
@@ -24,5 +23,6 @@ data class ProblemArchEntity(
     @ColumnInfo(name = "modifier") val modifier: String?,           // 修改人
     @ColumnInfo(name = "modified_time") val modifiedTime: String?,  // 修改时间
     @ColumnInfo(name = "upload_flag") val uploadFlag: String?,      // app端上传数据标记
-    @ColumnInfo(name = "valid") val valid: Int?                    // 1 有效，2 无效
+    @ColumnInfo(name = "valid") val valid: Int?,                    // 1 有效，2 无效
+    @ColumnInfo(name = "geom") val geom: String?                   // 问题记录的几何数据(Json)
 )

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

@@ -17,7 +17,6 @@ data class QrCodeEntity(
     @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 = "location") val location: String?,           // 位置坐标({x:1,y:1,z:1})
     @ColumnInfo(name = "remark") val remark: String?,               // 描述信息
     @ColumnInfo(name = "creator") val creator: String?,             // 创建人
     @ColumnInfo(name = "creation_time") val creationTime: String?,  // 创建时间
@@ -25,6 +24,5 @@ data class QrCodeEntity(
     @ColumnInfo(name = "modified_time") val 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})
 )

demo/src/main/java/com/framework/mvvm/model/db/entity/RelConfigEntity.kt

@@ -18,6 +18,4 @@ data class RelConfigEntity(
     @ColumnInfo(name = "class_code_to") val classCodeTo: String,      //  to  端对象class_code
     @ColumnInfo(name = "graph_code") val graphCode: String,           // 关系的图类型代码
     @ColumnInfo(name = "rel_code") val relCode: String,               // 关系的边类型代码
-    @ColumnInfo(name = "project_id") val projectId: String?,               // 关系的边类型代码
-
 )

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

@@ -14,7 +14,6 @@ data class SpaceEntity(
     @PrimaryKey val id: String,
     @ColumnInfo(name = "space_id") val spaceId: String,              // 空间id
     @ColumnInfo(name = "work_id") val workId: String,                // 交付工作流程id
-    @ColumnInfo(name = "outline") val outline: String?,               // 空间边界，模型更新空间变化时，用来做匹配计算
     @ColumnInfo(name = "space_type") val spaceType: String?,          // 任务空间类型(base|sub)
     @ColumnInfo(name = "parent_space_id") val parentSpaceId: String?, // 父级空间id(空间类型为sub时)
     @ColumnInfo(name = "arch_state") val archState: Int?,             // 建筑结构核查任务状态(0:待核查;1:核查中;2:核查完毕)
@@ -28,6 +27,7 @@ data class SpaceEntity(
     @ColumnInfo(name = "modified_time") val modifiedTime: String?,    // 修改时间
     @ColumnInfo(name = "valid") val valid: Int?,                      // 合法标识
     @ColumnInfo(name = "upload_flag") val uploadFlag: Int?,           // app端上传数据标记
+    @ColumnInfo(name = "outline") val outline: String?,               // 空间边界，模型更新空间变化时，用来做匹配计算
 )
 
 /*

demo/src/main/java/com/sybotan/android/demo/activities/PocActivity.kt

@@ -1,7 +1,6 @@
 package com.sybotan.android.demo.activities
 
 import android.Manifest
-import android.accounts.AccountManager
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
@@ -16,7 +15,6 @@ import org.kodein.di.DI
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.android.x.viewmodel.viewModel
-import org.kodein.di.instance
 
 class PocActivity : AppCompatActivity(), DIAware {
 
@@ -25,6 +23,7 @@ class PocActivity : AppCompatActivity(), DIAware {
     private val mVm: FrameViewModel by viewModel()
 
     private val tag = "PocActivity"
+
     private val REQUEST_EXTERNAL_STORAGE = 1 // 不可改
 
     override fun onCreate(savedInstanceState: Bundle?) {