fix:hpc提交 by yangyang

pbs/src/main/java/com/sdm/pbs/controller/TaskAdapter.java

@@ -13,6 +13,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
@@ -30,18 +31,18 @@ public class TaskAdapter implements ITaskFeignClient {
     @Autowired
     private TaskController taskController;
 
-    @PostMapping(value = "/adapterSubmitHpcJob")
+    @PostMapping("/adapterSubmitHpcJob")
     @Operation(summary = "作业提交")
-    public SdmResponse<String> adapterSubmitHpcJob(SubmitHpcTaskRemoteReq req) {
+    public SdmResponse<String> adapterSubmitHpcJob(@RequestBody SubmitHpcTaskRemoteReq req) {
         // spdm 回传路径
         // 求解文件获取，可以在这一层分片上传，然后拿到对应的路径
-        getSimulationFile(req);
         SubmitHpcTaskReq submitHpcTaskReq = new SubmitHpcTaskReq();
+        getSimulationFile(req,submitHpcTaskReq);
         BeanUtils.copyProperties(req,submitHpcTaskReq);
         return taskController.submitHpcJob(submitHpcTaskReq);
     }
 
-    private void getSimulationFile(SubmitHpcTaskRemoteReq req){
+    private void getSimulationFile(SubmitHpcTaskRemoteReq req,SubmitHpcTaskReq submitHpcTaskReq ){
         log.info("提交请求参数：{}", JSONObject.toJSONString(req));
         String simulationFileLocalPath = req.getSimulationFileLocalPath();
         String masterFileRegularStr = req.getMasterFileRegularStr();
@@ -54,14 +55,14 @@ public class TaskAdapter implements ITaskFeignClient {
         FilesUtil.collectFiles(simulationFileLocalPath,masterFileRegularStr,inputFilesRegularStr,masterFilePath,inputFilePaths);
         try {
             MultipartFile masterMultipartFile = FilesUtil.toMultipartFile(masterFilePath.get());
-            req.setMasterFile(masterMultipartFile);
+            submitHpcTaskReq.setMasterFile(masterMultipartFile);
             if(CollectionUtils.isNotEmpty(inputFilePaths)){
                 List<MultipartFile> inputFiles = new ArrayList<>();
                 for (String inputFilePath : inputFilePaths) {
                     MultipartFile inputFile = FilesUtil.toMultipartFile(inputFilePath);
                     inputFiles.add(inputFile);
                 }
-                req.setInputFiles(inputFiles);
+                submitHpcTaskReq.setInputFiles(inputFiles);
             }
         } catch (Exception e) {
             log.error("getSimulationFile error",e);