Browse Source

Merge remote-tracking branch 'origin/develop' into develop

lijie 3 years ago
parent
commit
44ff9eb420

+ 20 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/ObjectRelationServiceImpl.java

@@ -1,5 +1,6 @@
 package com.persagy.dmp.rwd.digital.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.persagy.dmp.basic.dto.RelationCalDTO;
 import com.persagy.dmp.common.constant.ValidEnum;
 import com.persagy.dmp.digital.entity.ObjectRelation;
+import com.persagy.dmp.rwd.basic.utils.DigitalCommonUtils;
 import com.persagy.dmp.rwd.basic.utils.DigitalMessageHelper;
 import com.persagy.dmp.rwd.digital.dao.ObjectRelationMapper;
 import com.persagy.dmp.rwd.digital.service.IObjectRelationService;
@@ -63,10 +65,28 @@ public class ObjectRelationServiceImpl extends ServiceImpl<ObjectRelationMapper,
      */
     @Override
     public List<ObjectRelation> insert(List<ObjectRelation> voList) {
+        //创建默认的图实例id
+        createGraphId(voList);
+        //新增关系数据
         iService.saveOrUpdateBatch(voList);
         return voList;
     }
 
+    /**
+     * 创建默认的图实例id
+     * @param voList
+     */
+    private void createGraphId(List<ObjectRelation> voList){
+        if(CollUtil.isEmpty(voList)){
+            return;
+        }
+        for (ObjectRelation objectRelation : voList) {
+            String graphCode = objectRelation.getGraphCode();
+            String graphId = DigitalCommonUtils.getDefaultGraphIdByGraphCode(graphCode);
+            objectRelation.setGraphId(graphId);
+        }
+    }
+
 
     /**
      * 修改关系数据

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

@@ -210,4 +210,22 @@ CREATE TABLE IF NOT EXISTS `dt_equip_class_rel`  (
  `valid` tinyint(0) NULL DEFAULT 1 COMMENT '合法标识',
  `ts` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '乐观锁',
  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COMMENT = '项目设备类边关系表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COMMENT = '项目设备类边关系表' ROW_FORMAT = Dynamic;
+
+
+CREATE TABLE IF NOT EXISTS `dt_define_info_collect`  (
+`id` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+`define_info_id` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+`project_id` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+`group_code` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '集团编码',
+`visiable` int NULL DEFAULT NULL COMMENT '是否可见 1- 可见 0-不可见',
+`code` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '信息点',
+`class_code` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型编码',
+`creator` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+`creation_time` char(14) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建时间',
+`modifier` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '最后修改人',
+`modified_time` char(14) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '最后修改时间',
+`valid` tinyint NULL DEFAULT NULL COMMENT '合法标识',
+`ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '乐观锁',
+PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;