From d525106211fc58c4fd1f5a7d18d6eacf45c01a87 Mon Sep 17 00:00:00 2001 From: yangyang01000846 <15195822163@163.com> Date: Fri, 16 Jan 2026 16:33:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9Ahpc=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=8C=87=E5=AE=9A=E6=A0=B8=E6=95=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/flowable/executeConfig/HPCExecuteConfig.java | 6 ++++-- .../com/sdm/flowable/controller/ProcessController.java | 4 ++-- .../java/com/sdm/flowable/delegate/handler/HpcHandler.java | 5 +++-- .../java/com/sdm/pbs/service/impl/IPbsHpcServiceImpl.java | 7 ++++--- 4 files changed, 13 insertions(+), 9 deletions(-) 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 350a6ff6..d26dd00a 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 @@ -7,9 +7,11 @@ public class HPCExecuteConfig extends BaseExecuteConfig { private String beforeNodeId; // 先默认写死一个，后面前端配置传递 - private String masterFileRegularStr = "^.*\\.xml$"; +// private String masterFileRegularStr = "^.*\\.xml$"; + private String inputFormat; // 先默认写死一个，后面前端配置传递 - private String inputFilesRegularStr="^.+\\.json$"; +// private String inputFilesRegularStr="^.+\\.json$"; + private String slaveFormat; // 节点的命令 这个不用传递了,配置在后台表里的 private String nodeExeCommand; diff --git a/flowable/src/main/java/com/sdm/flowable/controller/ProcessController.java b/flowable/src/main/java/com/sdm/flowable/controller/ProcessController.java index 53dfded3..9006010d 100644 --- a/flowable/src/main/java/com/sdm/flowable/controller/ProcessController.java +++ b/flowable/src/main/java/com/sdm/flowable/controller/ProcessController.java @@ -281,10 +281,10 @@ public class ProcessController implements IFlowableFeignClient { config.setUuid(appuuid); config.setBeforeNodeId(beforeNodeId); if(!Objects.isNull(params.get("masterFileRegularStr"))){ - config.setMasterFileRegularStr(params.get("masterFileRegularStr").toString()); + config.setInputFormat(params.get("masterFileRegularStr").toString()); } if(!Objects.isNull(params.get("inputFilesRegularStr"))){ - config.setInputFilesRegularStr(params.get("inputFilesRegularStr").toString()); + config.setSlaveFormat(params.get("inputFilesRegularStr").toString()); } String currentNodeId = params.get("currentNodeId").toString(); DelegateExecution execution = new DelegateExecution() { 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 2d05f3b2..b10e1628 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 @@ -65,12 +65,13 @@ public class HpcHandler implements ExecutionHandler,HPCExecu submitHpcTaskRemoteReq.setSoftwareId(config.getUuid()); String beforeNodeId = config.getBeforeNodeId(); String currentNodeId =execution.getCurrentActivityId(); - String masterFileRegularStr = config.getMasterFileRegularStr(); - String inputFilesRegularStr = config.getInputFilesRegularStr(); + String masterFileRegularStr = config.getInputFormat(); + String inputFilesRegularStr = config.getSlaveFormat(); if(StringUtils.isBlank(masterFileRegularStr)){ throw new RuntimeException("Hpc任务执行失败，主求解文件规则不能是空"); } CoreLogger.info("beforeNodeId:{},currentNodeId:{},masterFileRegularStr:{},inputFilesRegularStr:{}",beforeNodeId,currentNodeId,masterFileRegularStr,inputFilesRegularStr); + CoreLogger.info("Hpc执行 processDefinitionId:{},processInstanceId:{}",execution.getProcessDefinitionId(),execution.getProcessInstanceId()); // 初始化用户/租户信息 initUserInfo(execution,params); // params 取只是测试使用 diff --git a/pbs/src/main/java/com/sdm/pbs/service/impl/IPbsHpcServiceImpl.java b/pbs/src/main/java/com/sdm/pbs/service/impl/IPbsHpcServiceImpl.java index ca174481..b45b4e61 100644 --- a/pbs/src/main/java/com/sdm/pbs/service/impl/IPbsHpcServiceImpl.java +++ b/pbs/src/main/java/com/sdm/pbs/service/impl/IPbsHpcServiceImpl.java @@ -4,6 +4,7 @@ import com.sdm.common.common.SdmResponse; import com.sdm.common.entity.constants.HpcConstants; import com.sdm.common.entity.constants.NumberConstants; import com.sdm.common.entity.req.pbs.hpc.*; +import com.sdm.common.entity.resp.pbs.hpc.FileNodeInfo; import com.sdm.common.entity.resp.pbs.hpc.JobCancelResp; import com.sdm.common.entity.resp.pbs.hpc.SubmitHpcJobResp; import com.sdm.common.entity.resp.pbs.hpc.listtasks.ListTasks; @@ -11,14 +12,12 @@ import com.sdm.common.entity.resp.pbs.hpc.listtasks.ListTasksResp; import com.sdm.common.entity.resp.pbs.hpc.nodelist.NodeList; import com.sdm.common.entity.resp.pbs.hpc.nodelist.NodeListResp; import com.sdm.common.log.CoreLogger; -import com.sdm.common.entity.resp.pbs.hpc.FileNodeInfo; import com.sdm.pbs.model.bo.HpcJobStatusInfo; import com.sdm.pbs.model.bo.HpcNodeInfo; import com.sdm.pbs.model.bo.HpcResouceInfo; import com.sdm.pbs.model.req.SubmitHpcTaskReq; import com.sdm.pbs.service.HpcInstructionService; import com.sdm.pbs.service.IPbsService; -import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -61,14 +60,16 @@ public class IPbsHpcServiceImpl implements IPbsService { MergeSubmitHpcJobReq mergeSubmitHpcJobReq = new MergeSubmitHpcJobReq(); NewJobReq newJobReq = new NewJobReq(); newJobReq.setJobname(req.getJobName()); - // todo newJobReq.setProjectname(req.getProjectname()); + newJobReq.setNumcores(String.valueOf(req.getCoreNum())); AddJobReq addJobReq = new AddJobReq(); addJobReq.setName(req.getRunName()); addJobReq.setStdout(req.getStdout()); addJobReq.setWorkdir(req.getWorkDir()); addJobReq.setCommand(req.getCommand()); + addJobReq.setNumcores(String.valueOf(req.getCoreNum())); SubmitHpcJobReq submitHpcJobReq = new SubmitHpcJobReq(); + submitHpcJobReq.setNumcores(String.valueOf(req.getCoreNum())); mergeSubmitHpcJobReq.setNewJobReq(newJobReq); mergeSubmitHpcJobReq.setAddJobReq(addJobReq); mergeSubmitHpcJobReq.setSubmitHpcJobReq(submitHpcJobReq);