From 0a984643ed14713ee033b9c7fc383d6fe65e2913 Mon Sep 17 00:00:00 2001
From: yangyang01000846 <15195822163@163.com>
Date: Tue, 20 Jan 2026 20:25:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9Ahpc=E6=89=8B?=
 =?UTF-8?q?=E5=8A=A8=E6=A8=A1=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flowable/delegate/handler/HpcHandler.java |  4 ++--
 .../com/sdm/pbs/controller/TaskAdapter.java   | 21 ++-----------------
 2 files changed, 4 insertions(+), 21 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 174629c4..611b9f9c 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
@@ -196,9 +196,9 @@ public class HpcHandler implements ExecutionHandler<Map<String, Object>,HPCExecu
         if (Objects.equals(executeMode,FlowableConfig.EXECUTE_MODE_MANUAL)) {
             List<String> masterFilePaths = getFileListFromMap(params, "masterFileRegularStr");
             List<String> inPutFilePaths = getFileListFromMap(params, "inputFilesRegularStr");
-            if(CollectionUtils.isEmpty(masterFilePaths)||CollectionUtils.isEmpty(inPutFilePaths)){
+            if(CollectionUtils.isEmpty(masterFilePaths)){
                 CoreLogger.warn("hpc executeMode manual,filepath illegal");
-                throw new RuntimeException("hpc executeMode manual,filepath illegal");
+                throw new RuntimeException("手动模式求解文件不能为空");
             }
             submitHpcTaskRemoteReq.setManualMasterFilepaths(masterFilePaths);
             submitHpcTaskRemoteReq.setManualInputFilePaths(inPutFilePaths);
diff --git a/pbs/src/main/java/com/sdm/pbs/controller/TaskAdapter.java b/pbs/src/main/java/com/sdm/pbs/controller/TaskAdapter.java
index 26eb0563..5039c5d5 100644
--- a/pbs/src/main/java/com/sdm/pbs/controller/TaskAdapter.java
+++ b/pbs/src/main/java/com/sdm/pbs/controller/TaskAdapter.java
@@ -83,7 +83,7 @@ public class TaskAdapter implements ITaskFeignClient {
                 finalInputFilePaths.add(FLOWABLE_SIMULATION_BASEDIR+inputFilePath);
             }
             // 本地从文件
-            submitHpcTaskReq.setInputFilePaths(inputFilePaths);
+            submitHpcTaskReq.setInputFilePaths(finalInputFilePaths);
             log.info("getSimulationFile 手动主文件：{}，从文件：{}",masterFilepath,JSONObject.toJSONString(finalInputFilePaths));
         }
         // 自动
@@ -108,24 +108,7 @@ public class TaskAdapter implements ITaskFeignClient {
             masterFilepath=masterFilePathAtomic.get();
             // 本地主文件
             submitHpcTaskReq.setMasterFilePath(masterFilepath);
-        }
-        try {
-//            MultipartFile masterMultipartFile = FilesUtil.toMultipartFile(masterFilepath);
-//            submitHpcTaskReq.setMasterFile(masterMultipartFile);
-            if(CollectionUtils.isNotEmpty(inputFilePaths)){
-                // 本地从文件
-                submitHpcTaskReq.setInputFilePaths(inputFilePaths);
-//                List<MultipartFile> inputFiles = new ArrayList<>();
-//                for (String inputFilePath : inputFilePaths) {
-//                    MultipartFile inputFile = FilesUtil.toMultipartFile(inputFilePath);
-//                    inputFiles.add(inputFile);
-//                }
-//                submitHpcTaskReq.setInputFiles(inputFiles);
-
-            }
-        } catch (Exception e) {
-            log.error("getSimulationFile error",e);
-            throw new RuntimeException("求解文件处理失败"+e.getMessage());
+            submitHpcTaskReq.setInputFilePaths(inputFilePaths);
         }
     }