From 575d2ea186db93c46a8e7f89203a6418dcda1041 Mon Sep 17 00:00:00 2001
From: yangyang01000846 <15195822163@163.com>
Date: Thu, 15 Jan 2026 20:18:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9Ahpc=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=B7=A5=E4=BD=9C=E7=9B=AE=E5=BD=95,=E6=9C=80?=
 =?UTF-8?q?=E9=A1=B6=E5=B1=82=E7=BB=9F=E4=B8=80=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sdm/flowable/delegate/handler/HpcHandler.java  | 5 -----
 .../java/com/sdm/pbs/service/impl/PbsServiceDecorator.java  | 6 +++++-
 2 files changed, 5 insertions(+), 6 deletions(-)

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 d741b36b..2d05f3b2 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
@@ -26,7 +26,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
@@ -53,10 +52,6 @@ public class HpcHandler implements ExecutionHandler<Map<String, Object>,HPCExecu
     @Autowired
     private MessageFeignClientImpl messageFeignClient;
 
-    @Value("${hpc.mockCommand:}")
-    private String mockCommand;
-
-
     /*
     * params:业务参数
     * config：框架属性
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 2d46def9..929d8f73 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
@@ -114,6 +114,9 @@ public class PbsServiceDecorator implements IPbsServiceDecorator {
     @Value("${hpc.fileToHpc.http.mergePath:}")
     private String fileToHpcMergePath;
 
+    @Value("${hpc.workDirPrePath:spdm}")
+    private String workDirPrePath;
+
     @Override
     public SdmResponse<HpcResouceInfo> queryHpcResource() {
         return pbsService.queryHpcResource();
@@ -173,7 +176,8 @@ public class PbsServiceDecorator implements IPbsServiceDecorator {
         log.info("Hpc任务执行开始，用户id:{}", userId);
         // 拼接逻辑
         String subDirPrefix = Objects.isNull(userId) ? "" : (String.valueOf(userId) + "\\");
-        String subDir = subDirPrefix + req.getJobName() + "\\" + System.currentTimeMillis();
+        // spdm 开头
+        String subDir = workDirPrePath+subDirPrefix + req.getJobName() + "\\" + System.currentTimeMillis();
         log.info("Hpc任务执行开始，结果输出目录:{}", subDir);
         return subDir;
     }