From 54f310e81a5733c7f001cc4408a619f4c1912de1 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 2 Jul 2024 15:59:37 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=88=9B=E5=BB=BA=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E8=AE=BE=E7=BD=AE=E7=9A=84=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E7=AD=96=E7=95=A5=EF=BC=8C=E5=9B=9E=E6=98=BE=E7=9A=84=E6=98=AF?= =?UTF-8?q?=E9=80=9A=E7=94=A8=E8=8A=82=E7=82=B9=E7=9A=84=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1191351335485440]流程管理-创建作业节点设置的通知策略，回显的是通用节点的通知策略 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1191351335485440 --- .../regulatehandler/ActionConfigRegulateHandler.java | 7 +++++-- .../NotifyPolicyConfigRegulateHandler.java | 3 +-- .../stephandler/utilhandler/EndProcessUtilHandler.java | 8 ++++++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/neatlogic/module/process/stephandler/regulatehandler/ActionConfigRegulateHandler.java b/src/main/java/neatlogic/module/process/stephandler/regulatehandler/ActionConfigRegulateHandler.java index dc59655a8..1fd5c5333 100644 --- a/src/main/java/neatlogic/module/process/stephandler/regulatehandler/ActionConfigRegulateHandler.java +++ b/src/main/java/neatlogic/module/process/stephandler/regulatehandler/ActionConfigRegulateHandler.java @@ -19,10 +19,10 @@ package neatlogic.module.process.stephandler.regulatehandler; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import neatlogic.framework.notify.core.INotifyPolicyHandler; import neatlogic.framework.process.dto.processconfig.ActionConfigVo; import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler; import neatlogic.framework.process.stephandler.core.IRegulateHandler; -import neatlogic.module.process.notify.handler.OmnipotentNotifyPolicyHandler; import org.springframework.stereotype.Service; @Service @@ -40,7 +40,10 @@ public class ActionConfigRegulateHandler implements IRegulateHandler { if (actionConfigVo == null) { actionConfigVo = new ActionConfigVo(); } - actionConfigVo.setHandler(OmnipotentNotifyPolicyHandler.class.getName()); + Class clazz = processStepInternalHandler.getNotifyPolicyHandlerClass(); + if (clazz != null) { + actionConfigVo.setHandler(clazz.getName()); + } newConfigObj.put("actionConfig", actionConfigVo); } } diff --git a/src/main/java/neatlogic/module/process/stephandler/regulatehandler/NotifyPolicyConfigRegulateHandler.java b/src/main/java/neatlogic/module/process/stephandler/regulatehandler/NotifyPolicyConfigRegulateHandler.java index d603c5b3b..d69a1be5e 100644 --- a/src/main/java/neatlogic/module/process/stephandler/regulatehandler/NotifyPolicyConfigRegulateHandler.java +++ b/src/main/java/neatlogic/module/process/stephandler/regulatehandler/NotifyPolicyConfigRegulateHandler.java @@ -23,7 +23,6 @@ import neatlogic.framework.notify.crossover.INotifyServiceCrossoverService; import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo; import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler; import neatlogic.framework.process.stephandler.core.IRegulateHandler; -import neatlogic.module.process.notify.handler.OmnipotentNotifyPolicyHandler; import org.springframework.stereotype.Service; @Service @@ -38,7 +37,7 @@ public class NotifyPolicyConfigRegulateHandler implements IRegulateHandler { public void regulateConfig(IProcessStepInternalHandler processStepInternalHandler, JSONObject oldConfigObj, JSONObject newConfigObj) { JSONObject notifyPolicyConfig = oldConfigObj.getJSONObject("notifyPolicyConfig"); INotifyServiceCrossoverService notifyServiceCrossoverService = CrossoverServiceFactory.getApi(INotifyServiceCrossoverService.class); - InvokeNotifyPolicyConfigVo invokeNotifyPolicyConfigVo = notifyServiceCrossoverService.regulateNotifyPolicyConfig(notifyPolicyConfig, OmnipotentNotifyPolicyHandler.class); + InvokeNotifyPolicyConfigVo invokeNotifyPolicyConfigVo = notifyServiceCrossoverService.regulateNotifyPolicyConfig(notifyPolicyConfig, processStepInternalHandler.getNotifyPolicyHandlerClass()); newConfigObj.put("notifyPolicyConfig", invokeNotifyPolicyConfigVo); } } diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/EndProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/EndProcessUtilHandler.java index d79376af2..9f257497f 100644 --- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/EndProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/EndProcessUtilHandler.java @@ -2,12 +2,14 @@ package neatlogic.module.process.stephandler.utilhandler; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import neatlogic.framework.notify.core.INotifyPolicyHandler; import neatlogic.framework.process.constvalue.ProcessStepHandlerType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.dto.ProcessStepVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerBase; import neatlogic.framework.process.util.ProcessConfigUtil; +import neatlogic.module.process.notify.handler.TaskNotifyPolicyHandler; import org.springframework.stereotype.Service; @Service @@ -37,6 +39,12 @@ public class EndProcessUtilHandler extends ProcessStepInternalHandlerBase { public void updateProcessTaskStepUserAndWorker(Long processTaskId, Long processTaskStepId) { } + + @Override + public Class getNotifyPolicyHandlerClass() { + return TaskNotifyPolicyHandler.class; + } + @Override public String[] getRegulateKeyList() { return new String[]{"processConfig", "formConfig", "scoreConfig", "slaList"}; -- Gitee