Browse Source

更新dt_define_graph,dt_define_rel两张表的初始化语句

lijie 3 years ago
parent
commit
81d448446e

File diff suppressed because it is too large
+ 169 - 169
dmp-business/dmp-rwd/src/main/resources/db/init/data.sql


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

@@ -90,9 +90,14 @@ CREATE TABLE IF NOT EXISTS `dt_define_rel` (
   `remark` varchar(45) DEFAULT NULL,
   `before_cal_rel` json NULL COMMENT '计算关系之前需要计算的关系',
   `cal_rule` json NULL COMMENT '计算器,就是计算规则',
-  `from_obj_type` varchar(50) NULL DEFAULT NULL COMMENT '边关系左侧的对象分类',
-  `to_obj_type` varchar(50) NULL DEFAULT NULL COMMENT '关系右侧的对象分类',
-  `automatic_flag` tinyint DEFAULT NULL COMMENT '0-手动计算,1-自动计算',
+  `from_obj_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '边关系左侧的对象分类',
+  `to_obj_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '关系右侧的对象分类',
+  `automatic_flag` tinyint(0) NULL DEFAULT NULL COMMENT '自动计算类型,0-手动计算,1-自动计算',
+  `source_flag` tinyint(0) NULL DEFAULT NULL COMMENT '是否需要配置源末端',
+  `manual` int(0) NULL DEFAULT NULL COMMENT '手动计算类型 1 禁用  2提示引导 3手动维护',
+  `system_type` tinyint(0) NULL DEFAULT NULL COMMENT '风系统1,水系统0',
+  `mep_system_type` json NULL COMMENT '机电系统类型',
+  `zone_types` json NULL COMMENT '分区类型code集合',
   `creator` varchar(32) DEFAULT NULL COMMENT '创建人',
   `creation_time` char(14) NULL DEFAULT NULL COMMENT '创建时间',
   `modifier` varchar(32) DEFAULT NULL COMMENT '最后修改人',

+ 178 - 0
dmp-business/dmp-rwd/src/main/resources/docs/根据现有mysql数据快速生成DML语句的sql记录.md

@@ -0,0 +1,178 @@
+## 1.生成dt_define_rel的初始化数据语句
+```sql
+SELECT
+    'REPLACE INTO `dt_define_rel` ( `id`, `attribute`, `valid`, `directional`, `modified_time`, `code`, `modifier`, `remark`, `graph_code`, `creator`, `ts`, `creation_time`, `target_objs`, `name`, `before_cal_rel`, `cal_rule`, `from_obj_type`, `to_obj_type`, `automatic_flag`, `source_flag`, `manual`, `system_type`, `mep_system_type`, `zone_types`, `cal_flag`) VALUES '
+FROM
+    DUAL UNION
+SELECT
+    CONCAT(
+            '(\'',
+            id,
+            '\',',
+            IFNULL( CONCAT( '\'', attribute, '\'' ), 'NULL' ),
+            ',',
+            valid,
+            ',\'',
+            directional,
+            '\',',
+            IFNULL( CONCAT( '\'', modified_time, '\'' ), 'NULL' ),
+            ',\'',
+            `code`,
+            '\',',
+            IFNULL( CONCAT( '\'', modifier, '\'' ), 'NULL' ),
+            ',',
+            IFNULL( CONCAT( '\'', remark, '\'' ), 'NULL' ),
+            ',\'',
+            graph_code,
+            '\',',
+            IFNULL( CONCAT( '\'', creator, '\'' ), 'NULL' ),
+            ',\'',
+            ts,
+            '\',',
+            IFNULL( CONCAT( '\'', creation_time, '\'' ), 'NULL' ),
+            ',',
+            IFNULL( CONCAT( '\'', target_objs, '\'' ), 'NULL' ),
+            ',\'',
+            `name`,
+            '\',',
+            IFNULL( CONCAT( '\'', before_cal_rel, '\'' ), 'NULL' ),
+            ',',
+            IFNULL( CONCAT( '\'', cal_rule, '\'' ), 'NULL' ),
+            ',',
+            IFNULL( CONCAT( '\'', from_obj_type, '\'' ), 'NULL' ),
+            ',',
+            IFNULL( CONCAT( '\'', to_obj_type, '\'' ), 'NULL' ),
+            ',',
+            IFNULL( CONCAT( '\'', automatic_flag, '\'' ), 'NULL' ),
+            ',',
+            IFNULL( CONCAT( '\'', source_flag, '\'' ), 'NULL' ),
+            ',',
+            IFNULL( CONCAT( '\'', manual, '\'' ), 'NULL' ),
+            ',',
+            IFNULL( CONCAT( '\'', system_type, '\'' ), 'NULL' ),
+            ',',
+            IFNULL( CONCAT( '\'', mep_system_type, '\'' ), 'NULL' ),
+            ',',
+            IFNULL( CONCAT( '\'', zone_types, '\'' ), 'NULL' ),
+            ',',
+            IFNULL( CONCAT( '\'', cal_flag, '\'' ), 'NULL' ),
+            '),'
+        )
+FROM
+    dt_define_rel
+```
+
+## 2.快速生成integrated_config表配置的sql
+```sql
+SELECT
+	CONCAT(
+		'INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE` , `DESCRIPTION`, `ISUPDATE`, `BELONGTO`) SELECT \'',
+		PKEY,
+		'\', \'',
+		PVALUE,
+		'\', \'',
+		'dmp-dic',
+		'\', \'',
+		PPROFILE,
+		'\', \'',
+		LABLE,
+		'\', ',
+		IFNULL( CONCAT( '\'', DESCRIPTION, '\'' ), 'NULL' ),
+		', \'',
+		ISUPDATE,
+		'\', ',
+		IFNULL( CONCAT( '\'', BELONGTO, '\'' ), 'NULL' ),
+		' FROM DUAL WHERE NOT EXISTS (SELECT PKEY FROM integrated_config WHERE PKEY = \'',
+		PKEY,
+		'\' AND APPLICATION = \'',
+		'dmp-dic',
+		'\');' 
+) 
+FROM
+	`integrated_config`
+WHERE
+	`APPLICATION` = 'dc-dic';
+```
+
+## 3.获得dt_define_rel的更新语句
+```sql
+SELECT
+	CONCAT(
+		'UPDATE dt_define_rel SET source_flag=',
+		IFNULL( CONCAT( '\'', is_source, '\'' ), 'NULL' ),
+		', automatic_flag=',
+		IFNULL( CONCAT( '\'', is_automatic, '\'' ), 'NULL' ),
+		', manual=',
+		IFNULL( CONCAT( '\'', manual, '\'' ), 'NULL' ),
+		', system_type=',
+		IFNULL( CONCAT( '\'', system_type, '\'' ), 'NULL' ),
+		', mep_system_type=',
+		IFNULL( CONCAT( '\'', mep_system_type, '\'' ), 'NULL' ),
+		', cal_flag=\'1\'',
+		' WHERE graph_code=\'',
+		graphic_type,
+		'\' AND code=\'',
+		rel_code,
+		'\';' 
+) 
+FROM
+	relation_type 
+WHERE
+	graphic_type IS NOT NULL 
+	AND rel_code IS NOT NULL;
+```
+
+## 4.2021年10月14日16:02:28 dt_define_rel表新增字段
+```sql
+ALTER TABLE dt_define_rel ADD COLUMN  `before_cal_rel` json NULL COMMENT '计算关系之前需要计算的关系';
+ALTER TABLE dt_define_rel ADD COLUMN  `cal_rule` json NULL COMMENT '计算器,就是计算规则';
+ALTER TABLE dt_define_rel ADD COLUMN  `from_obj_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '边关系左侧的对象分类';
+ALTER TABLE dt_define_rel ADD COLUMN  `to_obj_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '关系右侧的对象分类';
+ALTER TABLE dt_define_rel ADD COLUMN  `automatic_flag` tinyint(0) NULL DEFAULT NULL COMMENT '自动计算类型,0-手动计算,1-自动计算';
+ALTER TABLE dt_define_rel ADD COLUMN  `source_flag` tinyint(0) NULL DEFAULT NULL COMMENT '是否需要配置源末端';
+ALTER TABLE dt_define_rel ADD COLUMN  `manual` int(0) NULL DEFAULT NULL COMMENT '手动计算类型 1 禁用  2提示引导 3手动维护';
+ALTER TABLE dt_define_rel ADD COLUMN  `system_type` tinyint(0) NULL DEFAULT NULL COMMENT '风系统1,水系统0';
+ALTER TABLE dt_define_rel ADD COLUMN  `mep_system_type` json NULL COMMENT '机电系统类型';
+ALTER TABLE dt_define_rel ADD COLUMN  `zone_types` json NULL COMMENT '分区类型code集合';
+ALTER TABLE dt_define_rel ADD COLUMN  `cal_flag` tinyint(0) NULL DEFAULT NULL COMMENT '是否参与计算';
+```
+
+## 5.生成dt_define_graph的初始化语句
+```sql
+SELECT
+    'REPLACE INTO `dt_define_graph` ( `id`, `name`, `valid`, `modified_time`, `code`, `second_category`, `remark`, `modifier`, `creator`, `ts`, `creation_time`, `object_types`, `first_category`) VALUES '
+FROM
+    DUAL UNION
+SELECT
+    CONCAT(
+            '(\'',
+            id,
+            '\',',
+            IFNULL( CONCAT( '\'', `name`, '\'' ), 'NULL' ),
+            ',',
+            valid,
+            ',',
+            IFNULL( CONCAT( '\'', modified_time, '\'' ), 'NULL' ),
+            ',',
+            IFNULL( CONCAT( '\'', `code`, '\'' ), 'NULL' ),
+            ',',
+            IFNULL( CONCAT( '\'', second_category, '\'' ), 'NULL' ),
+            ',',
+            IFNULL( CONCAT( '\'', remark, '\'' ), 'NULL' ),
+            ',',
+            IFNULL( CONCAT( '\'', modifier, '\'' ), 'NULL' ),
+            ',',
+            IFNULL( CONCAT( '\'', creator, '\'' ), 'NULL' ),
+            ',\'',
+            ts,
+            '\',',
+            IFNULL( CONCAT( '\'', creation_time, '\'' ), 'NULL' ),
+            ',',
+            IFNULL( CONCAT( '\'', object_types, '\'' ), 'NULL' ),
+						',',
+            IFNULL( CONCAT( '\'', first_category, '\'' ), 'NULL' ),
+            '),'
+        )
+FROM
+    dt_define_graph
+```

+ 42 - 0
dmp-business/dmp-rwd/src/main/resources/mapper/ConnectedBlockMapper.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.persagy.dmp.rwd.digital.dao.ConnectedBlockMapper">
+
+    <resultMap id="BaseResultMap" type="com.persagy.dmp.digital.entity.ConnectedBlock">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="firstId" column="first_id" jdbcType="VARCHAR"/>
+            <result property="firstType" column="first_type" jdbcType="VARCHAR"/>
+            <result property="firstModelId" column="first_model_id" jdbcType="VARCHAR"/>
+            <result property="secondId" column="second_id" jdbcType="VARCHAR"/>
+            <result property="secondType" column="second_type" jdbcType="VARCHAR"/>
+            <result property="secondModelId" column="second_model_id" jdbcType="VARCHAR"/>
+            <result property="direction" column="direction" jdbcType="TINYINT"/>
+            <result property="blockId" column="block_id" jdbcType="VARCHAR"/>
+            <result property="projectId" column="project_id" jdbcType="VARCHAR"/>
+            <result property="depth" column="depth" jdbcType="TINYINT"/>
+            <result property="mepSystemType" column="mep_system_type" jdbcType="VARCHAR"/>
+            <result property="domain" column="domain" jdbcType="VARCHAR"/>
+            <result property="buildingId" column="building_id" jdbcType="VARCHAR"/>
+            <result property="firstTypeCode" column="first_type_code" jdbcType="VARCHAR"/>
+            <result property="secondTypeCode" column="second_type_code" jdbcType="VARCHAR"/>
+            <result property="creator" column="creator" jdbcType="VARCHAR"/>
+            <result property="creationTime" column="creation_time" jdbcType="CHAR"/>
+            <result property="modifier" column="modifier" jdbcType="VARCHAR"/>
+            <result property="modifiedTime" column="modified_time" jdbcType="CHAR"/>
+            <result property="valid" column="valid" jdbcType="TINYINT"/>
+            <result property="ts" column="ts" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,first_id,first_type,
+        first_model_id,second_id,second_type,
+        second_model_id,direction,block_id,
+        project_id,depth,mep_system_type,
+        domain,building_id,first_type_code,
+        second_type_code,creator,creation_time,
+        modifier,modified_time,valid,
+        ts
+    </sql>
+</mapper>

+ 32 - 0
dmp-business/dmp-rwd/src/main/resources/mapper/ConnectedBlockSourceMapper.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.persagy.dmp.rwd.digital.dao.ConnectedBlockSourceMapper">
+
+    <resultMap id="BaseResultMap" type="com.persagy.dmp.digital.entity.ConnectedBlockSource">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="projectId" column="project_id" jdbcType="VARCHAR"/>
+            <result property="blockId" column="block_id" jdbcType="VARCHAR"/>
+            <result property="sourceId" column="source_id" jdbcType="VARCHAR"/>
+            <result property="sourceType" column="source_type" jdbcType="VARCHAR"/>
+            <result property="mepSystemType" column="mep_system_type" jdbcType="VARCHAR"/>
+            <result property="domain" column="domain" jdbcType="VARCHAR"/>
+            <result property="buildingId" column="building_id" jdbcType="VARCHAR"/>
+            <result property="sourceFlag" column="source_flag" jdbcType="TINYINT"/>
+            <result property="creator" column="creator" jdbcType="VARCHAR"/>
+            <result property="creationTime" column="creation_time" jdbcType="CHAR"/>
+            <result property="modifier" column="modifier" jdbcType="VARCHAR"/>
+            <result property="modifiedTime" column="modified_time" jdbcType="CHAR"/>
+            <result property="valid" column="valid" jdbcType="TINYINT"/>
+            <result property="ts" column="ts" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,project_id,block_id,
+        source_id,source_type,mep_system_type,
+        domain,building_id,source_flag,
+        creator,creation_time,modifier,
+        modified_time,valid,ts
+    </sql>
+</mapper>

+ 21 - 2
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/RelationDefine.java

@@ -12,6 +12,7 @@ import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotNull;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 关系定义
@@ -54,7 +55,25 @@ public class RelationDefine extends AuditableEntity {
     /** 关系右侧的对象分类 */
     @TableField(value = "to_obj_type")
     private String toObjType;
-    /** 关系右侧的对象分类 */
+    /** 自动计算类型,0-手动计算,1-自动计算,0-手动计算,1-自动计算 */
     @TableField(value = "automatic_flag")
-    private Integer automaticFlag;
+    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;
+    /** 机电系统类型 */
+    @TableField(value = "mep_system_type")
+    private Set<String> mepSystemType;
+    /** 分区类型code集合 */
+    @TableField(value = "zone_types")
+    private Set<String> zoneTypes;
+    /** 是否参与计算 */
+    @TableField(value = "cal_flag")
+    private Boolean calFlag;
 }