From 3ecd40a84b89f06c574954241acdf8d475eb5442 Mon Sep 17 00:00:00 2001
From: yangyang01000846 <15195822163@163.com>
Date: Fri, 16 Jan 2026 11:45:04 +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=89=A7=E8=A1=8C=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sdm/flowable/controller/ProcessController.java    | 2 ++
 .../com/sdm/pbs/service/impl/PbsServiceDecorator.java     | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

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 ee4e439b..53dfded3 100644
--- a/flowable/src/main/java/com/sdm/flowable/controller/ProcessController.java
+++ b/flowable/src/main/java/com/sdm/flowable/controller/ProcessController.java
@@ -276,7 +276,9 @@ public class ProcessController implements IFlowableFeignClient {
     @PostMapping("/testHpc")
     public String testHpc(@RequestBody Map<String, Object> params) {
         String beforeNodeId = params.get("beforeNodeId").toString();
+        String appuuid = params.get("appuuid").toString();
         HPCExecuteConfig config=new HPCExecuteConfig();
+        config.setUuid(appuuid);
         config.setBeforeNodeId(beforeNodeId);
         if(!Objects.isNull(params.get("masterFileRegularStr"))){
             config.setMasterFileRegularStr(params.get("masterFileRegularStr").toString());
diff --git a/pbs/src/main/java/com/sdm/pbs/service/impl/PbsServiceDecorator.java b/pbs/src/main/java/com/sdm/pbs/service/impl/PbsServiceDecorator.java
index 929d8f73..d39a58a6 100644
--- a/pbs/src/main/java/com/sdm/pbs/service/impl/PbsServiceDecorator.java
+++ b/pbs/src/main/java/com/sdm/pbs/service/impl/PbsServiceDecorator.java
@@ -144,7 +144,7 @@ public class PbsServiceDecorator implements IPbsServiceDecorator {
         req.setComsolResultName(substring+"_result.mph");
         // 2.处理命令拼接和参数替换
         CommandResult commandResult = buildAndReplaceHpcCommand(req, masterFilePath);
-        if (StringUtils.isBlank(commandResult.getCommand())) {
+        if (StringUtils.isBlank(commandResult.getFormatCommand())) {
             log.error("Hpc执行失败，command命令不能为空{}",JSONObject.toJSONString(req));
             throw new RuntimeException("Hpc执行失败，command命令不能为空");
         }
@@ -177,7 +177,7 @@ public class PbsServiceDecorator implements IPbsServiceDecorator {
         // 拼接逻辑
         String subDirPrefix = Objects.isNull(userId) ? "" : (String.valueOf(userId) + "\\");
         // spdm 开头
-        String subDir = workDirPrePath+subDirPrefix + req.getJobName() + "\\" + System.currentTimeMillis();
+        String subDir = workDirPrePath + "\\"+subDirPrefix + req.getJobName() + "\\" + System.currentTimeMillis();
         log.info("Hpc任务执行开始，结果输出目录:{}", subDir);
         return subDir;
     }
@@ -210,7 +210,7 @@ public class PbsServiceDecorator implements IPbsServiceDecorator {
                 throw new RuntimeException("该应用没有初始化配置command");
             }
             command = simulationHpcCommand.getCommand();
-
+            formatCommand=command;
             // 命令中动态参数的处理替换
             for (SimulationHpcCommandPlaceholder placeholder : placeholders) {
                 String keyEnName = placeholder.getKeyEnName();
@@ -246,7 +246,7 @@ public class PbsServiceDecorator implements IPbsServiceDecorator {
                     }
                 }
 
-                command = CommandReplaceUtil.replaceCommandPlaceholder(command, keyEnName, replaceValue);
+                formatCommand = CommandReplaceUtil.replaceCommandPlaceholder(formatCommand, keyEnName, replaceValue);
             }
         }