浏览代码

@task: container_config table

bai 3 年之前
父节点
当前提交
ea6aba2350

+ 3 - 1
demo/src/main/java/com/framework/app/Constants.kt

@@ -6,9 +6,11 @@ package com.framework.app
 //const val testIP = "http://192.168.0.48:8876/"
 const val testIP = "http://192.168.0.48:8876/"
 
+const val test2IP = "http://192.168.0.11:8876/"
+
 const val tencentIP = "http://82.157.28.170:8876/"
 
-const val IP = testIP
+const val IP = test2IP
 
 const val pathDownloadMap = "adm/downloadMap?key="
 

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

@@ -32,7 +32,8 @@ import com.framework.mvvm.model.db.entity.task.*
         ProblemEquipEntity::class,
         ComponentEntity::class,
         PipeEntity::class,
-        ServeAreaEntity::class
+        ServeAreaEntity::class,
+        ContainerConfigEntity::class
     ], version = 1, exportSchema = true
 )
 @TypeConverters(GsonConverter::class)
@@ -57,6 +58,7 @@ abstract class AdmDatabase : RoomDatabase() {
     abstract fun componentDao(): ComponentDao
     abstract fun pipeDao(): PipeDao
     abstract fun serveAreaDao(): ServeAreaDao
+    abstract fun containerConfigDao(): ContainerConfigDao
 
     companion object {
         @Volatile

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

@@ -0,0 +1,27 @@
+package com.framework.mvvm.model.db.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import com.framework.mvvm.model.db.entity.dict.ContainerConfigEntity
+
+/**
+ * 表 container_config Dao
+ */
+@Dao
+interface ContainerConfigDao {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insContainer(vararg container: ContainerConfigEntity)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insContainers(containers: List<ContainerConfigEntity>)
+
+    @Query("select * from container_config")
+    suspend fun getContainers(): List<ContainerConfigEntity>
+
+    @Query("select * from container_config where container_code = :container")
+    suspend fun getWidgetsByContainer(container: String): List<ContainerConfigEntity>
+
+}

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

@@ -0,0 +1,15 @@
+package com.framework.mvvm.model.db.entity.dict
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+/**
+ * 容器设备-无模型设备 配置
+ */
+@Entity(tableName = "container_config")
+data class ContainerConfigEntity(
+    @PrimaryKey val id: String,
+    @ColumnInfo(name = "container_code") var containerCode: String, // 容器设备类型代码
+    @ColumnInfo(name = "widget_code") var widgetCode: String        // 容器设备内部支持的无模型设备类型代码
+)

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

@@ -271,6 +271,7 @@ class AdmRepository(
                     dict.config?.let { db.configDao().insConfigs(it) }
                     dict.relConfig?.let { db.relConfigDao().insConfigs(it) }
                     dict.component?.let { db.componentDao().insComponents(it) }
+                    dict.containerConfig?.let { db.containerConfigDao().insContainers(it) }
                     dict.dict?.system?.let { db.systemDao().insSystems(it) }
                     dict.dict?.equipment?.let { db.equipmentDao().insEquipments(it) }
                     dict.dict?.relation?.let { db.relationDictDao().insRelationDicts(it) }

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

@@ -11,7 +11,8 @@ data class Dict(
     val pipeConfig: List<PipeConfigEntity>? = null,
     val infosConfig: List<InfosConfigEntity>? = null,
     val relConfig: List<RelConfigEntity>? = null,
-    val component: List<ComponentEntity>? = null
+    val component: List<ComponentEntity>? = null,
+    val containerConfig: List<ContainerConfigEntity>? = null
 )
 
 /**

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

@@ -58,7 +58,7 @@ class PocActivity : BaseActivity(), DIAware {
             mVm.downloadBuilding(sp) {
                 // ToastUtils.showMyToast("下载完成")
                 val builder = AlertDialog.Builder(this)
-                val dialog= builder.setMessage("建筑数据下载成功")
+                val dialog = builder.setMessage("建筑数据下载成功")
                     .setPositiveButton("确定") { dialog, id ->
                         dialog.dismiss()
                     }.create()
@@ -73,7 +73,7 @@ class PocActivity : BaseActivity(), DIAware {
             mVm.uploadBuilding {
                 // ToastUtils.showMyToast("建筑数据上传成功")
                 val builder = AlertDialog.Builder(this)
-                val dialog= builder.setMessage("建筑数据上传成功")
+                val dialog = builder.setMessage("建筑数据上传成功")
                     .setPositiveButton("确定") { dialog, id ->
                         dialog.dismiss()
                     }.create()
@@ -90,7 +90,7 @@ class PocActivity : BaseActivity(), DIAware {
                 )
             ) {
                 val builder = AlertDialog.Builder(this)
-                val dialog= builder.setMessage("框架数据和数据字典下载成功")
+                val dialog = builder.setMessage("框架数据和数据字典下载成功")
                     .setPositiveButton("确定") { dialog, id ->
                         dialog.dismiss()
                     }.create()