浏览代码

update 优化 工作流任务创建监听器 传递流程参数

疯狂的狮子Li 1 年之前
父节点
当前提交
5d2156cb5e

+ 6 - 0
ruoyi-api/ruoyi-api-workflow/src/main/java/org/dromara/workflow/api/event/ProcessTaskEvent.java

@@ -6,6 +6,7 @@ import org.dromara.common.core.utils.SpringUtils;
 import org.springframework.cloud.bus.event.RemoteApplicationEvent;
 
 import java.io.Serial;
+import java.util.Map;
 
 /**
  * 流程任务监听
@@ -59,6 +60,11 @@ public class ProcessTaskEvent extends RemoteApplicationEvent {
      */
     private String status;
 
+    /**
+     * 办理参数
+     */
+    private Map<String, Object> params;
+
     public ProcessTaskEvent() {
         super(new Object(), SpringUtils.getApplicationName(), DEFAULT_DESTINATION_FACTORY.getDestination(null));
     }

+ 2 - 1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java

@@ -56,7 +56,7 @@ public class FlowProcessEventHandler {
      * @param instance 实例数据
      * @param taskId   任务id
      */
-    public void processTaskHandler(String flowCode, Instance instance, Long taskId) {
+    public void processTaskHandler(String flowCode, Instance instance, Long taskId, Map<String, Object> params) {
         String tenantId = TenantHelper.getTenantId();
         log.info("【流程任务事件发布】租户ID: {}, 流程编码: {}, 业务ID: {}, 节点类型: {}, 节点编码: {}, 节点名称: {}, 任务ID: {}",
             tenantId, flowCode, instance.getBusinessId(), instance.getNodeType(), instance.getNodeCode(), instance.getNodeName(), taskId);
@@ -69,6 +69,7 @@ public class FlowProcessEventHandler {
         processTaskEvent.setNodeName(instance.getNodeName());
         processTaskEvent.setTaskId(taskId);
         processTaskEvent.setStatus(instance.getFlowStatus());
+        processTaskEvent.setParams(params);
         SpringUtils.context().publishEvent(processTaskEvent);
     }
 

+ 1 - 1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java

@@ -130,7 +130,7 @@ public class WorkflowGlobalListener implements GlobalListener {
         }
         //发布任务事件
         if (task != null) {
-            flowProcessEventHandler.processTaskHandler(definition.getFlowCode(), instance, task.getId());
+            flowProcessEventHandler.processTaskHandler(definition.getFlowCode(), instance, task.getId(), params);
         }
         if (ObjectUtil.isNull(flowParams)) {
             return;

+ 2 - 2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java

@@ -137,7 +137,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
     }
 
     /**
-     * 总体流程监听(例如: 草稿,撤销,退回,作废,终止,已完成,单任务完成等)
+     * 总体流程监听(例如: 草稿,撤销,退回,作废,终止,已完成等)
      * 正常使用只需#processEvent.flowCode=='leave1'
      * 示例为了方便则使用startsWith匹配了全部示例key
      *
@@ -167,7 +167,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
     }
 
     /**
-     * 执行任务创建监听
+     * 执行任务创建监听(也代表上一条任务完成事件)
      * 示例:也可通过  @EventListener(condition = "#processTaskEvent.flowCode=='leave1'")进行判断
      * 在方法中判断流程节点key
      * if ("xxx".equals(processTaskEvent.getNodeCode())) {