add start node try submit

xlorne · xlorne · commit 8687d711d308 · 2024-11-26T10:55:23.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.17</version>
+        <version>3.3.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-application/src/main/java/com/codingapi/example/command/FlowRecordCmdController.java b/example/example-application/src/main/java/com/codingapi/example/command/FlowRecordCmdController.java
@@ -3,7 +3,7 @@
 import com.codingapi.example.domain.User;
 import com.codingapi.example.pojo.cmd.FlowCmd;
 import com.codingapi.example.repository.UserRepository;
-import com.codingapi.springboot.flow.pojo.FlowNodeResult;
+import com.codingapi.springboot.flow.pojo.FlowSubmitResult;
 import com.codingapi.springboot.flow.pojo.FlowResult;
 import com.codingapi.springboot.flow.service.FlowService;
 import com.codingapi.springboot.framework.dto.response.Response;
@@ -32,9 +32,13 @@ public SingleResponse<FlowResult> startFlow(@RequestBody FlowCmd.StartFlow reque
 
 
     @PostMapping("/trySubmitFlow")
-    public SingleResponse<FlowNodeResult> trySubmitFlow(@RequestBody FlowCmd.SubmitFlow request) {
+    public SingleResponse<FlowSubmitResult> trySubmitFlow(@RequestBody FlowCmd.SubmitFlow request) {
         User current = userRepository.getUserByUsername(request.getUserName());
-        return SingleResponse.of(flowService.trySubmitFlow(request.getRecordId(), current, request.getBindData(), request.getOpinion()));
+        if(request.getRecordId()>0) {
+            return SingleResponse.of(flowService.trySubmitFlow(request.getRecordId(), current, request.getBindData(), request.getOpinion()));
+        }else {
+            return SingleResponse.of(flowService.trySubmitFlow(request.getWorkCode(), current, request.getBindData(), request.getOpinion()));
+        }
     }
 
 
diff --git a/example/example-application/src/main/java/com/codingapi/example/pojo/cmd/FlowCmd.java b/example/example-application/src/main/java/com/codingapi/example/pojo/cmd/FlowCmd.java
@@ -60,6 +60,7 @@ public Opinion getOpinion() {
     public static class SubmitFlow {
 
         private long recordId;
+        private String workCode;
         private String advice;
         private boolean success;
         private JSONObject formData;
diff --git a/example/example-application/src/main/java/com/codingapi/example/query/FlowRecordQueryController.java b/example/example-application/src/main/java/com/codingapi/example/query/FlowRecordQueryController.java
@@ -36,8 +36,9 @@ public MultiResponse<FlowRecordEntity> list(SearchRequest searchRequest) {
     @GetMapping("/detail")
     public SingleResponse<FlowDetail> detail(SearchRequest searchRequest) {
         long id = Long.parseLong(searchRequest.getParameter("id"));
+        String workCode = searchRequest.getParameter("workCode");
         User user = userRepository.getUserByUsername(TokenContext.current().getUsername());
-        return SingleResponse.of(flowService.detail(id,user));
+        return SingleResponse.of(flowService.detail(id, workCode, user));
     }
 
 
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.17</version>
+        <version>3.3.18</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.17</version>
+        <version>3.3.18</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.17</version>
+        <version>3.3.18</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.17</version>
+        <version>3.3.18</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.17</version>
+    <version>3.3.18</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.3.17</version>
+    <version>3.3.18</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</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.3.17</version>
+        <version>3.3.18</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.17</version>
+        <version>3.3.18</version>
     </parent>
 
     <name>springboot-starter-flow</name>
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/pojo/FlowSubmitResult.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/pojo/FlowSubmitResult.java
@@ -8,13 +8,13 @@
 import java.util.List;
 
 @Getter
-public class FlowNodeResult {
+public class FlowSubmitResult {
 
     private final FlowWork flowWork;
     private final FlowNode flowNode;
     private final List<? extends IFlowOperator> operators;
 
-    public FlowNodeResult(FlowWork flowWork, FlowNode flowNode, List<? extends IFlowOperator> operators) {
+    public FlowSubmitResult(FlowWork flowWork, FlowNode flowNode, List<? extends IFlowOperator> operators) {
         this.flowWork = flowWork;
         this.flowNode = flowNode;
         this.operators = operators;
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,7 +3,7 @@
 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.FlowNodeResult;
+import com.codingapi.springboot.flow.pojo.FlowSubmitResult;
 import com.codingapi.springboot.flow.pojo.FlowResult;
 import com.codingapi.springboot.flow.repository.*;
 import com.codingapi.springboot.flow.service.impl.*;
@@ -41,7 +41,7 @@ public FlowService(FlowWorkRepository flowWorkRepository,
         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);
+        this.flowTrySubmitService = new FlowTrySubmitService(flowRecordRepository, flowBindDataRepository, flowOperatorRepository, flowProcessRepository, flowWorkRepository, flowBackupRepository);
         this.flowSaveService = new FlowSaveService(flowRecordRepository, flowBindDataRepository, flowProcessRepository);
         this.flowTransferService = new FlowTransferService(flowRecordRepository, flowBindDataRepository, flowProcessRepository);
         this.flowPostponedService = new FlowPostponedService(flowRecordRepository, flowProcessRepository);
@@ -158,23 +158,36 @@ public void save(long recordId, IFlowOperator currentOperator, IBindData bindDat
      * @param advice   审批意见
      */
     public FlowResult startFlow(String workCode, IFlowOperator operator, IBindData bindData, String advice) {
-         return flowStartService.startFlow(workCode, operator, bindData, advice);
+        return flowStartService.startFlow(workCode, operator, bindData, advice);
     }
 
 
     /**
-     * 尝试提交流程
+     * 尝试提交流程 (流程过程中)
      *
      * @param recordId        流程记录id
      * @param currentOperator 当前操作者
      * @param bindData        绑定数据
      * @param opinion         审批意见
      */
-    public FlowNodeResult trySubmitFlow(long recordId, IFlowOperator currentOperator, IBindData bindData, Opinion opinion) {
+    public FlowSubmitResult trySubmitFlow(long recordId, IFlowOperator currentOperator, IBindData bindData, Opinion opinion) {
         return flowTrySubmitService.trySubmitFlow(recordId, currentOperator, bindData, opinion);
     }
 
 
+    /**
+     * 尝试提交流程 (发起流程)
+     *
+     * @param workCode        流程编码
+     * @param currentOperator 当前操作者
+     * @param bindData        绑定数据
+     * @param opinion         审批意见
+     */
+    public FlowSubmitResult trySubmitFlow(String workCode, IFlowOperator currentOperator, IBindData bindData, Opinion opinion) {
+        return flowTrySubmitService.trySubmitFlow(workCode, currentOperator, bindData, opinion);
+    }
+
+
     /**
      * 提交流程
      *
@@ -198,7 +211,7 @@ public FlowResult submitFlow(long recordId, IFlowOperator currentOperator, IBind
      * @param opinion         审批意见
      */
     public String customFlowEvent(long recordId, IFlowOperator currentOperator, String buttonId, IBindData bindData, Opinion opinion) {
-       return flowCustomEventService.customFlowEvent(recordId, currentOperator, buttonId, bindData, opinion);
+        return flowCustomEventService.customFlowEvent(recordId, currentOperator, buttonId, bindData, opinion);
     }
 
 
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
@@ -6,7 +6,9 @@
 import com.codingapi.springboot.flow.domain.FlowWork;
 import com.codingapi.springboot.flow.domain.Opinion;
 import com.codingapi.springboot.flow.em.FlowSourceDirection;
-import com.codingapi.springboot.flow.pojo.FlowNodeResult;
+import com.codingapi.springboot.flow.pojo.FlowSubmitResult;
+import com.codingapi.springboot.flow.record.FlowBackup;
+import com.codingapi.springboot.flow.record.FlowProcess;
 import com.codingapi.springboot.flow.record.FlowRecord;
 import com.codingapi.springboot.flow.repository.*;
 import com.codingapi.springboot.flow.service.FlowDirectionService;
@@ -27,17 +29,19 @@ public class FlowTrySubmitService {
     private final FlowBindDataRepository flowBindDataRepository;
     private final FlowOperatorRepository flowOperatorRepository;
     private final FlowProcessRepository flowProcessRepository;
+    private final FlowWorkRepository flowWorkRepository;
+    private final FlowBackupRepository flowBackupRepository;
 
 
     /**
-     * 尝试提交流程
+     * 尝试提交流程 （流程过程中）
      *
      * @param recordId        流程记录id
      * @param currentOperator 当前操作者
      * @param bindData        绑定数据
      * @param opinion         审批意见
      */
-    public FlowNodeResult trySubmitFlow(long recordId, IFlowOperator currentOperator, IBindData bindData, Opinion opinion) {
+    public FlowSubmitResult trySubmitFlow(long recordId, IFlowOperator currentOperator, IBindData bindData, Opinion opinion) {
 
         FlowRecordVerifyService flowRecordVerifyService = new FlowRecordVerifyService(flowRecordRepository, flowProcessRepository, recordId, currentOperator);
 
@@ -59,6 +63,22 @@ public FlowNodeResult trySubmitFlow(long recordId, IFlowOperator currentOperator
         FlowNode flowNode = flowRecordVerifyService.getFlowNode();
         FlowWork flowWork = flowRecordVerifyService.getFlowWork();
 
+        return trySubmitFlow(flowWork, flowNode, flowRecord, currentOperator, bindData, opinion);
+    }
+
+
+    /**
+     * 预提交流程数据查询
+     *
+     * @param flowWork        流程设计
+     * @param flowNode        流程节点
+     * @param flowRecord      流程记录
+     * @param currentOperator 当前操作者
+     * @param bindData        绑定数据
+     * @param opinion         审批意见
+     * @return FlowSubmitResult
+     */
+    private FlowSubmitResult trySubmitFlow(FlowWork flowWork, FlowNode flowNode, FlowRecord flowRecord, IFlowOperator currentOperator, IBindData bindData, Opinion opinion) {
 
         // 保存流程表单快照数据
         BindDataSnapshot snapshot = null;
@@ -69,7 +89,7 @@ public FlowNodeResult trySubmitFlow(long recordId, IFlowOperator currentOperator
         }
 
         // 审批方向判断服务
-        FlowDirectionService flowDirectionService = new FlowDirectionService(flowRecordVerifyService.getFlowNode(), flowRecordVerifyService.getFlowWork(), opinion);
+        FlowDirectionService flowDirectionService = new FlowDirectionService(flowNode, flowWork, opinion);
 
         // 加载流程审批方向
         flowDirectionService.loadFlowSourceDirection();
@@ -95,7 +115,7 @@ public FlowNodeResult trySubmitFlow(long recordId, IFlowOperator currentOperator
             boolean next = flowDirectionService.hasCurrentFlowNodeIsDone();
             if (next) {
                 List<FlowRecord> todoRecords = historyRecords.stream().filter(FlowRecord::isTodo).toList();
-                return new FlowNodeResult(flowWork, flowNode, todoRecords.stream().map(FlowRecord::getCurrentOperator).toList());
+                return new FlowSubmitResult(flowWork, flowNode, todoRecords.stream().map(FlowRecord::getCurrentOperator).toList());
             }
         }
 
@@ -142,6 +162,86 @@ public FlowNodeResult trySubmitFlow(long recordId, IFlowOperator currentOperator
         FlowNode nextNode = flowNodeService.getNextNode();
 
         List<? extends IFlowOperator> operators = flowNodeService.loadNextNodeOperators();
-        return new FlowNodeResult(flowWork, nextNode, operators);
+        return new FlowSubmitResult(flowWork, nextNode, operators);
+    }
+
+
+    /**
+     * 尝试提交流程 （发起流程）
+     *
+     * @param workCode        流程编码
+     * @param currentOperator 当前操作者
+     * @param bindData        绑定数据
+     * @param opinion         审批意见
+     */
+    public FlowSubmitResult trySubmitFlow(String workCode, IFlowOperator currentOperator, IBindData bindData, Opinion opinion) {
+        // 检测流程是否存在
+        FlowWork flowWork = flowWorkRepository.getFlowWorkByCode(workCode);
+        if (flowWork == null) {
+            throw new IllegalArgumentException("flow work not found");
+        }
+        flowWork.verify();
+        flowWork.enableValidate();
+
+        // 流程数据备份
+        FlowBackup flowBackup = flowBackupRepository.getFlowBackupByWorkIdAndVersion(flowWork.getId(), flowWork.getUpdateTime());
+        if (flowBackup == null) {
+            flowBackup = flowBackupRepository.backup(flowWork);
+        }
+
+        // 保存流程
+        FlowProcess flowProcess = new FlowProcess(flowBackup.getId(), currentOperator);
+
+        // 保存绑定数据
+        BindDataSnapshot snapshot = new BindDataSnapshot(bindData);
+
+        // 创建流程id
+        String processId = flowProcess.getProcessId();
+
+        // 获取开始节点
+        FlowNode start = flowWork.getStartNode();
+        if (start == null) {
+            throw new IllegalArgumentException("start node not found");
+        }
+        // 设置开始流程的上一个流程id
+        long preId = 0;
+
+        List<FlowRecord> historyRecords = new ArrayList<>();
+
+        FlowNodeService flowNodeService = new FlowNodeService(flowOperatorRepository,
+                flowRecordRepository,
+                snapshot,
+                opinion,
+                currentOperator,
+                currentOperator,
+                historyRecords,
+                flowWork,
+                processId,
+                preId);
+
+        flowNodeService.setNextNode(start);
+
+        FlowRecord startRecord = null;
+
+        // 创建待办记录
+        List<FlowRecord> records = flowNodeService.createRecord();
+        if (records.isEmpty()) {
+            throw new IllegalArgumentException("flow record not found");
+        } else {
+            for (FlowRecord record : records) {
+                record.updateOpinion(opinion);
+                startRecord = record;
+            }
+        }
+
+        // 检测流程是否结束
+        if (flowNodeService.nextNodeIsOver()) {
+            for (FlowRecord record : records) {
+                record.submitRecord(currentOperator, snapshot, opinion, FlowSourceDirection.PASS);
+                record.finish();
+                startRecord = record;
+            }
+        }
+        return this.trySubmitFlow(flowWork, start, startRecord, currentOperator, bindData, opinion);
     }
 }
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/FlowTest.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/FlowTest.java
@@ -8,7 +8,7 @@
 import com.codingapi.springboot.flow.flow.Leave;
 import com.codingapi.springboot.flow.matcher.OperatorMatcher;
 import com.codingapi.springboot.flow.pojo.FlowDetail;
-import com.codingapi.springboot.flow.pojo.FlowNodeResult;
+import com.codingapi.springboot.flow.pojo.FlowSubmitResult;
 import com.codingapi.springboot.flow.record.FlowRecord;
 import com.codingapi.springboot.flow.repository.*;
 import com.codingapi.springboot.flow.service.FlowService;
@@ -767,10 +767,10 @@ void recallTest1() {
         // 提交流程
         FlowRecord userTodo = userTodos.get(0);
 
-        FlowNodeResult flowNodeResult =  flowService.trySubmitFlow(userTodo.getId(), user, leave, Opinion.pass("同意"));
-        assertEquals(flowNodeResult.getOperators().size(), 2);
-        assertTrue(flowNodeResult.getOperators().stream().map(IFlowOperator::getUserId).toList().contains(dept.getUserId()));
-        assertTrue(flowNodeResult.getOperators().stream().map(IFlowOperator::getUserId).toList().contains(lorne.getUserId()));
+        FlowSubmitResult flowSubmitResult =  flowService.trySubmitFlow(userTodo.getId(), user, leave, Opinion.pass("同意"));
+        assertEquals(flowSubmitResult.getOperators().size(), 2);
+        assertTrue(flowSubmitResult.getOperators().stream().map(IFlowOperator::getUserId).toList().contains(dept.getUserId()));
+        assertTrue(flowSubmitResult.getOperators().stream().map(IFlowOperator::getUserId).toList().contains(lorne.getUserId()));
 
         flowService.submitFlow(userTodo.getId(), user, leave, Opinion.pass("同意").specify(dept.getUserId()));
 
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/TrySubmitTest.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/TrySubmitTest.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

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,9 @@ public MultiResponse<FlowRecordEntity> list(SearchRequest searchRequest) {`
`36`	`36`	`@GetMapping("/detail")`
`37`	`37`	`public SingleResponse<FlowDetail> detail(SearchRequest searchRequest) {`
`38`	`38`	`long id = Long.parseLong(searchRequest.getParameter("id"));`
	`39`	`+ String workCode = searchRequest.getParameter("workCode");`
`39`	`40`	`User user = userRepository.getUserByUsername(TokenContext.current().getUsername());`
`40`		`- return SingleResponse.of(flowService.detail(id,user));`
	`41`	`+ return SingleResponse.of(flowService.detail(id, workCode, user));`
`41`	`42`	`}`
`42`	`43`
`43`	`44`