wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update - 流程实例的通过或驳回,都去完成待办消息

Browse Source
This commit is contained in:
wangli 2023-12-06 20:34:49 +08:00
parent 3c0d4c94a7
commit 96b6f32d3c
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/response/mq/ProcessInstanceDTO.java
View File

@ -88,4 +88,9 @@ public class ProcessInstanceDTO implements Serializable {
* 取消流程实例的特殊字段 * 取消流程实例的特殊字段
*/ */
private String cancelReason; private String cancelReason;
/**
* 待办消息的 ID
*/
private String pendingMessageId;
} }

12
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java
View File

@ -5,9 +5,11 @@ import cn.axzo.framework.rocketmq.EventProducer;
import cn.axzo.workflow.common.enums.ProcessInstanceEventEnum; import cn.axzo.workflow.common.enums.ProcessInstanceEventEnum;
import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner; import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner;
import cn.axzo.workflow.common.model.response.mq.ProcessInstanceDTO; import cn.axzo.workflow.common.model.response.mq.ProcessInstanceDTO;
import cn.axzo.workflow.core.common.utils.BpmnMetaParserHelper;
import cn.axzo.workflow.core.listener.BpmnProcessEventListener; import cn.axzo.workflow.core.listener.BpmnProcessEventListener;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.flowable.bpmn.model.BpmnModel;
import org.flowable.common.engine.api.delegate.event.FlowableEngineEntityEvent; import org.flowable.common.engine.api.delegate.event.FlowableEngineEntityEvent;
import org.flowable.engine.RepositoryService; import org.flowable.engine.RepositoryService;
import org.flowable.engine.delegate.event.FlowableCancelledEvent; import org.flowable.engine.delegate.event.FlowableCancelledEvent;
@ -164,6 +166,11 @@ public class RocketMqBpmnProcessEventListener implements BpmnProcessEventListene
.setBusinessKey(((FlowableProcessCancelledEventImpl) event).getExecution().getProcessInstanceBusinessKey()) .setBusinessKey(((FlowableProcessCancelledEventImpl) event).getExecution().getProcessInstanceBusinessKey())
.setBusinessProcessInstanceName(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getName()) .setBusinessProcessInstanceName(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getName())
.setCancelReason(String.valueOf(event.getCause())); .setCancelReason(String.valueOf(event.getCause()));
BpmnModel bpmnModel = repositoryService.getBpmnModel(event.getProcessDefinitionId());
BpmnMetaParserHelper.getNoticeConfig(bpmnModel.getMainProcess())
.ifPresent(i -> {
dto.setPendingMessageId(i.getPending().getPendingMessageId());
});
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("RocketMqBpmProcessEventListener#onRejected MQ.Data: {}", JSON.toJSONString(dto)); log.debug("RocketMqBpmProcessEventListener#onRejected MQ.Data: {}", JSON.toJSONString(dto));
} }
@ -194,6 +201,11 @@ public class RocketMqBpmnProcessEventListener implements BpmnProcessEventListene
.setTenantId(((ExecutionEntityImpl) event.getEntity()).getTenantId()) .setTenantId(((ExecutionEntityImpl) event.getEntity()).getTenantId())
.setBusinessKey(((ExecutionEntityImpl) event.getEntity()).getProcessInstanceBusinessKey()) .setBusinessKey(((ExecutionEntityImpl) event.getEntity()).getProcessInstanceBusinessKey())
.setBusinessProcessInstanceName(((ExecutionEntityImpl) event.getEntity()).getName()); .setBusinessProcessInstanceName(((ExecutionEntityImpl) event.getEntity()).getName());
BpmnModel bpmnModel = repositoryService.getBpmnModel(event.getProcessDefinitionId());
BpmnMetaParserHelper.getNoticeConfig(bpmnModel.getMainProcess())
.ifPresent(i -> {
dto.setPendingMessageId(i.getPending().getPendingMessageId());
});
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("RocketMqBpmProcessEventListener#onCompleted MQ.Data: {}", JSON.toJSONString(dto)); log.debug("RocketMqBpmProcessEventListener#onCompleted MQ.Data: {}", JSON.toJSONString(dto));
} }