فهرست منبع

@task: delete modifiedTime, creator, creationTime, modifier, updateApp, createApp

bai 3 سال پیش
والد
کامیت
60a44acb4a
19فایلهای تغییر یافته به همراه61 افزوده شده و 195 حذف شده
  1. 2 2
      demo/src/main/java/com/framework/mvvm/model/db/AdmDatabase.kt
  2. 40 0
      demo/src/main/java/com/framework/mvvm/model/db/dao/JobSpaceDao.kt
  3. 0 40
      demo/src/main/java/com/framework/mvvm/model/db/dao/SpaceDao.kt
  4. 2 2
      demo/src/main/java/com/framework/mvvm/model/db/entity/BaseEntity.kt
  5. 0 4
      demo/src/main/java/com/framework/mvvm/model/db/entity/task/FileEntity.kt
  6. 3 17
      demo/src/main/java/com/framework/mvvm/model/db/entity/task/SpaceEntity.kt
  7. 0 6
      demo/src/main/java/com/framework/mvvm/model/db/entity/task/ObjectEntity.kt
  8. 0 4
      demo/src/main/java/com/framework/mvvm/model/db/entity/task/PipeEntity.kt
  9. 0 4
      demo/src/main/java/com/framework/mvvm/model/db/entity/task/ProblemArchEntity.kt
  10. 0 4
      demo/src/main/java/com/framework/mvvm/model/db/entity/task/ProblemEquipEntity.kt
  11. 0 4
      demo/src/main/java/com/framework/mvvm/model/db/entity/task/QrCodeEntity.kt
  12. 0 6
      demo/src/main/java/com/framework/mvvm/model/db/entity/task/RelationEntity.kt
  13. 0 4
      demo/src/main/java/com/framework/mvvm/model/db/entity/task/ServeAreaEntity.kt
  14. 10 45
      demo/src/main/java/com/framework/mvvm/model/repository/AdmRepository.kt
  15. 1 1
      demo/src/main/java/com/framework/mvvm/model/vo/Building.kt
  16. 1 1
      demo/src/main/java/com/sybotan/android/demo/viewmodel/BuildVM.kt
  17. 0 20
      demo/src/main/java/com/sybotan/android/demo/viewmodel/EquipDetailVM.kt
  18. 1 9
      demo/src/main/java/com/sybotan/android/demo/viewmodel/GraphyVM.kt
  19. 1 22
      demo/src/main/java/com/sybotan/android/demo/viewmodel/SpaceMapVM.kt

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

@@ -23,7 +23,7 @@ import com.framework.mvvm.model.db.entity.task.*
         M2dEquipEntity::class,
         ConfigEntity::class,
         FileEntity::class,
-        SpaceEntity::class,
+        JobSpaceEntity::class,
         QrCodeEntity::class,
         ObjectEntity::class,
         ProjectEntity::class,
@@ -54,7 +54,7 @@ abstract class AdmDatabase : RoomDatabase() {
     abstract fun relationDao(): RelationDao
     abstract fun relationDictDao(): RelationDictDao
     abstract fun relConfigDao(): RelConfigDao
-    abstract fun spaceDao(): SpaceDao
+    abstract fun jobSpaceDao(): JobSpaceDao
     abstract fun systemDao(): SystemDao
     abstract fun componentDao(): ComponentDao
     abstract fun pipeDao(): PipeDao

+ 40 - 0
demo/src/main/java/com/framework/mvvm/model/db/dao/JobSpaceDao.kt

@@ -0,0 +1,40 @@
+package com.framework.mvvm.model.db.dao
+
+import androidx.room.*
+import com.framework.mvvm.model.db.entity.task.JobSpaceEntity
+
+/**
+ * 表 space Dao
+ */
+@Dao
+interface JobSpaceDao {
+    @Query("select * from job_space")
+    suspend fun getSpaces(): List<JobSpaceEntity>
+
+    @Query("select * from job_space where id = :id")
+    suspend fun getSpaceById(id: String): JobSpaceEntity
+
+    @Query("select * from job_space where space_id = :id")
+    suspend fun getSpaceBySpaceId(id: String): JobSpaceEntity
+
+    @Query("select * from job_space where floor_id = :id and arch_state =:archState")
+    suspend fun getSpaceByArchStateFloorId(id: String, archState: String): List<JobSpaceEntity>
+
+    @Query("select * from job_space where floor_id = :id and equip_state =:equipState")
+    suspend fun getSpaceByEquipStateFloorId(id: String, equipState: String): List<JobSpaceEntity>
+
+    @Query("select * from job_space where building_id = :id")
+    suspend fun getSpaceByBuildingId(id: String): List<JobSpaceEntity>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insSpace(vararg space: JobSpaceEntity)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insSpaces(spaces: List<JobSpaceEntity>)
+
+    @Update
+    suspend fun updateSpaces(spaces: List<JobSpaceEntity>)
+
+    @Delete
+    suspend fun delSpace(space: JobSpaceEntity)
+}

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

@@ -1,40 +0,0 @@
-package com.framework.mvvm.model.db.dao
-
-import androidx.room.*
-import com.framework.mvvm.model.db.entity.task.SpaceEntity
-
-/**
- * 表 space Dao
- */
-@Dao
-interface SpaceDao {
-    @Query("select * from space")
-    suspend fun getSpaces(): List<SpaceEntity>
-
-    @Query("select * from space where id = :id")
-    suspend fun getSpaceById(id: String): SpaceEntity
-
-    @Query("select * from space where space_id = :id")
-    suspend fun getSpaceBySpaceId(id: String): SpaceEntity
-
-    @Query("select * from space where floor_id = :id and arch_state =:archState")
-    suspend fun getSpaceByArchStateFloorId(id: String, archState: String): List<SpaceEntity>
-
-    @Query("select * from space where floor_id = :id and equip_state =:equipState")
-    suspend fun getSpaceByEquipStateFloorId(id: String, equipState: String): List<SpaceEntity>
-
-    @Query("select * from space where building_id = :id")
-    suspend fun getSpaceByBuildingId(id: String): List<SpaceEntity>
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insSpace(vararg space: SpaceEntity)
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insSpaces(spaces: List<SpaceEntity>)
-
-    @Update
-    suspend fun updateSpaces(spaces: List<SpaceEntity>)
-
-    @Delete
-    suspend fun delSpace(space: SpaceEntity)
-}

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

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

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

@@ -17,10 +17,6 @@ data class FileEntity(
     @ColumnInfo(name = "state") override var state: String? = "0",
     @ColumnInfo(name = "upload_flag") override var uploadFlag: String?,
     @ColumnInfo(name = "valid") override var valid: Int?,
-    @ColumnInfo(name = "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|...)

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

@@ -9,18 +9,14 @@ import com.google.gson.JsonElement
 /**
  * 工作空间表
  */
-@Entity(tableName = "space")
-data class SpaceEntity(
+@Entity(tableName = "job_space")
+data class JobSpaceEntity(
     @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
@@ -29,14 +25,4 @@ data class SpaceEntity(
     @ColumnInfo(name = "arch_state") var archState: Int?,             // 建筑结构核查任务状态(0:待核查;1:核查中;2:核查完毕)
     @ColumnInfo(name = "equip_state") var equipState: Int?,           // 设备勘测任务状态(0:待勘测;1:勘测中;2:勘测完毕)
     @ColumnInfo(name = "outline") val outline: JsonElement? = null,           // 空间边界,模型更新空间变化时,用来做匹配计算
-) : BaseEntity
-
-/*
-// 后期优化
-@Entity(tableName = "outline")
-data class OutLineEntity(
-    @PrimaryKey(autoGenerate = true) val id: Int,
-    @ColumnInfo(name = "x") val x: Double,
-    @ColumnInfo(name = "y") val y: Double,
-    @ColumnInfo(name = "z") val z: Double
-)*/
+) : BaseEntity

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

@@ -23,10 +23,6 @@ data class ObjectEntity(
     @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 = "obj_type") val objType: String?,             // 对象类型
     @ColumnInfo(name = "class_code") var classCode: String?,         // 对象类型编码
@@ -34,10 +30,8 @@ data class ObjectEntity(
     @ColumnInfo(name = "local_name") val localName: String?,        // 对象位置名称
     @ColumnInfo(name = "group_code") val groupCode: String?,        // 集团编码
     @ColumnInfo(name = "grouping") val grouping: Int?,              // 1 表示单个对象,2 表示对象组
-    @ColumnInfo(name = "create_app") val createApp: 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 = "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 数据格式

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

@@ -18,10 +18,6 @@ data class PipeEntity(
     @ColumnInfo(name = "valid") override var valid: Int?,
     @ColumnInfo(name = "state") override var state: String? = "0",
     @ColumnInfo(name = "upload_flag") override var uploadFlag: String?,
-    @ColumnInfo(name = "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端对象

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

@@ -18,10 +18,6 @@ data class ProblemArchEntity(
     @ColumnInfo(name = "state") override var state: String? = "0",
     @ColumnInfo(name = "upload_flag") override var uploadFlag: String?,
     @ColumnInfo(name = "valid") override var valid: Int?,
-    @ColumnInfo(name = "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?,   // 问题类型

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

@@ -17,10 +17,6 @@ data class ProblemEquipEntity(
     @ColumnInfo(name = "state") override var state: String? = "0",
     @ColumnInfo(name = "upload_flag") override var uploadFlag: String?,
     @ColumnInfo(name = "valid") override var valid: Int?,
-    @ColumnInfo(name = "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?,   // 问题类型

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

@@ -18,10 +18,6 @@ data class QrCodeEntity(
     @ColumnInfo(name = "state") override var state: String? = "0",
     @ColumnInfo(name = "upload_flag") override var uploadFlag: String?,
     @ColumnInfo(name = "valid") override var valid: Int?,
-    @ColumnInfo(name = "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?,                       // 描述信息

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

@@ -17,10 +17,6 @@ data class RelationEntity(
     @ColumnInfo(name = "state") override var state: String? = "0",
     @ColumnInfo(name = "upload_flag") override var uploadFlag: String?,
     @ColumnInfo(name = "valid") override var valid: Int?,
-    @ColumnInfo(name = "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?,         // 图编码
@@ -28,8 +24,6 @@ data class RelationEntity(
     @ColumnInfo(name = "rel_value") val relValue: String?,           // 关系值
     @ColumnInfo(name = "obj_from") val objFrom: String?,             // 关系源对象
     @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 = "client_id") val clientId: String?,           // 客户端生成id
     @ColumnInfo(name = "client_device") val clientDevice: String?,   // 标识客户端设备
     @ColumnInfo(name = "delivery_state") val deliveryState: Int?,    // BDTP交付状态: 1 已交付, 0 待交付

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

@@ -18,10 +18,6 @@ data class ServeAreaEntity(
     @ColumnInfo(name = "state") override var state: String? = "0",
     @ColumnInfo(name = "upload_flag") override var uploadFlag: String?,
     @ColumnInfo(name = "valid") override var valid: Int?,
-    @ColumnInfo(name = "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_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对应对象(圆心半径))

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

@@ -2,7 +2,6 @@ package com.framework.mvvm.model.repository
 
 import android.content.SharedPreferences
 import android.util.Log
-import androidx.lifecycle.LiveData
 import com.framework.app.DEVICE_ID
 import com.framework.app.api.Api
 import com.framework.app.base.IRepository
@@ -10,7 +9,6 @@ import com.framework.app.http.FileInfo
 import com.framework.app.http.FileUploadInfo
 import com.framework.mvvm.model.data.*
 import com.framework.mvvm.model.db.AdmDatabase
-import com.framework.mvvm.model.db.entity.ProjectEntity
 import com.framework.mvvm.model.db.entity.dict.*
 import com.framework.mvvm.model.db.entity.task.*
 import com.framework.mvvm.model.vo.AdmRequest
@@ -72,12 +70,12 @@ class AdmRepository(
         return db.objectDao().getObjectById(objId)
     }
 
-    suspend fun getSpaceByArchStateFloorId(id: String, archState: String): List<SpaceEntity> {
-        return db.spaceDao().getSpaceByArchStateFloorId(id, archState)
+    suspend fun getSpaceByArchStateFloorId(id: String, archState: String): List<JobSpaceEntity> {
+        return db.jobSpaceDao().getSpaceByArchStateFloorId(id, archState)
     }
 
-    suspend fun getSpaceByEquipStateFloorId(id: String, equipState: String): List<SpaceEntity> {
-        return db.spaceDao().getSpaceByEquipStateFloorId(id, equipState)
+    suspend fun getSpaceByEquipStateFloorId(id: String, equipState: String): List<JobSpaceEntity> {
+        return db.jobSpaceDao().getSpaceByEquipStateFloorId(id, equipState)
     }
 
     suspend fun getBuildByObjType(objType: String): List<ObjectEntity> {
@@ -92,12 +90,12 @@ class AdmRepository(
         return db.objectDao().getObjectByBuildingId(buildingId, type)
     }
 
-    suspend fun getSpaceBySpaceId(id: String): SpaceEntity {
-        return db.spaceDao().getSpaceBySpaceId(id)
+    suspend fun getSpaceBySpaceId(id: String): JobSpaceEntity {
+        return db.jobSpaceDao().getSpaceBySpaceId(id)
     }
 
-    suspend fun insSpace(space: SpaceEntity) {
-        return db.spaceDao().insSpace(space)
+    suspend fun insSpace(space: JobSpaceEntity) {
+        return db.jobSpaceDao().insSpace(space)
     }
 
     suspend fun getEquipByFloorId(id: String): List<ObjectEntity> {
@@ -313,7 +311,7 @@ class AdmRepository(
                 block?.invoke(building)
                 try {
                     building.file?.let { db.fileDao().insFiles(it) }
-                    building.jobSpace?.let { db.spaceDao().insSpaces(it) }
+                    building.jobSpace?.let { db.jobSpaceDao().insSpaces(it) }
                     building.objects?.let { db.objectDao().insObjects(it) }
                     building.problemArch?.let { db.problemArchDao().insProblems(it) }
                     building.problemEquip?.let { db.problemEquipDao().insProblems(it) }
@@ -362,7 +360,7 @@ class AdmRepository(
         try {
             val pipeDao = db.pipeDao()
             val fileDao = db.fileDao()
-            val spaceDao = db.spaceDao()
+            val spaceDao = db.jobSpaceDao()
             val qrCodeDao = db.qrCodeDao()
             val objectDao = db.objectDao()
             val relationDao = db.relationDao()
@@ -416,68 +414,35 @@ class AdmRepository(
                     Log.e("AdmViewModel", """uploadBuilding success: $result""")
                     files.forEach {
                         it.state = "2"
-                        if (it.creationTime.isNullOrEmpty())
-                            it.creationTime = result.timestamp
-                        else
-                            it.modifiedTime = result.timestamp
                         fileDao.insFile(it)
                     }
                     pipes.forEach {
                         it.state = "2"
-                        if (it.creationTime.isNullOrEmpty())
-                            it.creationTime = result.timestamp
-                        else
-                            it.modifiedTime = result.timestamp
                         pipeDao.insPipe(it)
                     }
                     spaces.forEach {
                         it.state = "2"
-                        if (it.creationTime.isNullOrEmpty())
-                            it.creationTime = result.timestamp
-                        else
-                            it.modifiedTime = result.timestamp
                         spaceDao.insSpace(it)
                     }
                     objects.forEach {
                         it.state = "2"
-                        if (it.creationTime.isNullOrEmpty())
-                            it.creationTime = result.timestamp
-                        else
-                            it.modifiedTime = result.timestamp
                         objectDao.insObject(it)
                     }
                     qrCodes.forEach {
                         it.state = "2"
-                        if (it.creationTime.isNullOrEmpty())
-                            it.creationTime = result.timestamp
-                        else
-                            it.modifiedTime = result.timestamp
                         qrCodeDao.insQrCode(it)
                     }
                     relations.forEach {
                         it.state = "2"
-                        if (it.creationTime.isNullOrEmpty())
-                            it.creationTime = result.timestamp
-                        else
-                            it.modifiedTime = result.timestamp
                         relationDao.insRelation(it)
                     }
                     problemArchs.forEach {
                         it.state = "2"
-                        if (it.creationTime.isNullOrEmpty())
-                            it.creationTime = result.timestamp
-                        else
-                            it.modifiedTime = result.timestamp
                         problemArchDao.insProblem(it)
                     }
                     problemEquips.forEach {
                         it.state = "2"
-                        if (it.creationTime.isNullOrEmpty())
-                            it.creationTime = result.timestamp
-                        else
-                            it.modifiedTime = result.timestamp
                         problemEquipDao.insProblem(it)
-
                     }
                 }
             }

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

@@ -7,7 +7,7 @@ import com.framework.mvvm.model.db.entity.task.*
  */
 data class Building(
     val buildingId: String,
-    val jobSpace: List<SpaceEntity>?, // outline 需要处理
+    val jobSpace: List<JobSpaceEntity>?,
     val objects: List<ObjectEntity>?,
     val file: List<FileEntity>?,
     val qrCode: List<QrCodeEntity>?,

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

@@ -68,7 +68,7 @@ class BuildVM(app: Application, b: BaseViewModelInterface, a: BaseActivity) :
                 floorList.sortByDescending { floor -> floor.floorSequenceID }
                 t.add(
                     Build(
-                        createTime = build.creationTime.toString(),
+                        createTime = "",
                         id = build.id,
                         localId = build.localId!!,
                         lastUpdate = "",

+ 0 - 20
demo/src/main/java/com/sybotan/android/demo/viewmodel/EquipDetailVM.kt

@@ -186,14 +186,8 @@ class EquipDetailVM(
                     grouping = 1,
                     buildingId = buildingId,
                     floorId = floorId,
-                    creator = "Android",
-                    createApp = "",
-                    creationTime = "",
-                    modifier = "Android",
-                    modifiedTime = "",
                     clientDevice = "",
                     clientId = uuid,
-                    updateApp = "",
                     uploadFlag = "",
                     valid = 1,
                     deliveryState = null,
@@ -239,10 +233,6 @@ class EquipDetailVM(
                             projectId = projectId,
                             buildingId = buildingId,
                             floorId = floorId,
-                            creator = "android",
-                            creationTime = "",
-                            modifier = "",
-                            modifiedTime = null,
                             valid = 1,
                             uploadFlag = "", state = "1"
                         )
@@ -560,12 +550,6 @@ class EquipDetailVM(
                 relValue = null,
                 objFrom = objFrom,
                 objTo = objto,
-                createApp = null,
-                updateApp = null,
-                creator = null,
-                creationTime = "",
-                modifiedTime = "",
-                modifier = null,
                 clientId = null,
                 clientDevice = null,
                 uploadFlag = null,
@@ -618,10 +602,6 @@ class EquipDetailVM(
                 floorId = floorId,
                 objFrom = objFrom,
                 objTo = objto,
-                creator = null,
-                creationTime = "",
-                modifiedTime = "",
-                modifier = null,
                 uploadFlag = null,
                 deliveryState = null,
                 valid = 1,

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

@@ -1,6 +1,5 @@
 package com.sybotan.android.demo.viewmodel
 
-import android.app.Activity.RESULT_OK
 import android.app.Application
 import android.graphics.PointF
 import android.text.TextUtils
@@ -12,9 +11,6 @@ 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.google.gson.Gson
 import com.google.gson.reflect.TypeToken
@@ -63,7 +59,7 @@ class GraphyVM(
      */
     fun getSpaceJob(from: String, spaceList: ArrayList<SpaceItem>) {
         viewModelScope.launch {
-            var spaceList: ArrayList<SpaceEntity> = ArrayList()
+            var spaceList: ArrayList<JobSpaceEntity> = ArrayList()
             if ("space".equals(from)) {
                 val spaceByArchState1 = repo.getSpaceByArchStateFloorId(floorId, "1")
                 val spaceByArchState2 = repo.getSpaceByArchStateFloorId(floorId, "2")
@@ -406,10 +402,6 @@ class GraphyVM(
                         problemType = null,
                         problemState = 1,
                         message = null,
-                        creator = null,
-                        creationTime = "",
-                        modifier = null,
-                        modifiedTime = "",
                         uploadFlag = null,
                         valid = 1, state = "1"
                     )

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

@@ -16,7 +16,6 @@ import cn.sagacloud.android.cadengine.types.PointZ
 import com.framework.mvvm.model.db.entity.task.*
 import com.framework.mvvm.model.repository.AdmRepository
 import com.google.gson.Gson
-import com.google.gson.JsonArray
 import com.google.gson.reflect.TypeToken
 import com.sybotan.android.demo.activities.BaseActivity
 import com.sybotan.android.demo.bean.result.*
@@ -56,7 +55,7 @@ class SpaceMapVM(
      */
     fun getSpaceJob() {
         viewModelScope.launch {
-            val spaceList: ArrayList<SpaceEntity> = ArrayList()
+            val spaceList: ArrayList<JobSpaceEntity> = ArrayList()
             val spaceByArchState1 = repo.getSpaceByArchStateFloorId(floorId, "1")
             val spaceByArchState2 = repo.getSpaceByArchStateFloorId(floorId, "2")
             spaceList.addAll(spaceByArchState1)
@@ -178,10 +177,6 @@ class SpaceMapVM(
                 problemType = "",
                 problemState = 1,
                 message = content,
-                creator = "",
-                creationTime = "",
-                modifier = "android",
-                modifiedTime = "",
                 uploadFlag = "",
                 valid = 1,
                 state = "1",
@@ -212,10 +207,6 @@ class SpaceMapVM(
                         projectId = projectId,
                         buildingId = buildingId,
                         floorId = floorId,
-                        creator = "android",
-                        creationTime = "",
-                        modifier = "",
-                        modifiedTime = null,
                         valid = 1,
                         uploadFlag = "", state = "1"
                     )
@@ -306,10 +297,6 @@ class SpaceMapVM(
                 buildingId = buildingId,
                 floorId = floorId,
                 remark = "wall",
-                creator = "Anroid",
-                creationTime = "",
-                modifier = "Android",
-                modifiedTime = "",
                 valid = 1,
                 uploadFlag = "", state = "1", location = toJson
             )
@@ -419,10 +406,6 @@ class SpaceMapVM(
                     state = "1",
                     uploadFlag = null,
                     valid = 1,
-                    creator = null,
-                    creationTime = null,
-                    modifier = null,
-                    modifiedTime = null,
                     objId = deviceId,
                     geomType = "polygon",
                     geom = gson.toJsonTree(geom),
@@ -453,10 +436,6 @@ class SpaceMapVM(
                     state = "1",
                     uploadFlag = null,
                     valid = 1,
-                    creator = null,
-                    creationTime = null,
-                    modifier = null,
-                    modifiedTime = null,
                     objId = deviceId,
                     geomType = "polygon",
                     geom = gson.toJsonTree(geom),