diff --git a/common/src/main/java/com/sdm/common/entity/flowable/executeConfig/HPCExecuteConfig.java b/common/src/main/java/com/sdm/common/entity/flowable/executeConfig/HPCExecuteConfig.java index 1bb979a5..8ee3a91f 100644 --- a/common/src/main/java/com/sdm/common/entity/flowable/executeConfig/HPCExecuteConfig.java +++ b/common/src/main/java/com/sdm/common/entity/flowable/executeConfig/HPCExecuteConfig.java @@ -10,5 +10,7 @@ public class HPCExecuteConfig extends BaseExecuteConfig { private String masterFileRegularStr = "^.*\\.xml$"; // 先默认写死一个,后面前端配置传递 private String inputFilesRegularStr="^.+\\.json$"; + // 节点的命令 + private String nodeExeCommand; } 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 c0c8f2dd..c91994b6 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 @@ -57,7 +57,7 @@ public class HpcHandler implements ExecutionHandler,HPCExecu @Override public void execute(DelegateExecution execution, Map 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,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,HPCExecu /** * 将参数Map转换为SubmitHpcTaskRemoteReq对象的工具方法 */ - private SubmitHpcTaskRemoteReq convertParamsToReq(Map params) { + private SubmitHpcTaskRemoteReq convertParamsToReq(Map params,String command) { SubmitHpcTaskRemoteReq req = new SubmitHpcTaskRemoteReq(); if (params == null) { return req; @@ -248,8 +253,8 @@ public class HpcHandler implements ExecutionHandler,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());