Merge pull request #145 from codingapi/dev

xlorne · web-flow · commit 95bb86968aee · 2025-08-27T16:56:44.000+08:00
fix #144
diff --git a/event.md b/event.md
@@ -26,6 +26,8 @@
 事件： URGE 当前审批人
 * 延期流程
 事件: 未发送事件
+* 停止流程
+事件： STOP 当前审批人
 
 ---------------------
 自定义事件：是前端自己触法的逻辑
diff --git a/example/example-app/example-app-cmd-domain/pom.xml b/example/example-app/example-app-cmd-domain/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-app</artifactId>
-        <version>3.4.13</version>
+        <version>3.4.14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-app/example-app-cmd-meta/pom.xml b/example/example-app/example-app-cmd-meta/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-app</artifactId>
-        <version>3.4.13</version>
+        <version>3.4.14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-app/example-app-query/pom.xml b/example/example-app/example-app-query/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-app</artifactId>
-        <version>3.4.13</version>
+        <version>3.4.14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-app/pom.xml b/example/example-app/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-        <version>3.4.13</version>
+        <version>3.4.14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/example/example-domain/example-domain-leave/pom.xml b/example/example-domain/example-domain-leave/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-domain</artifactId>
-        <version>3.4.13</version>
+        <version>3.4.14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-domain/example-domain-user/pom.xml b/example/example-domain/example-domain-user/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-domain</artifactId>
-        <version>3.4.13</version>
+        <version>3.4.14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-       <version>3.4.13</version>
+       <version>3.4.14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/example/example-infra/example-infra-flow/pom.xml b/example/example-infra/example-infra-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-infra</artifactId>
-       <version>3.4.13</version>
+       <version>3.4.14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-infra/example-infra-jpa/pom.xml b/example/example-infra/example-infra-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-infra</artifactId>
-        <version>3.4.13</version>
+        <version>3.4.14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-infra/example-infra-security/pom.xml b/example/example-infra/example-infra-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-infra</artifactId>
-        <version>3.4.13</version>
+        <version>3.4.14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-infra/pom.xml b/example/example-infra/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-        <version>3.4.13</version>
+        <version>3.4.14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/example/example-interface/pom.xml b/example/example-interface/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-        <version>3.4.13</version>
+        <version>3.4.14</version>
     </parent>
 
     <artifactId>example-interface</artifactId>
diff --git a/example/example-server/pom.xml b/example/example-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.4.13</version>
+       <version>3.4.14</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/pom.xml b/example/pom.xml
@@ -19,7 +19,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.4.13</version>
+    <version>3.4.14</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.4.13</version>
+    <version>3.4.14</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>
diff --git a/springboot-starter-data-authorization/pom.xml b/springboot-starter-data-authorization/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-       <version>3.4.13</version>
+       <version>3.4.14</version>
     </parent>
 
     <name>springboot-starter-data-authorization</name>
diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.4.13</version>
+       <version>3.4.14</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.4.13</version>
+       <version>3.4.14</version>
     </parent>
 
     <name>springboot-starter-flow</name>
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/domain/Opinion.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/domain/Opinion.java
@@ -35,6 +35,8 @@ public class Opinion {
     public static final int RESULT_CIRCULATE = 4;
     // 审批结果 等待
     public static final int RESULT_WAITING = 5;
+    // 审批结果 停止
+    public static final int RESULT_STOP = 6;
 
     /**
      * 审批意见
@@ -82,6 +84,10 @@ public static Opinion pass(String advice) {
         return new Opinion(advice, RESULT_PASS, TYPE_DEFAULT);
     }
 
+    public static Opinion stop() {
+        return new Opinion("", RESULT_STOP, TYPE_DEFAULT);
+    }
+
     public static Opinion reject(String advice) {
         return new Opinion(advice, RESULT_REJECT, TYPE_DEFAULT);
     }
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/event/FlowApprovalEvent.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/event/FlowApprovalEvent.java
@@ -42,6 +42,8 @@ public class FlowApprovalEvent implements ISyncEvent {
     public static final int STATE_BACK = 12;
     // 作废
     public static final int STATE_VOIDED = 13;
+    // 停止
+    public static final int STATE_STOP = 14;
 
     private final int state;
     private final IFlowOperator operator;
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/record/FlowRecord.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/record/FlowRecord.java
@@ -246,6 +246,16 @@ public void circulate() {
         this.opinion = Opinion.circulate();
     }
 
+    /**
+     * 停止流程
+     */
+    public void stop(){
+        this.flowSourceDirection = FlowSourceDirection.PASS;
+        this.flowType = FlowType.DONE;
+        this.updateTime = System.currentTimeMillis();
+        this.opinion = Opinion.stop();
+    }
+
     /**
      * 转交流程
      */
@@ -326,6 +336,7 @@ public boolean isFinish() {
         return this.flowStatus == FlowStatus.FINISH;
     }
 
+
     /**
      * 是否等待
      */
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowService.java
@@ -316,4 +316,16 @@ public void back(String processId, String backNodeCode, IFlowOperator currentOpe
         flowBackService.back(processId, backNodeCode, currentOperator);
     }
 
+
+
+    /**
+     * 停止流程
+     *
+     * @param recordId        流程记录id
+     * @param currentOperator 当前操作者
+     */
+    public void stop(long recordId, IFlowOperator currentOperator) {
+        FlowStopService flowSubmitService = new FlowStopService(recordId, currentOperator, flowServiceRepositoryHolder);
+        flowSubmitService.stop();
+    }
 }
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowStopService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowStopService.java
@@ -0,0 +1,102 @@
+package com.codingapi.springboot.flow.service.impl;
+
+import com.codingapi.springboot.flow.bind.BindDataSnapshot;
+import com.codingapi.springboot.flow.domain.FlowNode;
+import com.codingapi.springboot.flow.domain.FlowWork;
+import com.codingapi.springboot.flow.event.FlowApprovalEvent;
+import com.codingapi.springboot.flow.record.FlowRecord;
+import com.codingapi.springboot.flow.repository.FlowBindDataRepository;
+import com.codingapi.springboot.flow.repository.FlowRecordRepository;
+import com.codingapi.springboot.flow.service.FlowRecordVerifyService;
+import com.codingapi.springboot.flow.service.FlowServiceRepositoryHolder;
+import com.codingapi.springboot.flow.user.IFlowOperator;
+import com.codingapi.springboot.framework.event.EventPusher;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Transactional
+public class FlowStopService {
+
+
+    private final IFlowOperator currentOperator;
+    private final FlowRecordVerifyService flowRecordVerifyService;
+    private final FlowRecordRepository flowRecordRepository;
+    private final FlowBindDataRepository flowBindDataRepository ;
+
+    private FlowRecord flowRecord;
+    private FlowWork flowWork;
+    private FlowNode flowNode;
+    private BindDataSnapshot snapshot;
+
+
+
+    public FlowStopService(long recordId,
+                           IFlowOperator currentOperator,
+                           FlowServiceRepositoryHolder flowServiceRepositoryHolder) {
+        this.currentOperator = currentOperator;
+        this.flowRecordRepository = flowServiceRepositoryHolder.getFlowRecordRepository();
+        this.flowBindDataRepository = flowServiceRepositoryHolder.getFlowBindDataRepository();
+        this.flowRecordVerifyService = new FlowRecordVerifyService(
+                flowServiceRepositoryHolder.getFlowWorkRepository(),
+                flowServiceRepositoryHolder.getFlowRecordRepository(),
+                flowServiceRepositoryHolder.getFlowProcessRepository(),
+                recordId,
+                currentOperator);
+    }
+
+
+    // 加载流程
+    private void loadFlow() {
+        // 验证流程的提交状态
+        flowRecordVerifyService.verifyFlowRecordSubmitState();
+        // 验证当前操作者
+        flowRecordVerifyService.verifyFlowRecordCurrentOperator();
+
+        // 加载流程设计
+        flowRecordVerifyService.loadFlowWork();
+        // 加载流程节点
+        flowRecordVerifyService.loadFlowNode();
+        // 验证没有子流程
+        flowRecordVerifyService.verifyChildrenRecordsIsEmpty();
+
+        this.flowRecord = flowRecordVerifyService.getFlowRecord();
+        this.flowNode = flowRecordVerifyService.getFlowNode();
+        this.flowWork = flowRecordVerifyService.getFlowWork();
+        this.snapshot = flowBindDataRepository.getBindDataSnapshotById(flowRecord.getSnapshotId());
+    }
+
+
+
+    /**
+     * 提交流程
+     **/
+    public void stop() {
+        // 加载流程信息
+        this.loadFlow();
+
+        // 停止流程
+        flowRecord.stop();
+        flowRecordRepository.update(flowRecord);
+
+        List<FlowRecord> todoRecords = flowRecordRepository.findFlowRecordByProcessId(flowRecord.getProcessId());
+        for (FlowRecord record : todoRecords) {
+            if (record.isTodo()) {
+                record.stop();
+                flowRecordRepository.update(record);
+            }
+        }
+
+        flowRecordRepository.finishFlowRecordByProcessId(flowRecord.getProcessId());
+
+        EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_STOP,
+                flowRecord,
+                flowRecord.getCurrentOperator(),
+                flowWork,
+                snapshot.toBindData()
+        ), true);
+
+    }
+
+
+}
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/FlowStopTest.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/FlowStopTest.java
diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml
diff --git a/springboot-starter/src/main/resources/banner.txt b/springboot-starter/src/main/resources/banner.txt
