bai 3 lat temu
rodzic
commit
00e44505dd

+ 19 - 16
app/src/main/java/com/ys/bdtp/adm/mvvm/model/db/entity/dict/EquipmentEntity.kt

@@ -21,15 +21,17 @@ import java.io.Serializable
  * @param majorCode 专业编码
  * @param systemCode 系统编码
  * @param parentCode 父编码
- * @param equipmentCode 父编设备编码码
- * @param m2d 正向交付设备类标注
+ * @param instanceScope 交付范围:实例范围
+ * @param defineTypeId 对象类型定义Id
+ * @param deliveryType 交付类型: 0-项目交付 1-现场交付
+ * @param isDelivery 是否交付: 0-否 1-是
+ * @param isDelivery 是否交付: 0-否 1-是
+ * @param associationRelation 交付范围: 依赖&关联
  * @param valid 有效标识: 0 无效, 1 有效
  * @param version 版本
  * @param sourceFrom
  * @param creator 创建人
  * @param creationTime 创建时间
- * @param modifier 最后修改人
- * @param modifiedTime 最后修改时间
  */
 @Entity(tableName = "equipment")
 data class EquipmentEntity(
@@ -40,17 +42,18 @@ data class EquipmentEntity(
     @ColumnInfo(name = "alias_code") val aliasCode: String?,
     @ColumnInfo(name = "alias_name") val aliasName: String?,
     @ColumnInfo(name = "group_code") val groupCode: String?,
-    @ColumnInfo(name = "project_id") val projectId: String?,         // 项目 id
-    @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 = "m2d") var m2d: Boolean,
-    @ColumnInfo(name = "valid") var valid: Int?,                     // 有效标识, // 1 正常 0 删除
-    @ColumnInfo(name = "version") val version: String?,              // 版本
-    @ColumnInfo(name = "source_from") var sourceFrom: Boolean,
+    @ColumnInfo(name = "project_id") val projectId: String?,
+    @ColumnInfo(name = "major_code") val majorCode: String?,
+    @ColumnInfo(name = "system_code") val systemCode: String?,
+    @ColumnInfo(name = "parent_code") val parentCode: String?,
+    @ColumnInfo(name = "instance_scope") val instanceScope: String?,
+    @ColumnInfo(name = "define_type_id") val defineTypeId: String?,
+    @ColumnInfo(name = "delivery_type") val deliveryType: String?,
+    @ColumnInfo(name = "is_delivery") val isDelivery: Int,
+    @ColumnInfo(name = "association_relation") val associationRelation: Int,
+    @ColumnInfo(name = "valid") var valid: Int?,
+    @ColumnInfo(name = "version") val version: String?,
+    @ColumnInfo(name = "source_from") var sourceFrom: 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 = "creation_time") val creationTime: Long
 )

+ 21 - 5
app/src/main/java/com/ys/bdtp/adm/mvvm/model/db/entity/dict/InfoEntity.kt

@@ -29,20 +29,36 @@ import com.google.gson.JsonElement
  */
 @Entity(tableName = "info")
 data class InfoEntity(
-    @PrimaryKey(autoGenerate = true)
-    @ColumnInfo(name = "id") val id: Int = 0,
+    @PrimaryKey @ColumnInfo(name = "id") val id: String,
     @ColumnInfo(name = "code") val code: String? = null,
     @ColumnInfo(name = "name") val name: String? = null,
     @ColumnInfo(name = "alias_code") val aliasCode: String? = null,
+    @ColumnInfo(name = "alias_name") val aliasName: String? = null,
     @ColumnInfo(name = "class_code") val classCode: String? = null,
     @ColumnInfo(name = "group_code") val groupCode: String? = null,
     @ColumnInfo(name = "project_id") val projectId: String? = null,
     @ColumnInfo(name = "first_tag") val firstTag: String? = null,
     @ColumnInfo(name = "second_tag") val secondTag: String? = null,
     @ColumnInfo(name = "input_mode") val inputMode: String? = null,
-    @ColumnInfo(name = "unit") val unit: String? = null,
     @ColumnInfo(name = "data_type") val dataType: String? = null,
+    @ColumnInfo(name = "unit") val unit: String? = null,
+    @ColumnInfo(name = "show_order") val showOrder: Int? = null,
+    @ColumnInfo(name = "category") val category: String? = null,
+    @ColumnInfo(name = "collect_info") val collectInfo: String? = null,
+    @ColumnInfo(name = "data_from") val dataFrom: String? = null,
+    @ColumnInfo(name = "define_info_id") val defineInfoId: String? = null,
+    @ColumnInfo(name = "delivery_type") val deliveryType: Int? = null,
+    @ColumnInfo(name = "formater") val formater: String? = null,
+    @ColumnInfo(name = "is_delivery") val isDelivery: Boolean,
+    @ColumnInfo(name = "is_multiple") val isMultiple: Boolean,
+    @ColumnInfo(name = "is_region") val isRegion: Boolean,
+    @ColumnInfo(name = "priority") val priority: String,
+    @ColumnInfo(name = "source_from") var sourceFrom: Int,
+    @ColumnInfo(name = "sub_flag") var subFlag: Boolean,
+    @ColumnInfo(name = "weak_point") var weakPoint: Boolean,
+    @ColumnInfo(name = "valid") var valid: Int?,
+    @ColumnInfo(name = "version") val version: String?,
+    @ColumnInfo(name = "creator") val creator: String,
+    @ColumnInfo(name = "creation_time") val creationTime: Long,
     @ColumnInfo(name = "data_source") val dataSource: JsonElement? = null,
-    @ColumnInfo(name = "show_order") val showOrder: Long? = null,
-    @ColumnInfo(name = "version") val version: String? = null
 )

+ 9 - 7
app/src/main/java/com/ys/bdtp/adm/mvvm/model/db/entity/dict/MajorEntity.kt

@@ -15,17 +15,19 @@ import androidx.room.PrimaryKey
  * @param type 专业类型
  * @param orderNum 序号
  * @param dictTypeId 字典类型id
+ * @param parentId
  * @param valid 有效标识: 0 无效, 1 有效
  * @param remark 备注
  */
 @Entity(tableName = "major")
 data class MajorEntity(
     @PrimaryKey @ColumnInfo(name = "id") 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") var valid: Int?,               // 有效标识: 1 正常 0 删除
-    @ColumnInfo(name = "remark") var remark: 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,
+    @ColumnInfo(name = "parent_id") val parentId: String,
+    @ColumnInfo(name = "valid") var valid: Int?,
+    @ColumnInfo(name = "remark") var remark: String?,
 )

+ 30 - 10
app/src/main/java/com/ys/bdtp/adm/mvvm/model/db/entity/dict/RelationDictEntity.kt

@@ -3,6 +3,7 @@ package com.ys.bdtp.adm.mvvm.model.db.entity.dict
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import com.google.gson.JsonElement
 
 /**
  * 字典, 关系表
@@ -10,7 +11,7 @@ import androidx.room.PrimaryKey
  * @author bai
  *
  * @param id
- * @param code 关系编码
+ * @param relCode 关系编码
  * @param name 关系名称
  * @param graphCode 图编码
  * @param directional 方向
@@ -23,14 +24,33 @@ import androidx.room.PrimaryKey
 @Entity(tableName = "relation_dict")
 data class RelationDictEntity(
     @PrimaryKey val id: String,
-    @ColumnInfo(name = "code") val code: String,                  // 关系编码
-    @ColumnInfo(name = "name") val name: String,                  // 关系名
-    @ColumnInfo(name = "graph_code") val graphCode: String,       // 图编码
-    @ColumnInfo(name = "directional") val directional: Int?,      // 方向
-    @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 = "rel_code") val relCode: String,
+    @ColumnInfo(name = "graph_code") val graphCode: String,
+    @ColumnInfo(name = "graph_name") val graphName: String,
+    @ColumnInfo(name = "group_code") val groupCode: String,
+    @ColumnInfo(name = "attribute") val attribute: String?,
+    @ColumnInfo(name = "automatic_flag") val automaticFlag: String?,
+    @ColumnInfo(name = "cal_flag") val calFlag: Boolean,
+    @ColumnInfo(name = "delivery_cal_flag") val deliveryCalFlag: Boolean,
+    @ColumnInfo(name = "delivery_type") val deliveryType: Int,
+    @ColumnInfo(name = "directional") val directional: Int?,
+    @ColumnInfo(name = "from_obj_type") val fromObjType: String?,
+    @ColumnInfo(name = "to_obj_type") val toObjType: String?,
+    @ColumnInfo(name = "target_objs") val targetObjs: String?,
+    @ColumnInfo(name = "manual") val manual: Int,
+    @ColumnInfo(name = "project_id") val projectId: String,
+    @ColumnInfo(name = "prompting") val prompting: String,
+    @ColumnInfo(name = "source_flag") val sourceFlag: Boolean,
+    @ColumnInfo(name = "system_type") val systemType: Int,
+    @ColumnInfo(name = "before_cal_rels") val beforeCalRels: JsonElement? = null,
+    @ColumnInfo(name = "cal_rules") val calRules: JsonElement? = null,
+    @ColumnInfo(name = "source_type_codes") val sourceTypeCodes: JsonElement? = null,
+    @ColumnInfo(name = "end_type_codes") val endTypeCodes: JsonElement? = null,
+    @ColumnInfo(name = "zone_types") val zoneTypes: JsonElement? = null,
+    @ColumnInfo(name = "mep_system_type") val mepSystemType: JsonElement? = null,
     @ColumnInfo(name = "valid") var valid: Int?,                   // 有效标识, // 1 正常 0 删除
+    @ColumnInfo(name = "remark") val remark: String?,
+    @ColumnInfo(name = "creator") val creator: String,
+    @ColumnInfo(name = "creation_time") val creationTime: Long,
+
 )

+ 4 - 6
app/src/main/java/com/ys/bdtp/adm/mvvm/model/db/entity/dict/SystemEntity.kt

@@ -41,15 +41,13 @@ data class SystemEntity(
     @ColumnInfo(name = "group_code") val groupCode: String?,
     @ColumnInfo(name = "project_id") val projectId: 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 = "m2d") var m2d: Boolean,
+    @ColumnInfo(name = "define_type_id")  val defineTypeId: String,
+    @ColumnInfo(name = "delivery_type") val deliveryType: Int,
+    @ColumnInfo(name = "is_delivery") val isDelivery: Int,
     @ColumnInfo(name = "valid") var valid: Int?,
     @ColumnInfo(name = "version") val version: String?,
-    @ColumnInfo(name = "source_from") var sourceFrom: Boolean,
+    @ColumnInfo(name = "source_from") var sourceFrom: 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,
 )

+ 2 - 0
app/src/main/java/com/ys/bdtp/adm/mvvm/model/db/entity/task/ProblemEntity.kt

@@ -11,6 +11,7 @@ import com.google.gson.JsonElement
  * @author bai
  *
  * @param id
+ * @param groupCode 集团编码
  * @param projectId 项目id
  * @param buildingId 建筑id
  * @param floorId 楼层id
@@ -35,6 +36,7 @@ import com.google.gson.JsonElement
 @Entity(tableName = "problem")
 class ProblemEntity(
     @PrimaryKey @ColumnInfo(name = "id") val id: String,
+    @ColumnInfo(name = "group_code") val groupCode: String? = null,
     @ColumnInfo(name = "project_id") val projectId: String,
     @ColumnInfo(name = "building_id") val buildingId: String,
     @ColumnInfo(name = "floor_id") val floorId: String,

+ 6 - 0
app/src/main/java/com/ys/bdtp/adm/mvvm/model/nt/Api.kt

@@ -1,6 +1,7 @@
 package com.ys.bdtp.adm.mvvm.model.nt
 
 import com.ys.bdtp.adm.mvvm.model.Model
+import com.ys.bdtp.adm.mvvm.model.vo.Dict
 import com.ys.bdtp.adm.mvvm.model.vo.request.Account
 import com.ys.bdtp.adm.mvvm.model.vo.request.Login
 import retrofit2.http.Body
@@ -27,4 +28,9 @@ interface Api {
     @POST("auth/login/loginInfo")
     suspend fun getAccount(): Model<Account>
 
+    /**
+     * 获取字典数据
+     */
+    @POST("adm-server/adm/dict")
+    suspend fun getDict(): Model<Dict>
 }

+ 17 - 0
app/src/main/java/com/ys/bdtp/adm/mvvm/model/vo/Dict.kt

@@ -0,0 +1,17 @@
+package com.ys.bdtp.adm.mvvm.model.vo
+
+import com.ys.bdtp.adm.mvvm.model.db.entity.dict.*
+import com.ys.bdtp.adm.mvvm.model.db.entity.task.RelationEntity
+
+/**
+ * 字典数据
+ *
+ * @author bai
+ */
+data class Dict(
+    val equipment: List<EquipmentEntity>,
+    val infos: List<InfoEntity>,
+    val major: List<MajorEntity>,
+    val relation: List<RelationEntity>,
+    val system: List<SystemEntity>
+)

+ 0 - 4
app/src/main/java/com/ys/bdtp/adm/mvvm/model/vo/Temp.kt

@@ -1,4 +0,0 @@
-package com.ys.bdtp.adm.mvvm.model.vo
-
-class Temp {
-}