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

修改：hpc节点命令修改

Browse Source
This commit is contained in:
yangyang01000846
2026-01-06 11:12:37 +08:00
parent 1fe12dc4fa
commit b3ab9c577a
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,7 @@ public class HpcHandler implements ExecutionHandler<Map<String, Object>,HPCExecu
@Override
public void execute(DelegateExecution execution, Map<String, Object> params, HPCExecuteConfig config) {
CoreLogger.info("hpc process excute,params:{},config:{}",JSONObject.toJSONString(params),JSONObject.toJSONString(config));
SubmitHpcTaskRemoteReq submitHpcTaskRemoteReq = convertParamsToReq(params);
SubmitHpcTaskRemoteReq submitHpcTaskRemoteReq = convertParamsToReq(params,config.getNodeExeCommand());
String beforeNodeId = config.getBeforeNodeId();
String currentNodeId =execution.getCurrentActivityId();
String masterFileRegularStr = config.getMasterFileRegularStr();
@@ -130,6 +130,11 @@ public class HpcHandler implements ExecutionHandler<Map<String, Object>,HPCExecu
ThreadLocalContext.setUserId(userId);
ThreadLocalContext.setUserName(userName);
ThreadLocalContext.setTenantId(tenantId);
ThreadLocalContext.setUserId(1979078323595476993l);
ThreadLocalContext.setUserName("yytest");
ThreadLocalContext.setTenantId(1979091834410176514l);
CoreLogger.info("hpcHander initUserInfo userId:{},tenantId:{},userName:{}",userId,tenantId,userName);
}
@@ -222,7 +227,7 @@ public class HpcHandler implements ExecutionHandler<Map<String, Object>,HPCExecu
/**
* 将参数Map转换为SubmitHpcTaskRemoteReq对象的工具方法
*/
private SubmitHpcTaskRemoteReq convertParamsToReq(Map<String, Object> params) {
private SubmitHpcTaskRemoteReq convertParamsToReq(Map<String, Object> params,String command) {
SubmitHpcTaskRemoteReq req = new SubmitHpcTaskRemoteReq();
if (params == null) {
return req;
@@ -248,8 +253,8 @@ public class HpcHandler implements ExecutionHandler<Map<String, Object>,HPCExecu
req.setRunId(params.get("runId").toString());
req.setRunName(params.get("runName").toString());
// mock 时暂时自己传递，后面根据软件名称查询命令 todo 后面从表配置查询
String command =(params.get("command")==null||StringUtils.isBlank(params.get("command").toString()))?
"\\\\CARSAFE\\share\\solver\\RLithium\\reta.exe -i %s" : params.get("command").toString();
// String command =(params.get("command")==null||StringUtils.isBlank(params.get("command").toString()))?
// "\\\\CARSAFE\\share\\solver\\RLithium\\reta.exe -i %s" : params.get("command").toString();
req.setCommand(command);
req.setProjectname(params.get("projectname").toString());
// req.setFeatchFileType(params.get("featchFileType").toString());