update 2.9.26

Author: xlorne

pom.xml

@@ -15,7 +15,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.9.25</version>
+    <version>2.9.26</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

springboot-starter-data-authorization/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.25</version>
+        <version>2.9.26</version>
     </parent>
 
     <artifactId>springboot-starter-data-authorization</artifactId>

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.25</version>
+        <version>2.9.26</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-flow/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.25</version>
+        <version>2.9.26</version>
     </parent>
 
     <name>springboot-starter-flow</name>

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/pojo/FlowStepResult.java

@@ -0,0 +1,28 @@
+package com.codingapi.springboot.flow.pojo;
+
+import com.codingapi.springboot.flow.domain.FlowNode;
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+public class FlowStepResult {
+
+    private final List<FlowNode> flowNodes;
+
+    public FlowStepResult() {
+        this.flowNodes = new ArrayList<>();
+    }
+
+    public void addFlowNode(FlowNode flowNode) {
+        this.flowNodes.add(flowNode);
+    }
+
+
+    public void print(){
+        for (FlowNode flowNode : flowNodes) {
+            System.out.println("flowNode = " + flowNode.getName());
+        }
+    }
+}

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowService.java

@@ -4,6 +4,7 @@
 import com.codingapi.springboot.flow.domain.Opinion;
 import com.codingapi.springboot.flow.pojo.FlowDetail;
 import com.codingapi.springboot.flow.pojo.FlowResult;
+import com.codingapi.springboot.flow.pojo.FlowStepResult;
 import com.codingapi.springboot.flow.pojo.FlowSubmitResult;
 import com.codingapi.springboot.flow.repository.*;
 import com.codingapi.springboot.flow.result.MessageResult;
@@ -188,6 +189,18 @@ public FlowSubmitResult trySubmitFlow(long recordId, IFlowOperator currentOperat
     }
 
 
+    /**
+     * 获取流程执行节点
+     *
+     * @param workCode
+     * @param currentOperator
+     * @return
+     */
+    public FlowStepResult getFlowStep(String workCode, IBindData bindData, IFlowOperator currentOperator) {
+        FlowStepService flowStepService = new FlowStepService(workCode, currentOperator, bindData, flowServiceRepositoryHolder);
+        return flowStepService.getFlowStep();
+    }
+
     /**
      * 尝试提交流程 (发起流程)
      *

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowStepService.java

@@ -0,0 +1,83 @@
+package com.codingapi.springboot.flow.service.impl;
+
+import com.codingapi.springboot.flow.bind.BindDataSnapshot;
+import com.codingapi.springboot.flow.bind.IBindData;
+import com.codingapi.springboot.flow.domain.FlowNode;
+import com.codingapi.springboot.flow.domain.FlowWork;
+import com.codingapi.springboot.flow.domain.Opinion;
+import com.codingapi.springboot.flow.pojo.FlowStepResult;
+import com.codingapi.springboot.flow.record.FlowRecord;
+import com.codingapi.springboot.flow.repository.FlowOperatorRepository;
+import com.codingapi.springboot.flow.repository.FlowRecordRepository;
+import com.codingapi.springboot.flow.service.FlowNodeService;
+import com.codingapi.springboot.flow.service.FlowServiceRepositoryHolder;
+import com.codingapi.springboot.flow.user.IFlowOperator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FlowStepService {
+    private final FlowWork flowWork;
+
+    private final IFlowOperator currentOperator;
+    private final IBindData bindData;
+    private final FlowServiceRepositoryHolder flowServiceRepositoryHolder;
+
+    private FlowNodeService flowNodeService;
+    private FlowNode flowNode;
+
+    public FlowStepService(String workCode, IFlowOperator currentOperator, IBindData bindData, FlowServiceRepositoryHolder flowServiceRepositoryHolder) {
+        this.currentOperator = currentOperator;
+        this.bindData = bindData;
+        this.flowServiceRepositoryHolder = flowServiceRepositoryHolder;
+        this.flowWork = flowServiceRepositoryHolder.getFlowWorkRepository().getFlowWorkByCode(workCode);
+    }
+
+
+    public FlowStepResult getFlowStep() {
+        FlowStepResult flowStepResult = new FlowStepResult();
+        // 获取开始节点
+        FlowNode start = flowWork.getStartNode();
+        if (start == null) {
+            throw new IllegalArgumentException("start node not found");
+        }
+
+        this.flowNode = start;
+        // 设置开始流程的上一个流程id
+        long preId = 0;
+
+        // 创建流程id
+        String processId = "flow_" + System.currentTimeMillis();
+
+        List<FlowRecord> historyRecords = new ArrayList<>();
+
+        FlowOperatorRepository flowOperatorRepository = flowServiceRepositoryHolder.getFlowOperatorRepository();
+        FlowRecordRepository flowRecordRepository = flowServiceRepositoryHolder.getFlowRecordRepository();
+
+        BindDataSnapshot snapshot = new BindDataSnapshot(bindData);
+        flowNodeService = new FlowNodeService(flowOperatorRepository,
+                flowRecordRepository,
+                snapshot,
+                Opinion.pass("同意"),
+                currentOperator,
+                currentOperator,
+                historyRecords,
+                flowWork,
+                null,
+                processId,
+                preId);
+
+        flowNodeService.setNextNode(start);
+
+        this.flowNode = start;
+        flowStepResult.addFlowNode(this.flowNode);
+
+        do {
+            flowNodeService.loadNextPassNode(this.flowNode);
+            this.flowNode = flowNodeService.getNextNode();
+            flowStepResult.addFlowNode(this.flowNode);
+        } while (!flowNode.isOverNode());
+
+        return flowStepResult;
+    }
+}

springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/CirculateTest.java

@@ -8,6 +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.FlowStepResult;
 import com.codingapi.springboot.flow.record.FlowRecord;
 import com.codingapi.springboot.flow.repository.*;
 import com.codingapi.springboot.flow.service.FlowService;
@@ -79,6 +80,10 @@ void circulate(){
         // 创建流程
         flowService.startFlow(workCode, user, leave, "发起流程");
 
+
+        FlowStepResult result = flowService.getFlowStep(workCode, leave, user);
+        result.print();
+
         // 查看我的待办
         List<FlowRecord> userTodos = flowRecordRepository.findUnReadByOperatorId(user.getUserId(), pageRequest).getContent();
         assertEquals(1, userTodos.size());

springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/FlowTest.java

@@ -8,6 +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.FlowStepResult;
 import com.codingapi.springboot.flow.pojo.FlowSubmitResult;
 import com.codingapi.springboot.flow.record.FlowRecord;
 import com.codingapi.springboot.flow.repository.*;
@@ -72,6 +73,9 @@ void entrustTest() {
         Leave leave = new Leave("我要出去看看");
         leaveRepository.save(leave);
 
+        FlowStepResult result = flowService.getFlowStep(workCode, leave, user);
+        result.print();
+
         // 创建流程
         flowService.startFlow(workCode, user, leave, "发起流程");
 
@@ -898,7 +902,7 @@ void recallTest1() {
      * 删除流程测试
      */
     @Test
-    void removeTest1() {
+    void removeTest() {
         PageRequest pageRequest = PageRequest.of(0, 1000);
 
         User lorne = new User("lorne");

springboot-starter-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.25</version>
+        <version>2.9.26</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>