From fccc215aa432854f1cd729b1c4a02c48a9b51bfc Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Sat, 7 Oct 2023 11:35:41 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E5=9C=A8=20MQ=20=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E5=AE=8C=E5=96=84=E5=8F=91=E8=B5=B7=E4=BA=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/RocketMqBpmProcessEventListener.java | 7 +++++++ .../listener/RocketMqBpmTaskEventListener.java | 10 ++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/RocketMqBpmProcessEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/RocketMqBpmProcessEventListener.java index 832f3070b..e38326645 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/RocketMqBpmProcessEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/RocketMqBpmProcessEventListener.java @@ -2,6 +2,7 @@ package cn.axzo.workflow.server.controller.listener; import cn.axzo.framework.rocketmq.Event; import cn.axzo.framework.rocketmq.EventProducer; +import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner; import cn.axzo.workflow.common.model.response.mq.ProcessInstanceDTO; import cn.axzo.workflow.core.listener.BpmProcessEventListener; import com.alibaba.fastjson.JSON; @@ -17,6 +18,7 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; +import static cn.axzo.workflow.common.constant.BpmConstants.INTERNAL_INITIATOR; import static cn.axzo.workflow.common.enums.ProcessInstanceEventEnum.*; @@ -51,6 +53,7 @@ public class RocketMqBpmProcessEventListener implements BpmProcessEventListener .setProcessDefinitionId(event.getProcessDefinitionId()) .setProcessDefinitionKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey()) .setProcessDefinitionVersion(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionVersion()) + .setInitiator(((FlowableProcessCancelledEventImpl) event).getExecution().getVariable(INTERNAL_INITIATOR, BpmnTaskDelegateAssigner.class)) .setVariables(((ExecutionEntityImpl) event.getEntity()).getVariables()) .setStartTime(((ExecutionEntityImpl) event.getEntity()).getStartTime()) .setTenantId(((ExecutionEntityImpl) event.getEntity()).getTenantId()) @@ -83,6 +86,7 @@ public class RocketMqBpmProcessEventListener implements BpmProcessEventListener .setProcessDefinitionId(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionId()) .setProcessDefinitionKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey()) .setProcessDefinitionVersion(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionVersion()) + .setInitiator(((FlowableProcessCancelledEventImpl) event).getExecution().getVariable(INTERNAL_INITIATOR, BpmnTaskDelegateAssigner.class)) .setVariables(((ExecutionEntityImpl) event.getEntity()).getVariables()) .setStartTime(((ExecutionEntityImpl) event.getEntity()).getStartTime()) .setTenantId(((ExecutionEntityImpl) event.getEntity()).getTenantId()) @@ -115,6 +119,7 @@ public class RocketMqBpmProcessEventListener implements BpmProcessEventListener .setProcessDefinitionId(event.getProcessDefinitionId()) .setProcessDefinitionKey(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey()) .setProcessDefinitionVersion(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionVersion()) + .setInitiator(((FlowableProcessCancelledEventImpl) event).getExecution().getVariable(INTERNAL_INITIATOR, BpmnTaskDelegateAssigner.class)) .setVariables(((FlowableProcessCancelledEventImpl) event).getExecution().getVariables()) .setStartTime(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getStartTime()) .setTenantId(((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId()) @@ -153,6 +158,7 @@ public class RocketMqBpmProcessEventListener implements BpmProcessEventListener .setProcessDefinitionId(event.getProcessDefinitionId()) .setProcessDefinitionKey(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey()) .setProcessDefinitionVersion(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionVersion()) + .setInitiator(((FlowableProcessCancelledEventImpl) event).getExecution().getVariable(INTERNAL_INITIATOR, BpmnTaskDelegateAssigner.class)) .setVariables(((FlowableProcessCancelledEventImpl) event).getExecution().getVariables()) .setStartTime(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getStartTime()) .setTenantId(((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId()) @@ -187,6 +193,7 @@ public class RocketMqBpmProcessEventListener implements BpmProcessEventListener .setProcessDefinitionKey(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey()) .setProcessDefinitionVersion(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionVersion()) .setVariables(((FlowableProcessCancelledEventImpl) event).getExecution().getVariables()) + .setInitiator(((FlowableProcessCancelledEventImpl) event).getExecution().getVariable(INTERNAL_INITIATOR, BpmnTaskDelegateAssigner.class)) .setStartTime(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getStartTime()) .setTenantId(((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId()) .setBusinessKey(((FlowableProcessCancelledEventImpl) event).getExecution().getProcessInstanceBusinessKey()) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/RocketMqBpmTaskEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/RocketMqBpmTaskEventListener.java index d174d0f26..96857e5d0 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/RocketMqBpmTaskEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/RocketMqBpmTaskEventListener.java @@ -16,6 +16,7 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; +import static cn.axzo.workflow.common.constant.BpmConstants.INTERNAL_INITIATOR; import static cn.axzo.workflow.common.constant.BpmConstants.INTERNAL_SPECIFY_NEXT_APPROVER; import static cn.axzo.workflow.common.enums.ProcessTaskEventEnum.*; @@ -84,7 +85,7 @@ public class RocketMqBpmTaskEventListener implements BpmTaskEventListener { } private ProcessTaskDTO build(DelegateTask delegateTask, ProcessTaskEventEnum type) { - ProcessTaskDTO dto = new ProcessTaskDTO() + return new ProcessTaskDTO() .setType(type) .setCategory(getDeployment(delegateTask.getProcessInstanceId()).getCategory()) .setProcessTaskId(delegateTask.getId()) @@ -92,14 +93,11 @@ public class RocketMqBpmTaskEventListener implements BpmTaskEventListener { .setCurrentElementKey(delegateTask.getTaskDefinitionKey()) .setCurrentElementName(delegateTask.getName()) .setProcessDefinitionId(delegateTask.getProcessDefinitionId()) + .setInitiator(delegateTask.getVariable(INTERNAL_INITIATOR, BpmnTaskDelegateAssigner.class)) + .setApprover(delegateTask.getVariable(INTERNAL_SPECIFY_NEXT_APPROVER, BpmnTaskDelegateAssigner.class)) .setVariables(delegateTask.getVariables()) .setStartTime(delegateTask.getCreateTime()) .setTenantId(delegateTask.getTenantId()); - - BpmnTaskDelegateAssigner approver = delegateTask.getVariable(INTERNAL_SPECIFY_NEXT_APPROVER, - BpmnTaskDelegateAssigner.class); - dto.setApprover(approver); - return dto; } private void sendMessageQueue(ProcessTaskDTO dto, ProcessTaskEventEnum eventEnum) {