add manual node

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/action/actions/PassAction.java

@@ -3,13 +3,16 @@
 import com.codingapi.flow.action.ActionDisplay;
 import com.codingapi.flow.action.ActionType;
 import com.codingapi.flow.action.BaseAction;
+import com.codingapi.flow.context.ActionResponseContext;
 import com.codingapi.flow.event.FlowRecordDoneEvent;
 import com.codingapi.flow.event.FlowRecordTodoEvent;
 import com.codingapi.flow.event.IFlowEvent;
 import com.codingapi.flow.manager.NodeStrategyManager;
 import com.codingapi.flow.node.BaseAuditNode;
 import com.codingapi.flow.node.IFlowNode;
+import com.codingapi.flow.node.nodes.ManualNode;
 import com.codingapi.flow.operator.IFlowOperator;
+import com.codingapi.flow.pojo.response.NodeOption;
 import com.codingapi.flow.record.FlowRecord;
 import com.codingapi.flow.session.FlowSession;
 import com.codingapi.flow.session.IRepositoryHolder;
@@ -71,10 +74,25 @@ public void run(FlowSession flowSession) {
         List<FlowRecord> recordList = new ArrayList<>();
         FlowRecord currentRecord = flowSession.getCurrentRecord();
         IFlowNode currentNode = flowSession.getCurrentNode();
+
+        // 如果下节点为手动节点时，提交流程时需要先选择节点
+        List<IFlowNode> nextNodes = flowSession.matchNextNodes();
+        if (nextNodes != null && nextNodes.size() == 1) {
+            IFlowNode nextNode = nextNodes.get(0);
+            if (nextNode.getType().equalsIgnoreCase(ManualNode.NODE_TYPE)) {
+                IFlowNode manulNode = flowSession.getAdvice().getManualNode();
+                if (manulNode == null && nextNode.blocks() != null) {
+                    List<NodeOption> options = nextNode.blocks().stream().map(NodeOption::new).toList();
+                    ActionResponseContext.getInstance().set(options);
+                    return;
+                }
+            }
+        }
+
         boolean isFinish = currentNode.isFinish(flowSession);
         currentRecord.update(flowSession, true);
         // 添加流程结束事件
-        flowEvents.add(new FlowRecordDoneEvent(currentRecord,flowSession.isMock()));
+        flowEvents.add(new FlowRecordDoneEvent(currentRecord, flowSession.isMock()));
         recordList.add(currentRecord);
 
         // 激活下一个按顺序审批的记录数据
@@ -85,7 +103,7 @@ public void run(FlowSession flowSession) {
                 if (record.getNodeOrder() == currentRecord.getNodeOrder() + 1) {
                     record.show();
                     recordList.add(record);
-                    flowEvents.add(new FlowRecordTodoEvent(record,flowSession.isMock()));
+                    flowEvents.add(new FlowRecordTodoEvent(record, flowSession.isMock()));
                 }
             }
         }
@@ -98,7 +116,7 @@ public void run(FlowSession flowSession) {
                 notifyRecord.notifyRecord(flowSession.updateSession(forwardOperator));
                 // 如果不存储这个记录，若下一流程是结束流程时，无法更新流程状态为结束状态。
                 repositoryHolder.saveRecord(notifyRecord);
-                flowEvents.add(new FlowRecordDoneEvent(notifyRecord,flowSession.isMock()));
+                flowEvents.add(new FlowRecordDoneEvent(notifyRecord, flowSession.isMock()));
             }
 
             // 是否委托记录
@@ -109,17 +127,17 @@ public void run(FlowSession flowSession) {
                 rebackRecord.clearDelegate();
 
                 recordList.add(rebackRecord);
-                flowEvents.add(new FlowRecordTodoEvent(rebackRecord,flowSession.isMock()));
+                flowEvents.add(new FlowRecordTodoEvent(rebackRecord, flowSession.isMock()));
             } else {
                 this.triggerNode(flowSession, (triggerSession) -> {
                     List<FlowRecord> records = this.generateRecords(triggerSession);
                     if (!records.isEmpty()) {
                         for (FlowRecord record : records) {
                             if (record.isShow()) {
                                 if (record.isNotify()) {
-                                    flowEvents.add(new FlowRecordDoneEvent(record,flowSession.isMock()));
+                                    flowEvents.add(new FlowRecordDoneEvent(record, flowSession.isMock()));
                                 } else {
-                                    flowEvents.add(new FlowRecordTodoEvent(record,flowSession.isMock()));
+                                    flowEvents.add(new FlowRecordTodoEvent(record, flowSession.isMock()));
                                 }
                             }
                         }

flow-engine-framework/src/main/java/com/codingapi/flow/context/ActionResponseContext.java

@@ -0,0 +1,35 @@
+package com.codingapi.flow.context;
+
+import com.codingapi.flow.pojo.response.ActionResponse;
+import com.codingapi.flow.pojo.response.NodeOption;
+import lombok.Getter;
+
+import java.util.List;
+
+public class ActionResponseContext {
+
+    @Getter
+    private final static ActionResponseContext instance = new ActionResponseContext();
+
+    private final ThreadLocal<ActionResponse> threadLocal;
+
+
+    private ActionResponseContext() {
+        this.threadLocal = new InheritableThreadLocal<>();
+    }
+
+
+    public void clear() {
+        this.threadLocal.remove();
+    }
+
+    public void set(List<NodeOption> options) {
+        this.threadLocal.set(new ActionResponse(options));
+    }
+
+    public ActionResponse get() {
+        return threadLocal.get();
+    }
+
+
+}

flow-engine-framework/src/main/java/com/codingapi/flow/manager/FlowNodeState.java

@@ -26,10 +26,12 @@ public FlowNodeState(IFlowNode node) {
         this.blockNodeTypes.add(NodeType.CONDITION.name());
         this.blockNodeTypes.add(NodeType.INCLUSIVE.name());
         this.blockNodeTypes.add(NodeType.PARALLEL.name());
+        this.blockNodeTypes.add(NodeType.MANUAL.name());
 
         this.branchNodeTypes.add(NodeType.CONDITION_BRANCH.name());
         this.branchNodeTypes.add(NodeType.INCLUSIVE_BRANCH.name());
         this.branchNodeTypes.add(NodeType.PARALLEL_BRANCH.name());
+        this.branchNodeTypes.add(NodeType.MANUAL_BRANCH.name());
     }
 
     public boolean isEndNode() {

flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/ManualBranchNode.java

@@ -28,7 +28,6 @@ public String getType() {
         return NODE_TYPE;
     }
 
-
     public ManualBranchNode(String id, String name, int order) {
         super(id, name, order);
     }
@@ -46,34 +45,10 @@ public boolean handle(FlowSession request) {
     }
 
 
-
     public static ManualBranchNode formMap(Map<String, Object> map) {
         return BaseFlowNode.fromMap(map, ManualBranchNode.class);
     }
 
-    /**
-     * 匹配条件分支
-     *
-     * @param nodeList    当前节点下的所有条件
-     * @param flowSession 当前会话
-     * @return 匹配的节点
-     */
-    public List<IFlowNode> filterBranches(List<IFlowNode> nodeList, FlowSession flowSession) {
-        Workflow workflow = flowSession.getWorkflow();
-        IFlowNode currentNode = flowSession.getCurrentNode();
-        ParallelNodeRelationHelper helper = new ParallelNodeRelationHelper(workflow,currentNode,nodeList);
-        // 分析并行分支的结束汇聚节点
-        IFlowNode overNode = helper.fetchMargeNode();
-        if (overNode == null) {
-            throw FlowNotFoundException.parallelEndNodeNotNull();
-        }
-
-        // 在流程记录中记录，合并的条件信息。
-        FlowRecord flowRecord = flowSession.getCurrentRecord();
-        flowRecord.parallelBranchNode(overNode.getId(), nodeList.size(), RandomUtils.generateStringId());
-
-        return nodeList;
-    }
 
     public static Builder builder() {
         return new Builder();

flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/ManualNode.java

@@ -5,6 +5,7 @@
 import com.codingapi.flow.node.IBlockNode;
 import com.codingapi.flow.node.IFlowNode;
 import com.codingapi.flow.node.NodeType;
+import com.codingapi.flow.session.FlowSession;
 import com.codingapi.flow.utils.RandomUtils;
 
 import java.util.ArrayList;
@@ -34,13 +35,30 @@ public ManualNode() {
         this(RandomUtils.generateStringId(), DEFAULT_NAME, 0);
     }
 
+    /**
+     * 匹配条件分支
+     *
+     * @param nodeList    当前节点下的所有条件
+     * @param flowSession 当前会话
+     * @return 匹配的节点
+     */
+    public List<IFlowNode> filterBranches(List<IFlowNode> nodeList, FlowSession flowSession) {
+        IFlowNode selectNode = flowSession.getAdvice().getManualNode();
+        if (selectNode == null) {
+            return nodeList;
+        } else {
+            List<IFlowNode> nextNodes = new ArrayList<>();
+            nextNodes.add(selectNode);
+            return nextNodes;
+        }
+    }
 
     @Override
-    public void addDefaultBranch(int count){
+    public void addDefaultBranch(int count) {
         List<IFlowNode> branches = new ArrayList<>();
-        for (int i=0;i<count;i++){
+        for (int i = 0; i < count; i++) {
             ManualBranchNode branchNode = new ManualBranchNode();
-            branchNode.setOrder(i+1);
+            branchNode.setOrder(i + 1);
             branches.add(branchNode);
         }
         this.setBlocks(branches);

flow-engine-framework/src/main/java/com/codingapi/flow/pojo/body/FlowAdviceBody.java

@@ -9,7 +9,7 @@
 import java.util.List;
 
 /**
- *  流程审批意见
+ * 流程审批意见
  */
 @Data
 @NoArgsConstructor
@@ -24,6 +24,11 @@ public class FlowAdviceBody {
      */
     private String advice;
 
+    /**
+     * 人工选择节点
+     */
+    private String manualNodeId;
+
     /**
      * 签名key
      */
@@ -57,6 +62,7 @@ public FlowAdviceBody(FlowSession flowSession) {
         this.operatorId = flowSession.getCurrentOperator().getUserId();
         this.signKey = flowSession.getAdvice().getSignKey();
         this.backNodeId = flowSession.getAdvice().getBackNode() != null ? flowSession.getAdvice().getBackNode().getId() : null;
+        this.manualNodeId = flowSession.getAdvice().getManualNode() != null ? flowSession.getAdvice().getManualNode().getId() : null;
         this.forwardOperatorIds = flowSession.getAdvice().getForwardOperators() != null ? flowSession.getAdvice().getForwardOperators().stream().map(IFlowOperator::getUserId).toList() : null;
     }
 

flow-engine-framework/src/main/java/com/codingapi/flow/pojo/request/FlowActionRequest.java

@@ -50,6 +50,10 @@ public FlowAdvice toFlowAdvice(Workflow workflow, IFlowAction flowAction) {
             flowAdvice.setBackNode(workflow.getFlowNode(advice.getBackNodeId()));
         }
 
+        if (StringUtils.hasText(advice.getManualNodeId())) {
+            flowAdvice.setManualNode(workflow.getFlowNode(advice.getManualNodeId()));
+        }
+
         return flowAdvice;
     }
 

flow-engine-framework/src/main/java/com/codingapi/flow/pojo/response/ActionResponse.java

@@ -0,0 +1,18 @@
+package com.codingapi.flow.pojo.response;
+
+import lombok.Getter;
+
+import java.util.List;
+
+@Getter
+public class ActionResponse {
+
+    /**
+     * 可选节点
+     */
+    private final List<NodeOption> options;
+
+    public ActionResponse(List<NodeOption> options) {
+        this.options = options;
+    }
+}

flow-engine-framework/src/main/java/com/codingapi/flow/service/FlowService.java

@@ -1,6 +1,7 @@
 package com.codingapi.flow.service;
 
 import com.codingapi.flow.pojo.request.*;
+import com.codingapi.flow.pojo.response.ActionResponse;
 import com.codingapi.flow.pojo.response.FlowContent;
 import com.codingapi.flow.pojo.response.ProcessNode;
 import com.codingapi.flow.service.impl.*;
@@ -60,9 +61,9 @@ public long create(FlowCreateRequest request) {
      *
      * @param request 审批请求
      */
-    public void action(FlowActionRequest request) {
+    public ActionResponse action(FlowActionRequest request) {
         FlowActionService flowActionService = new FlowActionService(request,this.repositoryHolder);
-        flowActionService.action();
+        return flowActionService.action();
     }
 
     /**

flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowActionService.java

@@ -1,6 +1,7 @@
 package com.codingapi.flow.service.impl;
 
 import com.codingapi.flow.action.IFlowAction;
+import com.codingapi.flow.context.ActionResponseContext;
 import com.codingapi.flow.exception.FlowNotFoundException;
 import com.codingapi.flow.exception.FlowStateException;
 import com.codingapi.flow.form.FormData;
@@ -9,6 +10,7 @@
 import com.codingapi.flow.node.IFlowNode;
 import com.codingapi.flow.operator.IFlowOperator;
 import com.codingapi.flow.pojo.request.FlowActionRequest;
+import com.codingapi.flow.pojo.response.ActionResponse;
 import com.codingapi.flow.record.FlowRecord;
 import com.codingapi.flow.service.FlowRecordService;
 import com.codingapi.flow.service.WorkflowService;
@@ -38,8 +40,9 @@ public FlowActionService(FlowActionRequest request,IRepositoryHolder repositoryH
         this.repositoryHolder = repositoryHolder;
     }
 
-    public void action() {
+    public ActionResponse action() {
 
+        ActionResponseContext.getInstance().clear();
         request.verify();
         // 验证当前用户
         IFlowOperator currentOperator = flowOperatorGateway.get(request.getAdvice().getOperatorId());
@@ -88,6 +91,7 @@ public void action() {
         // 执行动作
         flowAction.run(session);
 
+        return ActionResponseContext.getInstance().get();
     }
 }