From f0741706aac72e04847e97b6db365aaefe7d8ccd Mon Sep 17 00:00:00 2001
From: zhuxinru <zhuxinru@honeycombis.com>
Date: Thu, 16 Apr 2026 17:59:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BB=BB=E5=8A=A1=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=BD=92=E6=A1=A3=E6=8C=87=E6=A0=87=E5=92=8C?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=BA=E5=85=B3=E9=94=AE=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/SimulationTaskResultCurveResp.java   |  4 ++
 .../impl/SimulationRunServiceImpl.java        | 66 ++++++++-----------
 2 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/common/src/main/java/com/sdm/common/entity/resp/data/SimulationTaskResultCurveResp.java b/common/src/main/java/com/sdm/common/entity/resp/data/SimulationTaskResultCurveResp.java
index 0e82c173..fa3e6b74 100644
--- a/common/src/main/java/com/sdm/common/entity/resp/data/SimulationTaskResultCurveResp.java
+++ b/common/src/main/java/com/sdm/common/entity/resp/data/SimulationTaskResultCurveResp.java
@@ -41,4 +41,8 @@ public class SimulationTaskResultCurveResp extends BaseResp {
 
     @Schema(description = "创建人")
     private Long creatorId;
+
+    @Schema(description = "更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
 }
diff --git a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
index da440ec4..1d0334ab 100644
--- a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
@@ -1227,6 +1227,11 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
             CurveParamDto curveParamDto = getCurveParamsFromUpload(req.getFile(), 2);
             return SdmResponse.success(curveParamDto);
         }
+        if (StringUtils.isEmpty(req.getFileTypeDictValue())) {
+            req.setFileTypeDictClass(FileDictTagEnum.FILE_TYPE.getDictClass());
+            req.setFileTypeDictValue(String.valueOf(req.getFileType()));
+            req.setDictTags(Arrays.asList(FileDictTagEnum.FILE_TYPE.getDictClassFieldName(), FileDictTagEnum.FILE_TYPE.getDictValueFieldName()));
+        }
 
         SimulationRunKeyResult simulationRunKeyResult = new SimulationRunKeyResult();
         BeanUtils.copyProperties(req, simulationRunKeyResult);
@@ -1248,11 +1253,6 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
         if (req.getFile() != null) {
             UploadFilesReq filesReq = new UploadFilesReq();
             BeanUtils.copyProperties(req, filesReq);
-            if (StringUtils.isEmpty(req.getFileTypeDictValue())) {
-                filesReq.setFileTypeDictClass(FileDictTagEnum.FILE_TYPE.getDictClass());
-                filesReq.setFileTypeDictValue(String.valueOf(req.getFileType()));
-                filesReq.setDictTags(Arrays.asList(FileDictTagEnum.FILE_TYPE.getDictClassFieldName(), FileDictTagEnum.FILE_TYPE.getDictValueFieldName()));
-            }
             SdmResponse response = uploadKeyResultFiles(filesReq);
             if (response.isSuccess() && response.getData() != null) {
                 JSONObject result = JSONObject.from(response.getData());
@@ -2272,42 +2272,30 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
                     fileName,
                     "application/octet-stream",
                     fileData);
-            if (StringUtils.isNotEmpty(taskId)) {
-                // 上传到任务下的交付物文件夹的报告文件夹下
-                Long parentId = getParentDirId(taskId, fileBizTypeEnum.getDirName());
-                UploadFilesReq filesReq = new UploadFilesReq();
-                filesReq.setFile(multipartFile);
-                filesReq.setFileName(fileName);
-                filesReq.setFileType(fileBizTypeEnum.getValue());
-                filesReq.setUuid(null);
-                filesReq.setDirId(parentId);
-                filesReq.setSortOrder(sortOrder);
-                filesReq.setFileTypeDictClass(FileDictTagEnum.FILE_TYPE.getDictClass());
-                filesReq.setFileTypeDictValue(String.valueOf(fileBizTypeEnum.getValue()));
-                filesReq.setDictTags(Arrays.asList(FileDictTagEnum.FILE_TYPE.getDictClassFieldName(), FileDictTagEnum.FILE_TYPE.getDictValueFieldName()));
-                filesReq.setIsConverSameNameFile(true);
-                SdmResponse sdmResponse = uploadKeyResultFiles(filesReq);
-                if (!sdmResponse.isSuccess()) {
-                    log.error("生成自动化报告上传任务报告结果目录失败：{}", JSON.toJSONString(sdmResponse));
-                    throw new RuntimeException("生成自动化报告上传任务报告结果目录失败");
-                }
-            } else {
-                // 上传到算例下的报告文件夹下
-                KeyResultReq resultReq = new KeyResultReq();
-                resultReq.setKeyResultType(fileBizTypeEnum == FileBizTypeEnum.CLOUD_FILE ? KeyResultTypeEnum.IMAGE.getKeyResultType() : KeyResultTypeEnum.DOCUMENT.getKeyResultType());
-                resultReq.setRunId(runId);
-                resultReq.setName(fileName);
 
-                resultReq.setFile(multipartFile);
-                resultReq.setFileName(fileName);
-                resultReq.setFileType(fileBizTypeEnum.getValue());
-                resultReq.setIsConverSameNameFile(true);
-                SdmResponse sdmResponse = addSimulationKeyResult(resultReq);
-                if (!sdmResponse.isSuccess()) {
-                    log.error("生成自动化报告上传算例报告结果目录失败：{}", JSON.toJSONString(sdmResponse));
-                    throw new RuntimeException("生成自动化报告上传算例报告结果目录失败");
-                }
+            KeyResultReq resultReq = new KeyResultReq();
+            resultReq.setKeyResultType(fileBizTypeEnum == FileBizTypeEnum.CLOUD_FILE ? KeyResultTypeEnum.IMAGE.getKeyResultType() : KeyResultTypeEnum.DOCUMENT.getKeyResultType());
+            resultReq.setTaskId(taskId);
+            resultReq.setName(fileName);
+            resultReq.setFile(multipartFile);
+            resultReq.setFileName(fileName);
+            resultReq.setFileType(fileBizTypeEnum.getValue());
+            resultReq.setIsConverSameNameFile(true);
+
+            if (StringUtils.isNotEmpty(taskId)) {
+                // 上传到任务下的交付物文件夹的报告/图片文件夹下
+                resultReq.setTaskId(taskId);
+            } else {
+                // 上传到算例下的报告/图片文件夹下
+                resultReq.setRunId(runId);
             }
+
+            SdmResponse sdmResponse = addSimulationKeyResult(resultReq);
+            if (!sdmResponse.isSuccess()) {
+                log.error("生成自动化报告上传报告结果目录失败：{}", JSON.toJSONString(sdmResponse));
+                throw new RuntimeException("生成自动化报告上传报告结果目录失败");
+            }
+
             fileInputStream.close();
         } catch (Exception ex) {
             log.error("生成自动化报告失败：{}", ex.getMessage());