From 73abfce1ced0c02674ed98647946a7ba8fdf4c5f Mon Sep 17 00:00:00 2001 From: yangyang01000846 <15195822163@163.com> Date: Tue, 20 Jan 2026 15:57:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=B1=82=E8=A7=A3=E6=96=87=E4=BB=B6=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pbs/src/main/java/com/sdm/pbs/controller/TaskAdapter.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 8a44fc1a..26eb0563 100644 --- a/pbs/src/main/java/com/sdm/pbs/controller/TaskAdapter.java +++ b/pbs/src/main/java/com/sdm/pbs/controller/TaskAdapter.java @@ -15,7 +15,6 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; import java.nio.charset.StandardCharsets; import java.util.*; @@ -29,6 +28,7 @@ public class TaskAdapter implements ITaskFeignClient { private static final String EXECUTE_MODE_AUTO = "AUTO"; private static final String EXECUTE_MODE_MANUAL = "MANUAL"; + private static final String FLOWABLE_SIMULATION_BASEDIR = "/home/simulation/"; @Autowired private TaskController taskController; @@ -74,11 +74,17 @@ public class TaskAdapter implements ITaskFeignClient { // 手动 if (Objects.equals(req.getExecuteMode(),EXECUTE_MODE_MANUAL)) { masterFilepath = req.getManualMasterFilepaths().get(0); + masterFilepath=FLOWABLE_SIMULATION_BASEDIR+masterFilepath; // 本地主文件 submitHpcTaskReq.setMasterFilePath(masterFilepath); inputFilePaths= req.getManualInputFilePaths(); + List finalInputFilePaths = new ArrayList<>(); + for(String inputFilePath:inputFilePaths){ + finalInputFilePaths.add(FLOWABLE_SIMULATION_BASEDIR+inputFilePath); + } // 本地从文件 submitHpcTaskReq.setInputFilePaths(inputFilePaths); + log.info("getSimulationFile 手动主文件：{}，从文件：{}",masterFilepath,JSONObject.toJSONString(finalInputFilePaths)); } // 自动 if (Objects.equals(req.getExecuteMode(),EXECUTE_MODE_AUTO)) {