toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改：手动提交任务，节点判断信息优化

Browse Source
This commit is contained in:
yangyang01000846
2026-01-20 17:46:56 +08:00
parent ded2034a79
commit 058325ea65
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java
View File

@@ -67,7 +67,17 @@ public class HpcHandler implements ExecutionHandler<Map<String, Object>,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<Map<String, Object>,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);
//