From 1a0a4cd15f416b82d6bc36536748c6b9b6e92d21 Mon Sep 17 00:00:00 2001
From: qinoy <qinoy8521@163.com>
Date: Mon, 29 May 2023 17:03:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=AF=E5=88=B0=E7=AB=AF=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=20=E5=9B=BE=E7=94=9F=E6=88=90=E5=89=8D=E7=BD=AE=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20=E8=8A=82=E7=82=B9=E6=A0=B9=E6=8D=AE=E8=A2=AB?=
 =?UTF-8?q?=E6=8C=87=E5=90=91=E7=9A=84=E8=BF=9E=E7=BA=BF=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...oft.apps.coe.method.process.subprocess.jar | Bin 41238 -> 41612 bytes
 .../process/subprocess/graph/GraphLayout.java |   2 +-
 .../subprocess/graph/VertexPreHandle.java     |  28 ++++++++++++++++--
 .../method/process/subprocess/mode/Node.java  |  26 ++++++++++++++--
 4 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/com.actionsoft.apps.coe.method.process.subprocess/lib/com.actionsoft.apps.coe.method.process.subprocess.jar b/com.actionsoft.apps.coe.method.process.subprocess/lib/com.actionsoft.apps.coe.method.process.subprocess.jar
index 1b017e3b5e6c76b2889c68c8d0ba5d9dccc35e43..72faf8f5d52d823aca8e9d29085ba0c862871a1c 100644
GIT binary patch
delta 8575
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

delta 8124
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
DyJ9NA

diff --git a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphLayout.java b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphLayout.java
index c94ddc5f..7dc87313 100644
--- a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphLayout.java
+++ b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphLayout.java
@@ -225,7 +225,7 @@ public class GraphLayout {
                 if (unIsPosition.size() == 1){
                     position[rearNodeIndex][0] = position[nodeIndex][0]; // 当前节点的如果为第一个后置节点 则 坐标x的值一致
                 }else {
-                    position[rearNodeIndex][0] = position[nodeIndex][0] + shapeW + (unIsPosition.size() - 1) * horizInterval; // 非第一个后置节点的坐标x = 上一个节点的坐标x + 图形宽度 + 第几个后置节点 * 横向间隔
+                    position[rearNodeIndex][0] = realTimeX + shapeW + (unIsPosition.size() - 1) * horizInterval; // 非第一个后置节点的坐标x = 上一个节点的坐标x + 图形宽度 + 第几个后置节点 * 横向间隔
                     realTimeX = position[rearNodeIndex][0];
                 }
                 isPosition[rearNodeIndex] = true;
diff --git a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/VertexPreHandle.java b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/VertexPreHandle.java
index cc239c93..eb6377af 100644
--- a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/VertexPreHandle.java
+++ b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/VertexPreHandle.java
@@ -113,6 +113,8 @@ public class VertexPreHandle {
      * 如果未在选择的范围内 则忽略
      *
      * 同时处理节点的前后置关系
+     *
+     * 同时根据当前节点被指向的线条数量排序 由低到高
      * @param processIdList
      * @param nodeIndexMap
      * @return 按照节点前置流程数量 从小到大排序
@@ -120,15 +122,23 @@ public class VertexPreHandle {
      */
     public List<Node> excludeLearAndRearNode(List<String> processIdList, Map<String, Integer> nodeIndexMap) throws AWSException {
         List<Node> nodeList = new ArrayList<>();
+        Map<String, Integer> pointsMap = new HashMap<>();
         for (int i = 0; i < processIdList.size(); i++) {
-            Node node = new Node(processIdList.get(i));
+            Node node = new Node(processIdList.get(i), PALRepositoryCache.getCache().get(processIdList.get(i)).getName());
             // 前置流程
             List<DesignerShapeRelationModel> leadProcessList = DesignerShapeRelationCache.getByFileId(processIdList.get(i), SubProcessConst.LEAD_PROCESS_ATTR_ID);
             List<Node> leadNodeList = new ArrayList<>();
             leadProcessList.stream().forEach(model -> {
                 if (processIdList.contains(model.getRelationFileId())){
-                    Node leadNode = new Node(model.getRelationFileId());
+                    Node leadNode = new Node(model.getRelationFileId(), PALRepositoryCache.getCache().get(model.getRelationFileId()).getName());
                     leadNodeList.add(leadNode);
+
+                    // 当前节点被指向的线条数+1
+                    if (pointsMap.containsKey(node.getId())) {
+                        pointsMap.put(node.getId(), pointsMap.get(node.getId()).intValue() + 1);
+                    } else {
+                        pointsMap.put(node.getId(), 1);
+                    }
                 }
             });
             node.setLeadNodeList(leadNodeList);
@@ -137,8 +147,14 @@ public class VertexPreHandle {
             List<Node> rearNodeList = new ArrayList<>();
             rearProcessList.stream().forEach(model -> {
                 if (processIdList.contains(model.getRelationFileId())){
-                    Node rearNode = new Node(model.getRelationFileId());
+                    Node rearNode = new Node(model.getRelationFileId(), PALRepositoryCache.getCache().get(model.getRelationFileId()).getName());
                     rearNodeList.add(rearNode);
+
+                    if (pointsMap.containsKey(model.getRelationFileId())) {
+                        pointsMap.put(model.getRelationFileId(), pointsMap.get(model.getRelationFileId()).intValue() + 1);
+                    } else {
+                        pointsMap.put(model.getRelationFileId(), 1);
+                    }
                 }
             });
             node.setRearNodeList(rearNodeList);
@@ -147,6 +163,12 @@ public class VertexPreHandle {
             nodeIndexMap.put(node.getId(), nodeList.size() - 1);
         }
 
+        for (Node node : nodeList) {
+            if (pointsMap.containsKey(node.getId())){
+                node.setPoints(pointsMap.get(node.getId()));
+            }
+        }
+
         Collections.sort(nodeList);
         return nodeList;
     }
diff --git a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/mode/Node.java b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/mode/Node.java
index b870a4b4..87c76e5b 100644
--- a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/mode/Node.java
+++ b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/mode/Node.java
@@ -10,14 +10,20 @@ import java.util.Objects;
 public class Node implements Comparable<Node> {
 
     private String id;
+    private String name;
     private List<Node> leadNodeList;
     private List<Node> rearNodeList;
-
+    private int points; // 被指向的线条数
 
     public Node(String id) {
         this.id = id;
     }
 
+    public Node(String id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
     public String getId() {
         return id;
     }
@@ -26,6 +32,14 @@ public class Node implements Comparable<Node> {
         this.id = id;
     }
 
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public List<Node> getLeadNodeList() {
         return leadNodeList;
     }
@@ -42,6 +56,14 @@ public class Node implements Comparable<Node> {
         this.rearNodeList = rearNodeList;
     }
 
+    public int getPoints() {
+        return points;
+    }
+
+    public void setPoints(int points) {
+        this.points = points;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -57,6 +79,6 @@ public class Node implements Comparable<Node> {
 
     @Override
     public int compareTo(Node node) {
-        return Integer.compare(this.leadNodeList.size(), node.getLeadNodeList().size());
+        return Integer.compare(this.points, node.points);
     }
 }