From fc7325c786bdc45dca385b7252ec3e82592aa5fb Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Tue, 19 Dec 2023 19:52:56 +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 --- .../ChangeCreateNotifyPolicyHandler.java | 15 +++++++------- .../ChangeHandleNotifyPolicyHandler.java | 20 ++++--------------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/main/java/neatlogic/module/change/notify/handler/ChangeCreateNotifyPolicyHandler.java b/src/main/java/neatlogic/module/change/notify/handler/ChangeCreateNotifyPolicyHandler.java index 7db3f65..6ac5edd 100644 --- a/src/main/java/neatlogic/module/change/notify/handler/ChangeCreateNotifyPolicyHandler.java +++ b/src/main/java/neatlogic/module/change/notify/handler/ChangeCreateNotifyPolicyHandler.java @@ -27,7 +27,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; @@ -37,10 +36,12 @@ import neatlogic.framework.process.auth.PROCESS_MODIFY; import neatlogic.framework.process.constvalue.ConditionProcessTaskOptions; import neatlogic.framework.process.constvalue.ProcessTaskGroupSearch; import neatlogic.framework.process.constvalue.ProcessUserType; -import neatlogic.framework.process.notify.constvalue.*; +import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyParam; +import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; +import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; +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 org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Component; @@ -65,10 +66,10 @@ public class ChangeCreateNotifyPolicyHandler 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/change/notify/handler/ChangeHandleNotifyPolicyHandler.java b/src/main/java/neatlogic/module/change/notify/handler/ChangeHandleNotifyPolicyHandler.java index 0a1fa85..749cf69 100644 --- a/src/main/java/neatlogic/module/change/notify/handler/ChangeHandleNotifyPolicyHandler.java +++ b/src/main/java/neatlogic/module/change/notify/handler/ChangeHandleNotifyPolicyHandler.java @@ -12,7 +12,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; @@ -22,13 +21,11 @@ import neatlogic.framework.process.auth.PROCESS_MODIFY; import neatlogic.framework.process.constvalue.ConditionProcessTaskOptions; import neatlogic.framework.process.constvalue.ProcessTaskGroupSearch; import neatlogic.framework.process.constvalue.ProcessUserType; -import neatlogic.framework.process.notify.constvalue.ProcessNotifyPolicyHandlerGroup; import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyParam; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.notify.core.IDefaultTemplate; import neatlogic.framework.process.notify.core.NotifyDefaultTemplateFactory; -import neatlogic.framework.util.I18nUtils; import neatlogic.module.change.notify.constvalue.ChangeHandleNotifyParam; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Component; @@ -63,15 +60,6 @@ public class ChangeHandleNotifyPolicyHandler extends NotifyPolicyHandlerBase { return returnList; } -// @Override -// public List getNotifyTriggerListForNotifyTree() { -// List returnList = new ArrayList<>(); -// for (ChangeTriggerType changeNotifyType : ChangeTriggerType.values()) { -// returnList.add(new NotifyTriggerVo(changeNotifyType.getTrigger(), changeNotifyType.getText(), changeNotifyType.getDescription())); -// } -// return returnList; -// } - @Override public List myNotifyTriggerTemplateList(NotifyHandlerType type) { List list = new ArrayList<>(); @@ -177,8 +165,8 @@ public class ChangeHandleNotifyPolicyHandler extends NotifyPolicyHandlerBase { return PROCESS_MODIFY.class.getSimpleName(); } - @Override - public INotifyPolicyHandlerGroup getGroup() { - return ProcessNotifyPolicyHandlerGroup.TASKSTEP; - } +// @Override +// public INotifyPolicyHandlerGroup getGroup() { +// return ProcessNotifyPolicyHandlerGroup.TASKSTEP; +// } } -- Gitee