From 057dd2b65fb228f8199ee69ced999df70d2b836a Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 13 Oct 2023 15:32:03 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B5=81=E7=A8=8B=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=EF=BC=88=E9=A6=96=E6=AC=A1=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=97=B6=E9=9C=80=E8=A6=81=E6=89=8B=E5=8A=A8=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/mapper/ProcessModelNodeMapper.java |  2 ++
 .../mapper/xml/ProcessModelNodeMapper.xml       | 14 ++++++++++++++
 .../service/ProcessModelNodeService.java        | 17 +++++++++++++----
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/ProcessModelNodeMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/ProcessModelNodeMapper.java
index 60ffff4c..85dff1ba 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/ProcessModelNodeMapper.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/ProcessModelNodeMapper.java
@@ -14,4 +14,6 @@ public interface ProcessModelNodeMapper extends BaseMapper<ProcessModelNode> {
     int deleteByModelId(@Param("modelId")String modelId);
 
 
+    void updateSortByInsertNode(@Param("modelId") String modelId, @Param("sort") Integer sort);
+    void updateSortByDeleteNode(@Param("modelId") String modelId, @Param("sort") Integer sort);
 }
\ No newline at end of file
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessModelNodeMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessModelNodeMapper.xml
index 390e3125..006b8905 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessModelNodeMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessModelNodeMapper.xml
@@ -42,4 +42,18 @@
         delete from process_model_node
         where model_id=#{modelId}
     </delete>
+
+    <update id="updateSortByInsertNode">
+        update process_model_node
+        set sort = sort + 1
+        where model_id = #{modelId}
+          and sort > #{sort}
+    </update>
+
+    <update id="updateSortByDeleteNode">
+        update process_model_node
+        set sort = sort - 1
+        where model_id = #{modelId}
+        and sort > #{sort}
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessModelNodeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessModelNodeService.java
index 9efd45b7..3486dcca 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessModelNodeService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessModelNodeService.java
@@ -145,7 +145,12 @@ public class ProcessModelNodeService extends ServiceImpl<ProcessModelNodeMapper,
             updateFlow.eq(ProcessModelNode::getXmlNodeId,flowOrigin2.getXmlNodeId());
             updateFlow.set(ProcessModelNode::getXmlTargetRef,userTaskId);
             processModelNodeMapper.update(null,updateFlow);
-            insertUserTask(modelId, userTask);
+            //获得排序
+            Integer sort = processModelNode.getSort();
+            //更新所有大于当前sort的加1（空出来的用于存放新节点）
+            processModelNodeMapper.updateSortByInsertNode(modelId,sort);
+            //新增节点
+            insertUserTask(modelId, userTask, sort+1);
             List<SequenceFlow> incomingFlows = gateway.getIncomingFlows();
             for (SequenceFlow incomingFlow : incomingFlows) {
                 insertFlow(modelId, incomingFlow);
@@ -155,6 +160,7 @@ public class ProcessModelNodeService extends ServiceImpl<ProcessModelNodeMapper,
             for (SequenceFlow outgoingFlow : outgoingFlows) {
                 insertFlow(modelId, outgoingFlow);
             }
+
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -234,7 +240,9 @@ public class ProcessModelNodeService extends ServiceImpl<ProcessModelNodeMapper,
             String json = objectNode1.toString();
             byte[] bytes1 = json.getBytes(StandardCharsets.UTF_8);
             repositoryService.addModelEditorSource(modelId, bytes1);
-
+            Integer sort = processModelNode.getSort();
+            //更新所有大于当前sort的减1（把当前节点的空位去掉）
+            processModelNodeMapper.updateSortByDeleteNode(modelId,sort);
             //删除数据库中的节点
             removeNode(modelId,xmlNodeIdList);
             //更新待删除节点前的线的指向
@@ -268,12 +276,13 @@ public class ProcessModelNodeService extends ServiceImpl<ProcessModelNodeMapper,
         processModelNodeMapper.insert(gatewayNode);
     }
 
-    private void insertUserTask(String modelId, UserTask userTask) {
+    private void insertUserTask(String modelId, UserTask userTask, int sort) {
         ProcessModelNode userTaskNode = new ProcessModelNode();
         userTaskNode.setModelId(modelId);
         userTaskNode.setNodeName(userTask.getName());
         userTaskNode.setNodeType("userTask");
         userTaskNode.setXmlNodeId(userTask.getId());
+        userTaskNode.setSort(sort);
         userTaskNode.setIsApprovalNode(1);
         userTaskNode.setIsCanDeleted(1);
         processModelNodeMapper.insert(userTaskNode);
@@ -356,6 +365,7 @@ public class ProcessModelNodeService extends ServiceImpl<ProcessModelNodeMapper,
                 nodeType = "userTask";
                 nodeName = userTask.getName();
                 xmlNodeId = userTask.getId();
+                processModelNode.setSort(sort++);
             } else if (flowElement instanceof SequenceFlow) {
                 SequenceFlow sequenceFlow = (SequenceFlow) flowElement;
                 nodeType = "sequenceFlow";
@@ -400,7 +410,6 @@ public class ProcessModelNodeService extends ServiceImpl<ProcessModelNodeMapper,
             processModelNode.setXmlNodeId(xmlNodeId);
             processModelNode.setXmlSourceRef(xmlSourceRef);
             processModelNode.setXmlTargetRef(xmlTargetRef);
-            processModelNode.setSort(sort++);
             processModelNode.setIsApprovalNode(YesOrNoEnum.NO.getInteger());
             processModelNode.setIsCanDeleted(YesOrNoEnum.NO.getInteger());
             processModelNodeList.add(processModelNode);