From cd7bdcb56fbaf00066bc5c67bec43c6765717ce3 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 20 Aug 2024 20:41:16 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E9=80=9A=E7=9F=A5=E7=AD=96=E7=95=A5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1227345283743744]自动化通知策略增加触发点 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1227345283743744 --- .../framework/notify/core/INotifyPolicyHandler.java | 4 ++++ .../framework/notify/core/NotifyPolicyHandlerFactory.java | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/framework/notify/core/INotifyPolicyHandler.java b/src/main/java/neatlogic/framework/notify/core/INotifyPolicyHandler.java index 29454cc1e..75f3cd9bd 100644 --- a/src/main/java/neatlogic/framework/notify/core/INotifyPolicyHandler.java +++ b/src/main/java/neatlogic/framework/notify/core/INotifyPolicyHandler.java @@ -61,4 +61,8 @@ public interface INotifyPolicyHandler { default int isAllowMultiPolicy() { return 1; } + + default String getModuleGroup() { + return null; + } } diff --git a/src/main/java/neatlogic/framework/notify/core/NotifyPolicyHandlerFactory.java b/src/main/java/neatlogic/framework/notify/core/NotifyPolicyHandlerFactory.java index b854583df..509ed0b45 100644 --- a/src/main/java/neatlogic/framework/notify/core/NotifyPolicyHandlerFactory.java +++ b/src/main/java/neatlogic/framework/notify/core/NotifyPolicyHandlerFactory.java @@ -27,6 +27,7 @@ import neatlogic.framework.notify.dto.NotifyTreeVo; import neatlogic.framework.notify.dto.NotifyTriggerVo; import neatlogic.framework.util.$; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; import java.util.HashMap; @@ -159,8 +160,12 @@ public class NotifyPolicyHandlerFactory extends ModuleInitializedListenerBase { for (Entry entry : map.entrySet()) { INotifyPolicyHandler notifyPolicyHandler = entry.getValue(); if (notifyPolicyHandler.isPublic()) { + String moduleGroup = notifyPolicyHandler.getModuleGroup(); + if (StringUtils.isBlank(moduleGroup)) { + moduleGroup = moduleVo.getGroup(); + } notifyPolicyHandlerMap.put(notifyPolicyHandler.getClassName(), notifyPolicyHandler); - handler2ModuleGroupIdMap.put(notifyPolicyHandler.getClassName(), moduleVo.getGroup()); + handler2ModuleGroupIdMap.put(notifyPolicyHandler.getClassName(), moduleGroup); handler2ModuleIdMap.put(notifyPolicyHandler.getClassName(), moduleVo.getId()); // notifyPolicyHandlerList.add(new NotifyPolicyHandlerVo(notifyPolicyHandler.getClassName(), notifyPolicyHandler.getName(), notifyPolicyHandler.getAuthName(), moduleVo.getId(), moduleVo.getGroup(), notifyPolicyHandler.isAllowMultiPolicy())); -- Gitee