From 0eb19522938c5db501fd37d439a0c5aa89100ee5 Mon Sep 17 00:00:00 2001 From: yangqicheng Date: Mon, 13 May 2024 20:52:56 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E6=97=A5=E5=BF=97=E8=BE=93?= =?UTF-8?q?=E5=87=BA=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B=E5=AE=9E=E4=BE=8B?= =?UTF-8?q?id=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EngineActivityEndEventListener.java | 4 +- .../EngineActivityStartEventListener.java | 4 +- .../EngineActivityTakeEventListener.java | 4 +- .../EngineCarbonCopyEventListener.java | 2 +- .../EngineExecutionStartListener.java | 6 +- .../listener/EngineNoticeEventListener.java | 12 ++-- .../EngineProcessInstanceEventListener.java | 4 +- .../listener/EngineTaskEventListener.java | 6 +- .../impl/ExtTaskInstEventListener.java | 2 +- ...nternalExtAxTaskInstEvent_lo_Listener.java | 2 +- .../RocketMqBpmActivityEventListener.java | 26 ++++---- .../RocketMqMessagePushEventListener.java | 59 +++++++++---------- .../MessagePushProcessEventListener.java | 16 ++--- .../RocketMqBpmnProcessEventListener.java | 22 +++---- .../task/AutoOperatorEvent_101_Listener.java | 4 +- .../MessagePushTaskEvent_103_Listener.java | 14 ++--- .../RocketMqBpmnTaskEvent_102_Listener.java | 17 +++--- ...napshotBpmnTaskTaskEvent_100_Listener.java | 4 +- 18 files changed, 104 insertions(+), 104 deletions(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineActivityEndEventListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineActivityEndEventListener.java index 83916ec5d..daa2f2694 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineActivityEndEventListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineActivityEndEventListener.java @@ -31,8 +31,8 @@ public class EngineActivityEndEventListener implements ExecutionListener { if (Objects.nonNull(execution.getTransientVariable(EVENT_NAME + execution.getCurrentActivityId()))) { return; } - log.info("EngineActivityEndEventListener Event: {}, ActivityId: {}", execution.getEventName(), - execution.getCurrentActivityId()); + log.info("EngineActivityEndEventListener Event: {}, ActivityId: {},ProcessInstanceId:{}", execution.getEventName(), + execution.getCurrentActivityId(), execution.getProcessInstanceId()); getOrderedListeners().forEach(i -> i.onEnd(execution)); execution.setTransientVariable(EVENT_NAME + execution.getCurrentActivityId(), true); } diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineActivityStartEventListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineActivityStartEventListener.java index 10360b7e8..357afe22c 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineActivityStartEventListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineActivityStartEventListener.java @@ -30,8 +30,8 @@ public class EngineActivityStartEventListener implements ExecutionListener { if (Objects.nonNull(execution.getTransientVariable(EVENT_NAME + execution.getCurrentActivityId()))) { return; } - log.info("EngineActivityStartEventListener Event: {}, ActivityId: {}", execution.getEventName(), - execution.getCurrentActivityId()); + log.info("EngineActivityStartEventListener Event: {}, ActivityId: {}, ProcessInstanceId: {}", execution.getEventName(), + execution.getCurrentActivityId(), execution.getProcessInstanceId()); getOrderedListeners().forEach(i -> i.onStart(execution)); execution.setTransientVariable(EVENT_NAME + execution.getCurrentActivityId(), true); } diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineActivityTakeEventListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineActivityTakeEventListener.java index d0a2b9961..18a9bafcc 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineActivityTakeEventListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineActivityTakeEventListener.java @@ -30,8 +30,8 @@ public class EngineActivityTakeEventListener implements ExecutionListener { if (Objects.nonNull(execution.getTransientVariable(EVENT_NAME + execution.getCurrentActivityId()))) { return; } - log.info("EngineActivityTakeEventListener Event: {}, ActivityId: {}", execution.getEventName(), - execution.getCurrentActivityId()); + log.info("EngineActivityTakeEventListener Event: {}, ActivityId: {}, ProcessInstanceId: {}", execution.getEventName(), + execution.getCurrentActivityId(), execution.getProcessInstanceId()); getOrderedListeners().forEach(i -> i.onTake(execution)); execution.setTransientVariable(EVENT_NAME + execution.getCurrentActivityId(), true); } diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineCarbonCopyEventListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineCarbonCopyEventListener.java index 26a1057a8..c9f26d948 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineCarbonCopyEventListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineCarbonCopyEventListener.java @@ -66,7 +66,7 @@ public class EngineCarbonCopyEventListener implements JavaDelegate { @Override public void execute(DelegateExecution execution) { - log.info("EngineCarbonCopyEventListener exec..."); + log.info("EngineCarbonCopyEventListener exec...,processInstanceId: {}", execution.getProcessInstanceId()); String currentActivityId = execution.getCurrentActivityId(); String processDefinitionId = execution.getProcessDefinitionId(); String processInstanceId = execution.getProcessInstanceId(); diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java index 22dd618aa..b9fadca1f 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java @@ -139,8 +139,8 @@ public class EngineExecutionStartListener implements ExecutionListener { // 这里只会是 human 这一种情况， 因为 nobody 在转 BPMN 协议时，Activity 直接变成了 ReceiveTask 节点了。 List assigners = new ArrayList<>(); getApproverSpecify(userTask).ifPresent(specify -> { - log.info("当前审批节点ID: {}, 节点名称: {}, 审批人指定方式: {}", userTask.getId(), - userTask.getName(), specify.getDesc()); + log.info("当前审批节点ID: {}, 节点名称: {}, 审批人指定方式: {},processInstanceId: {}", userTask.getId(), + userTask.getName(), specify.getDesc(), execution.getProcessInstanceId()); assigners.addAll(approverSelect(specify.getType(), userTask, execution, true)); }); @@ -202,7 +202,7 @@ public class EngineExecutionStartListener implements ExecutionListener { /** * 根据审批人指定类型查询审批人 * - * @param type "审批人指定"方式 {@link ApproverSpecifyEnum} + * @param type "审批人指定"方式 {@link ApproverSpecifyEnum} * @param flowElement 当前节点, 这个对象会包含配置元数据, 可以在该方法中或者基于 BpmnTaskAssigneeSelector 建一个抽象类, 做解析元数据公共方法 * @return */ diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineNoticeEventListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineNoticeEventListener.java index 1f3b8068d..aba6e2546 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineNoticeEventListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineNoticeEventListener.java @@ -61,37 +61,37 @@ public class EngineNoticeEventListener extends AbstractFlowableEventListener { stopWatch.start("PUSH-NOTICE Event Execution Time"); getOrderedListeners().forEach(i -> i.onNotice(event)); stopWatch.stop(); - log.info("PUSH-NOTICE StopWatch : running time = " + stopWatch.getTotalTimeSeconds() + " 's"); + log.info("PUSH-NOTICE StopWatch : running time = " + stopWatch.getTotalTimeSeconds() + " 's,processInstanceId: {}", ((MessagePushEvent) flowableEvent).getProcessInstanceId()); break; case PENDING_PUSH: stopWatch.start("PUSH-PENDING Event Execution Time"); getOrderedListeners().forEach(i -> i.onPendingPush(event)); stopWatch.stop(); - log.info("PUSH-PENDING StopWatch : running time = " + stopWatch.getTotalTimeSeconds() + " 's"); + log.info("PUSH-PENDING StopWatch : running time = " + stopWatch.getTotalTimeSeconds() + " 's,processInstanceId: {}", ((MessagePushEvent) flowableEvent).getProcessInstanceId()); break; case PENDING_COMPLETE: stopWatch.start("PUSH-PENDING-COMPLETE Event Execution Time"); getOrderedListeners().forEach(i -> i.onPendingComplete(event)); stopWatch.stop(); - log.info("PUSH-PENDING-COMPLETE StopWatch : running time = " + stopWatch.getTotalTimeSeconds() + " 's"); + log.info("PUSH-PENDING-COMPLETE StopWatch : running time = " + stopWatch.getTotalTimeSeconds() + " 's,processInstanceId: {}", ((MessagePushEvent) flowableEvent).getProcessInstanceId()); break; case CARBON_COPY: stopWatch.start("CARBON-COPY Event Execution Time"); getOrderedListeners().forEach(i -> i.onCarbonCopy(event)); stopWatch.stop(); - log.info("CARBON-COPY StopWatch : running time = " + stopWatch.getTotalTimeSeconds() + " 's"); + log.info("CARBON-COPY StopWatch : running time = " + stopWatch.getTotalTimeSeconds() + " 's,processInstanceId: {}", ((MessagePushEvent) flowableEvent).getProcessInstanceId()); break; case CARBON_COPY_COMPLETE: stopWatch.start("CARBON-COPY-COMPLETE Event Execution Time"); getOrderedListeners().forEach(i -> i.onCarbonCopyComplete(event)); stopWatch.stop(); - log.info("CARBON-COPY-COMPLETE StopWatch : running time = " + stopWatch.getTotalTimeSeconds() + " 's"); + log.info("CARBON-COPY-COMPLETE StopWatch : running time = " + stopWatch.getTotalTimeSeconds() + " 's,processInstanceId: {}", ((MessagePushEvent) flowableEvent).getProcessInstanceId()); break; case SMS: stopWatch.start("SMS Event Execution Time"); getOrderedListeners().forEach(i -> i.onSms(event)); stopWatch.stop(); - log.info("SMS StopWatch : running time = " + stopWatch.getTotalTimeSeconds() + " 's"); + log.info("SMS StopWatch : running time = " + stopWatch.getTotalTimeSeconds() + " 's,processInstanceId: {}", ((MessagePushEvent) flowableEvent).getProcessInstanceId()); break; default: } diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineProcessInstanceEventListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineProcessInstanceEventListener.java index 3a1f52fbf..15b7538c1 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineProcessInstanceEventListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineProcessInstanceEventListener.java @@ -114,8 +114,8 @@ public class EngineProcessInstanceEventListener extends AbstractFlowableEngineEv resultEnum = DELETED; break; } - log.error("这里是不允许执行到的地方,为防止引擎一些未发现的地方,在这里输出错误日志! this current thread name: {}", - Thread.currentThread().getName()); + log.error("这里是不允许执行到的地方,为防止引擎一些未发现的地方,在这里输出错误日志! this current thread name: {},processInstanceId: {}", + Thread.currentThread().getName(), event.getProcessInstanceId()); throw new IllegalArgumentException("这里是不允许执行到的地方, 请关注程序逻辑"); } runtimeService.updateBusinessStatus(event.getProcessInstanceId(), resultEnum.getStatus()); diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineTaskEventListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineTaskEventListener.java index dd1a4c509..6fd82c8d6 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineTaskEventListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineTaskEventListener.java @@ -29,8 +29,8 @@ public class EngineTaskEventListener implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - log.info("Task Listener, Event: ALL , TaskId: {}, EventName: {}", delegateTask.getId(), - delegateTask.getEventName()); + log.info("Task Listener, Event: ALL , TaskId: {}, EventName: {}, ProcessInstanceId: {}", delegateTask.getId(), + delegateTask.getEventName(), delegateTask.getProcessInstanceId()); StopWatch stopWatch = new StopWatch("EngineTaskEventListener"); stopWatch.start("All Task Event Execution Time"); @@ -57,7 +57,7 @@ public class EngineTaskEventListener implements TaskListener { default: } }); - log.info("StopWatch '" + stopWatch.currentTaskName() + "': running time = " + stopWatch.getTotalTimeSeconds() + " s"); + log.info("StopWatch '" + stopWatch.currentTaskName() + "': running time = " + stopWatch.getTotalTimeSeconds() + " s,processInstanceId: {}", delegateTask.getProcessInstanceId()); stopWatch.stop(); } diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/impl/ExtTaskInstEventListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/impl/ExtTaskInstEventListener.java index ca49b7715..4ec68e8dd 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/impl/ExtTaskInstEventListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/impl/ExtTaskInstEventListener.java @@ -53,7 +53,7 @@ public class ExtTaskInstEventListener extends AbstractFlowableEventListener { @Override public void onEvent(FlowableEvent flowableEvent) { if (flowableEvent instanceof ExtTaskInstEvent) { - log.info("Ext Task Inst Event : {}, eventType: {}", JSONUtil.toJsonStr(flowableEvent), flowableEvent.getType()); + log.info("Ext Task Inst Event : {}, eventType: {}, processInstanceId: {}", JSONUtil.toJsonStr(flowableEvent), flowableEvent.getType(), ((ExtTaskInstEvent) flowableEvent).getProcessInstanceId()); ExtTaskInstEvent event = (ExtTaskInstEvent) flowableEvent; ReceiveTaskEventType eventType = (ReceiveTaskEventType) flowableEvent.getType(); if (SUPPORT_EVENTS.contains(eventType)) { diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/impl/InternalExtAxTaskInstEvent_lo_Listener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/impl/InternalExtAxTaskInstEvent_lo_Listener.java index 94fff4f25..89793bf85 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/impl/InternalExtAxTaskInstEvent_lo_Listener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/impl/InternalExtAxTaskInstEvent_lo_Listener.java @@ -71,7 +71,7 @@ public class InternalExtAxTaskInstEvent_lo_Listener extends AbstractBpmnEventLis @Override public void onDeleted(DelegateTask delegateTask) { Object operationType = delegateTask.getTransientVariable(TASK_COMPLETE_OPERATION_TYPE + delegateTask.getId()); - log.info("taskId:{}, operationType:{}", delegateTask.getId(), operationType); + log.info("taskId:{}, operationType:{}, processInstanceId: {}", delegateTask.getId(), operationType, delegateTask.getProcessInstanceId()); // 多实例或签同意时,无法正确区分状态, 所以默认认为这种是无需展示在日志中的 BpmnProcessInstanceResultEnum resultEnum = DELETED; 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 4eb134156..152ca2e51 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 @@ -64,17 +64,17 @@ public class RocketMqBpmActivityEventListener extends AbstractBpmnEventListener< @Override public void onStart(DelegateExecution execution) { - log.info("RocketMqBpmActivityEventListener#onStart...activityId: {}", execution.getCurrentActivityId()); + log.info("RocketMqBpmActivityEventListener#onStart...activityId: {}, processInstanceId: {}", execution.getCurrentActivityId(), execution.getProcessInstanceId()); ProcessActivityDTO dto = build(PROCESS_ACTIVITY_START, execution); sendMessageQueue(dto, PROCESS_ACTIVITY_START); - log.info("RocketMqBpmActivityEventListener#onStart...end, activityId: {}", - execution.getCurrentActivityId()); + log.info("RocketMqBpmActivityEventListener#onStart...end, activityId: {}, processInstanceId: {}", + execution.getCurrentActivityId(), execution.getProcessInstanceId()); } @Override public void onWaitAssignee(BizSpecifyAssigneeEvent event) { - log.info("RocketMqBpmActivityEventListener#onWaitAssignee...activityId: {}", event.getActivityId()); + log.info("RocketMqBpmActivityEventListener#onWaitAssignee...activityId: {}, processInstanceId: {}", event.getActivityId(), event.getProcessInstanceId()); // 特殊的自定义业务事件, 不能使用公共的 build 方法 ProcessActivityDTO dto = new ProcessActivityDTO(); dto.setType(PROCESS_ACTIVITY_WAIT_ASSIGNEE); @@ -96,33 +96,33 @@ public class RocketMqBpmActivityEventListener extends AbstractBpmnEventListener< } dto.setWorkflowEngineVersion(version); sendMessageQueue(dto, PROCESS_ACTIVITY_WAIT_ASSIGNEE); - log.info("RocketMqBpmActivityEventListener#onWaitAssignee...end, activityId: {}", event.getActivityId()); + log.info("RocketMqBpmActivityEventListener#onWaitAssignee...end, activityId: {}, processInstanceId: {}", event.getActivityId(), event.getProcessInstanceId()); } @Override public void onTake(DelegateExecution execution) { - log.info("RocketMqBpmActivityEventListener#onTake...activityId: {}", - execution.getCurrentActivityId()); + log.info("RocketMqBpmActivityEventListener#onTake...activityId: {}, processInstanceId: {}", + execution.getCurrentActivityId(), execution.getProcessInstanceId()); ProcessActivityDTO dto = build(PROCESS_ACTIVITY_TAKE, execution); handlePassedAssignee(execution, dto); sendMessageQueue(dto, PROCESS_ACTIVITY_TAKE); - log.info("RocketMqBpmActivityEventListener#onTake...end, activityId: {}", - execution.getCurrentActivityId()); + log.info("RocketMqBpmActivityEventListener#onTake...end, activityId: {}, processInstanceId: {}", + execution.getCurrentActivityId(), execution.getProcessInstanceId()); } @Override public void onEnd(DelegateExecution execution) { - log.info("RocketMqMessagePushEventListener#onEnd...activityId: {}", - execution.getCurrentActivityId()); + log.info("RocketMqMessagePushEventListener#onEnd...activityId: {}, processInstanceId: {}", + execution.getCurrentActivityId(), execution.getProcessInstanceId()); ProcessActivityDTO dto = build(PROCESS_ACTIVITY_END, execution); handlePassedAssignee(execution, dto); sendMessageQueue(dto, PROCESS_ACTIVITY_END); - log.info("RocketMqBpmActivityEventListener#onEnd...end, activityId: {}", - execution.getCurrentActivityId()); + log.info("RocketMqBpmActivityEventListener#onEnd...end, activityId: {}, processInstanceId: {}", + execution.getCurrentActivityId(), execution.getProcessInstanceId()); } private ProcessActivityDTO build(ProcessActivityEventEnum type, DelegateExecution execution) { 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 7728a7e68..39cc5d262 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 @@ -114,15 +114,15 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< || Objects.isNull(event.getAssigners())) { return; } - log.info("RocketMqMessagePushEventListener#onNotice...msgTemplateId: {}, receivePerson: {}", - event.getNoticeConfig().getNotice().getNoticeMessageId(), JSONUtil.toJsonStr(event.getAssigners())); + log.info("RocketMqMessagePushEventListener#onNotice...msgTemplateId: {}, receivePerson: {}, processInstanceId: {}", + event.getNoticeConfig().getNotice().getNoticeMessageId(), JSONUtil.toJsonStr(event.getAssigners()), event.getProcessInstanceId()); if (Objects.nonNull(event.getNoticeConfig().getNotice())) { MessagePushDTO dto = build(event.getNoticeConfig().getNotice().getNoticeMessageId(), PROCESS_PUSH_NOTICE, event, collectionVariable(event)); sendMessageQueue(dto, PROCESS_PUSH_NOTICE); } - log.info("RocketMqMessagePushEventListener#onNotice...end, msgTemplateId: {}, receivePerson: {}", - event.getNoticeConfig().getNotice().getNoticeMessageId(), JSONUtil.toJsonStr(event.getAssigners())); + log.info("RocketMqMessagePushEventListener#onNotice...end, msgTemplateId: {}, receivePerson: {}, processInstanceId: {}", + event.getNoticeConfig().getNotice().getNoticeMessageId(), JSONUtil.toJsonStr(event.getAssigners()), event.getProcessInstanceId()); } @@ -134,18 +134,18 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< || Objects.isNull(event.getAssigners())) { return; } - log.info("RocketMqMessagePushEventListener#onPendingPush...msgTemplateId: {}, receivePerson: {}", - event.getNoticeConfig().getPending().getPendingMessageId(), - JSONUtil.toJsonStr(event.getAssigners())); + log.info("RocketMqMessagePushEventListener#onPendingPush...msgTemplateId: {}, receivePerson: {}, processInstanceId: {}", + event.getNoticeConfig().getPending().getPendingMessageId(), + JSONUtil.toJsonStr(event.getAssigners()), event.getProcessInstanceId()); if (Objects.nonNull(event.getNoticeConfig().getPending())) { MessagePushDTO dto = build(event.getNoticeConfig().getPending().getPendingMessageId(), PROCESS_PUSH_PENDING, event, collectionVariable(event)); sendMessageQueue(dto, PROCESS_PUSH_PENDING); } - log.info("RocketMqMessagePushEventListener#onPendingPush...end, msgTemplateId: {}, receivePerson: {}", - event.getNoticeConfig().getPending().getPendingMessageId(), - JSONUtil.toJsonStr(event.getAssigners())); + log.info("RocketMqMessagePushEventListener#onPendingPush...end, msgTemplateId: {}, receivePerson: {}, processInstanceId: {}", + event.getNoticeConfig().getPending().getPendingMessageId(), + JSONUtil.toJsonStr(event.getAssigners()), event.getProcessInstanceId()); } @Override @@ -155,17 +155,16 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< || !StringUtils.hasText(event.getNoticeConfig().getPending().getPendingMessageId())) { return; } - log.info("RocketMqMessagePushEventListener#onPendingComplete...msgTemplateId: {}, receivePerson: {}", - event.getNoticeConfig().getPending().getPendingMessageId(), - JSONUtil.toJsonStr(event.getAssigners())); + log.info("RocketMqMessagePushEventListener#onPendingComplete...msgTemplateId: {}, receivePerson: {}, processInstanceId: {}", + event.getNoticeConfig().getPending().getPendingMessageId(), + JSONUtil.toJsonStr(event.getAssigners()), event.getProcessInstanceId()); if (Objects.nonNull(event.getNoticeConfig().getPending())) { MessagePushDTO dto = build(event.getNoticeConfig().getPending().getPendingMessageId(), PROCESS_PUSH_PENDING_COMPLETE, event, collectionVariable(event)); sendMessageQueue(dto, PROCESS_PUSH_PENDING_COMPLETE); } - log.info("RocketMqMessagePushEventListener#onPendingComplete...end, msgTemplateId: {}, receivePerson: " + - "{}", event.getNoticeConfig().getPending().getPendingMessageId(), - JSONUtil.toJsonStr(event.getAssigners())); + log.info("RocketMqMessagePushEventListener#onPendingComplete...end, msgTemplateId: {}, receivePerson: {}, processInstanceId: {}", event.getNoticeConfig().getPending().getPendingMessageId(), + JSONUtil.toJsonStr(event.getAssigners()), event.getProcessInstanceId()); } @Override @@ -175,17 +174,17 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< || !StringUtils.hasText(event.getNoticeConfig().getCarbonCopy().getCarbonCopyMessageId())) { return; } - log.info("RocketMqMessagePushEventListener#onCarbonCopy... cc' templateId: {}, receivePerson: {}", - event.getNoticeConfig().getCarbonCopy().getCarbonCopyMessageId(), - JSONUtil.toJsonStr(event.getAssigners())); + log.info("RocketMqMessagePushEventListener#onCarbonCopy... cc' templateId: {}, receivePerson: {}, processInstanceId: {}", + event.getNoticeConfig().getCarbonCopy().getCarbonCopyMessageId(), + JSONUtil.toJsonStr(event.getAssigners()), event.getProcessInstanceId()); if (Objects.nonNull(event.getNoticeConfig().getCarbonCopy())) { MessagePushDTO dto = build(event.getNoticeConfig().getCarbonCopy().getCarbonCopyMessageId(), PROCESS_CARBON_COPY, event, collectionVariable(event)); sendMessageQueue(dto, PROCESS_CARBON_COPY); } - log.info("RocketMqMessagePushEventListener#onCarbonCopy...end, cc' templateId: {}, receivePerson: {}", - event.getNoticeConfig().getCarbonCopy().getCarbonCopyMessageId(), - JSONUtil.toJsonStr(event.getAssigners())); + log.info("RocketMqMessagePushEventListener#onCarbonCopy...end, cc' templateId: {}, receivePerson: {}, processInstanceId: {}", + event.getNoticeConfig().getCarbonCopy().getCarbonCopyMessageId(), + JSONUtil.toJsonStr(event.getAssigners()), event.getProcessInstanceId()); } /** @@ -200,15 +199,15 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< || !StringUtils.hasText(event.getNoticeConfig().getCarbonCopy().getCarbonCopyMessageId())) { return; } - log.info("RocketMqMessagePushEventListener#onCarbonCopyComplete... cc' templateId: {}", - event.getNoticeConfig().getCarbonCopy().getCarbonCopyMessageId()); + log.info("RocketMqMessagePushEventListener#onCarbonCopyComplete... cc' templateId: {}, processInstanceId: {}", + event.getNoticeConfig().getCarbonCopy().getCarbonCopyMessageId(), event.getProcessInstanceId()); if (Objects.nonNull(event.getNoticeConfig().getCarbonCopy())) { MessagePushDTO dto = build(event.getNoticeConfig().getCarbonCopy().getCarbonCopyMessageId(), PROCESS_CARBON_COPY_COMPLETE, event, collectionVariable(event)); sendMessageQueue(dto, PROCESS_CARBON_COPY_COMPLETE); } - log.info("RocketMqMessagePushEventListener#onCarbonCopyComplete...end, cc' templateId: {}", - event.getNoticeConfig().getCarbonCopy().getCarbonCopyMessageId()); + log.info("RocketMqMessagePushEventListener#onCarbonCopyComplete...end, cc' templateId: {}, processInstanceId: {}", + event.getNoticeConfig().getCarbonCopy().getCarbonCopyMessageId(), event.getProcessInstanceId()); } @Override @@ -219,15 +218,15 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< || Objects.isNull(event.getAssigners())) { return; } - log.info("RocketMqMessagePushEventListener#onSms...msgTemplateId: {}, receivePerson: {}", - event.getNoticeConfig().getSms().getSmsId(), JSONUtil.toJsonStr(event.getAssigners())); + log.info("RocketMqMessagePushEventListener#onSms...msgTemplateId: {}, receivePerson: {}, processInstanceId: {}", + event.getNoticeConfig().getSms().getSmsId(), JSONUtil.toJsonStr(event.getAssigners()), event.getProcessInstanceId()); if (Objects.nonNull(event.getNoticeConfig().getCarbonCopy())) { MessagePushDTO dto = build(event.getNoticeConfig().getSms().getSmsId(), PROCESS_PUSH_SMS, event, collectionVariable(event)); sendMessageQueue(dto, PROCESS_PUSH_SMS); } - log.info("RocketMqMessagePushEventListener#onSms...end, msgTemplateId: {}, receivePerson: {}", - event.getNoticeConfig().getSms().getSmsId(), JSONUtil.toJsonStr(event.getAssigners())); + log.info("RocketMqMessagePushEventListener#onSms...end, msgTemplateId: {}, receivePerson: {}, processInstanceId: {}", + event.getNoticeConfig().getSms().getSmsId(), JSONUtil.toJsonStr(event.getAssigners()), event.getProcessInstanceId()); } private Map collectionVariable(MessagePushEvent event) { 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 4469be0b6..e1ebbaa30 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 @@ -40,30 +40,30 @@ public class MessagePushProcessEventListener extends AbstractBpmnEventListener

repositoryService.createDeploymentQuery() .deploymentId(((ExecutionEntityImpl) event.getEntity()).getDeploymentId()).singleResult()); Process mainProcess = getContext().getProcess(() -> repositoryService.getBpmnModel(event.getProcessDefinitionId()).getMainProcess()); @@ -81,13 +81,13 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< setProcessInstanceVersion(event.getProcessInstanceId(), dto); sendMessageQueue(dto, PROCESS_INSTANCE_CREATED); - log.info("MessagePushProcessEventListener#onCreated...end: {}", event.getProcessInstanceId()); + log.info("MessagePushProcessEventListener#onCreated...end, processInstanceId: {}", event.getProcessInstanceId()); } @Override public void onStarted(FlowableProcessStartedEvent event) { - log.info("MessagePushProcessEventListener#onStarted...{}", ((ExecutionEntityImpl) event.getEntity()).getProcessInstanceId()); + log.info("MessagePushProcessEventListener#onStarted..., processInstanceId: {}", event.getNestedProcessInstanceId()); Deployment deployment = getContext().getDeployment(() -> repositoryService.createDeploymentQuery() .deploymentId(((ExecutionEntityImpl) event.getEntity()).getDeploymentId()) .singleResult()); @@ -120,7 +120,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< @Override public void onCancelled(FlowableCancelledEvent event) { - log.info("MessagePushProcessEventListener#onCancelled...{}", event.getProcessInstanceId()); + log.info("MessagePushProcessEventListener#onCancelled..., processInstanceId: {}", event.getProcessInstanceId()); Deployment deployment = getContext().getDeployment(() -> repositoryService.createDeploymentQuery() .deploymentId(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getDeploymentId()) .singleResult()); @@ -146,7 +146,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< setProcessDeleteReason(event, dto); setProcessInstanceVersion(event.getProcessInstanceId(), dto); sendMessageQueue(dto, PROCESS_INSTANCE_CANCELLED); - log.info("MessagePushProcessEventListener#onCancelled...end: {}", event.getProcessInstanceId()); + log.info("MessagePushProcessEventListener#onCancelled...end, processInstanceId: {}", event.getProcessInstanceId()); } /** @@ -156,7 +156,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< */ @Override public void onRejected(FlowableCancelledEvent event) { - log.info("MessagePushProcessEventListener#onRejected...{}", event.getProcessInstanceId()); + log.info("MessagePushProcessEventListener#onRejected..., processInstanceId: {}", event.getProcessInstanceId()); Deployment deployment = getContext().getDeployment(() -> repositoryService.createDeploymentQuery() .deploymentId(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getDeploymentId()) .singleResult()); @@ -182,12 +182,12 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< setProcessDeleteReason(event, dto); setProcessInstanceVersion(event.getProcessInstanceId(), dto); sendMessageQueue(dto, PROCESS_INSTANCE_REJECTED); - log.info("MessagePushProcessEventListener#onRejected...end: {}", event.getProcessInstanceId()); + log.info("MessagePushProcessEventListener#onRejected...end, processInstanceId: {}", event.getProcessInstanceId()); } @Override public void onAborted(FlowableCancelledEvent event) { - log.info("MessagePushProcessEventListener#onAborted...{}", event.getProcessInstanceId()); + log.info("MessagePushProcessEventListener#onAborted..., processInstanceId: {}", event.getProcessInstanceId()); Deployment deployment = getContext().getDeployment(() -> repositoryService.createDeploymentQuery() .deploymentId(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getDeploymentId()) .singleResult()); @@ -213,12 +213,12 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< setProcessDeleteReason(event, dto); setProcessInstanceVersion(event.getProcessInstanceId(), dto); sendMessageQueue(dto, PROCESS_INSTANCE_ABORTED); - log.info("MessagePushProcessEventListener#onAborted...end: {}", event.getProcessInstanceId()); + log.info("MessagePushProcessEventListener#onAborted...end, processInstanceId: {}.", event.getProcessInstanceId()); } @Override public void onCompleted(FlowableEngineEntityEvent event) { - log.info("MessagePushProcessEventListener#onCompleted...{}", event.getProcessInstanceId()); + log.info("MessagePushProcessEventListener#onCompleted...,processInstanceId: {}", event.getProcessInstanceId()); Deployment deployment = getContext().getDeployment(() -> repositoryService.createDeploymentQuery() .deploymentId(((ExecutionEntityImpl) event.getEntity()).getDeploymentId()) .singleResult()); @@ -247,7 +247,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< } dto.setWorkflowEngineVersion(version); sendMessageQueue(dto, PROCESS_INSTANCE_COMPLETED); - log.info("MessagePushProcessEventListener#onCompleted...end: {}", event.getProcessInstanceId()); + log.info("MessagePushProcessEventListener#onCompleted...end,processInstanceId: {}", event.getProcessInstanceId()); } private void setProcessDeleteReason(FlowableCancelledEvent event, ProcessInstanceDTO dto) { diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java index 1bbdd0ccb..8c31ea247 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java @@ -82,7 +82,7 @@ public class AutoOperatorEvent_101_Listener extends AbstractBpmnEventListener eventProducer; @Resource @@ -59,37 +60,37 @@ public class RocketMqBpmnTaskEvent_102_Listener extends AbstractBpmnEventListene @Override public void onAssigned(DelegateTask delegateTask) { - log.info("RocketMqBpmnTaskEventListener#onAssigned...{}", delegateTask.getTaskDefinitionKey()); + log.info("RocketMqBpmnTaskEventListener#onAssigned...{}, processInstanceId:{}", delegateTask.getTaskDefinitionKey(), delegateTask.getProcessInstanceId()); if (StringUtils.hasLength(delegateTask.getAssignee()) && delegateTask.getAssignee().contains(TASK_ASSIGNEE_SKIP_FLAT)) { return; } ProcessTaskDTO dto = build(delegateTask, PROCESS_TASK_ASSIGNED); sendMessageQueue(dto, PROCESS_TASK_ASSIGNED); - log.info("RocketMqBpmnTaskEventListener#onAssigned...end: {}", delegateTask.getTaskDefinitionKey()); + log.info("RocketMqBpmnTaskEventListener#onAssigned...end: {}, processInstanceId:{}", delegateTask.getTaskDefinitionKey(), delegateTask.getProcessInstanceId()); } @Override public void onCreated(DelegateTask delegateTask) { - log.info("RocketMqBpmnTaskEventListener#onCreated...{}", delegateTask.getTaskDefinitionKey()); + log.info("RocketMqBpmnTaskEventListener#onCreated...{}, processInstanceId:{}", delegateTask.getTaskDefinitionKey(), delegateTask.getProcessInstanceId()); ProcessTaskDTO dto = build(delegateTask, PROCESS_TASK_CREATED); sendMessageQueue(dto, PROCESS_TASK_CREATED); - log.info("RocketMqBpmnTaskEventListener#onCreated...end: {}", delegateTask.getTaskDefinitionKey()); + log.info("RocketMqBpmnTaskEventListener#onCreated...end: {}, processInstanceId:{}", delegateTask.getTaskDefinitionKey(), delegateTask.getProcessInstanceId()); } @Override public void onCompleted(DelegateTask delegateTask) { - log.info("RocketMqBpmnTaskEventListener#onCompleted...{}", delegateTask.getTaskDefinitionKey()); + log.info("RocketMqBpmnTaskEventListener#onCompleted...{}, processInstanceId:{}", delegateTask.getTaskDefinitionKey(), delegateTask.getProcessInstanceId()); ProcessTaskDTO dto = build(delegateTask, PROCESS_TASK_COMPLETED); sendMessageQueue(dto, PROCESS_TASK_COMPLETED); - log.info("RocketMqBpmnTaskEventListener#onCompleted...end: {}", delegateTask.getTaskDefinitionKey()); + log.info("RocketMqBpmnTaskEventListener#onCompleted...end: {}, processInstanceId:{}", delegateTask.getTaskDefinitionKey(), delegateTask.getProcessInstanceId()); } @Override public void onDeleted(DelegateTask delegateTask) { - log.info("RocketMqBpmnTaskEventListener#onDeleted...{}", delegateTask.getTaskDefinitionKey()); + log.info("RocketMqBpmnTaskEventListener#onDeleted...{}, processInstanceId:{}", delegateTask.getTaskDefinitionKey(), delegateTask.getProcessInstanceId()); ProcessTaskDTO dto = build(delegateTask, PROCESS_TASK_DELETED); sendMessageQueue(dto, PROCESS_TASK_DELETED); - log.info("RocketMqBpmnTaskEventListener#onDeleted...end: {}", delegateTask.getTaskDefinitionKey()); + log.info("RocketMqBpmnTaskEventListener#onDeleted...end: {}, processInstanceId:{}", delegateTask.getTaskDefinitionKey(), delegateTask.getProcessInstanceId()); } private Deployment getDeployment(String processInstanceId) { diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/SnapshotBpmnTaskTaskEvent_100_Listener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/SnapshotBpmnTaskTaskEvent_100_Listener.java index aaf5e76e4..ff80b7d8f 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/SnapshotBpmnTaskTaskEvent_100_Listener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/SnapshotBpmnTaskTaskEvent_100_Listener.java @@ -43,7 +43,7 @@ public class SnapshotBpmnTaskTaskEvent_100_Listener extends AbstractBpmnEventLis @Override public void onAssigned(DelegateTask delegateTask) { - log.info("SnapshotBpmnTaskTaskEventListener#onAssigned...{}", delegateTask.getTaskDefinitionKey()); + log.info("SnapshotBpmnTaskTaskEventListener#onAssigned...{}, processInstanceId:{}", delegateTask.getTaskDefinitionKey(), delegateTask.getProcessInstanceId()); List assignerList = runtimeService.getVariable(delegateTask.getProcessInstanceId(), INTERNAL_ACTIVITY_RELATION_ASSIGNEE_LIST_INFO_SNAPSHOT + delegateTask.getTaskDefinitionKey(), List.class); @@ -61,6 +61,6 @@ public class SnapshotBpmnTaskTaskEvent_100_Listener extends AbstractBpmnEventLis } }); - log.info("SnapshotBpmnTaskTaskEventListener#onAssigned...end: {}", delegateTask.getTaskDefinitionKey()); + log.info("SnapshotBpmnTaskTaskEventListener#onAssigned...end: {}, processInstanceId:{}", delegateTask.getTaskDefinitionKey(), delegateTask.getProcessInstanceId()); } }