From 058325ea65f9b1c871698fe16b14aafdbf6cb793 Mon Sep 17 00:00:00 2001 From: yangyang01000846 <15195822163@163.com> Date: Tue, 20 Jan 2026 17:46:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=BB=E5=8A=A1=EF=BC=8C=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flowable/delegate/handler/HpcHandler.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) 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); //