update 2.9.27

Author: xlorne

pom.xml

@@ -15,7 +15,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.9.26</version>
+    <version>2.9.27</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.26</version>
+        <version>2.9.27</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.26</version>
+        <version>2.9.27</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.26</version>
+        <version>2.9.27</version>
     </parent>
 
     <name>springboot-starter-flow</name>

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

@@ -1,6 +1,8 @@
 package com.codingapi.springboot.flow.pojo;
 
 import com.codingapi.springboot.flow.domain.FlowNode;
+import com.codingapi.springboot.flow.em.NodeType;
+import com.codingapi.springboot.flow.user.IFlowOperator;
 import lombok.Getter;
 
 import java.util.ArrayList;
@@ -9,20 +11,38 @@
 @Getter
 public class FlowStepResult {
 
-    private final List<FlowNode> flowNodes;
+    private final List<FlowStepNode> flowNodes;
 
     public FlowStepResult() {
         this.flowNodes = new ArrayList<>();
     }
 
-    public void addFlowNode(FlowNode flowNode) {
-        this.flowNodes.add(flowNode);
+    public void addFlowNode(FlowNode flowNode,List<? extends IFlowOperator> operators) {
+        this.flowNodes.add(new FlowStepNode(flowNode.getId(), flowNode.getCode(),flowNode.getName(),flowNode.getType(),operators));
     }
 
 
     public void print(){
-        for (FlowNode flowNode : flowNodes) {
+        for (FlowStepNode flowNode : flowNodes) {
             System.out.println("flowNode = " + flowNode.getName());
         }
     }
+
+
+    @Getter
+    public static class FlowStepNode{
+        private final String id;
+        private final String code;
+        private final String name;
+        private final NodeType type;
+        private final List<? extends IFlowOperator> operators;
+
+        public FlowStepNode(String id, String code, String name, NodeType type,List<? extends IFlowOperator> operators) {
+            this.id = id;
+            this.code = code;
+            this.name = name;
+            this.type = type;
+            this.operators = operators;
+        }
+    }
 }

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

@@ -70,12 +70,12 @@ public FlowStepResult getFlowStep() {
         flowNodeService.setNextNode(start);
 
         this.flowNode = start;
-        flowStepResult.addFlowNode(this.flowNode);
+        flowStepResult.addFlowNode(this.flowNode, this.flowNodeService.loadNextNodeOperators());
 
         do {
             flowNodeService.loadNextPassNode(this.flowNode);
             this.flowNode = flowNodeService.getNextNode();
-            flowStepResult.addFlowNode(this.flowNode);
+            flowStepResult.addFlowNode(this.flowNode, this.flowNodeService.loadNextNodeOperators());
         } while (!flowNode.isOverNode());
 
         return flowStepResult;

springboot-starter-security/pom.xml

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

springboot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.9.26</version>
+        <version>2.9.27</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 

springboot-starter/src/main/resources/META-INF/banner.txt

@@ -1,4 +1,4 @@
 ------------------------------------------------------
-CodingApi SpringBoot-Starter 2.9.26
+CodingApi SpringBoot-Starter 2.9.27
 springboot version (${spring-boot.version})
 ------------------------------------------------------