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 6484ff4792f25ebda0b0f24c1aab01de1bbe0e76..505f4b648c06400fb308b7d925f5c6ad46de1f3b 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 f634b9c15ed966b8514a32ff358fc4550ef95156..ce0db7624cb1b9c444ed5392994e8c01e37b6655 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 ee861d335e55948aa97dbb01a594f85d1d1ec797..f6e5bb3538713bcf77253e80577f5303087551b4 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 3ced3d610bc444937ab3d481c9f8f0e07fb14f8f..ee78bc720692724d51e80e619d5f5677a65457f3 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; +// } }