diff --git a/flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java b/flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java index 9a59bd18..174629c4 100644 --- a/flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java +++ b/flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java @@ -67,7 +67,17 @@ public class HpcHandler implements ExecutionHandler,HPCExecu String currentNodeId =execution.getCurrentActivityId(); String masterFileRegularStr = config.getInputFormat(); String inputFilesRegularStr = config.getSlaveFormat(); - if(StringUtils.isBlank(masterFileRegularStr)){ + + CoreLogger.info("hpc executeMode:{}",params.get("executeMode")); + String executeMode = params.get("executeMode").toString(); + if(StringUtils.isBlank(executeMode)|| + (!Objects.equals(executeMode,FlowableConfig.EXECUTE_MODE_AUTO)&& + !Objects.equals(executeMode,FlowableConfig.EXECUTE_MODE_MANUAL))){ + throw new RuntimeException("hpc executeMode illegal"); + } + // 自动才判断正则 + if(Objects.equals(executeMode,FlowableConfig.EXECUTE_MODE_AUTO)&& + StringUtils.isBlank(masterFileRegularStr)){ throw new RuntimeException("Hpc任务执行失败,主求解文件规则不能是空"); } CoreLogger.info("beforeNodeId:{},currentNodeId:{},masterFileRegularStr:{},inputFilesRegularStr:{}",beforeNodeId,currentNodeId,masterFileRegularStr,inputFilesRegularStr); @@ -83,13 +93,7 @@ public class HpcHandler implements ExecutionHandler,HPCExecu submitHpcTaskRemoteReq.setMasterFileRegularStr(masterFileRegularStr); submitHpcTaskRemoteReq.setInputFilesRegularStr(inputFilesRegularStr); - CoreLogger.info("hpc executeMode:{}",params.get("executeMode")); - String executeMode = params.get("executeMode").toString(); - if(StringUtils.isBlank(executeMode)|| - (!Objects.equals(executeMode,FlowableConfig.EXECUTE_MODE_AUTO)&& - !Objects.equals(executeMode,FlowableConfig.EXECUTE_MODE_MANUAL))){ - throw new RuntimeException("hpc executeMode illegal"); - } + // 处理hpc求解文件路径 dealHpcFile(submitHpcTaskRemoteReq,beforeNodeId,currentNodeId, processDefinitionId,processInstanceId,executeMode,params); //