From 39d14c3b6afdd33925aa30d4526066c81e16c6fa Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Tue, 19 Dec 2023 19:54:28 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E7=AD=96=E7=95=A5=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1049841239556096]通知策略翻译 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1049841239556096 --- .../module/cmdb/notify/handler/CmdbNotifyGroup.java | 2 +- .../cmdb/notify/handler/CmdbNotifyPolicyHandler.java | 11 +++++------ .../notifyhandler/CiEntitySyncNotifyHandler.java | 10 ++++------ .../process/notifyhandler/CmdbSyncNotifyHandler.java | 10 ++++------ 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/main/java/neatlogic/module/cmdb/notify/handler/CmdbNotifyGroup.java b/src/main/java/neatlogic/module/cmdb/notify/handler/CmdbNotifyGroup.java index 6484ff47..505f4b64 100644 --- a/src/main/java/neatlogic/module/cmdb/notify/handler/CmdbNotifyGroup.java +++ b/src/main/java/neatlogic/module/cmdb/notify/handler/CmdbNotifyGroup.java @@ -18,7 +18,7 @@ package neatlogic.module.cmdb.notify.handler; import neatlogic.framework.notify.core.INotifyPolicyHandlerGroup; import neatlogic.framework.util.$; - +@Deprecated public enum CmdbNotifyGroup implements INotifyPolicyHandlerGroup { CMDB("cmdb", "配置管理"); private final String value; diff --git a/src/main/java/neatlogic/module/cmdb/notify/handler/CmdbNotifyPolicyHandler.java b/src/main/java/neatlogic/module/cmdb/notify/handler/CmdbNotifyPolicyHandler.java index f634b9c1..ce0db762 100644 --- a/src/main/java/neatlogic/module/cmdb/notify/handler/CmdbNotifyPolicyHandler.java +++ b/src/main/java/neatlogic/module/cmdb/notify/handler/CmdbNotifyPolicyHandler.java @@ -19,7 +19,6 @@ package neatlogic.module.cmdb.notify.handler; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.cmdb.auth.label.CI_MODIFY; import neatlogic.framework.dto.ConditionParamVo; -import neatlogic.framework.notify.core.INotifyPolicyHandlerGroup; import neatlogic.framework.notify.core.NotifyHandlerType; import neatlogic.framework.notify.core.NotifyPolicyHandlerBase; import neatlogic.framework.notify.dto.NotifyTriggerTemplateVo; @@ -33,7 +32,7 @@ import java.util.List; public class CmdbNotifyPolicyHandler extends NotifyPolicyHandlerBase { @Override public String getName() { - return "模型"; + return "cmdb.ci"; } /** @@ -44,10 +43,10 @@ public class CmdbNotifyPolicyHandler extends NotifyPolicyHandlerBase { return CI_MODIFY.class.getSimpleName(); } - @Override - public INotifyPolicyHandlerGroup getGroup() { - return CmdbNotifyGroup.CMDB; - } +// @Override +// public INotifyPolicyHandlerGroup getGroup() { +// return CmdbNotifyGroup.CMDB; +// } @Override protected List myNotifyTriggerList() { 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 ee861d33..f6e5bb35 100644 --- a/src/main/java/neatlogic/module/cmdb/process/notifyhandler/CiEntitySyncNotifyHandler.java +++ b/src/main/java/neatlogic/module/cmdb/process/notifyhandler/CiEntitySyncNotifyHandler.java @@ -3,12 +3,10 @@ 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.INotifyPolicyHandlerGroup; import neatlogic.framework.notify.core.NotifyHandlerType; import neatlogic.framework.notify.core.NotifyPolicyHandlerBase; import neatlogic.framework.notify.dto.NotifyTriggerTemplateVo; import neatlogic.framework.notify.dto.NotifyTriggerVo; -import neatlogic.framework.process.notify.constvalue.ProcessNotifyPolicyHandlerGroup; import neatlogic.module.cmdb.process.stephandler.CmdbProcessStepHandlerType; import java.util.List; @@ -51,8 +49,8 @@ public class CiEntitySyncNotifyHandler extends NotifyPolicyHandlerBase { return CIENTITY_MODIFY.class.getSimpleName(); } - @Override - public INotifyPolicyHandlerGroup getGroup() { - return ProcessNotifyPolicyHandlerGroup.TASKSTEP; - } +// @Override +// public INotifyPolicyHandlerGroup getGroup() { +// return ProcessNotifyPolicyHandlerGroup.TASKSTEP; +// } } 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 3ced3d61..ee78bc72 100644 --- a/src/main/java/neatlogic/module/cmdb/process/notifyhandler/CmdbSyncNotifyHandler.java +++ b/src/main/java/neatlogic/module/cmdb/process/notifyhandler/CmdbSyncNotifyHandler.java @@ -19,12 +19,10 @@ 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.INotifyPolicyHandlerGroup; import neatlogic.framework.notify.core.NotifyHandlerType; import neatlogic.framework.notify.core.NotifyPolicyHandlerBase; import neatlogic.framework.notify.dto.NotifyTriggerTemplateVo; import neatlogic.framework.notify.dto.NotifyTriggerVo; -import neatlogic.framework.process.notify.constvalue.ProcessNotifyPolicyHandlerGroup; import neatlogic.module.cmdb.process.stephandler.CmdbProcessStepHandlerType; import org.springframework.stereotype.Component; @@ -68,8 +66,8 @@ public class CmdbSyncNotifyHandler extends NotifyPolicyHandlerBase { return CIENTITY_MODIFY.class.getSimpleName(); } - @Override - public INotifyPolicyHandlerGroup getGroup() { - return ProcessNotifyPolicyHandlerGroup.TASKSTEP; - } +// @Override +// public INotifyPolicyHandlerGroup getGroup() { +// return ProcessNotifyPolicyHandlerGroup.TASKSTEP; +// } } -- Gitee