From aa6f94a02e8fb21f49bcadc955cfb53f0e861634 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Wed, 17 Apr 2024 20:01:17 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E5=AE=8C=E5=96=84=E5=BC=82?= =?UTF-8?q?=E6=AD=A5=E6=93=8D=E4=BD=9C=E7=9B=B8=E5=85=B3=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E7=9A=84=E7=B1=BB=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../context/ActivityOperationContext.java | 2 +- .../context/NoticeOperationContext.java | 2 +- .../context/ProcessOperationContext.java | 2 +- .../common/context/TaskOperationContext.java | 21 +------------------ .../core/engine/event/ErrorInfoEvent.java | 2 +- .../core/engine/event/ErrorInfoEventType.java | 2 +- ...syncRunnableExecutionExceptionHandler.java | 5 ++++- .../BpmnAsyncExecutionErrorEventListener.java | 2 +- .../error/ErrorReporterEventListener.java | 2 ++ 9 files changed, 13 insertions(+), 27 deletions(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/ActivityOperationContext.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/ActivityOperationContext.java index 042915ef5..802dfac33 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/ActivityOperationContext.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/ActivityOperationContext.java @@ -1,7 +1,7 @@ package cn.axzo.workflow.core.common.context; /** - * TODO + * 活动(节点)相关操作上下文 * * @author wangli * @since 2024/4/12 16:43 diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/NoticeOperationContext.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/NoticeOperationContext.java index 1b22b580f..cb2a5e116 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/NoticeOperationContext.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/NoticeOperationContext.java @@ -1,7 +1,7 @@ package cn.axzo.workflow.core.common.context; /** - * TODO + * 通知相关操作上下文 * * @author wangli * @since 2024/4/12 16:47 diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/ProcessOperationContext.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/ProcessOperationContext.java index 37e60a92e..cb06e6e89 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/ProcessOperationContext.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/ProcessOperationContext.java @@ -1,7 +1,7 @@ package cn.axzo.workflow.core.common.context; /** - * TODO + * 流程相关操作上下文 * * @author wangli * @since 2024/4/9 22:52 diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/TaskOperationContext.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/TaskOperationContext.java index 7915a333f..9c52d02cf 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/TaskOperationContext.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/TaskOperationContext.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.function.Supplier; /** - * TODO + * 任务相关操作上下文 * * @author wangli * @since 2024/4/9 20:59 @@ -24,23 +24,4 @@ public class TaskOperationContext extends CommonContext { return extAxHiTaskInsts; } - // private Map> extTaskMap = new HashMap<>(); -// -// private Map> getExtTaskMap() { -// return extTaskMap; -// } -// -// private void setExtTaskMap(String key, List taskInstList) { -// extTaskMap.put(key, taskInstList); -// } -// -// public List getExtTaskInstList(String key, Supplier> supplier) { -// if (getExtTaskMap().containsKey(key)) { -// return getExtTaskMap().get(key); -// } -// setExtTaskMap(key, supplier.get()); -// return getExtTaskInstList(key, supplier); -// } - - } diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/event/ErrorInfoEvent.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/event/ErrorInfoEvent.java index 4632521ac..b795f0264 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/event/ErrorInfoEvent.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/event/ErrorInfoEvent.java @@ -7,7 +7,7 @@ import org.flowable.job.api.JobInfo; import static cn.axzo.workflow.core.engine.event.ErrorInfoEventType.NEW_ERROR; /** - * TODO + * 用于异步任务执行过程中出现的异常搜集和告警 * * @author wangli * @since 2024/4/17 16:45 diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/event/ErrorInfoEventType.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/event/ErrorInfoEventType.java index 1cdeafb87..c8675ebdd 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/event/ErrorInfoEventType.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/event/ErrorInfoEventType.java @@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.List; /** - * TODO + * 异步任务异常事件类型 * * @author wangli * @since 2024/4/17 16:47 diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/job/exception/handler/CustomAsyncRunnableExecutionExceptionHandler.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/job/exception/handler/CustomAsyncRunnableExecutionExceptionHandler.java index ded54baad..bc0957771 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/job/exception/handler/CustomAsyncRunnableExecutionExceptionHandler.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/job/exception/handler/CustomAsyncRunnableExecutionExceptionHandler.java @@ -1,21 +1,24 @@ package cn.axzo.workflow.core.engine.job.exception.handler; import cn.axzo.workflow.core.engine.event.ErrorInfoEvent; +import lombok.extern.slf4j.Slf4j; import org.flowable.common.engine.api.delegate.event.FlowableEventDispatcher; import org.flowable.job.api.JobInfo; import org.flowable.job.service.JobServiceConfiguration; import org.flowable.job.service.impl.asyncexecutor.AsyncRunnableExecutionExceptionHandler; /** - * TODO + * 自定义的异步任务执行异常处理器 * * @author wangli * @since 2024/4/17 16:03 */ +@Slf4j public class CustomAsyncRunnableExecutionExceptionHandler implements AsyncRunnableExecutionExceptionHandler { @Override public boolean handleException(JobServiceConfiguration jobServiceConfiguration, JobInfo job, Throwable exception) { + log.info("discover exception, jobId: {}, exception: {}", job.getId(), exception.getMessage()); FlowableEventDispatcher eventDispatcher = jobServiceConfiguration.getEventDispatcher(); diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/BpmnAsyncExecutionErrorEventListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/BpmnAsyncExecutionErrorEventListener.java index 0385f599b..15a3d805b 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/BpmnAsyncExecutionErrorEventListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/BpmnAsyncExecutionErrorEventListener.java @@ -4,7 +4,7 @@ import org.flowable.job.api.JobInfo; import org.springframework.core.Ordered; /** - * TODO + * 对引擎内异步任务执行异常的事件扩展监听接口 * * @author wangli * @since 2024/4/17 16:54 diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/error/ErrorReporterEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/error/ErrorReporterEventListener.java index fa9e47c76..1e5e77467 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/error/ErrorReporterEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/error/ErrorReporterEventListener.java @@ -9,6 +9,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; /** + * 异步任务执行异常的扩展监听器 + * * @author wangli * @since 2024/4/17 16:59 */