增加正逆向交付

dmp-business/dmp-rwd/src/main/resources/db/init/schema.sql

@@ -311,25 +311,27 @@ CREATE TABLE IF NOT EXISTS `dt_sync_data` (
 ) ENGINE=InnoDB ROW_FORMAT=DYNAMIC COMMENT='adm交付数据同步到项目现场';
 
 CREATE TABLE IF NOT EXISTS `dt_define_type_collect` (
-  `id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '1' COMMENT '主键ID',
-  `group_code` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '集团编码',
-  `project_id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '项目ID',
-  `define_type_id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '类型ID',
-  `code` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '对象类型编码',
-  `obj_type` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '对象类型',
-  `delivery_type` tinyint(1) NOT NULL DEFAULT '0' COMMENT '交付类型：0-项目交付 1-现场交付',
-  `is_delivery` tinyint(1) DEFAULT NULL COMMENT '是否交付 0-否 1-是',
-  `instance_scope` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '交付范围：实例范围',
-  `association_relation` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '交付范围：依赖&关联',
-  `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '交付范围：备注',
-  `creator` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
-  `creation_time` char(14) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建时间',
-  `modifier` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最后修改人',
-  `modified_time` char(14) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最后修改时间',
-  `valid` tinyint(1) NOT NULL DEFAULT '1' COMMENT '合法标识',
-  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '乐观锁',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='对象类型交付配置表';
+    `id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '1' COMMENT '主键ID',
+    `group_code` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '集团编码',
+    `project_id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '项目ID',
+    `define_type_id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '类型ID',
+    `code` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '对象类型编码',
+    `obj_type` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '对象类型',
+    `delivery_type` tinyint(1) DEFAULT '0' COMMENT '交付类型：0-项目交付 1-现场交付',
+    `is_delivery` tinyint(1) DEFAULT NULL COMMENT '是否交付 0-否 1-是',
+    `instance_scope` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '交付范围：实例范围',
+    `association_relation` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '交付范围：依赖&关联',
+    `delivery_way` tinyint DEFAULT NULL COMMENT '正逆向交付方式 0-逆向 1-正向 2-不确定',
+    `room_func_types` text COLLATE utf8mb4_general_ci COMMENT '交付主张不确定时，正向时设备所在物业空间的空间功能类型',
+    `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '交付范围：备注',
+    `creator` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+    `creation_time` char(14) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建时间',
+    `modifier` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最后修改人',
+    `modified_time` char(14) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最后修改时间',
+    `valid` tinyint(1) NOT NULL DEFAULT '1' COMMENT '合法标识',
+    `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '乐观锁',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='对象类型交付表';
 
 CREATE TABLE IF NOT EXISTS `dt_define_info_collect` (
   `id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,

dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/delivery/dto/RelationDefineCollectDTO.java

@@ -23,7 +23,6 @@ import java.util.Set;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class RelationDefineCollectDTO extends RelationDefineCollect {
-
     /** 图类型名称*/
     private String graphName;
     /** 边类型名称 */
@@ -49,20 +48,16 @@ public class RelationDefineCollectDTO extends RelationDefineCollect {
     /** 自动计算类型,0-手动计算,1-自动计算,0-手动计算,1-自动计算 */
     private Boolean automaticFlag;
     /** 是否需要配置源末端 */
-    @TableField(value = "source_flag")
     private Boolean sourceFlag;
     /** 手动计算类型 1 禁用  2提示引导 3手动维护 */
-    @TableField(value = "manual")
     private Integer manual;
     /** 系统类型,风系统1,水系统0 */
-    @TableField(value = "system_type")
     private Integer systemType;
     /** 机电系统类型 */
     private Set<String> mepSystemType;
     /** 分区类型code集合 */
     private Set<String> zoneTypes;
     /** 是否参与计算 */
-    @TableField(value = "cal_flag")
     private Boolean calFlag;
 
 

dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/delivery/entity/ObjectTypeCollect.java

@@ -1,6 +1,9 @@
 package com.persagy.dmp.delivery.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -35,6 +38,11 @@ public class ObjectTypeCollect extends AuditableEntity {
     private String instanceScope;
     /** 交付范围：依赖&关联 */
     private String associationRelation;
+    /** 正逆向交付方式 0-逆向 1-正向 2-不确定*/
+    private Integer deliveryWay;
+    /** 交付主张不确定时，正向时设备所在物业空间的空间功能类型*/
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private ArrayNode roomFuncTypes;
     /** 备注 */
     private String remark;