Merge remote-tracking branch 'origin/main'

project/src/main/java/com/sdm/project/controller/SimulationRunController.java

@@ -25,6 +25,7 @@ import com.sdm.project.service.ISimulationRunService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -35,6 +36,7 @@ import java.util.List;
 @RestController
 @RequestMapping(value = "/run")
 @Tag(name = "仿真任务策划管理", description = "仿真任务策划管理管理相关接口")
+@Slf4j
 public class SimulationRunController implements ISimulationRunFeignClient {
 
     @Resource

project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java

@@ -1015,9 +1015,12 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
         GetFileBaseInfoReq getFileBaseInfoReq = new GetFileBaseInfoReq();
         getFileBaseInfoReq.setFileId(req.getDirId());
         SdmResponse<FileMetadataInfoResp> fileBaseInfoResp = dataFeignClient.getFileBaseInfo(getFileBaseInfoReq);
-        if (fileBaseInfoResp.getData() != null && fileBaseInfoResp.getData().getTagReq() != null) {
-            TagReq tagReq = fileBaseInfoResp.getData().getTagReq();
-            req.setTagReq(tagReq);
+        if (fileBaseInfoResp.getData() != null) {
+            req.setTagReq(fileBaseInfoResp.getData().getTagReq());
+            // Feign multipart/form-data 无法传递复杂对象，需要转为JSON字符串
+            if (req.getTagReq() != null) {
+                req.setTagReqStr(JSON.toJSONString(req.getTagReq()));
+            }
         }
         return dataFeignClient.uploadFiles(req);
     }
@@ -2949,9 +2952,9 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
                     SimulationRunKeyResult simulationRunKeyResult = new SimulationRunKeyResult();
                     simulationRunKeyResult.setUuid(RandomUtil.generateString(32));
                     simulationRunKeyResult.setXQuantityType(sourceFile.getXQuantityType());
-                    simulationRunKeyResult.setXUnits(sourceFile.getXQuantityType());
-                    simulationRunKeyResult.setYQuantityType(sourceFile.getXQuantityType());
-                    simulationRunKeyResult.setYUnits(sourceFile.getXQuantityType());
+                    simulationRunKeyResult.setXUnits(sourceFile.getXUnits());
+                    simulationRunKeyResult.setYQuantityType(sourceFile.getYQuantityType());
+                    simulationRunKeyResult.setYUnits(sourceFile.getYUnits());
                     simulationRunKeyResult.setFileId(addFileInfoResp.getBusinessId());
                     simulationRunKeyResult.setCreator(ThreadLocalContext.getUserId());
                     simulationRunKeyResult.setUpdater(ThreadLocalContext.getUserId());