fix #80

xlorne · xlorne · commit 4c43e6ac97c7 · 2026-03-11T17:46:06.000+08:00
diff --git a/flow-engine-example/src/main/java/com/codingapi/example/handler/MyFlowRecordUrgeEventHandler.java b/flow-engine-example/src/main/java/com/codingapi/example/handler/MyFlowRecordUrgeEventHandler.java
@@ -1,4 +1,16 @@
 package com.codingapi.example.handler;
 
-public class MyFlowRecordUrgeEventHandler {
+import com.codingapi.flow.event.FlowRecordUrgeEvent;
+import com.codingapi.springboot.framework.event.IHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class MyFlowRecordUrgeEventHandler implements IHandler<FlowRecordUrgeEvent> {
+
+    @Override
+    public void handler(FlowRecordUrgeEvent event) {
+        log.info("催办 event:{}",event);
+    }
 }
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/manager/NodeStrategyManager.java b/flow-engine-framework/src/main/java/com/codingapi/flow/manager/NodeStrategyManager.java
@@ -38,7 +38,7 @@ public long getTimeoutTime() {
     /**
      * 是否可合并
      */
-    public boolean isMergeable() {
+    public boolean isEnableMergeable() {
         List<INodeStrategy> strategies = this.strategies;
         for (INodeStrategy strategy : strategies) {
             if (strategy instanceof RecordMergeStrategy) {
@@ -48,6 +48,19 @@ public boolean isMergeable() {
         return false;
     }
 
+    /**
+     * 是否支持撤回
+     */
+    public boolean isEnableRevoke(){
+        List<INodeStrategy> strategies = this.strategies;
+        for (INodeStrategy strategy : strategies) {
+            if (strategy instanceof RevokeStrategy) {
+                return ((RevokeStrategy) strategy).isEnable();
+            }
+        }
+        return false;
+    }
+
     /**
      * 是否按顺序执行的审批策略
      */
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/node/BaseAuditNode.java b/flow-engine-framework/src/main/java/com/codingapi/flow/node/BaseAuditNode.java
@@ -64,7 +64,7 @@ public void fillNewRecord(FlowSession session, FlowRecord flowRecord) {
         NodeStrategyManager nodeStrategyManager = this.strategyManager();
         flowRecord.setTitle(nodeStrategyManager.generateTitle(session));
         flowRecord.setTimeoutTime(nodeStrategyManager.getTimeoutTime());
-        flowRecord.setMergeable(nodeStrategyManager.isMergeable());
+        flowRecord.setMergeable(nodeStrategyManager.isEnableMergeable());
         flowRecord.newRecord();
     }
 
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/pojo/response/FlowContent.java b/flow-engine-framework/src/main/java/com/codingapi/flow/pojo/response/FlowContent.java
@@ -93,7 +93,7 @@ public class FlowContent {
     /**
      * 流程按钮
      */
-    private List<Map<String,Object>> actions;
+    private List<Map<String, Object>> actions;
 
     /**
      * 是否可合并
@@ -130,6 +130,44 @@ public class FlowContent {
      */
     private List<NodeOption> nodes;
 
+    /**
+     * 支持撤销
+     */
+    private boolean revoke;
+
+    /**
+     * 支持催办
+     */
+    private boolean urge;
+
+
+    /**
+     * 设置操作动作按钮
+     *
+     */
+    public void setOperationAction(Workflow workflow, FlowRecord flowRecord) {
+        if (flowRecord == null) {
+            this.revoke = false;
+            this.urge = false;
+        } else {
+            if (flowRecord.isFinish()) {
+                this.revoke = false;
+                this.urge = false;
+            }
+
+            if (flowRecord.isTodo()) {
+                this.revoke = false;
+                this.urge = false;
+            }
+
+            if (flowRecord.isDone() && !flowRecord.isFinish()) {
+                IFlowNode node = workflow.getFlowNode(flowRecord.getNodeId());
+                this.revoke = node.strategyManager().isEnableRevoke();
+                this.urge = workflow.strategyManager().isEnableUrge();
+            }
+        }
+    }
+
 
     public void pushCurrentNode(IFlowNode currentNode) {
         ActionManager actionManager = currentNode.actionManager();
@@ -141,7 +179,7 @@ public void pushCurrentNode(IFlowNode currentNode) {
         this.nodeName = currentNode.getName();
         this.nodeType = currentNode.getType();
         this.fieldPermissions = strategyManager.getFieldPermissions();
-        Map<String,Object> nodeData = currentNode.toMap();
+        Map<String, Object> nodeData = currentNode.toMap();
         this.view = (String) nodeData.get("view");
     }
 
@@ -162,7 +200,7 @@ public void pushRecords(FlowRecord record, List<FlowRecord> mergeRecords) {
         this.title = record.getTitle();
 
         this.todos = new ArrayList<>();
-        for (FlowRecord item : mergeRecords){
+        for (FlowRecord item : mergeRecords) {
             Body body = new Body();
             body.setRecordId(item.getId());
             body.setTitle(item.getTitle());
@@ -173,9 +211,9 @@ public void pushRecords(FlowRecord record, List<FlowRecord> mergeRecords) {
         }
     }
 
-    public void pushHistory(Workflow workflow,List<FlowRecord> historyRecords) {
+    public void pushHistory(Workflow workflow, List<FlowRecord> historyRecords) {
         this.histories = new ArrayList<>();
-        for (FlowRecord item : historyRecords){
+        for (FlowRecord item : historyRecords) {
             IFlowNode node = workflow.getFlowNode(item.getNodeId());
             History history = new History();
             history.setRecordId(item.getId());
@@ -193,18 +231,18 @@ public void pushHistory(Workflow workflow,List<FlowRecord> historyRecords) {
 
     public void pushCurrentOperator(IFlowOperator currentOperator) {
         this.currentOperator = new FlowOperator(currentOperator);
-        this.createOperator =  new FlowOperator(currentOperator);
+        this.createOperator = new FlowOperator(currentOperator);
     }
 
 
     @Data
-    public static class History{
+    public static class History {
         /**
          * 流程编号
          */
         private long recordId;
         /**
-         *  流程标题
+         * 流程标题
          */
         private String title;
 
@@ -246,15 +284,15 @@ public static class History{
     @Data
     public static class Body {
         /**
-         *  流程记录编号
+         * 流程记录编号
          */
         private long recordId;
         /**
-         *  流程标题
+         * 流程标题
          */
         private String title;
         /**
-         *  表单数据
+         * 表单数据
          */
         private Map<String, Object> data;
 
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/record/FlowRecord.java b/flow-engine-framework/src/main/java/com/codingapi/flow/record/FlowRecord.java
@@ -461,7 +461,7 @@ public void notifyRecord(FlowSession flowSession) {
         NodeStrategyManager nodeStrategyManager = currentNode.strategyManager();
         this.setTitle(nodeStrategyManager.generateTitle(flowSession));
         this.setTimeoutTime(nodeStrategyManager.getTimeoutTime());
-        this.setMergeable(nodeStrategyManager.isMergeable());
+        this.setMergeable(nodeStrategyManager.isEnableMergeable());
         this.update(flowSession, true);
         this.notify = true;
         this.forwardOperatorId = 0;
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowDetailService.java b/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowDetailService.java
@@ -86,7 +86,7 @@ private void loadWorkflow(){
 
         private void loadTodoFlowRecords(){
             if(this.flowRecord!=null){
-                if(this.flowRecord.isMergeable()){
+                if(this.flowRecord.isMergeable() && this.flowRecord.isTodo()){
                     List<FlowRecord> margeRecords = flowRecordService.getMergeRecord(flowRecord.getMergeKey());
                     this.flowContent.pushRecords(this.flowRecord, margeRecords);
                 }else {
@@ -122,6 +122,8 @@ public FlowContent create() {
             this.loadCurrentNode();
             this.loadTodoFlowRecords();
             this.loadHistoryRecords();
+
+            flowContent.setOperationAction(this.workflow,this.flowRecord);
             return flowContent;
         }
     }
diff --git a/flow-engine-starter-api/src/main/java/com/codingapi/flow/api/controller/FlowRecordController.java b/flow-engine-starter-api/src/main/java/com/codingapi/flow/api/controller/FlowRecordController.java
@@ -1,10 +1,7 @@
 package com.codingapi.flow.api.controller;
 
 import com.codingapi.flow.operator.IFlowOperator;
-import com.codingapi.flow.pojo.request.FlowActionRequest;
-import com.codingapi.flow.pojo.request.FlowCreateRequest;
-import com.codingapi.flow.pojo.request.FlowDetailRequest;
-import com.codingapi.flow.pojo.request.FlowProcessNodeRequest;
+import com.codingapi.flow.pojo.request.*;
 import com.codingapi.flow.pojo.response.FlowContent;
 import com.codingapi.flow.pojo.response.ProcessNode;
 import com.codingapi.flow.service.FlowService;
@@ -45,6 +42,21 @@ public SingleResponse<Long> create(@RequestBody FlowCreateRequest request) {
     }
 
 
+    @PostMapping("/urge")
+    public Response urge(@RequestBody IdRequest request) {
+        IFlowOperator current = (IFlowOperator) UserContext.getInstance().current();
+        flowService.urge(new FlowUrgeRequest(request.getLongId(),current.getUserId()));
+        return Response.buildSuccess();
+    }
+
+    @PostMapping("/revoke")
+    public Response revoke(@RequestBody IdRequest request) {
+        IFlowOperator current = (IFlowOperator) UserContext.getInstance().current();
+        flowService.revoke(new FlowRevokeRequest(request.getLongId(),current.getUserId()));
+        return Response.buildSuccess();
+    }
+
+
     @PostMapping("/action")
     public Response action(@RequestBody FlowActionRequest request) {
         IFlowOperator current = (IFlowOperator) UserContext.getInstance().current();

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public void fillNewRecord(FlowSession session, FlowRecord flowRecord) {`
`64`	`64`	`NodeStrategyManager nodeStrategyManager = this.strategyManager();`
`65`	`65`	`flowRecord.setTitle(nodeStrategyManager.generateTitle(session));`
`66`	`66`	`flowRecord.setTimeoutTime(nodeStrategyManager.getTimeoutTime());`
`67`		`- flowRecord.setMergeable(nodeStrategyManager.isMergeable());`
	`67`	`+ flowRecord.setMergeable(nodeStrategyManager.isEnableMergeable());`
`68`	`68`	`flowRecord.newRecord();`
`69`	`69`	`}`
`70`	`70`