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 dc59655a8d80f03410a4581d460f0a6cf7c889e1..1fd5c53335d3e9c673cc814e424cf6ba193f9fb8 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 d603c5b3b70585760a7ffa2307aeca871a4cbd49..d69a1be5e14443dea967ccb656ccc32ee777ed14 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 d79376af2fe9d225c808d81cd71123e241f08b9f..9f257497fb0033b1f89266de7dbee1ce7e8dac3d 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"};