代码合并修改

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

@@ -55,13 +55,13 @@ public class DiagramController {
      */
     @ApiOperation("系统图列表接口")
     @PostMapping("/getDiagrams")
-    public CommonResult<List<Diagram>> getDiagrams(@RequestBody Diagram diagram) {
+    public CommonResult<List<Diagram>> getDiagrams(@RequestBody Map<String, Object> diagram) {
         BdtpRequest current = BdtpRequest.getCurrent();
         String groupCode = current.getGroupCode();
         String projectId = current.getProjectId();
 
         List<Diagram> diagramList = dataStrategy.getDiagrams(null, projectId,
-                diagram.getSystemId(), groupCode, diagram.getName(), diagram.getFlag());
+                (String)diagram.get("systemId"), groupCode, (String)diagram.get("name"), (Boolean) diagram.get("flag"));
 
         return ResultHelper.multi(diagramList);
     }

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

@@ -5,6 +5,10 @@ import com.persagy.adm.diagram.core.model.base.XY;
 import com.persagy.adm.diagram.core.util.GeomUtil;
 import org.locationtech.jts.geom.Polygon;
 
+/**
+ * 块区域
+ * @author zhaoyk
+ */
 public class Block {
 
 	private DiagramNode node;

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

@@ -4,6 +4,7 @@ import com.persagy.adm.diagram.core.model.base.XY;
 
 /**
  * 连线的终点
+ * @author zhaoyk
  */
 public class LineEnd {
 

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

@@ -15,6 +15,7 @@ import java.util.List;
 
 /**
  * 连线布局计算
+ * @author zhaoyk
  */
 public class LineLayoutManager {
 

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

@@ -9,6 +9,7 @@ import java.util.stream.Collectors;
 
 /**
  * 连线路径计算
+ * @author zhaoyk
  */
 public class PathBuilder {
 

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

@@ -5,6 +5,7 @@ import org.locationtech.jts.geom.*;
 
 /**
  * 几何计算工具类
+ * @author zhaoyk
  */
 public class GeomUtil {
 

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

@@ -71,7 +71,7 @@ public class ModelAdapter {
         diagram.setProjectId(diagramEntity.getProjectId());
         diagram.setSystemId(diagramEntity.getSystemId());
         diagram.setGroupCode(diagramEntity.getGroupCode());
-        diagram.setCreateTime(diagramEntity.getCreationTime());
+        diagram.setExtraProp("createTime", diagramEntity.getCreationTime());
         diagram.setExtraProp("state", diagramEntity.getState());
         return diagram;
     }