From 126bcf376ef4faed25f2b0e67aa2286e50371071 Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Tue, 19 Dec 2023 19:57:27 +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 --- .../handler/AutomaticNotifyPolicyHandler.java | 10 ++++----- .../OmnipotentNotifyPolicyHandler.java | 13 ++++++------ .../handler/SlaNotifyPolicyHandler.java | 10 ++++----- .../handler/TaskNotifyPolicyHandler.java | 12 +++++------ .../handler/TimedTaskNotifyPolicyHandler.java | 21 +++++-------------- 5 files changed, 25 insertions(+), 41 deletions(-) diff --git a/src/main/java/neatlogic/module/process/notify/handler/AutomaticNotifyPolicyHandler.java b/src/main/java/neatlogic/module/process/notify/handler/AutomaticNotifyPolicyHandler.java index 008f08b84..72b61a22b 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/AutomaticNotifyPolicyHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/AutomaticNotifyPolicyHandler.java @@ -10,7 +10,6 @@ import neatlogic.framework.condition.core.IConditionHandler; import neatlogic.framework.dto.ConditionParamVo; import neatlogic.framework.dto.ExpressionVo; import neatlogic.framework.form.constvalue.FormConditionModel; -import neatlogic.framework.notify.core.INotifyPolicyHandlerGroup; import neatlogic.framework.notify.core.NotifyHandlerFactory; import neatlogic.framework.notify.core.NotifyHandlerType; import neatlogic.framework.notify.core.NotifyPolicyHandlerBase; @@ -24,7 +23,6 @@ import neatlogic.framework.process.constvalue.ProcessUserType; import neatlogic.framework.process.notify.constvalue.*; import neatlogic.framework.process.notify.core.IDefaultTemplate; import neatlogic.framework.process.notify.core.NotifyDefaultTemplateFactory; -import neatlogic.framework.util.I18nUtils; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Component; @@ -69,10 +67,10 @@ public class AutomaticNotifyPolicyHandler extends NotifyPolicyHandlerBase { return PROCESS_MODIFY.class.getSimpleName(); } - @Override - public INotifyPolicyHandlerGroup getGroup() { - return ProcessNotifyPolicyHandlerGroup.TASKSTEP; - } +// @Override +// public INotifyPolicyHandlerGroup getGroup() { +// return ProcessNotifyPolicyHandlerGroup.TASKSTEP; +// } @Override protected List myNotifyTriggerList() { diff --git a/src/main/java/neatlogic/module/process/notify/handler/OmnipotentNotifyPolicyHandler.java b/src/main/java/neatlogic/module/process/notify/handler/OmnipotentNotifyPolicyHandler.java index aa25a633e..e2d1685b8 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/OmnipotentNotifyPolicyHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/OmnipotentNotifyPolicyHandler.java @@ -10,7 +10,9 @@ import neatlogic.framework.condition.core.IConditionHandler; import neatlogic.framework.dto.ConditionParamVo; import neatlogic.framework.dto.ExpressionVo; import neatlogic.framework.form.constvalue.FormConditionModel; -import neatlogic.framework.notify.core.*; +import neatlogic.framework.notify.core.NotifyHandlerFactory; +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.auth.PROCESS_MODIFY; @@ -21,7 +23,6 @@ import neatlogic.framework.process.constvalue.ProcessUserType; import neatlogic.framework.process.notify.constvalue.*; import neatlogic.framework.process.notify.core.IDefaultTemplate; import neatlogic.framework.process.notify.core.NotifyDefaultTemplateFactory; -import neatlogic.framework.util.I18nUtils; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Component; @@ -151,8 +152,8 @@ public class OmnipotentNotifyPolicyHandler extends NotifyPolicyHandlerBase { return PROCESS_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/process/notify/handler/SlaNotifyPolicyHandler.java b/src/main/java/neatlogic/module/process/notify/handler/SlaNotifyPolicyHandler.java index a8c158088..21e9fb0e4 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/SlaNotifyPolicyHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/SlaNotifyPolicyHandler.java @@ -10,7 +10,6 @@ import neatlogic.framework.condition.core.IConditionHandler; import neatlogic.framework.dto.ConditionParamVo; import neatlogic.framework.dto.ExpressionVo; import neatlogic.framework.form.constvalue.FormConditionModel; -import neatlogic.framework.notify.core.INotifyPolicyHandlerGroup; import neatlogic.framework.notify.core.NotifyHandlerFactory; import neatlogic.framework.notify.core.NotifyHandlerType; import neatlogic.framework.notify.core.NotifyPolicyHandlerBase; @@ -25,7 +24,6 @@ import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepTaskNotifyParam; import neatlogic.framework.process.notify.core.IDefaultTemplate; import neatlogic.framework.process.notify.core.NotifyDefaultTemplateFactory; -import neatlogic.framework.util.I18nUtils; import neatlogic.module.process.notify.constvalue.SlaNotifyTriggerType; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Component; @@ -142,8 +140,8 @@ public class SlaNotifyPolicyHandler extends NotifyPolicyHandlerBase { return PROCESS_MODIFY.class.getSimpleName(); } - @Override - public INotifyPolicyHandlerGroup getGroup() { - return null; - } +// @Override +// public INotifyPolicyHandlerGroup getGroup() { +// return null; +// } } diff --git a/src/main/java/neatlogic/module/process/notify/handler/TaskNotifyPolicyHandler.java b/src/main/java/neatlogic/module/process/notify/handler/TaskNotifyPolicyHandler.java index f7e6f92c1..f77661d14 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/TaskNotifyPolicyHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/TaskNotifyPolicyHandler.java @@ -10,7 +10,6 @@ import neatlogic.framework.condition.core.IConditionHandler; import neatlogic.framework.dto.ConditionParamVo; import neatlogic.framework.dto.ExpressionVo; import neatlogic.framework.form.constvalue.FormConditionModel; -import neatlogic.framework.notify.core.INotifyPolicyHandlerGroup; import neatlogic.framework.notify.core.NotifyHandlerFactory; import neatlogic.framework.notify.core.NotifyHandlerType; import neatlogic.framework.notify.core.NotifyPolicyHandlerBase; @@ -24,7 +23,6 @@ import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyParam; import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyTriggerType; import neatlogic.framework.process.notify.core.IDefaultTemplate; import neatlogic.framework.process.notify.core.NotifyDefaultTemplateFactory; -import neatlogic.framework.util.I18nUtils; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Component; @@ -38,7 +36,7 @@ public class TaskNotifyPolicyHandler extends NotifyPolicyHandlerBase { @Override public String getName() { - return "工单"; + return "term.itsm.processtask"; } @Override @@ -132,8 +130,8 @@ public class TaskNotifyPolicyHandler extends NotifyPolicyHandlerBase { return PROCESS_MODIFY.class.getSimpleName(); } - @Override - public INotifyPolicyHandlerGroup getGroup() { - return null; - } +// @Override +// public INotifyPolicyHandlerGroup getGroup() { +// return null; +// } } diff --git a/src/main/java/neatlogic/module/process/notify/handler/TimedTaskNotifyPolicyHandler.java b/src/main/java/neatlogic/module/process/notify/handler/TimedTaskNotifyPolicyHandler.java index 8829fef91..591c3cb24 100755 --- a/src/main/java/neatlogic/module/process/notify/handler/TimedTaskNotifyPolicyHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/TimedTaskNotifyPolicyHandler.java @@ -16,15 +16,13 @@ limitations under the License. package neatlogic.module.process.notify.handler; +import com.alibaba.fastjson.JSONObject; 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.util.I18nUtils; import neatlogic.module.process.notify.constvalue.TimedTaskTriggerType; -import com.alibaba.fastjson.JSONObject; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -42,15 +40,6 @@ public class TimedTaskNotifyPolicyHandler extends NotifyPolicyHandlerBase { return "定时任务"; } -// @Override -// public List getNotifyTriggerListForNotifyTree() { -// List returnList = new ArrayList<>(); -// for (TimedTaskTriggerType type : TimedTaskTriggerType.values()) { -// returnList.add(new NotifyTriggerVo(type.getTrigger(), type.getText(), type.getDescription())); -// } -// return returnList; -// } - @Override protected List myNotifyTriggerList() { List returnList = new ArrayList<>(); @@ -88,10 +77,10 @@ public class TimedTaskNotifyPolicyHandler extends NotifyPolicyHandlerBase { return null; } - @Override - public INotifyPolicyHandlerGroup getGroup() { - return null; - } +// @Override +// public INotifyPolicyHandlerGroup getGroup() { +// return null; +// } @Override public boolean isPublic(){ -- Gitee