From 8958f580b9810ba164b3e2021d9b134dfa9cc2be Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 27 Jun 2024 16:53:14 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E6=96=B0=E8=87=AA=E5=8A=A8=E5=8C=96=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1181690880294912]后端-新自动化节点 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1181690880294912 --- .../job/callback/ProcessTaskCallbackHandler.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/neatlogic/module/process/job/callback/ProcessTaskCallbackHandler.java b/src/main/java/neatlogic/module/process/job/callback/ProcessTaskCallbackHandler.java index 1637ebce9..aa6c5777d 100644 --- a/src/main/java/neatlogic/module/process/job/callback/ProcessTaskCallbackHandler.java +++ b/src/main/java/neatlogic/module/process/job/callback/ProcessTaskCallbackHandler.java @@ -28,12 +28,12 @@ import neatlogic.framework.process.constvalue.AutoexecProcessStepHandlerType; import neatlogic.framework.process.constvalue.ProcessFlowDirection; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.constvalue.automatic.FailPolicy; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; -import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.exception.processtask.ProcessTaskNoPermissionException; import neatlogic.framework.process.stephandler.core.IProcessStepHandler; import neatlogic.framework.process.stephandler.core.ProcessStepHandlerFactory; +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.slf4j.Logger; @@ -42,6 +42,7 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.List; +import java.util.Objects; /** * @author linbq @@ -105,7 +106,11 @@ public class ProcessTaskCallbackHandler extends AutoexecJobCallbackBase { } String config = selectContentByHashMapper.getProcessTaskStepConfigByHash(processTaskStepVo.getConfigHash()); if (StringUtils.isNotBlank(config)) { - failPolicy = (String) JSONPath.read(config, "autoexecConfig.failPolicy"); + if (Objects.equals(processTaskStepVo.getHandler(), AutoexecProcessStepHandlerType.AUTOEXEC.getHandler())) { + failPolicy = (String) JSONPath.read(config, "autoexecConfig.failPolicy"); + } else if (Objects.equals(processTaskStepVo.getHandler(), "createjob")) { + failPolicy = (String) JSONPath.read(config, "createJobConfig.failPolicy"); + } } if (failed > 0) { if (FailPolicy.KEEP_ON.getValue().equals(failPolicy)) { @@ -129,7 +134,7 @@ public class ProcessTaskCallbackHandler extends AutoexecJobCallbackBase { List toProcessTaskStepIdList = processTaskMapper.getToProcessTaskStepIdListByFromIdAndType(processTaskStepVo.getId(), ProcessFlowDirection.FORWARD.getValue()); if (toProcessTaskStepIdList.size() == 1) { Long nextStepId = toProcessTaskStepIdList.get(0); - IProcessStepHandler handler = ProcessStepHandlerFactory.getHandler(AutoexecProcessStepHandlerType.AUTOEXEC.getHandler()); + IProcessStepHandler handler = ProcessStepHandlerFactory.getHandler(processTaskStepVo.getHandler()); if (handler != null) { try { JSONObject paramObj = processTaskStepVo.getParamObj(); -- Gitee