فهرست منبع

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

lijie 3 سال پیش
والد
کامیت
4d5f37554b
21فایلهای تغییر یافته به همراه204 افزوده شده و 63 حذف شده
  1. 4 4
      adm-business/adm-diagram/pom.xml
  2. 26 0
      adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/constant/Constants.java
  3. 1 1
      adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/core/DataStrategy.java
  4. 94 20
      adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/core/impl/DataStrategyImpl.java
  5. 33 3
      adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/core/model/Diagram.java
  6. 3 0
      adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/dao/DiagramMapper.java
  7. 0 11
      adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/define/entity/Legend.java
  8. 1 1
      adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/demo/DemoDataStrategy.java
  9. 3 1
      adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/entity/DiagramEntity.java
  10. 3 1
      adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/entity/DiagramType.java
  11. 3 1
      adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/entity/LegendEntity.java
  12. 4 4
      adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/entity/ModelAdapter.java
  13. 2 1
      adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/entity/TemplateEntity.java
  14. 1 1
      adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/manage/DemoDiagramManager.java
  15. 1 1
      adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/manage/TemplateManager.java
  16. 2 2
      adm-business/adm-diagram/src/main/resources/bootstrap.yml
  17. 1 1
      adm-business/adm-diagram/src/main/resources/db.init/schema.sql
  18. 15 3
      adm-business/adm-diagram/src/main/resources/mapper/Diagram.xml
  19. 1 1
      adm-business/adm-diagram/src/main/resources/mapper/DiagramType.xml
  20. 2 2
      adm-business/adm-diagram/src/main/resources/mapper/Legend.xml
  21. 4 4
      adm-business/adm-server/pom.xml

+ 4 - 4
adm-business/adm-diagram/pom.xml

@@ -45,10 +45,10 @@
             <groupId>com.persagy</groupId>
             <artifactId>dmp-digital-starter</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.persagy</groupId>-->
-<!--            <artifactId>dmp-file-starter</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.persagy</groupId>
+            <artifactId>dmp-file-starter</artifactId>
+        </dependency>
 
 
         <dependency>

+ 26 - 0
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/constant/Constants.java

@@ -0,0 +1,26 @@
+package com.persagy.adm.diagram.constant;
+
+/**
+ * 常量定义
+ *
+ * @author liyang
+ * @date 2022-01-04
+ */
+public class Constants {
+    /**
+     * id
+     */
+    public static final String ID = "id";
+    /**
+     * name
+     */
+    public static final String NAME = "name";
+    /**
+     * equipment
+     */
+    public static final String EQUIPMENT = "equipment";
+    /**
+     * system
+     */
+    public static final String SYSTEM = "system";
+}

+ 1 - 1
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/core/DataStrategy.java

@@ -15,7 +15,7 @@ import java.util.List;
  */
 public interface DataStrategy {
 
-    String implQualifier = "demo";
+    String implQualifier = "dataStrategyImpl";
 
     List<DiagramType> getDiagramTypes();
 

+ 94 - 20
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/core/impl/DataStrategyImpl.java

@@ -1,11 +1,14 @@
 package com.persagy.adm.diagram.core.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.persagy.adm.diagram.constant.Constants;
 import com.persagy.adm.diagram.core.DataStrategy;
 import com.persagy.adm.diagram.core.model.Diagram;
 import com.persagy.adm.diagram.core.model.legend.Legend;
@@ -14,7 +17,11 @@ import com.persagy.adm.diagram.dao.DiagramMapper;
 import com.persagy.adm.diagram.dao.DiagramTypeMapper;
 import com.persagy.adm.diagram.dao.LegendMapper;
 import com.persagy.adm.diagram.dao.TemplateMapper;
-import com.persagy.adm.diagram.entity.*;
+import com.persagy.adm.diagram.entity.DiagramEntity;
+import com.persagy.adm.diagram.entity.DiagramType;
+import com.persagy.adm.diagram.entity.LegendEntity;
+import com.persagy.adm.diagram.entity.ModelAdapter;
+import com.persagy.adm.diagram.entity.TemplateEntity;
 import com.persagy.adm.diagram.util.ServiceUtil;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.basic.model.QueryOperator;
@@ -23,12 +30,20 @@ import com.persagy.dmp.common.constant.ResponseCode;
 import com.persagy.dmp.common.exception.BusinessException;
 import com.persagy.dmp.digital.client.DigitalObjectFacade;
 import com.persagy.dmp.digital.client.DigitalRelationFacade;
+import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.digital.entity.ObjectRelation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.stream.Collectors;
@@ -110,8 +125,15 @@ public class DataStrategyImpl implements DataStrategy {
      */
     @Override
     public DiagramTemplate saveTemplate(DiagramTemplate template) {
-        TemplateEntity templateEntity = modelAdapter.toTemplateEntity(template);
-        templateMapper.saveTemplate(templateEntity);
+        if (StrUtil.isNotBlank(template.getId())) {
+            TemplateEntity dbEntity = templateMapper.selectById(template.getId());
+            if (dbEntity != null) {
+                templateMapper.updateById(modelAdapter.toTemplateEntity(template));
+                return template;
+            }
+        }
+        template.setId(IdUtil.simpleUUID());
+        templateMapper.saveTemplate(modelAdapter.toTemplateEntity(template));
         return template;
     }
 
@@ -168,6 +190,14 @@ public class DataStrategyImpl implements DataStrategy {
     @Override
     public Legend saveLegend(Legend legend, String systemCode) {
         legend.setSystem(systemCode);
+        if (StrUtil.isNotBlank(legend.getId())) {
+            LegendEntity dbEntity = legendMapper.selectById(legend.getId());
+            if (null != dbEntity) {
+                legendMapper.updateById(modelAdapter.toLegendEntity(legend));
+                return legend;
+            }
+        }
+        legend.setId(IdUtil.simpleUUID());
         legendMapper.saveLegend(modelAdapter.toLegendEntity(legend));
         return legend;
     }
@@ -242,13 +272,41 @@ public class DataStrategyImpl implements DataStrategy {
      */
     @Override
     public List<Diagram> getDiagrams(String diagramType, String projectId, String systemId, String groupCode, String name) {
+
+        Set<DiagramEntity> result = new HashSet<>();
+        //所有系统实例
+        List<ObjectNode> objectNodes = loadSystemInstance(projectId, groupCode);
+        //获取所有id
+        List<String> ids = objectNodes.stream().filter(node -> {
+            String objectName = Optional.ofNullable(node.get(Constants.NAME)).map(JsonNode::asText).orElse(StrUtil.EMPTY);
+            return objectName.contains(name);
+        }).map(jsonNodes -> jsonNodes.get(Constants.ID).asText()).collect(Collectors.toList());
+
+        if (CollectionUtil.isNotEmpty(ids)) {
+            //由系统实例名模糊匹配到的系统图列表
+            List<DiagramEntity> diagramsBySystemIds = diagramMapper.getDiagramsBySystemIds(ids);
+            //合并
+            result.addAll(diagramsBySystemIds);
+        }
+        //直接去系统图表根据名称模糊查询查出来的数据
         List<DiagramEntity> diagrams = diagramMapper.getDiagrams(diagramType,
                 projectId, systemId, groupCode, name);
-        if (CollectionUtil.isNotEmpty(diagrams)) {
-            return diagrams.stream().map(diagramEntity ->
-                    modelAdapter.toDiagram(diagramEntity)).collect(Collectors.toList());
-        }
-        return new ArrayList<>();
+        //合并
+        result.addAll(diagrams);
+
+        //转成map
+        Map<String, ObjectNode> map = objectNodes.stream().collect(Collectors.toMap(node
+                -> node.get(Constants.ID).asText(), node -> node));
+
+        return result.stream().map(diagramEntity -> {
+            Diagram diagram = modelAdapter.toDiagram(diagramEntity);
+            ObjectNode node = map.get(diagramEntity.getSystemId());
+            if (node != null) {
+                diagram.setSystemInstanceName(node.get(Constants.NAME).asText());
+            }
+            return diagram;
+        }).collect(Collectors.toList());
+
     }
 
     /**
@@ -259,8 +317,15 @@ public class DataStrategyImpl implements DataStrategy {
      */
     @Override
     public Diagram saveDiagram(Diagram diagram) {
-        DiagramEntity diagramEntity = modelAdapter.toDiagramEntity(diagram);
-        diagramMapper.saveDiagram(diagramEntity);
+        if (StrUtil.isNotBlank(diagram.getId())) {
+            DiagramEntity dbEntity = diagramMapper.selectById(diagram.getId());
+            if (null != dbEntity) {
+                diagramMapper.updateById(modelAdapter.toDiagramEntity(diagram));
+                return diagram;
+            }
+        }
+        diagram.setId(IdUtil.simpleUUID());
+        diagramMapper.saveDiagram(modelAdapter.toDiagramEntity(diagram));
         return diagram;
     }
 
@@ -299,9 +364,9 @@ public class DataStrategyImpl implements DataStrategy {
     @Override
     public List<ObjectNode> loadObjectsByType(List<String> equipmentTypes, String projectId,
                                               String systemId, String groupCode) {
-        QueryCriteria criteria = ServiceUtil.getQueryCriteria(objectMapper, "equipment");
+        QueryCriteria criteria = ServiceUtil.getQueryCriteria(objectMapper, Constants.EQUIPMENT);
         if (CollectionUtil.isNotEmpty(equipmentTypes)) {
-            ArrayNode types = criteria.getCriteria().putArray("classCode");
+            ArrayNode types = criteria.getCriteria().putArray(ObjectDigital.CLASS_CODE_HUM);
             equipmentTypes.forEach(types::add);
         }
 
@@ -348,19 +413,27 @@ public class DataStrategyImpl implements DataStrategy {
         return JsonNodeUtils.toListNode(allRelations, null, null);
     }
 
+    /**
+     * 查询obj_from 和 objTo 的数据
+     *
+     * @param projectId 项目id
+     * @param groupCode 集团code
+     * @param objectIds 对象id列表
+     * @return
+     */
     private List<ObjectRelation> queryRelationsByObjIds(String projectId, String groupCode, List<String> objectIds) {
         List<ObjectRelation> resultList = new ArrayList<>();
         //obj_from
         CompletableFuture<List<ObjectRelation>> fromFuture = CompletableFuture.supplyAsync(() -> {
             QueryCriteria criteria = ServiceUtil.getQueryCriteria(objectMapper);
-            ArrayNode objFrom = criteria.getCriteria().putArray("objFrom");
+            ArrayNode objFrom = criteria.getCriteria().putArray(ObjectRelation.OBJ_FROM_HUM);
             Optional.ofNullable(objectIds).ifPresent(strings -> strings.forEach(objFrom::add));
             return DigitalRelationFacade.query(groupCode, projectId, null, null, criteria);
         }, executor);
         //obj_to
         CompletableFuture<List<ObjectRelation>> toFuture = CompletableFuture.supplyAsync(() -> {
             QueryCriteria criteria = ServiceUtil.getQueryCriteria(objectMapper);
-            ArrayNode objTo = criteria.getCriteria().putArray("objTo");
+            ArrayNode objTo = criteria.getCriteria().putArray(ObjectRelation.OBJ_TO_HUM);
             Optional.ofNullable(objectIds).ifPresent(strings -> strings.forEach(objTo::add));
             return DigitalRelationFacade.query(groupCode, projectId, null, null, criteria);
         }, executor);
@@ -389,8 +462,8 @@ public class DataStrategyImpl implements DataStrategy {
         if (CollectionUtil.isEmpty(objectIds)) {
             throw new BusinessException(ResponseCode.A0400.getCode(), "objectIds不能为空");
         }
-        QueryCriteria criteria = ServiceUtil.getQueryCriteria(objectMapper, "equipment");
-        ArrayNode arr = criteria.getCriteria().putArray("id");
+        QueryCriteria criteria = ServiceUtil.getQueryCriteria(objectMapper, Constants.EQUIPMENT);
+        ArrayNode arr = criteria.getCriteria().putArray(Constants.ID);
         objectIds.forEach(arr::add);
 
         return DigitalObjectFacade.query(groupCode, projectId, null, null, criteria);
@@ -410,10 +483,11 @@ public class DataStrategyImpl implements DataStrategy {
             throw new BusinessException(ResponseCode.A0400.getCode(), "relationIds不能为空");
         }
         QueryCriteria criteria = ServiceUtil.getQueryCriteria(objectMapper);
-        ArrayNode nodes = criteria.getCriteria().putArray("id");
+        ArrayNode nodes = criteria.getCriteria().putArray(Constants.ID);
         relationIds.forEach(nodes::add);
 
-        List<ObjectRelation> result = DigitalRelationFacade.query(groupCode, projectId, null, null, criteria);
+        List<ObjectRelation> result = DigitalRelationFacade.query(groupCode, projectId,
+                null, null, criteria);
         return JsonNodeUtils.toListNode(result, null, null);
     }
 
@@ -426,7 +500,7 @@ public class DataStrategyImpl implements DataStrategy {
      */
     @Override
     public List<ObjectNode> loadSystemInstance(String projectId, String groupCode) {
-        QueryCriteria criteria = ServiceUtil.getQueryCriteria(objectMapper, "system");
+        QueryCriteria criteria = ServiceUtil.getQueryCriteria(objectMapper, Constants.SYSTEM);
         return DigitalObjectFacade.query(groupCode, projectId, null, null, criteria);
     }
 }

+ 33 - 3
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/core/model/Diagram.java

@@ -5,9 +5,7 @@ import com.persagy.adm.diagram.core.model.base.Container;
 import com.persagy.adm.diagram.core.model.base.XY;
 import com.persagy.adm.diagram.core.model.template.DiagramTemplate;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
+import java.util.*;
 
 /**
  * 系统图
@@ -59,6 +57,11 @@ public class Diagram {
 	 */
 	@Expose
 	private String systemId;
+	/**
+	 * 对应的系统实例名称
+	 */
+	@Expose
+	private String systemInstanceName;
 
 	/**
 	 * 集团编码
@@ -72,6 +75,11 @@ public class Diagram {
 	@Expose
 	private String state;
 
+	/**
+	 * 其他字段信息
+	 */
+	@Expose(serialize = false)
+	private Map<String, Object> extraProps;
 
 	/**
 	 * 节点列表
@@ -226,6 +234,14 @@ public class Diagram {
 		this.systemId = systemId;
 	}
 
+	public String getSystemInstanceName() {
+		return systemInstanceName;
+	}
+
+	public void setSystemInstanceName(String systemInstanceName) {
+		this.systemInstanceName = systemInstanceName;
+	}
+
 	public String getGroupCode() {
 		return groupCode;
 	}
@@ -242,6 +258,20 @@ public class Diagram {
 		this.state = state;
 	}
 
+	public Object getExtraProp(String propName) {
+		return extraProps != null ? extraProps.get(propName) : null;
+	}
+
+	public void setExtraProp(String propName, Object propValue) {
+		if(extraProps == null)
+			extraProps = new HashMap<>();
+
+		if(propValue != null)
+			extraProps.put(propName, propValue);
+		else
+			extraProps.remove(propName);
+	}
+
 	public DiagramTemplate getTemplate() {
 		return template;
 	}

+ 3 - 0
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/dao/DiagramMapper.java

@@ -22,6 +22,9 @@ public interface DiagramMapper extends BaseMapper<DiagramEntity> {
                                     @Param("groupCode") String groupCode,
                                     @Param("name") String name);
 
+    //按系统图类型查询
+    List<DiagramEntity> getDiagramsBySystemIds(@Param("systemIds") List<String> ids);
+
     void saveDiagram(DiagramEntity diagramEntity);
 
     boolean deleteByDiagramId(String diagramId);

+ 0 - 11
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/define/entity/Legend.java

@@ -1,11 +0,0 @@
-package com.persagy.adm.diagram.define.entity;
-
-import com.persagy.dmp.common.model.entity.AuditableEntity;
-
-/**
- * 图例
- * @author Administrator
- * @date 2021-11-30
- */
-public class Legend extends AuditableEntity {
-}

+ 1 - 1
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/demo/DemoDataStrategy.java

@@ -39,7 +39,7 @@ public class DemoDataStrategy implements DataStrategy {
 		readFiles((majCode, sysCode, typeCode, typeDir) -> {
 			DiagramType diagramType = new DiagramType();
 			diagramType.setMajor(majCode);
-			diagramType.setSystem(sysCode);
+			diagramType.setDSystem(sysCode);
 			diagramType.setCode(typeCode);
 			diagramType.setName(typeDir.getName());
 

+ 3 - 1
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/entity/DiagramEntity.java

@@ -1,5 +1,6 @@
 package com.persagy.adm.diagram.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,6 +12,7 @@ import lombok.ToString;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
+@TableName(value = "diagram")
 public class DiagramEntity extends AuditableEntity<DiagramEntity> {
 
     private String id;
@@ -33,7 +35,7 @@ public class DiagramEntity extends AuditableEntity<DiagramEntity> {
     /**
      * 所属的系统类型
      */
-    private String system;
+    private String btSystem;
 
     /**
      * 引用的模板id

+ 3 - 1
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/entity/DiagramType.java

@@ -1,5 +1,6 @@
 package com.persagy.adm.diagram.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,6 +12,7 @@ import lombok.ToString;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
+@TableName(value = "diagram_type")
 public class DiagramType extends AuditableEntity<DiagramType> {
 
     /**
@@ -21,7 +23,7 @@ public class DiagramType extends AuditableEntity<DiagramType> {
     /**
      * 所属系统
      */
-    private String system;
+    private String dSystem;
 
     /**
      * 系统图类型的编码

+ 3 - 1
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/entity/LegendEntity.java

@@ -1,5 +1,6 @@
 package com.persagy.adm.diagram.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,6 +12,7 @@ import lombok.ToString;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
+@TableName(value = "diagram_legend")
 public class LegendEntity extends AuditableEntity<LegendEntity> {
 
     private String name;
@@ -25,7 +27,7 @@ public class LegendEntity extends AuditableEntity<LegendEntity> {
     /**
      * 所属系统代码
      */
-    private String system;
+    private String btSystem;
 
     /**
      * 图例内容,json格式

+ 4 - 4
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/entity/ModelAdapter.java

@@ -44,7 +44,7 @@ public class ModelAdapter {
 		legend.setName(legendEntity.getName());
 		legend.setCode(legendEntity.getCode());
 		legend.setRemark(legendEntity.getRemark());
-		legend.setSystem(legendEntity.getSystem());
+		legend.setSystem(legendEntity.getBtSystem());
 		return legend;
 	}
 
@@ -54,7 +54,7 @@ public class ModelAdapter {
 		entity.setName(legend.getName());
 		entity.setCode(legend.getCode());
 		entity.setRemark(legend.getRemark());
-		entity.setSystem(legend.getSystem());
+		entity.setBtSystem(legend.getSystem());
 		entity.setLegendContent(parser.toJson(legend));
 		return entity;
 	}
@@ -66,7 +66,7 @@ public class ModelAdapter {
 		diagram.setRemark(diagramEntity.getRemark());
 		diagram.setType(diagramEntity.getType());
 		diagram.setTemplateId(diagramEntity.getTemplateId());
-		diagram.setSystem(diagramEntity.getSystem());
+		diagram.setSystem(diagramEntity.getBtSystem());
 		diagram.setProjectId(diagramEntity.getProjectId());
 		diagram.setSystemId(diagramEntity.getSystemId());
 		diagram.setGroupCode(diagramEntity.getGroupCode());
@@ -81,7 +81,7 @@ public class ModelAdapter {
 		entity.setRemark(diagram.getRemark());
 		entity.setType(diagram.getType());
 		entity.setTemplateId(diagram.getTemplateId());
-		entity.setSystem(diagram.getSystem());
+		entity.setBtSystem(diagram.getSystem());
 		entity.setProjectId(diagram.getProjectId());
 		entity.setSystemId(diagram.getSystemId());
 		entity.setGroupCode(diagram.getGroupCode());

+ 2 - 1
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/entity/TemplateEntity.java

@@ -1,5 +1,6 @@
 package com.persagy.adm.diagram.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -9,9 +10,9 @@ import lombok.ToString;
  * 模板实体
  */
 @Data
-
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
+@TableName(value = "diagram_template")
 public class TemplateEntity extends AuditableEntity<TemplateEntity> {
 
     /**

+ 1 - 1
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/manage/DemoDiagramManager.java

@@ -62,7 +62,7 @@ public class DemoDiagramManager {
 		List<Folder> folders = new ArrayList<>();
 		for (DiagramType type : types) {
 			Folder fm = Folder.getFolder(type.getMajor(), Folder.TYPE_MAJ, folders, maj);
-			Folder fs = Folder.getFolder(type.getSystem(), Folder.TYPE_SYS, (List)fm.getChildren(), sys);
+			Folder fs = Folder.getFolder(type.getDSystem(), Folder.TYPE_SYS, (List)fm.getChildren(), sys);
 
 			Folder ft = new Folder();
 			fs.getChildren().add(ft);

+ 1 - 1
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/manage/TemplateManager.java

@@ -65,7 +65,7 @@ public class TemplateManager {
 		List<Folder> folders = new ArrayList<>();
 		for (DiagramType type : types) {
 			Folder fm = Folder.getFolder(type.getMajor(), Folder.TYPE_MAJ, folders, maj);
-			Folder fs = Folder.getFolder(type.getSystem(), Folder.TYPE_SYS, (List)fm.getChildren(), sys);
+			Folder fs = Folder.getFolder(type.getDSystem(), Folder.TYPE_SYS, (List)fm.getChildren(), sys);
 
 			Folder ft = new Folder();
 			fs.getChildren().add(ft);

+ 2 - 2
adm-business/adm-diagram/src/main/resources/bootstrap.yml

@@ -9,9 +9,9 @@ spring:
       datasource:
         master:
           username: root
-          password: 123456
+          password: Bdtp@1qaz@WSX
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://localhost:3306/adm_diagram
+          url: jdbc:mysql://cd-cdb-nboe1rje.sql.tencentcdb.com:61955/adm_diagram
 persagy:
   common:
     token:

+ 1 - 1
adm-business/adm-diagram/src/main/resources/db.init/schema.sql

@@ -61,7 +61,7 @@ CREATE TABLE IF NOT EXISTS `diagram` (
   `bt_system` varchar(40) DEFAULT NULL COMMENT '所属的系统',
   `template_id` varchar(40) DEFAULT NULL COMMENT '引用的模板id',
   `project_id` varchar(40) DEFAULT NULL COMMENT '项目id',
-  `system_id` varchar(40) DEFAULT NULL COMMENT '系统id',
+  `system_id` varchar(100) DEFAULT NULL COMMENT '系统id',
   `group_code` varchar(40) DEFAULT NULL COMMENT '集团编码',
   `state` tinyint DEFAULT 1 NOT NULL COMMENT '系统图状态',
   `diagram_content` json DEFAULT NULL COMMENT '系统图内容,json格式',

+ 15 - 3
adm-business/adm-diagram/src/main/resources/mapper/Diagram.xml

@@ -7,7 +7,7 @@
         <result column="name" property="name" jdbcType="VARCHAR"/>
         <result column="remark" property="remark" jdbcType="VARCHAR"/>
         <result column="type" property="type" jdbcType="VARCHAR"/>
-        <result column="bt_system" property="system" jdbcType="VARCHAR"/>
+        <result column="bt_system" property="btSystem" jdbcType="VARCHAR"/>
         <result column="template_id" property="templateId" jdbcType="VARCHAR"/>
         <result column="project_id" property="projectId" jdbcType="VARCHAR"/>
         <result column="system_id" property="systemId" jdbcType="VARCHAR"/>
@@ -33,7 +33,7 @@
         project_id,system_id,group_code,diagram_content,
         creator,creation_time,modifier,modified_time)
         VALUES
-        (#{id},#{name},#{remark},#{type},#{system},#{templateId},
+        (#{id},#{name},#{remark},#{type},#{btSystem},#{templateId},
         #{projectId},#{systemId},#{groupCode},#{diagramContent},
         #{creator}, #{creationTime},#{modifier},#{modifiedTime})
     </insert>
@@ -54,7 +54,7 @@
         SELECT
         <include refid="baseSql"/>
         FROM diagram
-        WHERE 1=1
+        WHERE valid = 1
         <if test="null != diagramType and diagramType.length > 0">
             AND type=#{diagramType}
         </if>
@@ -72,6 +72,18 @@
         </if>
     </select>
 
+    <select id="getDiagramsBySystemIds" resultMap="diagramBaseMap">
+        SELECT
+        <include refid="baseSql"/>
+        FROM diagram
+        WHERE valid = 1
+        <if test="systemIds !=null and systemIds.size()>0">
+            <foreach collection="systemIds" open="AND system_id IN(" close=")" separator="," item="item">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
 </mapper>
 
 

+ 1 - 1
adm-business/adm-diagram/src/main/resources/mapper/DiagramType.xml

@@ -5,7 +5,7 @@
     <resultMap id="diagramTypeBaseMap" type="com.persagy.adm.diagram.entity.DiagramType">
         <id column="id" property="id" jdbcType="VARCHAR"/>
         <result column="major" property="major" jdbcType="VARCHAR"/>
-        <result column="d_system" property="system" jdbcType="VARCHAR"/>
+        <result column="d_system" property="dSystem" jdbcType="VARCHAR"/>
         <result column="code" property="code" jdbcType="VARCHAR"/>
         <result column="name" property="name" jdbcType="VARCHAR"/>
         <result column="remark" property="remark" jdbcType="VARCHAR"/>

+ 2 - 2
adm-business/adm-diagram/src/main/resources/mapper/Legend.xml

@@ -6,7 +6,7 @@
         <id column="id" property="id" jdbcType="VARCHAR"/>
         <result column="name" property="name" jdbcType="VARCHAR"/>
         <result column="code" property="code" jdbcType="VARCHAR"/>
-        <result column="bt_system" property="system" jdbcType="VARCHAR"/>
+        <result column="bt_system" property="btSystem" jdbcType="VARCHAR"/>
         <result column="legend_content" property="legendContent" jdbcType="VARCHAR"/>
         <result column="remark" property="remark" jdbcType="VARCHAR"/>
         <result column="creator" property="creator" jdbcType="VARCHAR"/>
@@ -26,7 +26,7 @@
         INSERT INTO diagram_legend
         (id,bt_system,code,name,remark,legend_content,creator,creation_time,
         modifier,modified_time)
-        VALUES (#{id},#{system},#{code},#{name},#{remark},#{legendContent},#{creator},
+        VALUES (#{id},#{btSystem},#{code},#{name},#{remark},#{legendContent},#{creator},
         #{creationTime},#{modifier},#{modifiedTime})
     </insert>
 

+ 4 - 4
adm-business/adm-server/pom.xml

@@ -30,9 +30,9 @@
             <groupId>com.persagy</groupId>
             <artifactId>dmp-digital-starter</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.persagy</groupId>-->
-<!--            <artifactId>dmp-file-starter</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.persagy</groupId>
+            <artifactId>dmp-file-starter</artifactId>
+        </dependency>
     </dependencies>
 </project>