forked from toolchaintechnologycenter/spdm-backend
新增:hpc任务增加任务正则等相关字段
This commit is contained in:
@@ -67,10 +67,12 @@ public class HpcHandler implements ExecutionHandler<Map<String, Object>,HPCExecu
|
||||
submitHpcTaskRemoteReq.setSoftwareId(config.getUuid());
|
||||
String beforeNodeId = config.getBeforeNodeId();
|
||||
String currentNodeId =execution.getCurrentActivityId();
|
||||
|
||||
String masterFileRegularStr = Objects.isNull(params.get("inputFormat"))?"":params.get("inputFormat").toString();
|
||||
String inputFilesRegularStr = Objects.isNull(params.get("slaveFormat"))?"":params.get("slaveFormat").toString();
|
||||
|
||||
String outputFormat = Objects.isNull(params.get("outputFormat"))?"":params.get("outputFormat").toString();
|
||||
submitHpcTaskRemoteReq.setInputFormat(masterFileRegularStr);
|
||||
submitHpcTaskRemoteReq.setSlaveFormat(inputFilesRegularStr);
|
||||
submitHpcTaskRemoteReq.setOutputFormat(outputFormat);
|
||||
log.info("hpc executeMode:{}",params.get("executeMode"));
|
||||
String executeMode = params.get("executeMode").toString();
|
||||
if(StringUtils.isBlank(executeMode)||
|
||||
@@ -97,7 +99,8 @@ public class HpcHandler implements ExecutionHandler<Map<String, Object>,HPCExecu
|
||||
// params 取只是测试使用
|
||||
String processInstanceId = (execution==null||StringUtils.isBlank(execution.getProcessInstanceId()))?
|
||||
params.get("processInstanceId").toString():execution.getProcessInstanceId();
|
||||
|
||||
submitHpcTaskRemoteReq.setProcessDefinitionId(processDefinitionId);
|
||||
submitHpcTaskRemoteReq.setProcessInstanceId(processInstanceId);
|
||||
submitHpcTaskRemoteReq.setMasterFileRegularStr(masterFileRegularStr);
|
||||
submitHpcTaskRemoteReq.setInputFilesRegularStr(inputFilesRegularStr);
|
||||
|
||||
@@ -199,6 +202,12 @@ public class HpcHandler implements ExecutionHandler<Map<String, Object>,HPCExecu
|
||||
ProcessNodeParam beforeNode = beforeNodeParams.get(0);
|
||||
Pair<String, Long> beforePair = getNodeObjectKey(beforeNode);
|
||||
String beforeNodeJectKey = beforePair.getLeft();
|
||||
if(Objects.isNull(beforePair.getRight())){
|
||||
log.error("前一节点文件dirId不能是null");
|
||||
MdcUtil.removeTraceId();
|
||||
throw new RuntimeException("前一节点文件dirId不能是null");
|
||||
}
|
||||
submitHpcTaskRemoteReq.setInputFileId(beforePair.getRight());
|
||||
// 本地求解文件路径 taskLocalBaseDir
|
||||
String simulationFilePath = simulationBaseDir + beforeNodeJectKey;
|
||||
submitHpcTaskRemoteReq.setSimulationFileLocalPath(simulationFilePath);
|
||||
|
||||
Reference in New Issue
Block a user