Quellcode durchsuchen

@fun: refactoring config

bai vor 3 Jahren
Ursprung
Commit
512928b018

+ 2 - 2
app/src/main/java/com/ys/bdtp/adm/mvvm/model/db/AdmDatabase.kt

@@ -19,8 +19,8 @@ import com.ys.bdtp.adm.mvvm.model.db.entity.task.*
 @Database(
     entities = [
         // config
-        BasicConfigEntity::class,
         ComponentEntity::class,
+        ConfigEntity::class,
         ContainerConfigEntity::class,
         InfosConfigEntity::class,
         PipeConfigEntity::class,
@@ -55,8 +55,8 @@ import com.ys.bdtp.adm.mvvm.model.db.entity.task.*
 @TypeConverters(GsonConverter::class)
 abstract class AdmDatabase : RoomDatabase() {
     // config
-    abstract fun basicConfigDao(): BasicConfigDao
     abstract fun componentDao(): ComponentDao
+    abstract fun configDao(): ConfigDao
     abstract fun containerConfigDao(): ContainerConfigDao
     abstract fun infosConfigDao(): InfosConfigDao
     abstract fun pipeConfigDao(): PipeConfigDao

+ 0 - 27
app/src/main/java/com/ys/bdtp/adm/mvvm/model/db/dao/config/BasicConfigDao.kt

@@ -1,27 +0,0 @@
-package com.ys.bdtp.adm.mvvm.model.db.dao.config
-
-import androidx.room.*
-import com.ys.bdtp.adm.mvvm.model.db.entity.config.BasicConfigEntity
-
-/**
- * basic_config 访问接口
- *
- * @author bai
- */
-@Dao
-interface BasicConfigDao {
-    @Query("select * from basic_config")
-    suspend fun getConfigs(): List<BasicConfigEntity>
-
-    @Query("select * from basic_config where id = :id")
-    suspend fun getConfigById(id: String): BasicConfigEntity
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insConfig(vararg config: BasicConfigEntity)
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insConfigs(configs: List<BasicConfigEntity>)
-
-    @Delete
-    suspend fun delConfig(config: BasicConfigEntity)
-}

+ 1 - 2
app/src/main/java/com/ys/bdtp/adm/mvvm/model/db/dao/config/ComponentDao.kt

@@ -5,7 +5,6 @@ import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import com.ys.bdtp.adm.mvvm.model.db.entity.config.BasicConfigEntity
 import com.ys.bdtp.adm.mvvm.model.db.entity.config.ComponentEntity
 
 /**
@@ -31,5 +30,5 @@ interface ComponentDao {
     suspend fun insComponents( comps: List<ComponentEntity>)
 
     @Delete
-    suspend fun delConfig(config: BasicConfigEntity)
+    suspend fun delConfig(config: ComponentEntity)
 }

+ 27 - 0
app/src/main/java/com/ys/bdtp/adm/mvvm/model/db/dao/config/ConfigDao.kt

@@ -0,0 +1,27 @@
+package com.ys.bdtp.adm.mvvm.model.db.dao.config
+
+import androidx.room.*
+import com.ys.bdtp.adm.mvvm.model.db.entity.config.ConfigEntity
+
+/**
+ * config 表访问接口
+ *
+ * @author bai
+ */
+@Dao
+interface ConfigDao {
+    @Query("select * from config")
+    suspend fun getConfigs(): List<ConfigEntity>
+
+    @Query("select * from config where id = :id")
+    suspend fun getConfigById(id: String): ConfigEntity
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insConfig(vararg config: ConfigEntity)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insConfigs(configs: List<ConfigEntity>)
+
+    @Delete
+    suspend fun delConfig(config: ConfigEntity)
+}

+ 2 - 2
app/src/main/java/com/ys/bdtp/adm/mvvm/model/db/entity/config/BasicConfigEntity.kt

@@ -16,8 +16,8 @@ import com.google.gson.JsonElement
  * @param data 配置项内容
  *
  */
-@Entity(tableName = "basic_config")
-data class BasicConfigEntity(
+@Entity(tableName = "config")
+data class ConfigEntity(
     @PrimaryKey val id: String,
     @ColumnInfo(name = "code") val code: String,               // 配置项编码
     @ColumnInfo(name = "name") val name: String,               // 配置项名称

+ 1 - 1
app/src/main/java/com/ys/bdtp/adm/mvvm/model/vo/Config.kt

@@ -12,7 +12,7 @@ data class Config(
     val admDefineProblemInfos: List<ProblemInfoEntity>,
     val admDefineProblemTypes: List<ProblemTypeEntity>,
     val component: List<ComponentEntity>,
-    val config: List<BasicConfigEntity>,
+    val config: List<ConfigEntity>,
     val containerConfig: List<ContainerConfigEntity>,
     val infosConfig: List<InfosConfigEntity>,
     val pipeConfig: List<PipeConfigEntity>,