端到端功能 节点展开连线处理代码提交

com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/SubProcessController.java

@@ -130,9 +130,9 @@ public class SubProcessController {
     }
 
     @Mapping("com.actionsoft.apps.coe.method.process.subprocess.shape_expand")
-    public String shapeExpand(UserContext uc, String repositoryId, String shapeId){
+    public String shapeExpand(UserContext uc, String repositoryId, String shapeId, String direction){
-
+        SubProcessWeb processWeb = new SubProcessWeb(uc);
-        return ResponseObject.newOkResponse("展开成功").toString();
+        return processWeb.shapeNodeExpand(repositoryId, shapeId, direction);
     }
 
 }

com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphLinkerRender.java

@@ -3,6 +3,7 @@ package com.actionsoft.apps.coe.method.process.subprocess.graph;
 import com.actionsoft.apps.coe.method.process.subprocess.constant.LinkerDefConstant;
 import com.actionsoft.apps.coe.method.process.subprocess.constant.SubProcessConst;
 import com.actionsoft.apps.coe.method.process.subprocess.mode.Node;
+import com.actionsoft.bpms.util.ConsolePrinter;
 import com.actionsoft.bpms.util.UUIDGener;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -180,15 +181,6 @@ public class GraphLinkerRender {
                         {toX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, toY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
                         endPoint
                 };
-            }else if (fromX > toX && fromY < toY){ // 目标节点在第三象限
-                double[] startPoint = new double[]{fromX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, fromY + SubProcessConst.SUB_PROCESS_SHAPE_H};
-                double[] endPoint = new double[]{toX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, toY};
-                return new double[][]{
-                        startPoint,
-                        {fromX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, toY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
-                        {toX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, toY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
-                        endPoint
-                };
             }else if (fromX < toX && fromY < toY){ // 目标节点在第四象限
                 double[] startPoint = new double[]{fromX + SubProcessConst.SUB_PROCESS_SHAPE_W, fromY + SubProcessConst.SUB_PROCESS_SHAPE_H / 2};
                 if (fromX + SubProcessConst.SUB_PROCESS_SHAPE_W + SubProcessConst.SHAPE_HORIZ_INTERVAL == toX){ // 相邻节点 存在两个折点
@@ -201,15 +193,17 @@ public class GraphLinkerRender {
                             endPoint
                     };
                 }else { // 不相邻节点 存在三个折点
-                    double[] endPoint = new double[]{toX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, toY + SubProcessConst.SUB_PROCESS_SHAPE_H};
+                    double[] endPoint = new double[]{toX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, toY};
                     return new double[][]{
                             startPoint,
                             {fromX + SubProcessConst.SUB_PROCESS_SHAPE_W + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, fromY + SubProcessConst.SUB_PROCESS_SHAPE_H / 2},
-                            {fromX + SubProcessConst.SUB_PROCESS_SHAPE_W + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, toY + SubProcessConst.SHAPE_VERT_INTERVAL / 2},
+                            {fromX + SubProcessConst.SUB_PROCESS_SHAPE_W + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, toY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
-                            {toX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, toY + SubProcessConst.SUB_PROCESS_SHAPE_H + SubProcessConst.SHAPE_VERT_INTERVAL / 2},
+                            {toX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, toY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
                             endPoint
                     };
                 }
+            }else if (fromX > toX && fromY < toY){ // 目标节点在第三象限 横向布局的情况下 应该不会出现目标节点在第三象限的情况
+                ConsolePrinter.warn("[端到端功能][总图生成模块]处理连线时目标节点在[横向布局]的情况下出现在了第三象限");
             }
         }
         return new double[2][2];

com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphNodeExpandHandle.java

@@ -8,6 +8,7 @@ import com.actionsoft.apps.coe.pal.pal.repository.designer.model.BaseModel;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.cache.DesignerShapeRelationCache;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.model.DesignerShapeRelationModel;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.util.ShapeUtil;
+import com.actionsoft.bpms.util.ConsolePrinter;
 import com.actionsoft.bpms.util.UUIDGener;
 import com.actionsoft.bpms.util.UtilString;
 import com.actionsoft.exception.AWSException;
@@ -15,6 +16,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -82,9 +84,32 @@ public class GraphNodeExpandHandle {
     private void toAssembleScopeLimitationShape() throws AWSException{
         JSONObject scopeLimitationShape = ShapeUtil.getProcessShapeDefinition(SubProcessConst.SUB_PROCESS_METHOD_ID, "展开范围标注");
         JSONObject childProcessPage = childProcessDefine.getJSONObject("page");
+        JSONObject childProcessElements = childProcessDefine.getJSONObject("elements");
+        Double childProcessEleMaxX = childProcessElements.keySet()
+                .stream()
+                .filter(key -> !"linker".equals(childProcessElements.getJSONObject(key).getString("name")))
+                .map(key -> childProcessElements.getJSONObject(key).getJSONObject("props").getDoubleValue("x"))
+                .max(Comparator.comparing(Double::doubleValue)).get();
+        Double childProcessEleMinX = childProcessElements.keySet()
+                .stream()
+                .filter(key -> !"linker".equals(childProcessElements.getJSONObject(key).getString("name")))
+                .map(key -> childProcessElements.getJSONObject(key).getJSONObject("props").getDoubleValue("x"))
+                .min(Comparator.comparing(Double::doubleValue)).get();
+        Double childProcessEleMaxY = childProcessElements.keySet()
+                .stream()
+                .filter(key -> !"linker".equals(childProcessElements.getJSONObject(key).getString("name")))
+                .map(key -> childProcessElements.getJSONObject(key).getJSONObject("props").getDoubleValue("y"))
+                .max(Comparator.comparing(Double::doubleValue)).get();
+        Double childProcessEleMinY = childProcessElements.keySet()
+                .stream()
+                .filter(key -> !"linker".equals(childProcessElements.getJSONObject(key).getString("name")))
+                .map(key -> childProcessElements.getJSONObject(key).getJSONObject("props").getDoubleValue("y"))
+                .min(Comparator.comparing(Double::doubleValue)).get();
         // 当前节点所标识的子流程文件的 画布宽度与高度 减去边距
-        double childProcessPageWidth = childProcessPage.getDoubleValue("width") - childProcessPage.getDoubleValue("padding") * 2;
+        // double childProcessPageWidth = childProcessPage.getDoubleValue("width") - childProcessPage.getDoubleValue("padding") * 2;
-        double childProcessPageHeight = childProcessPage.getDoubleValue("height") - childProcessPage.getDoubleValue("padding") * 2;
+        // double childProcessPageHeight = childProcessPage.getDoubleValue("height") - childProcessPage.getDoubleValue("padding") * 2;
+        double scopeShapeW = childProcessEleMaxX.doubleValue() - childProcessEleMinX + childProcessPage.getDoubleValue("padding") * 2;
+        double scopeShapeH = childProcessEleMaxY.doubleValue() - childProcessEleMinY + childProcessPage.getDoubleValue("padding") * 2;
 
         JSONObject elements = endToEndProcessDefine.getJSONObject("elements");
         // 找到当前要展开的子流程节点
@@ -99,8 +124,8 @@ public class GraphNodeExpandHandle {
         JSONObject scopeShapeProps = scopeLimitationShape.getJSONObject("props");
         scopeShapeProps.put("x", x);
         scopeShapeProps.put("y", y);
-        scopeShapeProps.put("w", childProcessPageWidth);
+        scopeShapeProps.put("w", scopeShapeW);
-        scopeShapeProps.put("h", childProcessPageHeight);
+        scopeShapeProps.put("h", scopeShapeH);
         scopeShapeProps.put("zindex", 1);
         this.scopeLimitationShape = scopeLimitationShape;
     }
@@ -109,8 +134,9 @@ public class GraphNodeExpandHandle {
      * 节点展开
      * @param direction 排布方向
      * @throws Exception
+     * @return 节点展开后的模型存储信息
      */
-    public void handleNodeExpand(String direction) throws Exception{
+    public String handleNodeExpand(String direction) throws Exception{
 
         Thread t1 = new Thread(() -> {
             // 1、总图节点以及连线处理
@@ -128,11 +154,11 @@ public class GraphNodeExpandHandle {
         t2.join();
 
         // 6、保存总图模型信息 以及 子流程模型信息备份
-        BaseModel baseModel = apiManager.getDefinition(repositoryId, 0);
+        // BaseModel baseModel = apiManager.getDefinition(repositoryId, 0);
-        baseModel.setDefinition(endToEndProcessDefine.toJSONString());
+        // baseModel.setDefinition(endToEndProcessDefine.toJSONString());
-        apiManager.storeDefinition(baseModel);
+        // apiManager.storeDefinition(baseModel);
-
+        // apiManager.storeChildProcessDefine(baseModel, relationFileId, childProcessDefine.toJSONString());
-        apiManager.storeChildProcessDefine(baseModel, relationFileId, childProcessDefine.toJSONString());
+        return endToEndProcessDefine.toJSONString();
     }
 
     /**
@@ -555,89 +581,83 @@ class NodeExpandLinkerRender{
 
     private double[][] calculationLinkerPointInHorizLayOut(double[] fromPoi, double[] toPoi, boolean currentExpandNodeIsStart, boolean currentExpandNodeIsEnd) {
         double fromX = fromPoi[0],fromY = fromPoi[1],toX = toPoi[0],toY = toPoi[1];
+        double scopeShapeW = scopeLimitationShape.getDoubleValue("w"), scopeShapeH = scopeLimitationShape.getDoubleValue("h");
         if (fromY == toY) { // 水平 方向上 存在从左向右直连的情况 但不存在从右向左直连的情况 水平方向上 从左向右 应是 右出 向上 左折 向下
             return fromX < toX
                     ? new double[][]
                     {
-                            {fromX + SubProcessConst.SUB_PROCESS_SHAPE_W, fromY + SubProcessConst.SUB_PROCESS_SHAPE_H / 2},
+                            {fromX + (currentExpandNodeIsStart ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W), fromY + (currentExpandNodeIsStart ? scopeShapeH : SubProcessConst.SUB_PROCESS_SHAPE_H) / 2},
-                            {fromX + SubProcessConst.SUB_PROCESS_SHAPE_W + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, fromY + SubProcessConst.SUB_PROCESS_SHAPE_H / 2},
+                            {fromX + (currentExpandNodeIsStart ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, fromY + (currentExpandNodeIsStart ? scopeShapeH : SubProcessConst.SUB_PROCESS_SHAPE_H) / 2},
-                            {fromX + SubProcessConst.SUB_PROCESS_SHAPE_W + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, fromY + SubProcessConst.SUB_PROCESS_SHAPE_H / 2},
+                            {toX - SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, toY + (currentExpandNodeIsEnd ? scopeShapeH : SubProcessConst.SUB_PROCESS_SHAPE_H) / 2},
-                            {toX, toY + SubProcessConst.SUB_PROCESS_SHAPE_H / 2}
+                            {toX, toY + (currentExpandNodeIsEnd ? scopeShapeH : SubProcessConst.SUB_PROCESS_SHAPE_H) / 2}
                     }
                     : new double[][]
                     {
-                            {fromX + SubProcessConst.SUB_PROCESS_SHAPE_W, fromY + SubProcessConst.SUB_PROCESS_SHAPE_H / 2},
+                            {fromX + (currentExpandNodeIsStart ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W), fromY + (currentExpandNodeIsStart ? scopeShapeH : SubProcessConst.SUB_PROCESS_SHAPE_H) / 2},
-                            {fromX + SubProcessConst.SUB_PROCESS_SHAPE_W + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, fromY + SubProcessConst.SUB_PROCESS_SHAPE_H / 2},
+                            {fromX + (currentExpandNodeIsStart ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, fromY + (currentExpandNodeIsStart ? scopeShapeH : SubProcessConst.SUB_PROCESS_SHAPE_H) / 2},
-                            {fromX + SubProcessConst.SUB_PROCESS_SHAPE_W + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, fromY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
+                            {fromX + (currentExpandNodeIsStart ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, fromY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
-                            {toX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, toY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
+                            {toX + (currentExpandNodeIsEnd ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) / 2, toY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
-                            {toX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, toY}
+                            {toX + (currentExpandNodeIsEnd ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) / 2, toY}
                     };
         }else if (fromX == toX) { // 垂直
             // 节点横向分布 连线按照大原则 垂直 不存在 fromY < toY 的情况 也就是不存在 连线从上到下直连的情况
-            double[] startPoint = new double[]{fromX + SubProcessConst.SUB_PROCESS_SHAPE_W, fromY + SubProcessConst.SUB_PROCESS_SHAPE_H / 2};
+            double[] startPoint = new double[]{fromX + (currentExpandNodeIsStart ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W), fromY + (currentExpandNodeIsStart ? scopeShapeH : SubProcessConst.SUB_PROCESS_SHAPE_H) / 2};
-            double[] endPoint = new double[]{toX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, toY};
+            double[] endPoint = new double[]{toX + (currentExpandNodeIsEnd ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) / 2, toY};
             return new double[][]{startPoint,
-                    {fromX + SubProcessConst.SUB_PROCESS_SHAPE_W + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, fromY + SubProcessConst.SUB_PROCESS_SHAPE_H / 2},
+                    {fromX + (currentExpandNodeIsStart ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, fromY + (currentExpandNodeIsStart ? scopeShapeH : SubProcessConst.SUB_PROCESS_SHAPE_H) / 2},
-                    {fromX + SubProcessConst.SUB_PROCESS_SHAPE_W + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, toY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
+                    {fromX + (currentExpandNodeIsStart ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, toY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
-                    {toX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, toY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
+                    {toX + (currentExpandNodeIsEnd ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) / 2, toY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
                     endPoint};
         }else {
             if (fromX < toX && fromY > toY){ // 目标节点在第一象限
-                double[] startPoint = new double[]{fromX + SubProcessConst.SUB_PROCESS_SHAPE_W, fromY + SubProcessConst.SUB_PROCESS_SHAPE_H / 2};
+                double[] startPoint = new double[]{fromX + (currentExpandNodeIsStart ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W), fromY + (currentExpandNodeIsStart ? scopeShapeH : SubProcessConst.SUB_PROCESS_SHAPE_H) / 2};
-                double turnPointX = fromX + SubProcessConst.SUB_PROCESS_SHAPE_W + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2;
+                double turnPointX = fromX + (currentExpandNodeIsStart ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2;
-                if (fromX + SubProcessConst.SUB_PROCESS_SHAPE_W + SubProcessConst.SHAPE_HORIZ_INTERVAL == toX){ // 相邻节点 存在两个折点
+                if (fromX + (currentExpandNodeIsStart ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) + SubProcessConst.SHAPE_HORIZ_INTERVAL == toX){ // 相邻节点 存在两个折点
-                    double[] endPoint = new double[]{toX, toY + SubProcessConst.SUB_PROCESS_SHAPE_H / 2};
+                    double[] endPoint = new double[]{toX, toY + (currentExpandNodeIsEnd ? scopeShapeH : SubProcessConst.SUB_PROCESS_SHAPE_H) / 2};
-                    return new double[][]{startPoint,{turnPointX, fromY + SubProcessConst.SUB_PROCESS_SHAPE_H / 2},{turnPointX, toY + SubProcessConst.SUB_PROCESS_SHAPE_H / 2}, endPoint};
+                    return new double[][]{startPoint,{turnPointX, fromY + (currentExpandNodeIsStart ? scopeShapeH : SubProcessConst.SUB_PROCESS_SHAPE_H) / 2},{turnPointX, toY + (currentExpandNodeIsEnd ? scopeShapeH : SubProcessConst.SUB_PROCESS_SHAPE_H) / 2}, endPoint};
                 }else { // 不相邻节点 存在三个折点
-                    double[] endPoint = new double[]{toX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, toY};
+                    double[] endPoint = new double[]{toX + (currentExpandNodeIsEnd ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) / 2, toY};
                     return new double[][]{
                             startPoint,
-                            {turnPointX, fromY + SubProcessConst.SUB_PROCESS_SHAPE_H / 2},
+                            {turnPointX, fromY + (currentExpandNodeIsStart ? scopeShapeH : SubProcessConst.SUB_PROCESS_SHAPE_H) / 2},
                             {turnPointX, toY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
-                            {toX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, toY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
+                            {toX + (currentExpandNodeIsEnd ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) / 2, toY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
                             endPoint
                     };
                 }
             }else if (fromX > toX && fromY > toY) { // 目标节点在第二象限 无论节点是否相邻 都按照三个折点走
-                double[] startPoint = new double[]{fromX + SubProcessConst.SUB_PROCESS_SHAPE_W, fromY + SubProcessConst.SUB_PROCESS_SHAPE_H / 2};
+                double[] startPoint = new double[]{fromX + (currentExpandNodeIsStart ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W), fromY + (currentExpandNodeIsStart ? scopeShapeH : SubProcessConst.SUB_PROCESS_SHAPE_H) / 2};
-                double[] endPoint = new double[]{toX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, toY};
+                double[] endPoint = new double[]{toX + (currentExpandNodeIsEnd ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) / 2, toY};
                 return new double[][]{
                         startPoint,
-                        {fromX + SubProcessConst.SUB_PROCESS_SHAPE_W + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, fromY + SubProcessConst.SUB_PROCESS_SHAPE_H / 2},
+                        {fromX + (currentExpandNodeIsStart ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, fromY + (currentExpandNodeIsStart ? scopeShapeH : SubProcessConst.SUB_PROCESS_SHAPE_H) / 2},
-                        {fromX + SubProcessConst.SUB_PROCESS_SHAPE_W + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, toY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
+                        {fromX + (currentExpandNodeIsStart ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, toY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
-                        {toX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, toY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
+                        {toX + (currentExpandNodeIsEnd ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) / 2, toY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
-                        endPoint
-                };
-            }else if (fromX > toX && fromY < toY){ // 目标节点在第三象限
-                double[] startPoint = new double[]{fromX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, fromY + SubProcessConst.SUB_PROCESS_SHAPE_H};
-                double[] endPoint = new double[]{toX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, toY};
-                return new double[][]{
-                        startPoint,
-                        {fromX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, toY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
-                        {toX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, toY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
                         endPoint
                 };
             }else if (fromX < toX && fromY < toY){ // 目标节点在第四象限
-                double[] startPoint = new double[]{fromX + SubProcessConst.SUB_PROCESS_SHAPE_W, fromY + SubProcessConst.SUB_PROCESS_SHAPE_H / 2};
+                double[] startPoint = new double[]{fromX + (currentExpandNodeIsStart ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W), fromY + (currentExpandNodeIsStart ? scopeShapeH : SubProcessConst.SUB_PROCESS_SHAPE_H) / 2};
-                if (fromX + SubProcessConst.SUB_PROCESS_SHAPE_W + SubProcessConst.SHAPE_HORIZ_INTERVAL == toX){ // 相邻节点 存在两个折点
+                if (fromX + (currentExpandNodeIsStart ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) + SubProcessConst.SHAPE_HORIZ_INTERVAL == toX){ // 相邻节点 存在两个折点
-                    double turnPointX = fromX + SubProcessConst.SUB_PROCESS_SHAPE_W + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2;
+                    double turnPointX = fromX + (currentExpandNodeIsStart ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2;
-                    double[] endPoint = new double[]{toX, toY + SubProcessConst.SUB_PROCESS_SHAPE_H / 2};
+                    double[] endPoint = new double[]{toX, toY + (currentExpandNodeIsEnd ? scopeShapeH : SubProcessConst.SUB_PROCESS_SHAPE_H) / 2};
                     return new double[][]{
                             startPoint,
-                            {turnPointX, fromY + SubProcessConst.SUB_PROCESS_SHAPE_H / 2},
+                            {turnPointX, fromY + (currentExpandNodeIsStart ? scopeShapeH : SubProcessConst.SUB_PROCESS_SHAPE_H) / 2},
-                            {turnPointX, toY + SubProcessConst.SUB_PROCESS_SHAPE_H / 2},
+                            {turnPointX, toY + (currentExpandNodeIsEnd ? scopeShapeH : SubProcessConst.SUB_PROCESS_SHAPE_H) / 2},
                             endPoint
                     };
                 }else { // 不相邻节点 存在三个折点
-                    double[] endPoint = new double[]{toX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, toY + SubProcessConst.SUB_PROCESS_SHAPE_H};
+                    double[] endPoint = new double[]{toX + (currentExpandNodeIsEnd ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) / 2, toY};
                     return new double[][]{
                             startPoint,
-                            {fromX + SubProcessConst.SUB_PROCESS_SHAPE_W + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, fromY + SubProcessConst.SUB_PROCESS_SHAPE_H / 2},
+                            {fromX + (currentExpandNodeIsStart ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, fromY + (currentExpandNodeIsStart ? scopeShapeH : SubProcessConst.SUB_PROCESS_SHAPE_H) / 2},
-                            {fromX + SubProcessConst.SUB_PROCESS_SHAPE_W + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, toY + SubProcessConst.SHAPE_VERT_INTERVAL / 2},
+                            {fromX + (currentExpandNodeIsStart ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) + SubProcessConst.SHAPE_HORIZ_INTERVAL / 2, toY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
-                            {toX + SubProcessConst.SUB_PROCESS_SHAPE_W / 2, toY + SubProcessConst.SUB_PROCESS_SHAPE_H + SubProcessConst.SHAPE_VERT_INTERVAL / 2},
+                            {toX + (currentExpandNodeIsEnd ? scopeShapeW : SubProcessConst.SUB_PROCESS_SHAPE_W) / 2, toY - SubProcessConst.SHAPE_VERT_INTERVAL / 2},
                             endPoint
                     };
                 }
+            }else if (fromX > toX && fromY < toY){ // 目标节点在第三象限 横向布局的情况下 应该不会出现目标节点在第三象限的情况
+                ConsolePrinter.warn("[端到端功能][节点展开模块]处理连线时目标节点在[横向布局]的情况下出现在了第三象限");
             }
         }
         return new double[2][2];

com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/web/SubProcessWeb.java

@@ -303,29 +303,22 @@ public class SubProcessWeb extends ActionWeb {
     }
 
 
-    public void shapeNodeExpand(String repositoryId, String shapeId, String direction){
+    /**
-
+     * 节点展开操作
-        /*
+     * @param repositoryId 当前总图ID
-        * 以当前节点展开涉及到动作拆分：
+     * @param shapeId 待展开的子流程节点ID
-        *
+     * @param direction 布局方向
-        * 0、判断当前节点是否展开过了，初次展开的话去源文件中找，否则去备份的文件中找
+     */
-        *
+    public String shapeNodeExpand(String repositoryId, String shapeId, String direction){
-        * 1、准备范围限制框元素，该元素坐标与当前被展开的节点坐标一致，宽度与高度与子流程标识的模型画布-边距的宽度、高度一致
-        *   同时，子流程标识的模型内的所有元素 以当前被展开的节点坐标为准，下移、右移 被展开节点坐标距离原点的距离
-        *
-        * 2、找到x大于等于、y大于等于当前被展开节点的所有子流程节点，将这些节点下移、右移到范围框之外
-        *
-        * 3、根据与当前节点的连线，找到总图中所有与当前被展开节点的相连的前置节点与后置节点
-        *
-        * 4、将子流程模型备份一份，为后续对展开后的节点做删除等操作
-        *
-        * */
 
         GraphNodeExpandHandle nodeExpandHandle = new GraphNodeExpandHandle(repositoryId, shapeId);
         try {
-            nodeExpandHandle.handleNodeExpand(direction);
+            String define = nodeExpandHandle.handleNodeExpand(direction);
+            ResponseObject ro = ResponseObject.newOkResponse("展开成功");
+            ro.setData(define);
+            return ro.toString();
         } catch (Exception e) {
-            throw new RuntimeException(e);
+            return ResponseObject.newErrResponse(e.getMessage()).toString();
         }
     }