add IDisplayNode

xlorne · xlorne · commit 4f637b227b5d · 2026-03-04T11:26:55.000+08:00
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/node/IDisplayNode.java b/flow-engine-framework/src/main/java/com/codingapi/flow/node/IDisplayNode.java
@@ -0,0 +1,10 @@
+package com.codingapi.flow.node;
+
+/**
+ *  流程审批中呈现的节点
+ *  在流程审批过程中可界面的节点，包括{@link com.codingapi.flow.node.nodes.StartNode}{@link com.codingapi.flow.node.nodes.EndNode} 等节点
+ *  过滤条件节点例如 {@link com.codingapi.flow.node.nodes.ConditionNode} {@link com.codingapi.flow.node.nodes.ConditionBranchNode} 等逻辑控制节点
+ */
+public interface IDisplayNode {
+
+}
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/ApprovalNode.java b/flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/ApprovalNode.java
@@ -4,6 +4,7 @@
 import com.codingapi.flow.action.actions.*;
 import com.codingapi.flow.builder.BaseNodeBuilder;
 import com.codingapi.flow.node.BaseAuditNode;
+import com.codingapi.flow.node.IDisplayNode;
 import com.codingapi.flow.node.NodeType;
 import com.codingapi.flow.strategy.node.*;
 import com.codingapi.flow.utils.RandomUtils;
@@ -15,7 +16,7 @@
 /**
  * 审批节点
  */
-public class ApprovalNode extends BaseAuditNode {
+public class ApprovalNode extends BaseAuditNode implements IDisplayNode {
 
     public static final String NODE_TYPE = NodeType.APPROVAL.name();
     public static final String DEFAULT_NAME = "审批节点";
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/DelayNode.java b/flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/DelayNode.java
@@ -5,6 +5,7 @@
 import com.codingapi.flow.domain.DelayTaskManager;
 import com.codingapi.flow.manager.NodeStrategyManager;
 import com.codingapi.flow.node.BaseFlowNode;
+import com.codingapi.flow.node.IDisplayNode;
 import com.codingapi.flow.node.NodeType;
 import com.codingapi.flow.record.FlowRecord;
 import com.codingapi.flow.session.FlowSession;
@@ -19,7 +20,7 @@
 /**
  * 延迟节点
  */
-public class DelayNode extends BaseFlowNode {
+public class DelayNode extends BaseFlowNode implements IDisplayNode {
 
     public static final String NODE_TYPE = NodeType.DELAY.name();
     public static final String DEFAULT_NAME = "延迟节点";
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/EndNode.java b/flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/EndNode.java
@@ -6,6 +6,7 @@
 import com.codingapi.flow.context.RepositoryHolderContext;
 import com.codingapi.flow.event.FlowRecordFinishEvent;
 import com.codingapi.flow.node.BaseFlowNode;
+import com.codingapi.flow.node.IDisplayNode;
 import com.codingapi.flow.node.NodeType;
 import com.codingapi.flow.record.FlowRecord;
 import com.codingapi.flow.session.FlowSession;
@@ -18,7 +19,7 @@
 /**
  * 结束节点
  */
-public class EndNode extends BaseFlowNode {
+public class EndNode extends BaseFlowNode implements IDisplayNode {
 
     public static final String NODE_TYPE = NodeType.END.name();
     public static final String DEFAULT_NAME = "结束节点";
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/HandleNode.java b/flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/HandleNode.java
@@ -4,6 +4,7 @@
 import com.codingapi.flow.action.actions.PassAction;
 import com.codingapi.flow.builder.BaseNodeBuilder;
 import com.codingapi.flow.node.BaseAuditNode;
+import com.codingapi.flow.node.IDisplayNode;
 import com.codingapi.flow.node.NodeType;
 import com.codingapi.flow.strategy.node.*;
 import com.codingapi.flow.utils.RandomUtils;
@@ -15,7 +16,7 @@
 /**
  * 办理节点
  */
-public class HandleNode extends BaseAuditNode {
+public class HandleNode extends BaseAuditNode implements IDisplayNode {
 
     public static final String NODE_TYPE = NodeType.HANDLE.name();
     public static final String DEFAULT_NAME = "办理节点";
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/NotifyNode.java b/flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/NotifyNode.java
@@ -6,6 +6,7 @@
 import com.codingapi.flow.manager.NodeStrategyManager;
 import com.codingapi.flow.manager.OperatorManager;
 import com.codingapi.flow.node.BaseAuditNode;
+import com.codingapi.flow.node.IDisplayNode;
 import com.codingapi.flow.node.NodeType;
 import com.codingapi.flow.operator.IFlowOperator;
 import com.codingapi.flow.record.FlowRecord;
@@ -20,7 +21,7 @@
 /**
  * 抄送节点
  */
-public class NotifyNode extends BaseAuditNode {
+public class NotifyNode extends BaseAuditNode implements IDisplayNode {
 
     public static final String NODE_TYPE = NodeType.NOTIFY.name();
     public static final String DEFAULT_NAME = "抄送节点";
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/RouterNode.java b/flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/RouterNode.java
@@ -5,6 +5,7 @@
 import com.codingapi.flow.form.FormMeta;
 import com.codingapi.flow.manager.NodeStrategyManager;
 import com.codingapi.flow.node.BaseFlowNode;
+import com.codingapi.flow.node.IDisplayNode;
 import com.codingapi.flow.node.IFlowNode;
 import com.codingapi.flow.node.NodeType;
 import com.codingapi.flow.session.FlowSession;
@@ -20,7 +21,7 @@
 /**
  * 路由分支节点
  */
-public class RouterNode extends BaseFlowNode {
+public class RouterNode extends BaseFlowNode implements IDisplayNode {
 
     public static final String NODE_TYPE = NodeType.ROUTER.name();
     public static final String DEFAULT_NAME = "路由节点";
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/StartNode.java b/flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/StartNode.java
@@ -8,6 +8,7 @@
 import com.codingapi.flow.context.GatewayContext;
 import com.codingapi.flow.manager.NodeStrategyManager;
 import com.codingapi.flow.node.BaseFlowNode;
+import com.codingapi.flow.node.IDisplayNode;
 import com.codingapi.flow.node.NodeType;
 import com.codingapi.flow.operator.IFlowOperator;
 import com.codingapi.flow.record.FlowRecord;
@@ -27,7 +28,7 @@
 /**
  * 开始节点
  */
-public class StartNode extends BaseFlowNode {
+public class StartNode extends BaseFlowNode implements IDisplayNode {
 
     public static final String NODE_TYPE = NodeType.START.name();
     public static final String DEFAULT_NAME = "开始节点";
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/SubProcessNode.java b/flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/SubProcessNode.java
@@ -3,6 +3,7 @@
 import com.codingapi.flow.builder.BaseNodeBuilder;
 import com.codingapi.flow.manager.NodeStrategyManager;
 import com.codingapi.flow.node.BaseFlowNode;
+import com.codingapi.flow.node.IDisplayNode;
 import com.codingapi.flow.node.NodeType;
 import com.codingapi.flow.session.FlowSession;
 import com.codingapi.flow.strategy.node.INodeStrategy;
@@ -16,7 +17,7 @@
 /**
  * 子流程
  */
-public class SubProcessNode extends BaseFlowNode {
+public class SubProcessNode extends BaseFlowNode implements IDisplayNode {
 
     public static final String NODE_TYPE = NodeType.SUB_PROCESS.name();
     public static final String DEFAULT_NAME = "子流程";
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/TriggerNode.java b/flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/TriggerNode.java
@@ -3,6 +3,7 @@
 import com.codingapi.flow.builder.BaseNodeBuilder;
 import com.codingapi.flow.manager.NodeStrategyManager;
 import com.codingapi.flow.node.BaseFlowNode;
+import com.codingapi.flow.node.IDisplayNode;
 import com.codingapi.flow.node.NodeType;
 import com.codingapi.flow.session.FlowSession;
 import com.codingapi.flow.strategy.node.INodeStrategy;
@@ -16,7 +17,7 @@
 /**
  * 触发节点
  */
-public class TriggerNode extends BaseFlowNode {
+public class TriggerNode extends BaseFlowNode implements IDisplayNode {
 
     public static final String NODE_TYPE = NodeType.TRIGGER.name();
     public static final String DEFAULT_NAME = "触发节点";
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/pojo/response/ProcessNode.java b/flow-engine-framework/src/main/java/com/codingapi/flow/pojo/response/ProcessNode.java
@@ -1,5 +1,6 @@
 package com.codingapi.flow.pojo.response;
 
+import com.codingapi.flow.node.IDisplayNode;
 import com.codingapi.flow.node.IFlowNode;
 import com.codingapi.flow.operator.IFlowOperator;
 import com.codingapi.flow.record.FlowRecord;
@@ -35,6 +36,11 @@ public class ProcessNode {
      */
     private String nodeType;
 
+    /**
+     * 是否呈现节点
+     */
+    private boolean display;
+
     /**
      * 记录状态
      * -1 为历史状态
@@ -59,6 +65,7 @@ public ProcessNode(FlowRecord flowRecord, Workflow workflow) {
         this.nodeName = flowNode.getName();
         this.nodeType = flowNode.getType();
         this.operators = new ArrayList<>();
+        this.display = true;
         this.state = STATE_HISTORY;
         this.operators.add(new FlowOperatorBody(flowRecord));
     }
@@ -70,6 +77,7 @@ public ProcessNode(IFlowNode flowNode, List<IFlowOperator> operators) {
         this.nodeType = flowNode.getType();
         this.operators = operators.stream().map(FlowOperatorBody::new).toList();
         this.state = STATE_NEXT;
+        this.display = flowNode instanceof IDisplayNode;
     }
 
 
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowProcessNodeService.java b/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowProcessNodeService.java
@@ -121,24 +121,10 @@ private class NextNodeLoader {
         @Getter
         private final List<ProcessNode> nodeList;
         private final IFlowNode currentNode;
-        private final List<String> displayNodeTypes;
 
         public NextNodeLoader(IFlowNode currentNode) {
             this.currentNode = currentNode;
             this.nodeList = new ArrayList<>();
-            this.displayNodeTypes = new ArrayList<>();
-            this.initDisplayNodeTypes();
-        }
-
-
-        private void initDisplayNodeTypes() {
-            this.displayNodeTypes.add(NodeType.START.name());
-            this.displayNodeTypes.add(NodeType.END.name());
-            this.displayNodeTypes.add(NodeType.APPROVAL.name());
-            this.displayNodeTypes.add(NodeType.NOTIFY.name());
-            this.displayNodeTypes.add(NodeType.HANDLE.name());
-            this.displayNodeTypes.add(NodeType.TRIGGER.name());
-            this.displayNodeTypes.add(NodeType.SUB_PROCESS.name());
         }
 
         private void fetchNextNode(FlowSession flowSession, List<IFlowNode> nexNodes) {
@@ -164,7 +150,7 @@ private void fetchNextNode(FlowSession flowSession, List<IFlowNode> nexNodes) {
         public List<ProcessNode> loadNextNode(FlowSession flowSession) {
             this.fetchNextNode(flowSession,List.of(this.currentNode));
 
-            List<ProcessNode> displayNodes = nodeList.stream().filter(node-> this.displayNodeTypes.contains(node.getNodeType())).toList();
+            List<ProcessNode> displayNodes = nodeList.stream().filter(ProcessNode::isDisplay).toList();
             List<ProcessNode> processNodeList = new ArrayList<>();
             for (ProcessNode node:displayNodes){
                 if(!processNodeList.contains(node)){
diff --git a/flow-engine-framework/src/test/java/com/codingapi/flow/workflow/WorkflowBuilderTest.java b/flow-engine-framework/src/test/java/com/codingapi/flow/workflow/WorkflowBuilderTest.java
@@ -9,6 +9,7 @@
 import com.codingapi.flow.form.FormMetaBuilder;
 import com.codingapi.flow.form.permission.PermissionType;
 import com.codingapi.flow.gateway.impl.UserGateway;
+import com.codingapi.flow.node.IDisplayNode;
 import com.codingapi.flow.node.IFlowNode;
 import com.codingapi.flow.node.nodes.*;
 import com.codingapi.flow.strategy.node.FormFieldPermissionStrategy;
@@ -157,10 +158,14 @@ void backNodes() {
 
         List<IFlowNode> nackNodes = workflow.getNackNodes(endNode);
         assertEquals(2, nackNodes.size());
+        assertEquals(2, nackNodes.stream().filter(node->node instanceof IDisplayNode).toList().size());
         assertTrue(nackNodes.contains(startNode));
         assertTrue(nackNodes.contains(approvalNode));
         assertFalse(nackNodes.contains(endNode));
 
+        List<IFlowNode> nodes = workflow.getNodes();
+        assertEquals(3, nodes.size());
+        assertEquals(3, nodes.stream().filter(node->node instanceof IDisplayNode).toList().size());
 
     }
 
diff --git a/flow-engine-starter-api/src/main/java/com/codingapi/flow/api/controller/WorkflowController.java b/flow-engine-starter-api/src/main/java/com/codingapi/flow/api/controller/WorkflowController.java
@@ -1,8 +1,11 @@
 package com.codingapi.flow.api.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.codingapi.flow.api.pojo.BackNodeRequest;
 import com.codingapi.flow.api.pojo.NodeCreateRequest;
+import com.codingapi.flow.api.pojo.SelectOption;
 import com.codingapi.flow.node.IBlockNode;
+import com.codingapi.flow.node.IDisplayNode;
 import com.codingapi.flow.node.IFlowNode;
 import com.codingapi.flow.node.NodeType;
 import com.codingapi.flow.node.factory.NodeFactory;
@@ -11,12 +14,14 @@
 import com.codingapi.flow.workflow.Workflow;
 import com.codingapi.flow.workflow.WorkflowBuilder;
 import com.codingapi.springboot.framework.dto.request.IdRequest;
+import com.codingapi.springboot.framework.dto.response.MultiResponse;
 import com.codingapi.springboot.framework.dto.response.Response;
 import com.codingapi.springboot.framework.dto.response.SingleResponse;
 import com.codingapi.springboot.framework.user.UserContext;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 
@@ -38,9 +43,9 @@ public Response remove(@RequestBody IdRequest request) {
     @PostMapping("/changeState")
     public Response changeState(@RequestBody IdRequest request) {
         Workflow workflow = workflowRepository.get(request.getStringId());
-        if(workflow.isDisable()){
+        if (workflow.isDisable()) {
             workflow.enable();
-        }else {
+        } else {
             workflow.disable();
         }
         workflowRepository.save(workflow);
@@ -67,6 +72,24 @@ public SingleResponse<Map<String, Object>> createNode(@RequestBody NodeCreateReq
         return SingleResponse.of(node.toMap());
     }
 
+
+    @PostMapping("/back-nodes")
+    public MultiResponse<SelectOption> backNodes(@RequestBody BackNodeRequest request) {
+        Workflow workflow = workflowRepository.get(request.getWorkId());
+        IFlowNode backNode = workflow.getFlowNode(request.getNodeId());
+        List<IFlowNode> backNodes = workflow.getNackNodes(backNode).stream().filter(node -> node instanceof IDisplayNode).toList();
+        return MultiResponse.of(backNodes.stream().map(node -> new SelectOption(node.getId(), node.getName())).toList());
+    }
+
+
+    @PostMapping("/nodes")
+    public MultiResponse<SelectOption> nodes(@RequestBody IdRequest request) {
+        Workflow workflow = workflowRepository.get(request.getStringId());
+        List<IFlowNode> backNodes = workflow.getNodes().stream().filter(node -> node instanceof IDisplayNode).toList();
+        return MultiResponse.of(backNodes.stream().map(node -> new SelectOption(node.getId(), node.getName())).toList());
+    }
+
+
     @PostMapping("/save")
     public Response save(@RequestBody JSONObject request) {
         IFlowOperator current = (IFlowOperator) UserContext.getInstance().current();
diff --git a/flow-engine-starter-api/src/main/java/com/codingapi/flow/api/pojo/BackNodeRequest.java b/flow-engine-starter-api/src/main/java/com/codingapi/flow/api/pojo/BackNodeRequest.java
@@ -0,0 +1,10 @@
+package com.codingapi.flow.api.pojo;
+
+import lombok.Data;
+
+@Data
+public class BackNodeRequest {
+
+    private String workId;
+    private String nodeId;
+}
diff --git a/flow-engine-starter-api/src/main/java/com/codingapi/flow/api/pojo/SelectOption.java b/flow-engine-starter-api/src/main/java/com/codingapi/flow/api/pojo/SelectOption.java
@@ -0,0 +1,15 @@
+package com.codingapi.flow.api.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SelectOption {
+
+    private String value;
+    private String label;
+
+}
