From 00177c28f55468c73fbb5dce0cd03d4021f5e2b3 Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Fri, 27 Dec 2024 09:08:10 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A2=9E=E5=8A=A0=E7=A7=9F=E6=88=B7ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/event/ProcessDeleteEvent.java | 5 +++++ .../common/core/domain/event/ProcessEvent.java | 5 +++++ .../common/core/domain/event/ProcessTaskEvent.java | 5 +++++ .../workflow/handler/FlowProcessEventHandler.java | 13 ++++++++++--- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java index 03e786766..d570c314e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java @@ -16,6 +16,11 @@ public class ProcessDeleteEvent implements Serializable { @Serial private static final long serialVersionUID = 1L; + /** + * 租户ID + */ + private String tenantId; + /** * 流程定义编码 */ diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java index 679cfe54d..21bfbefa4 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java @@ -16,6 +16,11 @@ public class ProcessEvent implements Serializable { @Serial private static final long serialVersionUID = 1L; + /** + * 租户ID + */ + private String tenantId; + /** * 流程定义编码 */ diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java index f92f47cbe..33bc6e5a6 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java @@ -16,6 +16,11 @@ public class ProcessTaskEvent implements Serializable { @Serial private static final long serialVersionUID = 1L; + /** + * 租户ID + */ + private String tenantId; + /** * 流程定义编码 */ diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java index 5a5dca75a..950778c2b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java @@ -5,6 +5,7 @@ import org.dromara.common.core.domain.event.ProcessDeleteEvent; import org.dromara.common.core.domain.event.ProcessEvent; import org.dromara.common.core.domain.event.ProcessTaskEvent; import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.satoken.utils.LoginHelper; import org.springframework.stereotype.Component; /** @@ -26,8 +27,10 @@ public class FlowProcessEventHandler { * @param submit 当为true时为申请人节点办理 */ public void processHandler(String flowCode, String businessId, String status, boolean submit) { - log.info("发布流程事件，流程状态: {}, 流程编码: {}, 业务ID: {}", status, flowCode, businessId); + String tenantId = LoginHelper.getTenantId(); + log.info("发布流程事件，租户ID: {}, 流程状态: {}, 流程编码: {}, 业务ID: {}, 是否申请人节点办理: {}", tenantId, status, flowCode, businessId, submit); ProcessEvent processEvent = new ProcessEvent(); + processEvent.setTenantId(tenantId); processEvent.setFlowCode(flowCode); processEvent.setBusinessId(businessId); processEvent.setStatus(status); @@ -44,8 +47,10 @@ public class FlowProcessEventHandler { * @param businessId 业务id */ public void processTaskHandler(String flowCode, String nodeCode, Long taskId, String businessId) { - log.info("发布流程任务事件, 流程编码: {}, 业务ID: {}", flowCode, businessId); + String tenantId = LoginHelper.getTenantId(); + log.info("发布流程任务事件, 租户ID: {}, 流程编码: {}, 节点编码: {}, 任务ID: {}, 业务ID: {}", tenantId, flowCode, nodeCode, taskId, businessId); ProcessTaskEvent processTaskEvent = new ProcessTaskEvent(); + processTaskEvent.setTenantId(tenantId); processTaskEvent.setFlowCode(flowCode); processTaskEvent.setNodeCode(nodeCode); processTaskEvent.setTaskId(taskId); @@ -60,8 +65,10 @@ public class FlowProcessEventHandler { * @param businessId 业务ID */ public void processDeleteHandler(String flowCode, String businessId) { - log.info("发布删除流程事件, 流程编码: {}, 业务ID: {}", flowCode, businessId); + String tenantId = LoginHelper.getTenantId(); + log.info("发布删除流程事件, 租户ID: {}, 流程编码: {}, 业务ID: {}", tenantId, flowCode, businessId); ProcessDeleteEvent processDeleteEvent = new ProcessDeleteEvent(); + processDeleteEvent.setTenantId(tenantId); processDeleteEvent.setFlowCode(flowCode); processDeleteEvent.setBusinessId(businessId); SpringUtils.context().publishEvent(processDeleteEvent);