From 4565340149f4e9faa975a8e270d21d468ceeb153 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 16 Aug 2024 17:28:03 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E7=AD=96=E7=95=A5=E6=A2=B3=E7=90=86=E6=AF=8F=E4=B8=AA=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E7=82=B9=E7=9A=84=E6=94=B6=E4=BB=B6=E4=BA=BA=EF=BC=8C?= =?UTF-8?q?=E6=B2=A1=E7=94=A8=E7=9A=84=E6=94=B6=E4=BB=B6=E4=BA=BA=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=EF=BC=8C=E5=A6=82=E6=BF=80=E6=B4=BB=E7=9A=84=E5=A4=84?= =?UTF-8?q?=E7=90=86=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1211578056146944]通知策略梳理每个触发点的收件人，没用的收件人去掉，如激活的处理人 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1211578056146944 --- .../CiEntitySyncNotifyHandler.java | 32 +++---------------- .../notifyhandler/CmdbSyncNotifyHandler.java | 29 +++++------------ .../CIEntitySyncProcessUtilHandler.java | 3 +- 3 files changed, 14 insertions(+), 50 deletions(-) diff --git a/src/main/java/neatlogic/module/cmdb/process/notifyhandler/CiEntitySyncNotifyHandler.java b/src/main/java/neatlogic/module/cmdb/process/notifyhandler/CiEntitySyncNotifyHandler.java index f4acd38a..e75f2de9 100644 --- a/src/main/java/neatlogic/module/cmdb/process/notifyhandler/CiEntitySyncNotifyHandler.java +++ b/src/main/java/neatlogic/module/cmdb/process/notifyhandler/CiEntitySyncNotifyHandler.java @@ -1,42 +1,18 @@ package neatlogic.module.cmdb.process.notifyhandler; -import com.alibaba.fastjson.JSONObject; import neatlogic.framework.cmdb.auth.label.CIENTITY_MODIFY; -import neatlogic.framework.dto.ConditionParamVo; -import neatlogic.framework.notify.core.NotifyPolicyHandlerBase; -import neatlogic.framework.notify.dto.NotifyTriggerVo; +import neatlogic.framework.process.notify.core.ProcessTaskNotifyHandlerBase; import neatlogic.module.cmdb.process.stephandler.CmdbProcessStepHandlerType; +import org.springframework.stereotype.Component; -import java.util.List; - -//@Component -public class CiEntitySyncNotifyHandler extends NotifyPolicyHandlerBase { +@Component +public class CiEntitySyncNotifyHandler extends ProcessTaskNotifyHandlerBase { @Override public String getName() { return CmdbProcessStepHandlerType.CIENTITYSYNC.getName(); } - @Override - protected List myNotifyTriggerList() { - return null; - } - - @Override - protected List mySystemParamList() { - return null; - } - - @Override - protected List mySystemConditionOptionList() { - return null; - } - - @Override - protected void myAuthorityConfig(JSONObject config) { - - } - @Override public String getAuthName() { return CIENTITY_MODIFY.class.getSimpleName(); diff --git a/src/main/java/neatlogic/module/cmdb/process/notifyhandler/CmdbSyncNotifyHandler.java b/src/main/java/neatlogic/module/cmdb/process/notifyhandler/CmdbSyncNotifyHandler.java index ab2dc651..9af44115 100644 --- a/src/main/java/neatlogic/module/cmdb/process/notifyhandler/CmdbSyncNotifyHandler.java +++ b/src/main/java/neatlogic/module/cmdb/process/notifyhandler/CmdbSyncNotifyHandler.java @@ -17,16 +17,16 @@ package neatlogic.module.cmdb.process.notifyhandler; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.cmdb.auth.label.CIENTITY_MODIFY; -import neatlogic.framework.dto.ConditionParamVo; -import neatlogic.framework.notify.core.NotifyPolicyHandlerBase; -import neatlogic.framework.notify.dto.NotifyTriggerVo; +import neatlogic.framework.process.constvalue.ProcessTaskGroupSearch; +import neatlogic.framework.process.constvalue.ProcessUserType; +import neatlogic.framework.process.notify.core.ProcessTaskNotifyHandlerBase; import neatlogic.module.cmdb.process.stephandler.CmdbProcessStepHandlerType; import org.springframework.stereotype.Component; import java.util.List; @Component -public class CmdbSyncNotifyHandler extends NotifyPolicyHandlerBase { +public class CmdbSyncNotifyHandler extends ProcessTaskNotifyHandlerBase { @Override public String getName() { @@ -34,23 +34,10 @@ public class CmdbSyncNotifyHandler extends NotifyPolicyHandlerBase { } @Override - protected List myNotifyTriggerList() { - return null; - } - - @Override - protected List mySystemParamList() { - return null; - } - - @Override - protected List mySystemConditionOptionList() { - return null; - } - - @Override - protected void myAuthorityConfig(JSONObject config) { - + protected void myCustomAuthorityConfig(JSONObject config) { + List excludeList = config.getJSONArray("excludeList").toJavaList(String.class); + excludeList.add(ProcessTaskGroupSearch.PROCESSUSERTYPE.getValue() + "#" + ProcessUserType.MINOR.getValue()); + config.put("excludeList", excludeList); } @Override diff --git a/src/main/java/neatlogic/module/cmdb/process/stephandler/CIEntitySyncProcessUtilHandler.java b/src/main/java/neatlogic/module/cmdb/process/stephandler/CIEntitySyncProcessUtilHandler.java index 88d4a185..eb6bb093 100644 --- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CIEntitySyncProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CIEntitySyncProcessUtilHandler.java @@ -13,6 +13,7 @@ import neatlogic.framework.process.dto.processconfig.ActionConfigActionVo; import neatlogic.framework.process.dto.processconfig.ActionConfigVo; import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerBase; import neatlogic.framework.process.util.ProcessConfigUtil; +import neatlogic.module.cmdb.process.notifyhandler.CiEntitySyncNotifyHandler; import neatlogic.module.cmdb.process.notifyhandler.CmdbSyncNotifyHandler; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; @@ -180,7 +181,7 @@ public class CIEntitySyncProcessUtilHandler extends ProcessStepInternalHandlerBa /** 通知 **/ JSONObject notifyPolicyConfig = configObj.getJSONObject("notifyPolicyConfig"); INotifyServiceCrossoverService notifyServiceCrossoverService = CrossoverServiceFactory.getApi(INotifyServiceCrossoverService.class); - InvokeNotifyPolicyConfigVo invokeNotifyPolicyConfigVo = notifyServiceCrossoverService.regulateNotifyPolicyConfig(notifyPolicyConfig, CmdbSyncNotifyHandler.class); + InvokeNotifyPolicyConfigVo invokeNotifyPolicyConfigVo = notifyServiceCrossoverService.regulateNotifyPolicyConfig(notifyPolicyConfig, CiEntitySyncNotifyHandler.class); resultObj.put("notifyPolicyConfig", invokeNotifyPolicyConfigVo); /** 动作 **/ -- Gitee