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

修改：hpc文件回传MINIO文件路径设置

Browse Source
This commit is contained in:
yangyang01000846
2026-01-06 09:32:36 +08:00
parent 0cf31591ea
commit a52cef26ca
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/com/sdm/common/entity/flowable/executeConfig/HPCExecuteConfig.java
View File

@@ -7,7 +7,7 @@ public class HPCExecuteConfig extends BaseExecuteConfig {
private String beforeNodeId; private String beforeNodeId;
// 先默认写死一个，后面前端配置传递 // 先默认写死一个，后面前端配置传递
private String masterFileRegularStr="^aa\\.xml$"; private String masterFileRegularStr = "^.*\\.xml$";
// 先默认写死一个，后面前端配置传递 // 先默认写死一个，后面前端配置传递
private String inputFilesRegularStr="^.+\\.json$"; private String inputFilesRegularStr="^.+\\.json$";

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

@@ -158,7 +158,8 @@ public class HpcHandler implements ExecutionHandler<Map<String, Object>,HPCExecu
ProcessNodeParam beforeNode = beforeNodeParams.get(0); ProcessNodeParam beforeNode = beforeNodeParams.get(0);
String beforeNodeJectKey = getNodeObjectKey(beforeNode); String beforeNodeJectKey = getNodeObjectKey(beforeNode);
// 本地求解文件路径 taskLocalBaseDir // 本地求解文件路径 taskLocalBaseDir
submitHpcTaskRemoteReq.setSimulationFileLocalPath(simulationBaseDir + beforeNodeJectKey); String simulationFilePath = simulationBaseDir + beforeNodeJectKey;
submitHpcTaskRemoteReq.setSimulationFileLocalPath(simulationFilePath);
CoreLogger.info("simulationFileLocalPath :{} ",simulationBaseDir + beforeNodeJectKey); CoreLogger.info("simulationFileLocalPath :{} ",simulationBaseDir + beforeNodeJectKey);
} }
// 手动上传的 // 手动上传的
@@ -175,7 +176,9 @@ public class HpcHandler implements ExecutionHandler<Map<String, Object>,HPCExecu
// hpc 节点回传路径 // hpc 节点回传路径
ProcessNodeParam currentNode = currentNodeParams.get(0); ProcessNodeParam currentNode = currentNodeParams.get(0);
String currentNodeJectKey = getNodeObjectKey(currentNode); String currentNodeJectKey = getNodeObjectKey(currentNode);
// hpc 回传文件路径 // hpc 回传minio文件路径,桶和租户绑定
submitHpcTaskRemoteReq.setStdoutSpdmMinoFilePath(currentNodeJectKey);
// hpc 回传本地文件路径
submitHpcTaskRemoteReq.setStdoutSpdmNasFilePath(simulationBaseDir + currentNodeJectKey); submitHpcTaskRemoteReq.setStdoutSpdmNasFilePath(simulationBaseDir + currentNodeJectKey);
CoreLogger.info("stdoutSpdmNasFilePath :{} ",simulationBaseDir + currentNodeJectKey); CoreLogger.info("stdoutSpdmNasFilePath :{} ",simulationBaseDir + currentNodeJectKey);
} }