fix flow service

xlorne · xlorne · commit 63ce4f3033d3 · 2024-12-31T17:34:49.000+08:00
diff --git a/example/example-application/pom.xml b/example/example-application/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.47</version>
+        <version>3.3.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.47</version>
+        <version>3.3.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-flow/pom.xml b/example/example-infra-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.47</version>
+        <version>3.3.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-jpa/pom.xml b/example/example-infra-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.47</version>
+        <version>3.3.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
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.3.47</version>
+        <version>3.3.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/pom.xml b/example/pom.xml
@@ -17,7 +17,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.47</version>
+    <version>3.3.48</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.3.47</version>
+    <version>3.3.48</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.3.47</version>
+        <version>3.3.48</version>
     </parent>
 
     <artifactId>springboot-starter-data-authorization</artifactId>
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.3.47</version>
+        <version>3.3.48</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.3.47</version>
+        <version>3.3.48</version>
     </parent>
 
     <name>springboot-starter-flow</name>
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/build/FlowWorkBuilder.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/build/FlowWorkBuilder.java
@@ -41,6 +41,11 @@ public FlowWorkBuilder postponedMax(int postponedMax) {
         return this;
     }
 
+    public FlowWorkBuilder skipIfSameApprover(boolean skipIfSameApprover) {
+        this.work.setSkipIfSameApprover(skipIfSameApprover);
+        return this;
+    }
+
     public FlowWorkBuilder title(String title) {
         this.work.setTitle(title);
         return this;
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/domain/FlowWork.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/domain/FlowWork.java
@@ -60,6 +60,12 @@ public class FlowWork {
      */
     private boolean enable;
 
+    /**
+     * &#26159;&#21542;&#36339;&#36807;&#30456;&#21516;&#23457;&#25209;&#20154;&#65292;&#40664;&#35748;&#20026;false
+     */
+    @Setter
+    private boolean skipIfSameApprover;
+
     /**
      * &#26368;&#22823;&#24310;&#26399;&#27425;&#25968;
      */
@@ -226,6 +232,7 @@ public FlowWorkSerializable toSerializable() {
                 createTime,
                 updateTime,
                 enable,
+                skipIfSameApprover,
                 postponedMax,
                 schema,
                 nodes.stream().map(FlowNode::toSerializable).collect(Collectors.toCollection(ArrayList::new)),
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/serializable/FlowWorkSerializable.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/serializable/FlowWorkSerializable.java
@@ -68,6 +68,12 @@ public class FlowWorkSerializable implements Serializable {
     @Setter
     private boolean enable;
 
+    /**
+     * &#26159;&#21542;&#36339;&#36807;&#30456;&#21516;&#23457;&#25209;&#20154;&#65292;&#40664;&#35748;&#20026;false
+     */
+    @Setter
+    private boolean skipIfSameApprover;
+
     /**
      * &#26368;&#22823;&#24310;&#26399;&#27425;&#25968;
      */
@@ -139,6 +145,7 @@ public FlowWork toFlowWork(FlowOperatorRepository flowOperatorRepository) {
                 createTime,
                 updateTime,
                 enable,
+                skipIfSameApprover,
                 postponedMax,
                 flowNodes,
                 relations.stream().map((item) -> item.toFlowRelation(flowNodes)).toList(),
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowRecordVerifyService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowRecordVerifyService.java
@@ -16,7 +16,6 @@
 public class FlowRecordVerifyService {
 
     // constructor params
-    private final long recordId;
     @Getter
     private final IFlowOperator currentOperator;
 
@@ -30,7 +29,7 @@ public class FlowRecordVerifyService {
     @Getter
     private FlowNode flowNode;
     @Getter
-    private FlowRecord flowRecord;
+    private final FlowRecord flowRecord;
 
     public FlowRecordVerifyService(FlowRecordRepository flowRecordRepository,
                                    FlowProcessRepository flowProcessRepository,
@@ -40,7 +39,11 @@ public FlowRecordVerifyService(FlowRecordRepository flowRecordRepository,
         this.flowProcessRepository = flowProcessRepository;
 
         this.currentOperator = currentOperator;
-        this.recordId = recordId;
+        FlowRecord flowRecord = flowRecordRepository.getFlowRecordById(recordId);
+        if (flowRecord == null) {
+            throw new IllegalArgumentException("flow record not found");
+        }
+        this.flowRecord = flowRecord;
     }
 
 
@@ -132,16 +135,6 @@ public void verifyTargetOperatorIsNotCurrentOperator(IFlowOperator targetOperato
     }
 
 
-    /**
-     *  &#33719;&#21462;&#27969;&#31243;&#35760;&#24405;&#23545;&#35937;
-     */
-    public void loadFlowRecord() {
-        FlowRecord flowRecord = flowRecordRepository.getFlowRecordById(recordId);
-        if (flowRecord == null) {
-            throw new IllegalArgumentException("flow record not found");
-        }
-        this.flowRecord = flowRecord;
-    }
 
     /**
      *  &#33719;&#21462;&#27969;&#31243;&#35774;&#35745;&#23545;&#35937;
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
@@ -3,8 +3,8 @@
 import com.codingapi.springboot.flow.bind.IBindData;
 import com.codingapi.springboot.flow.domain.Opinion;
 import com.codingapi.springboot.flow.pojo.FlowDetail;
-import com.codingapi.springboot.flow.pojo.FlowSubmitResult;
 import com.codingapi.springboot.flow.pojo.FlowResult;
+import com.codingapi.springboot.flow.pojo.FlowSubmitResult;
 import com.codingapi.springboot.flow.repository.*;
 import com.codingapi.springboot.flow.result.MessageResult;
 import com.codingapi.springboot.flow.service.impl.*;
@@ -21,7 +21,6 @@ public class FlowService {
 
     private final FlowDetailService flowDetailService;
     private final FlowStartService flowStartService;
-    private final FlowSubmitService flowSubmitService;
     private final FlowCustomEventService flowCustomEventService;
     private final FlowRecallService flowRecallService;
     private final FlowTrySubmitService flowTrySubmitService;
@@ -30,16 +29,18 @@ public class FlowService {
     private final FlowPostponedService flowPostponedService;
     private final FlowUrgeService flowUrgeService;
 
+    private final FlowServiceRepositoryHolder flowServiceRepositoryHolder;
+
 
     public FlowService(FlowWorkRepository flowWorkRepository,
                        FlowRecordRepository flowRecordRepository,
                        FlowBindDataRepository flowBindDataRepository,
                        FlowOperatorRepository flowOperatorRepository,
                        FlowProcessRepository flowProcessRepository,
                        FlowBackupRepository flowBackupRepository) {
+        this.flowServiceRepositoryHolder = new FlowServiceRepositoryHolder(flowWorkRepository, flowRecordRepository, flowBindDataRepository, flowOperatorRepository, flowProcessRepository, flowBackupRepository);
         this.flowDetailService = new FlowDetailService(flowWorkRepository, flowRecordRepository, flowBindDataRepository, flowOperatorRepository, flowProcessRepository);
         this.flowStartService = new FlowStartService(flowWorkRepository, flowRecordRepository, flowBindDataRepository, flowOperatorRepository, flowProcessRepository, flowBackupRepository);
-        this.flowSubmitService = new FlowSubmitService(flowRecordRepository, flowBindDataRepository, flowOperatorRepository, flowProcessRepository);
         this.flowCustomEventService = new FlowCustomEventService(flowRecordRepository, flowProcessRepository);
         this.flowRecallService = new FlowRecallService(flowRecordRepository, flowProcessRepository);
         this.flowTrySubmitService = new FlowTrySubmitService(flowRecordRepository, flowBindDataRepository, flowOperatorRepository, flowProcessRepository, flowWorkRepository, flowBackupRepository);
@@ -209,7 +210,8 @@ public FlowSubmitResult trySubmitFlow(String workCode, IFlowOperator currentOper
      * @param opinion         &#23457;&#25209;&#24847;&#35265;
      */
     public FlowResult submitFlow(long recordId, IFlowOperator currentOperator, IBindData bindData, Opinion opinion) {
-        return flowSubmitService.submitFlow(recordId, currentOperator, bindData, opinion);
+        FlowSubmitService flowSubmitService = new FlowSubmitService(recordId, currentOperator, bindData, opinion, flowServiceRepositoryHolder);
+        return flowSubmitService.submitFlow();
     }
 
 
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowServiceRepositoryHolder.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowServiceRepositoryHolder.java
@@ -0,0 +1,29 @@
+package com.codingapi.springboot.flow.service;
+
+import com.codingapi.springboot.flow.repository.*;
+import lombok.Getter;
+
+@Getter
+public class FlowServiceRepositoryHolder {
+
+    private final FlowWorkRepository flowWorkRepository;
+    private final FlowRecordRepository flowRecordRepository;
+    private final FlowBindDataRepository flowBindDataRepository;
+    private final FlowOperatorRepository flowOperatorRepository;
+    private final FlowProcessRepository flowProcessRepository;
+    private final FlowBackupRepository flowBackupRepository;
+
+    public FlowServiceRepositoryHolder(FlowWorkRepository flowWorkRepository,
+                                       FlowRecordRepository flowRecordRepository,
+                                       FlowBindDataRepository flowBindDataRepository,
+                                       FlowOperatorRepository flowOperatorRepository,
+                                       FlowProcessRepository flowProcessRepository,
+                                       FlowBackupRepository flowBackupRepository){
+        this.flowWorkRepository = flowWorkRepository;
+        this.flowRecordRepository = flowRecordRepository;
+        this.flowBindDataRepository = flowBindDataRepository;
+        this.flowOperatorRepository = flowOperatorRepository;
+        this.flowProcessRepository = flowProcessRepository;
+        this.flowBackupRepository = flowBackupRepository;
+    }
+}
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowCustomEventService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowCustomEventService.java
@@ -36,8 +36,6 @@ public class FlowCustomEventService {
     public MessageResult customFlowEvent(long recordId, IFlowOperator currentOperator, String buttonId, IBindData bindData, Opinion opinion) {
         FlowRecordVerifyService flowRecordVerifyService = new FlowRecordVerifyService(flowRecordRepository, flowProcessRepository, recordId, currentOperator);
 
-        // &#21152;&#36733;&#27969;&#31243;
-        flowRecordVerifyService.loadFlowRecord();
         // &#39564;&#35777;&#27969;&#31243;&#30340;&#25552;&#20132;&#29366;&#24577;
         flowRecordVerifyService.verifyFlowRecordSubmitState();
         // &#39564;&#35777;&#24403;&#21069;&#25805;&#20316;&#32773;
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowDetailService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowDetailService.java
@@ -39,7 +39,6 @@ public FlowDetail detail(long recordId, IFlowOperator currentOperator) {
                 flowProcessRepository,
                 recordId, currentOperator);
 
-        flowRecordVerifyService.loadFlowRecord();
         flowRecordVerifyService.setFlowRecordRead();
         flowRecordVerifyService.loadFlowWork();
 
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowPostponedService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowPostponedService.java
@@ -27,7 +27,6 @@ public void postponed(long recordId, IFlowOperator currentOperator, long time) {
                 flowProcessRepository,
                 recordId, currentOperator);
 
-        flowRecordVerifyService.loadFlowRecord();
         flowRecordVerifyService.verifyFlowRecordSubmitState();
         flowRecordVerifyService.verifyFlowRecordCurrentOperator();
         flowRecordVerifyService.loadFlowWork();
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowRecallService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowRecallService.java
@@ -30,7 +30,6 @@ public void recall(long recordId, IFlowOperator currentOperator) {
                 flowProcessRepository,
                 recordId, currentOperator);
 
-        flowRecordVerifyService.loadFlowRecord();
         flowRecordVerifyService.verifyFlowRecordCurrentOperator();
         flowRecordVerifyService.loadFlowWork();
         flowRecordVerifyService.loadFlowNode();
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowSaveService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowSaveService.java
@@ -30,7 +30,6 @@ public void save(long recordId, IFlowOperator currentOperator, IBindData bindDat
         FlowRecordVerifyService flowRecordVerifyService = new FlowRecordVerifyService(flowRecordRepository,
                 flowProcessRepository,
                 recordId, currentOperator);
-        flowRecordVerifyService.loadFlowRecord();
         flowRecordVerifyService.verifyFlowRecordSubmitState();
         flowRecordVerifyService.verifyFlowRecordCurrentOperator();
         flowRecordVerifyService.loadFlowWork();
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowSubmitService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowSubmitService.java
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowTransferService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowTransferService.java
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowTrySubmitService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowTrySubmitService.java
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowUrgeService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowUrgeService.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

-Original file line number
+Diff line change
     public MessageResult customFlowEvent(long recordId, IFlowOperator currentOperator, String buttonId, IBindData bindData, Opinion opinion) {
         FlowRecordVerifyService flowRecordVerifyService = new FlowRecordVerifyService(flowRecordRepository, flowProcessRepository, recordId, currentOperator);
 -        // 加载流程
 -        flowRecordVerifyService.loadFlowRecord();
         // 验证流程的提交状态
         flowRecordVerifyService.verifyFlowRecordSubmitState();
         // 验证当前操作者