From fa021c880ff1b477c5394ddbbbc5b1056bdaae0e Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 21 Aug 2024 14:51:00 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E9=80=9A=E7=9F=A5=E7=AD=96=E7=95=A5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1227345283743744]自动化通知策略增加触发点 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1227345283743744 --- .../handler/param/StepActiveTimeParamHandler.java | 5 ++--- .../handler/param/StepCommentListParamHandler.java | 11 +++++------ .../notify/handler/param/StepIdParamHandler.java | 11 +---------- .../notify/handler/param/StepNameParamHandler.java | 7 +++---- .../handler/param/StepStartTimeParamHandler.java | 5 ++--- .../handler/param/StepStayTimeParamHandler.java | 5 ++--- .../notify/handler/param/StepWorkerParamHandler.java | 5 ++--- 7 files changed, 17 insertions(+), 32 deletions(-) diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepActiveTimeParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepActiveTimeParamHandler.java index f20cfe31a..a1e69cc54 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepActiveTimeParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepActiveTimeParamHandler.java @@ -17,11 +17,10 @@ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; import neatlogic.framework.process.dto.ProcessTaskStepVo; +import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyTriggerType; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; -import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.notify.core.ProcessTaskNotifyParamHandlerBase; import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; -import neatlogic.module.process.notify.constvalue.SlaNotifyTriggerType; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -41,7 +40,7 @@ public class StepActiveTimeParamHandler extends ProcessTaskNotifyParamHandlerBas @Override public Object getMyText(ProcessTaskStepVo processTaskStepVo, INotifyTriggerType notifyTriggerType) { - if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType) && !(notifyTriggerType instanceof SlaNotifyTriggerType)) { + if (notifyTriggerType instanceof ProcessTaskNotifyTriggerType) { return null; } SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepCommentListParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepCommentListParamHandler.java index 0bce1f91e..9d3f4d228 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepCommentListParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepCommentListParamHandler.java @@ -16,17 +16,16 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.dao.mapper.UserMapper; -import neatlogic.framework.dto.*; +import neatlogic.framework.dto.UserVo; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; -import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.framework.process.dto.ProcessTaskContentVo; import neatlogic.framework.process.dto.ProcessTaskStepContentVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; +import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyTriggerType; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; -import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.notify.core.ProcessTaskNotifyParamHandlerBase; -import neatlogic.module.process.notify.constvalue.SlaNotifyTriggerType; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; @@ -55,7 +54,7 @@ public class StepCommentListParamHandler extends ProcessTaskNotifyParamHandlerBa @Override public Object getMyText(ProcessTaskStepVo processTaskStepVo, INotifyTriggerType notifyTriggerType) { - if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType) && !(notifyTriggerType instanceof SlaNotifyTriggerType)) { + if (notifyTriggerType instanceof ProcessTaskNotifyTriggerType) { return null; } List processTaskStepContentList = processTaskMapper.getProcessTaskStepContentByProcessTaskStepId(processTaskStepVo.getId()); diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepIdParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepIdParamHandler.java index f2f89cd5e..ac5d525a2 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepIdParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepIdParamHandler.java @@ -18,9 +18,7 @@ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; -import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.notify.core.ProcessTaskNotifyParamHandlerBase; -import neatlogic.module.process.notify.constvalue.SlaNotifyTriggerType; import org.springframework.stereotype.Component; /** @@ -37,13 +35,6 @@ public class StepIdParamHandler extends ProcessTaskNotifyParamHandlerBase { @Override public Object getMyText(ProcessTaskStepVo processTaskStepVo, INotifyTriggerType notifyTriggerType) { - if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType) && !(notifyTriggerType instanceof SlaNotifyTriggerType)) { - return null; - } - Long id = processTaskStepVo.getId(); - if (id != null) { - return id; - } - return null; + return processTaskStepVo.getId(); } } diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepNameParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepNameParamHandler.java index 3b892e235..47c101894 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepNameParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepNameParamHandler.java @@ -16,12 +16,11 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; +import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyTriggerType; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; -import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.notify.core.ProcessTaskNotifyParamHandlerBase; -import neatlogic.module.process.notify.constvalue.SlaNotifyTriggerType; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; @@ -44,7 +43,7 @@ public class StepNameParamHandler extends ProcessTaskNotifyParamHandlerBase { @Override public Object getMyText(ProcessTaskStepVo processTaskStepVo, INotifyTriggerType notifyTriggerType) { - if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType) && !(notifyTriggerType instanceof SlaNotifyTriggerType)) { + if (notifyTriggerType instanceof ProcessTaskNotifyTriggerType) { return null; } String name = processTaskStepVo.getName(); diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepStartTimeParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepStartTimeParamHandler.java index 360521dca..c4e6aea69 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepStartTimeParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepStartTimeParamHandler.java @@ -17,11 +17,10 @@ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; import neatlogic.framework.process.dto.ProcessTaskStepVo; +import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyTriggerType; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; -import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.notify.core.ProcessTaskNotifyParamHandlerBase; import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; -import neatlogic.module.process.notify.constvalue.SlaNotifyTriggerType; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -41,7 +40,7 @@ public class StepStartTimeParamHandler extends ProcessTaskNotifyParamHandlerBase @Override public Object getMyText(ProcessTaskStepVo processTaskStepVo, INotifyTriggerType notifyTriggerType) { - if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType) && !(notifyTriggerType instanceof SlaNotifyTriggerType)) { + if (notifyTriggerType instanceof ProcessTaskNotifyTriggerType) { return null; } SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepStayTimeParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepStayTimeParamHandler.java index 6958f9773..6282d9664 100755 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepStayTimeParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepStayTimeParamHandler.java @@ -17,12 +17,11 @@ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; import neatlogic.framework.process.constvalue.ProcessTaskStepStatus; +import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyTriggerType; import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; -import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.notify.core.ProcessTaskNotifyParamHandlerBase; -import neatlogic.module.process.notify.constvalue.SlaNotifyTriggerType; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -45,7 +44,7 @@ public class StepStayTimeParamHandler extends ProcessTaskNotifyParamHandlerBase @Override public Object getMyText(ProcessTaskStepVo processTaskStepVo, INotifyTriggerType notifyTriggerType) { - if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType) && !(notifyTriggerType instanceof SlaNotifyTriggerType)) { + if (notifyTriggerType instanceof ProcessTaskNotifyTriggerType) { return null; } ProcessTaskStepVo stepVo = processTaskMapper.getProcessTaskStepBaseInfoById(processTaskStepVo.getId()); diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepWorkerParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepWorkerParamHandler.java index 9b66652cc..011ab4f2b 100755 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepWorkerParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepWorkerParamHandler.java @@ -25,14 +25,13 @@ import neatlogic.framework.dto.UserVo; import neatlogic.framework.dto.WorkAssignmentUnitVo; import neatlogic.framework.notify.core.INotifyTriggerType; import neatlogic.framework.process.constvalue.ProcessUserType; +import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyTriggerType; import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepUserVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskStepWorkerVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; -import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.notify.core.ProcessTaskNotifyParamHandlerBase; -import neatlogic.module.process.notify.constvalue.SlaNotifyTriggerType; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Component; @@ -63,7 +62,7 @@ public class StepWorkerParamHandler extends ProcessTaskNotifyParamHandlerBase { @Override public Object getMyText(ProcessTaskStepVo processTaskStepVo, INotifyTriggerType notifyTriggerType) { - if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType) && !(notifyTriggerType instanceof SlaNotifyTriggerType)) { + if (notifyTriggerType instanceof ProcessTaskNotifyTriggerType) { return null; } List workerList = processTaskMapper.getProcessTaskStepWorkerByProcessTaskIdAndProcessTaskStepId(processTaskStepVo.getProcessTaskId(), processTaskStepVo.getId()); -- Gitee