Merge branch 'develop' of http://39.106.8.246:3003/BDTP/digital-delivery into develop

adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/controller/DiagramController.java

@@ -77,12 +77,6 @@ public class DiagramController {
 
         List<Diagram> diagramList = dataStrategy.getDiagrams(null, projectId,
                 (String) diagram.get("systemId"), groupCode, null, false);
-        if (diagramList != null) { //TODO 批量处理会导致接口响应慢，优化为列表和内容拆分的方式
-            diagramList.forEach(d -> {
-                diagramManager.buildDiagram(d);
-                d.toAbsoluteLocation();
-            });
-        }
 
         return diagramManager.json4View(ResultHelper.multi(diagramList));
     }

adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/controller/TemplateController.java

@@ -106,14 +106,4 @@ public class TemplateController {
         return ResultHelper.single(templateManager.modifyDynGroup(params.getDynGroup(), params.getCurrentCompId(), params.getTemplateId()));
     }
 
-    @PostMapping("copyContent")
-    public CommonResult<String> copyContent(@RequestBody EditRequest params){
-        return ResultHelper.single(templateManager.getCopyContent(params.getCurrentCompId(), params.getTemplateId()));
-    }
-
-    @PostMapping("pasteContent")
-    public CommonResult<DiagramTemplate> pasteContent(@RequestBody EditRequest params){
-        return ResultHelper.single(templateManager.setPasteContent(params.getContent(), params.getCurrentCompId(), params.getTemplateId()));
-    }
-
 }

adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/core/DiagramDataLoader.java

@@ -70,7 +70,7 @@ public class DiagramDataLoader {
 				}
 
 				//设置anchorLocations
-				en.setAnchorLocations();
+				en.getAnchorLocations();
 			}
 
 			if(obj != null) {

adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/core/model/EquipmentNode.java

@@ -56,7 +56,7 @@ public class EquipmentNode extends DiagramNode implements IDataBind {
 			label.setLocation(new XY(10, 10)); //TODO
 		}
 
-		setAnchorLocations();
+		//TODO anchors
 	}
 
 	@Override
@@ -115,16 +115,15 @@ public class EquipmentNode extends DiagramNode implements IDataBind {
 		return legend;
 	}
 
-	public void setAnchorLocations() {
-		if (legend.getAnchors() != null) {
-			anchorLocations = new HashMap<>();
-			for (Anchor anchor : legend.getAnchors()) {
-				anchorLocations.put(anchor.getCode(), anchor.calcLocation(size));
+	public Map<String, XY> getAnchorLocations() {
+		if (anchorLocations == null) {
+			if (legend.getAnchors() != null) {
+				anchorLocations = new HashMap<>();
+				for (Anchor anchor : legend.getAnchors()) {
+					anchorLocations.put(anchor.getCode(), anchor.calcLocation(size));
+				}
 			}
 		}
-	}
-
-	public Map<String, XY> getAnchorLocations() {
 		return anchorLocations;
 	}
 

adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/frame/EditRequest.java

@@ -40,8 +40,6 @@ public class EditRequest {
 
 	private DynGroup dynGroup;
 
-	private String content;
-
 	@Data
 	public static class TemplatePropsData {
 

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

@@ -2,7 +2,6 @@ package com.persagy.adm.diagram.manage;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.adm.diagram.core.ContentParser;
 import com.persagy.adm.diagram.core.DataStrategy;
@@ -402,64 +401,4 @@ public class TemplateManager {
         return saveTemplate(template);
     }
 
-    public String getCopyContent(String compId, String templateId){
-        DiagramTemplate template = dataStrategy.getTemplate(templateId);
-        template.init();
-
-        Object obj;
-        if(StrUtil.isNotBlank(compId)) {
-            obj = template.getContainerById(compId);
-            if(obj == null){
-                obj = template.getMainPipeById(compId);
-            }
-        } else {
-            obj = template;
-        }
-        return obj != null ? contentParser.toJson(obj) : "";
-    }
-
-    public DiagramTemplate setPasteContent(String content, String compId, String templateId){
-        DiagramTemplate template = dataStrategy.getTemplate(templateId);
-        template.init();
-
-        if(StrUtil.isNotBlank(content)) {
-            Map<String, Object> map = contentParser.parseContent(content, Map.class);
-            Object o = null;
-            if(Container.TYPE.equals(map.get("compType"))){
-                o = contentParser.parseContent(content, Container.class);
-            } else if(MainPipe.TYPE.equals(map.get("compType"))) {
-                o = contentParser.parseContent(content, MainPipe.class);
-            } else if(map.containsKey("frame")) {
-                o = contentParser.parseContent(content, DiagramTemplate.class);
-            }
-
-            if(o != null) {
-                if(o instanceof DiagramTemplate){
-                    DiagramTemplate other = (DiagramTemplate)o;
-                    if(StrUtil.isBlank(compId)) {
-                        template.setFrame(other.getFrame());
-                        template.setMainPipes(other.getMainPipes());
-                        template.setScatteredContainers(other.getScatteredContainers());
-                    }
-                } else if(o instanceof Container) {
-                    Container target = null;
-                    if(StrUtil.isNotBlank(compId)) {
-                        Container con = template.getContainerById(compId);
-                        if(con != null){
-                            target = con;
-                        }
-                    } else {
-                      target = template.getFrame();
-                    }
-                    if(target != null){
-                        target.addComp((Container)o);
-                    }
-                } else {
-                    //暂不支持干管粘贴
-                }
-            }
-        }
-        return saveTemplate(template);
-    }
-
 }