From a503354d79b0a01783f3d8fa5b2278f544c85efe Mon Sep 17 00:00:00 2001 From: wangli Date: Fri, 8 Dec 2023 22:49:08 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E7=BB=99=E6=89=80=E6=9C=89?= =?UTF-8?q?=E7=9A=84=E4=BA=8B=E4=BB=B6=E6=B7=BB=E5=8A=A0=E8=BF=9B=E5=87=BA?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/entity/ExtAxRocketLog.java | 40 ++++++++++++++ .../mapper/ExtAxRocketLogMapper.java | 15 +++++ .../core/service/ExtAxRocketLogService.java | 11 ++++ .../impl/ExtAxRocketLogServiceImpl.java | 25 +++++++++ .../main/resources/sql/ext_ax_rocket_log.sql | 13 +++++ .../RocketMqBpmActivityEventListener.java | 25 ++++----- .../RocketMqMessagePushEventListener.java | 36 ++++++++---- .../CustomBpmnProcessEventListener.java | 55 ------------------- .../MessagePushProcessEventListener.java | 18 ++++++ .../RocketMqBpmnProcessEventListener.java | 41 +++++++------- .../task/AutoOperatorEventListener.java | 12 ++++ .../task/MessagePushTaskEventListener.java | 12 ++++ .../task/RocketMqBpmnTaskEventListener.java | 36 ++++++------ .../SnapshotBpmnTaskTaskEventListener.java | 6 ++ .../StartNodeAutoCompleteEventListener.java | 6 ++ 15 files changed, 230 insertions(+), 121 deletions(-) create mode 100644 workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/entity/ExtAxRocketLog.java create mode 100644 workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/mapper/ExtAxRocketLogMapper.java create mode 100644 workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/ExtAxRocketLogService.java create mode 100644 workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/ExtAxRocketLogServiceImpl.java create mode 100644 workflow-engine-core/src/main/resources/sql/ext_ax_rocket_log.sql delete mode 100644 workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/CustomBpmnProcessEventListener.java diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/entity/ExtAxRocketLog.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/entity/ExtAxRocketLog.java new file mode 100644 index 000000000..5507b3ca7 --- /dev/null +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/entity/ExtAxRocketLog.java @@ -0,0 +1,40 @@ +package cn.axzo.workflow.core.repository.entity; + +import cn.axzo.framework.data.mybatisplus.model.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +/** + * rocket mq log + * + * @author wangli + * @since 2023/12/8 22:23 + */ +@EqualsAndHashCode(callSuper = true) +@TableName(value = "ext_ax_rocket_log", autoResultMap = true) +@Data +@ToString(callSuper = true) +public class ExtAxRocketLog extends BaseEntity { + + /** + * shardKey + */ + @TableField("key") + private String key; + + /** + * 事件类型 + */ + @TableField("event") + private String event; + + /** + * 事件源数据 + */ + @TableField("event_source") + private String eventSource; + +} diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/mapper/ExtAxRocketLogMapper.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/mapper/ExtAxRocketLogMapper.java new file mode 100644 index 000000000..f03877d3d --- /dev/null +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/mapper/ExtAxRocketLogMapper.java @@ -0,0 +1,15 @@ +package cn.axzo.workflow.core.repository.mapper; + +import cn.axzo.workflow.core.repository.entity.ExtAxRocketLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * ExtAxReProcDefMapper + * + * @author wangli + * @since 2023/11/18 22:16 + */ +@Mapper +public interface ExtAxRocketLogMapper extends BaseMapper { +} diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/ExtAxRocketLogService.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/ExtAxRocketLogService.java new file mode 100644 index 000000000..cd8633a05 --- /dev/null +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/ExtAxRocketLogService.java @@ -0,0 +1,11 @@ +package cn.axzo.workflow.core.service; + +/** + * 流程定义扩展表操作 Service + * + * @author wangli + * @since 2023/11/18 22:25 + */ +public interface ExtAxRocketLogService { + +} diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/ExtAxRocketLogServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/ExtAxRocketLogServiceImpl.java new file mode 100644 index 000000000..c89a4ff83 --- /dev/null +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/ExtAxRocketLogServiceImpl.java @@ -0,0 +1,25 @@ +package cn.axzo.workflow.core.service.impl; + +import cn.axzo.workflow.core.repository.mapper.ExtAxReProcDefMapper; +import cn.axzo.workflow.core.service.ExtAxRocketLogService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * 流程定义扩展表操作服务实现 + * + * @author wangli + * @since 2023/11/18 22:27 + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class ExtAxRocketLogServiceImpl implements ExtAxRocketLogService { + + @Resource + private ExtAxReProcDefMapper extAxReProcDefMapper; + +} diff --git a/workflow-engine-core/src/main/resources/sql/ext_ax_rocket_log.sql b/workflow-engine-core/src/main/resources/sql/ext_ax_rocket_log.sql new file mode 100644 index 000000000..6ff80d844 --- /dev/null +++ b/workflow-engine-core/src/main/resources/sql/ext_ax_rocket_log.sql @@ -0,0 +1,13 @@ +DROP TABLE IF EXISTS `EXT_AX_ROCKET_LOG`; +CREATE TABLE IF NOT EXISTS EXT_AX_ROCKET_LOG +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键', + `event` varchar(100) NOT NULL DEFAULT '' COMMENT '事件类型', + `key` varchar(100) NOT NULL DEFAULT '' COMMENT 'shardKey', + `event_source` varchar(4000) NOT NULL COMMENT '事件源数据', + `create_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `is_delete` bigint NOT NULL DEFAULT '0' COMMENT '是否删除', + PRIMARY KEY (`id`) +) ENGINE = InnoDB COMMENT '流程模型信息扩展表'; +create index idx_proc_def_id on EXT_AX_ROCKET_LOG (event, key); diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEventListener.java index bd51e9d3d..10c4e6e8d 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEventListener.java @@ -6,7 +6,6 @@ import cn.axzo.workflow.common.enums.ProcessActivityEventEnum; import cn.axzo.workflow.common.model.response.mq.ProcessActivityDTO; import cn.axzo.workflow.core.common.utils.BpmnMetaParserHelper; import cn.axzo.workflow.core.listener.BpmnActivityEventListener; -import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import org.flowable.bpmn.model.Process; import org.flowable.common.engine.api.delegate.event.FlowableEngineEvent; @@ -49,7 +48,7 @@ public class RocketMqBpmActivityEventListener implements BpmnActivityEventListen @Override public void onStarted(FlowableEngineEvent event) { if (log.isDebugEnabled()) { - log.debug("activity started event"); + log.debug("RocketMqBpmActivityEventListener#onStarted..."); } ProcessActivityDTO dto = new ProcessActivityDTO(); dto.setType(PROCESS_ACTIVITY_STARTED); @@ -69,16 +68,16 @@ public class RocketMqBpmActivityEventListener implements BpmnActivityEventListen } Process mainProcess = repositoryService.getBpmnModel(event.getProcessDefinitionId()).getMainProcess(); BpmnMetaParserHelper.getNoticeConfig(mainProcess).ifPresent(dto::setNoticeConf); - if (log.isDebugEnabled()) { - log.debug("RocketMqBpmActivityEventListener#onStarted MQ.Data: {}", JSON.toJSONString(dto)); - } sendMessageQueue(dto, PROCESS_ACTIVITY_STARTED); + if (log.isDebugEnabled()) { + log.debug("RocketMqBpmActivityEventListener#onStarted...end"); + } } @Override public void onCompleted(FlowableEngineEvent event) { if (log.isDebugEnabled()) { - log.debug("activity completed event"); + log.debug("RocketMqBpmActivityEventListener#onCompleted..."); } ProcessActivityDTO dto = new ProcessActivityDTO(); dto.setType(PROCESS_ACTIVITY_COMPLETED); @@ -98,16 +97,16 @@ public class RocketMqBpmActivityEventListener implements BpmnActivityEventListen } Process mainProcess = repositoryService.getBpmnModel(event.getProcessDefinitionId()).getMainProcess(); BpmnMetaParserHelper.getNoticeConfig(mainProcess).ifPresent(dto::setNoticeConf); - if (log.isDebugEnabled()) { - log.debug("RocketMqBpmActivityEventListener#onCompleted MQ.Data: {}", JSON.toJSONString(dto)); - } sendMessageQueue(dto, PROCESS_ACTIVITY_COMPLETED); + if (log.isDebugEnabled()) { + log.debug("RocketMqBpmActivityEventListener#onCompleted...end"); + } } @Override public void onCancelled(FlowableEngineEvent event) { if (log.isDebugEnabled()) { - log.debug("activity cancelled event"); + log.debug("RocketMqMessagePushEventListener#onCancelled..."); } ProcessActivityDTO dto = new ProcessActivityDTO(); dto.setType(PROCESS_ACTIVITY_CANCELLED); @@ -127,10 +126,10 @@ public class RocketMqBpmActivityEventListener implements BpmnActivityEventListen } Process mainProcess = repositoryService.getBpmnModel(event.getProcessDefinitionId()).getMainProcess(); BpmnMetaParserHelper.getNoticeConfig(mainProcess).ifPresent(dto::setNoticeConf); - if (log.isDebugEnabled()) { - log.debug("RocketMqBpmActivityEventListener#onCancelled MQ.Data: {}", JSON.toJSONString(dto)); - } sendMessageQueue(dto, PROCESS_ACTIVITY_CANCELLED); + if (log.isDebugEnabled()) { + log.debug("RocketMqBpmActivityEventListener#onCancelled...end"); + } } diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java index abd9b151d..f41400b77 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java @@ -115,12 +115,15 @@ public class RocketMqMessagePushEventListener implements BpmnMessagePushEventLis || Objects.isNull(event.getAssigner())) { return; } + if (log.isDebugEnabled()) { + log.debug("RocketMqMessagePushEventListener#onNotice..."); + } MessagePushDTO dto = build(event.getNoticeConfig().getNotice().getNoticeMessageId(), PROCESS_PUSH_NOTICE, event, collectionVariable(event)); - if (log.isDebugEnabled()) { - log.debug("MessagePushEventListener#onNotice MQ.Data: {}", JSON.toJSONString(dto)); - } sendMessageQueue(dto, PROCESS_PUSH_NOTICE); + if (log.isDebugEnabled()) { + log.debug("RocketMqMessagePushEventListener#onNotice...end"); + } } @@ -132,13 +135,16 @@ public class RocketMqMessagePushEventListener implements BpmnMessagePushEventLis || Objects.isNull(event.getAssigner())) { return; } + if (log.isDebugEnabled()) { + log.debug("RocketMqMessagePushEventListener#onPendingPush..."); + } MessagePushDTO dto = build(event.getNoticeConfig().getPending().getPendingMessageId(), PROCESS_PUSH_PENDING, event, collectionVariable(event)); - if (log.isDebugEnabled()) { - log.debug("MessagePushEventListener#onPending MQ.Data: {}", JSON.toJSONString(dto)); - } sendMessageQueue(dto, PROCESS_PUSH_PENDING); + if (log.isDebugEnabled()) { + log.debug("RocketMqMessagePushEventListener#onPendingPush...end"); + } } @Override @@ -148,12 +154,15 @@ public class RocketMqMessagePushEventListener implements BpmnMessagePushEventLis || !StringUtils.hasLength(event.getNoticeConfig().getPending().getPendingMessageId())) { return; } + if (log.isDebugEnabled()) { + log.debug("RocketMqMessagePushEventListener#onPendingComplete..."); + } MessagePushDTO dto = build(event.getNoticeConfig().getPending().getPendingMessageId(), PROCESS_PUSH_PENDING_COMPLETE, event, null); - if (log.isDebugEnabled()) { - log.debug("MessagePushEventListener#onPending MQ.Data: {}", JSON.toJSONString(dto)); - } sendMessageQueue(dto, PROCESS_PUSH_PENDING_COMPLETE); + if (log.isDebugEnabled()) { + log.debug("RocketMqMessagePushEventListener#onPendingComplete...end"); + } } @Override @@ -164,12 +173,15 @@ public class RocketMqMessagePushEventListener implements BpmnMessagePushEventLis || Objects.isNull(event.getAssigner())) { return; } + if (log.isDebugEnabled()) { + log.debug("RocketMqMessagePushEventListener#onSms..."); + } MessagePushDTO dto = build(event.getNoticeConfig().getSms().getSmsId(), PROCESS_PUSH_SMS, event, collectionVariable(event)); - if (log.isDebugEnabled()) { - log.debug("MessagePushEventListener#onSms MQ.Data: {}", JSON.toJSONString(dto)); - } sendMessageQueue(dto, PROCESS_PUSH_SMS); + if (log.isDebugEnabled()) { + log.debug("RocketMqMessagePushEventListener#onSms...end"); + } } private Map collectionVariable(MessagePushEvent event) { diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/CustomBpmnProcessEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/CustomBpmnProcessEventListener.java deleted file mode 100644 index 420fe487b..000000000 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/CustomBpmnProcessEventListener.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.axzo.workflow.server.controller.listener.process; - -import cn.axzo.workflow.core.listener.BpmnProcessEventListener; -import lombok.extern.slf4j.Slf4j; -import org.flowable.common.engine.api.delegate.event.FlowableEngineEntityEvent; -import org.flowable.engine.delegate.event.FlowableCancelledEvent; -import org.flowable.engine.delegate.event.FlowableProcessStartedEvent; -import org.springframework.core.Ordered; - -/** - * 自定义实现的流程监听器, 实现了 Ordered 接口 - * - * 注意:Order 值越小,优先级越高 - * - * @author wangli - * @since 2023/7/10 18:22 - */ -@Slf4j -//@Component -public class CustomBpmnProcessEventListener implements BpmnProcessEventListener, Ordered { - @Override - public void onCreated(FlowableEngineEntityEvent event) { - log.info("Process onCreated: ClassName: {}", event.getClass().getName()); - } - - @Override - public void onStarted(FlowableProcessStartedEvent event) { - log.info("Process onStarted: ClassName: {}", event.getClass().getName()); - } - - @Override - public void onCancelled(FlowableCancelledEvent event) { - log.info("Process onCancelled: ClassName: {}", event.getClass().getName()); - } - - /** - * 流程实例被驳回后回调 - * - * @param event - */ - @Override - public void onRejected(FlowableCancelledEvent event) { - log.info("Process onRejected: ClassName: {}", event.getClass().getName()); - } - - @Override - public void onCompleted(FlowableEngineEntityEvent event) { - log.info("Process onCompleted: ClassName: {}", event.getClass().getName()); - } - - @Override - public int getOrder() { - return 99; - } -} diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/MessagePushProcessEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/MessagePushProcessEventListener.java index 6835e06d7..a3ce34529 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/MessagePushProcessEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/MessagePushProcessEventListener.java @@ -32,17 +32,35 @@ public class MessagePushProcessEventListener implements BpmnProcessEventListener @Override public void onCancelled(FlowableCancelledEvent event) { + if (log.isDebugEnabled()) { + log.debug("MessagePushProcessEventListener#onCancelled..."); + } pendingComplete(event); + if (log.isDebugEnabled()) { + log.debug("MessagePushProcessEventListener#onCancelled...end"); + } } @Override public void onRejected(FlowableCancelledEvent event) { + if (log.isDebugEnabled()) { + log.debug("MessagePushProcessEventListener#onRejected..."); + } pendingComplete(event); + if (log.isDebugEnabled()) { + log.debug("MessagePushProcessEventListener#onRejected...end"); + } } @Override public void onCompleted(FlowableEngineEntityEvent event) { + if (log.isDebugEnabled()) { + log.debug("MessagePushProcessEventListener#onCompleted..."); + } pendingComplete(event); + if (log.isDebugEnabled()) { + log.debug("MessagePushProcessEventListener#onCompleted...end"); + } } private void pendingComplete(FlowableEngineEvent event) { diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java index 1f8ce8b9d..5c9746462 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java @@ -7,7 +7,6 @@ import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner; 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 com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import org.flowable.bpmn.model.Process; import org.flowable.common.engine.api.delegate.event.FlowableEngineEntityEvent; @@ -51,7 +50,7 @@ public class RocketMqBpmnProcessEventListener implements BpmnProcessEventListene @Override public void onCreated(FlowableEngineEntityEvent event) { if (log.isDebugEnabled()) { - log.debug("RocketMQ onCreated: ClassName: {}", event.getClass().getName()); + log.debug("MessagePushProcessEventListener#onCreated..."); } Deployment deployment = repositoryService.createDeploymentQuery().deploymentId(((ExecutionEntityImpl) event.getEntity()).getDeploymentId()).singleResult(); @@ -72,16 +71,16 @@ public class RocketMqBpmnProcessEventListener implements BpmnProcessEventListene .setBusinessKey(((ExecutionEntityImpl) event.getEntity()).getBusinessKey()) .setBusinessProcessInstanceName(((ExecutionEntityImpl) event.getEntity()).getName()); BpmnMetaParserHelper.getNoticeConfig(mainProcess).ifPresent(dto::setNoticeConf); - if (log.isDebugEnabled()) { - log.debug("RocketMqBpmProcessEventListener#onCreated MQ.Data: {}", JSON.toJSONString(dto)); - } sendMessageQueue(dto, PROCESS_INSTANCE_CREATED); + if (log.isDebugEnabled()) { + log.debug("MessagePushProcessEventListener#onCreated...end"); + } } @Override public void onStarted(FlowableProcessStartedEvent event) { if (log.isDebugEnabled()) { - log.debug("RocketMQ onStarted: ClassName: {}", event.getClass().getName()); + log.debug("MessagePushProcessEventListener#onStarted..."); } Deployment deployment = repositoryService.createDeploymentQuery().deploymentId(((ExecutionEntityImpl) event.getEntity()).getDeploymentId()) @@ -104,16 +103,16 @@ public class RocketMqBpmnProcessEventListener implements BpmnProcessEventListene .setBusinessKey(((ExecutionEntityImpl) event.getEntity()).getProcessInstance().getBusinessKey()) .setBusinessProcessInstanceName(((ExecutionEntityImpl) event.getEntity()).getProcessInstance().getName()); BpmnMetaParserHelper.getNoticeConfig(mainProcess).ifPresent(dto::setNoticeConf); - if (log.isDebugEnabled()) { - log.debug("RocketMqBpmProcessEventListener#onStarted MQ.Data: {}", JSON.toJSONString(dto)); - } sendMessageQueue(dto, PROCESS_INSTANCE_STARTED); + if (log.isDebugEnabled()) { + log.debug("MessagePushProcessEventListener#onStarted...end"); + } } @Override public void onCancelled(FlowableCancelledEvent event) { if (log.isDebugEnabled()) { - log.debug("RocketMQ onCancelled: ClassName: {}", event.getClass().getName()); + log.debug("MessagePushProcessEventListener#onCancelled..."); } Deployment deployment = repositoryService.createDeploymentQuery().deploymentId(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getDeploymentId()) @@ -135,10 +134,10 @@ public class RocketMqBpmnProcessEventListener implements BpmnProcessEventListene .setBusinessProcessInstanceName(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getName()) .setCancelReason(String.valueOf(event.getCause())); BpmnMetaParserHelper.getNoticeConfig(mainProcess).ifPresent(dto::setNoticeConf); - if (log.isDebugEnabled()) { - log.debug("RocketMqBpmProcessEventListener#onCancelled MQ.Data: {}", JSON.toJSONString(dto)); - } sendMessageQueue(dto, PROCESS_INSTANCE_CANCELLED); + if (log.isDebugEnabled()) { + log.debug("MessagePushProcessEventListener#onCancelled...end"); + } } /** @@ -149,7 +148,7 @@ public class RocketMqBpmnProcessEventListener implements BpmnProcessEventListene @Override public void onRejected(FlowableCancelledEvent event) { if (log.isDebugEnabled()) { - log.debug("RocketMQ onRejected: ClassName: {}", event.getClass().getName()); + log.debug("MessagePushProcessEventListener#onRejected..."); } Deployment deployment = repositoryService.createDeploymentQuery().deploymentId(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getDeploymentId()) @@ -171,16 +170,16 @@ public class RocketMqBpmnProcessEventListener implements BpmnProcessEventListene .setBusinessProcessInstanceName(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getName()) .setCancelReason(String.valueOf(event.getCause())); BpmnMetaParserHelper.getNoticeConfig(mainProcess).ifPresent(dto::setNoticeConf); - if (log.isDebugEnabled()) { - log.debug("RocketMqBpmProcessEventListener#onRejected MQ.Data: {}", JSON.toJSONString(dto)); - } sendMessageQueue(dto, PROCESS_INSTANCE_REJECTED); + if (log.isDebugEnabled()) { + log.debug("MessagePushProcessEventListener#onRejected...end"); + } } @Override public void onCompleted(FlowableEngineEntityEvent event) { if (log.isDebugEnabled()) { - log.debug("RocketMQ onCompleted: ClassName: {}", event.getClass().getName()); + log.debug("MessagePushProcessEventListener#onCompleted..."); } Deployment deployment = repositoryService.createDeploymentQuery().deploymentId(((ExecutionEntityImpl) event.getEntity()).getDeploymentId()) @@ -202,10 +201,10 @@ public class RocketMqBpmnProcessEventListener implements BpmnProcessEventListene .setBusinessKey(((ExecutionEntityImpl) event.getEntity()).getProcessInstanceBusinessKey()) .setBusinessProcessInstanceName(((ExecutionEntityImpl) event.getEntity()).getName()); BpmnMetaParserHelper.getNoticeConfig(mainProcess).ifPresent(dto::setNoticeConf); - if (log.isDebugEnabled()) { - log.debug("RocketMqBpmProcessEventListener#onCompleted MQ.Data: {}", JSON.toJSONString(dto)); - } sendMessageQueue(dto, PROCESS_INSTANCE_COMPLETED); + if (log.isDebugEnabled()) { + log.debug("MessagePushProcessEventListener#onCompleted...end"); + } } private void sendMessageQueue(ProcessInstanceDTO dto, ProcessInstanceEventEnum eventEnum) { diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEventListener.java index 1274bab3f..5540914d8 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEventListener.java @@ -50,6 +50,9 @@ public class AutoOperatorEventListener implements BpmnTaskEventListener, Ordered @Override public void onCreated(DelegateTask delegateTask) { + if (log.isDebugEnabled()) { + log.debug("AutoOperatorEventListener#onCreated..."); + } Process mainProcess = repositoryService.getBpmnModel(delegateTask.getProcessDefinitionId()).getMainProcess(); UserTask userTask = (UserTask) mainProcess.getFlowElement(delegateTask.getTaskDefinitionKey()); @@ -88,9 +91,15 @@ public class AutoOperatorEventListener implements BpmnTaskEventListener, Ordered } }); } + if (log.isDebugEnabled()) { + log.debug("AutoOperatorEventListener#onCreated...end"); + } } private void autoReject(DelegateTask delegateTask) { + if (log.isDebugEnabled()) { + log.debug("AutoOperatorEventListener#autoReject..."); + } taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), COMMENT_TYPE_ADVICE, "自动驳回"); Map variables = new HashMap<>(); variables.put(INTERNAL_END_TENANT_ID, delegateTask.getTenantId()); @@ -101,6 +110,9 @@ public class AutoOperatorEventListener implements BpmnTaskEventListener, Ordered // 删除流程实例，以实现驳回任务时，取消整个审批流程 processInstanceService.deleteProcessInstance(delegateTask.getProcessInstanceId(), REJECTION_AUTO_COMPLETED.getDesc()); + if (log.isDebugEnabled()) { + log.debug("AutoOperatorEventListener#autoReject...end"); + } } diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/MessagePushTaskEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/MessagePushTaskEventListener.java index fb78e17a3..2337b4def 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/MessagePushTaskEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/MessagePushTaskEventListener.java @@ -51,6 +51,9 @@ public class MessagePushTaskEventListener implements BpmnTaskEventListener, Orde @Override public void onAssigned(DelegateTask delegateTask) { + if (log.isDebugEnabled()) { + log.debug("MessagePushTaskEventListener#onAssigned..."); + } if (Objects.equals(TASK_ASSIGNEE_SKIP_FLAT, delegateTask.getAssignee())) { // 转交功能原审批人完成待办, 由于在流程引擎侧, 任务是不会在转交时立即结束, 但待办消息需要立即完成, // 下面的 onDelete 事件根据测试情况,看是否需要过滤掉这种任务的"完成待办"事件的推送 @@ -58,11 +61,20 @@ public class MessagePushTaskEventListener implements BpmnTaskEventListener, Orde return; } pendingPush(delegateTask); + if (log.isDebugEnabled()) { + log.debug("MessagePushTaskEventListener#onAssigned...end"); + } } @Override public void onDeleted(DelegateTask delegateTask) { + if (log.isDebugEnabled()) { + log.debug("MessagePushTaskEventListener#onDeleted..."); + } pendingComplete(delegateTask); + if (log.isDebugEnabled()) { + log.debug("MessagePushTaskEventListener#onDeleted...end"); + } } private void pendingComplete(DelegateTask delegateTask) { diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEventListener.java index 07d12acf7..7cd0d8d06 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEventListener.java @@ -54,53 +54,49 @@ public class RocketMqBpmnTaskEventListener implements BpmnTaskEventListener, Ord @Override public void onCreated(DelegateTask delegateTask) { if (log.isDebugEnabled()) { - log.debug("task created event"); + log.debug("RocketMqBpmnTaskEventListener#onCreated..."); } ProcessTaskDTO dto = build(delegateTask, PROCESS_TASK_CREATED); - if (log.isDebugEnabled()) { - log.debug("RocketMqBpmTaskEventListener#onCreated MQ.Data: {}", - com.alibaba.fastjson.JSON.toJSONString(dto)); - } sendMessageQueue(dto, PROCESS_TASK_CREATED); + if (log.isDebugEnabled()) { + log.debug("RocketMqBpmnTaskEventListener#onCreated...end"); + } } @Override public void onAssigned(DelegateTask delegateTask) { if (log.isDebugEnabled()) { - log.debug("task assigned event"); + log.debug("RocketMqBpmnTaskEventListener#onAssigned..."); } ProcessTaskDTO dto = build(delegateTask, PROCESS_TASK_ASSIGNED); - if (log.isDebugEnabled()) { - log.debug("RocketMqBpmTaskEventListener#onAssigned MQ.Data: {}", - com.alibaba.fastjson.JSON.toJSONString(dto)); - } sendMessageQueue(dto, PROCESS_TASK_ASSIGNED); + if (log.isDebugEnabled()) { + log.debug("RocketMqBpmnTaskEventListener#onAssigned...end"); + } } @Override public void onCompleted(DelegateTask delegateTask) { if (log.isDebugEnabled()) { - log.debug("task completed event"); + log.debug("RocketMqBpmnTaskEventListener#onCompleted..."); } ProcessTaskDTO dto = build(delegateTask, PROCESS_TASK_COMPLETED); - if (log.isDebugEnabled()) { - log.debug("RocketMqBpmTaskEventListener#onCompleted MQ.Data: {}", - com.alibaba.fastjson.JSON.toJSONString(dto)); - } sendMessageQueue(dto, PROCESS_TASK_COMPLETED); + if (log.isDebugEnabled()) { + log.debug("RocketMqBpmnTaskEventListener#onCompleted...end"); + } } @Override public void onDeleted(DelegateTask delegateTask) { if (log.isDebugEnabled()) { - log.debug("task deleted event"); + log.debug("RocketMqBpmnTaskEventListener#onDeleted..."); } ProcessTaskDTO dto = build(delegateTask, PROCESS_TASK_DELETED); - if (log.isDebugEnabled()) { - log.debug("RocketMqBpmTaskEventListener#onDeleted MQ.Data: {}", - com.alibaba.fastjson.JSON.toJSONString(dto)); - } sendMessageQueue(dto, PROCESS_TASK_DELETED); + if (log.isDebugEnabled()) { + log.debug("RocketMqBpmnTaskEventListener#onDeleted...end"); + } } private Deployment getDeployment(String processInstanceId) { diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/SnapshotBpmnTaskTaskEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/SnapshotBpmnTaskTaskEventListener.java index cfeba34e3..692cd8ddb 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/SnapshotBpmnTaskTaskEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/SnapshotBpmnTaskTaskEventListener.java @@ -30,6 +30,9 @@ public class SnapshotBpmnTaskTaskEventListener implements BpmnTaskEventListener, @Override public void onAssigned(DelegateTask delegateTask) { + if (log.isDebugEnabled()) { + log.debug("SnapshotBpmnTaskTaskEventListener#onAssigned..."); + } List assignerList = (List) delegateTask.getVariable(INTERNAL_TASK_RELATION_ASSIGNEE_LIST_INFO_SNAPSHOT + delegateTask.getTaskDefinitionKey()); if (CollectionUtils.isEmpty(assignerList)) { @@ -48,6 +51,9 @@ public class SnapshotBpmnTaskTaskEventListener implements BpmnTaskEventListener, // 保存每个 taskId 的审批人 delegateTask.setVariable(INTERNAL_TASK_RELATION_ASSIGNEE_INFO_SNAPSHOT + delegateTask.getId(), i); }); + if (log.isDebugEnabled()) { + log.debug("SnapshotBpmnTaskTaskEventListener#onAssigned...end"); + } } @Override diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/StartNodeAutoCompleteEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/StartNodeAutoCompleteEventListener.java index 3992ae50d..28ab69eb4 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/StartNodeAutoCompleteEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/StartNodeAutoCompleteEventListener.java @@ -42,6 +42,9 @@ public class StartNodeAutoCompleteEventListener implements BpmnTaskEventListener @Override public void onCreated(DelegateTask delegateTask) { + if (log.isDebugEnabled()) { + log.debug("StartNodeAutoCompleteEventListener#onCreated..."); + } Process mainProcess = repositoryService.getBpmnModel(delegateTask.getProcessDefinitionId()).getMainProcess(); UserTask userTask = (UserTask) mainProcess.getFlowElement(delegateTask.getTaskDefinitionKey()); @@ -57,5 +60,8 @@ public class StartNodeAutoCompleteEventListener implements BpmnTaskEventListener taskService.complete(delegateTask.getId(), runtimeService.getVariables(delegateTask.getExecutionId())); } }); + if (log.isDebugEnabled()) { + log.debug("StartNodeAutoCompleteEventListener#onCreated...end"); + } } }