From 51b12cd9b0fbf953f8dc14d114f1b2128274e94d Mon Sep 17 00:00:00 2001
From: zhuxinru <zhuxinru@honeycombis.com>
Date: Fri, 27 Mar 2026 17:30:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=BE=93=E5=85=A5=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BD=92=E6=A1=A3=E6=A0=B9=E6=8D=AE=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E9=80=89=E6=8B=A9=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=89=93tag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SimulationReportTemplateServiceImpl.java  |  4 +++
 .../entity/req/data/CopyFileToTaskReq.java    | 25 +++++++++++++++++++
 .../impl/MinioFileIDataFileServiceImpl.java   |  9 ++++++-
 .../impl/SimulationRunServiceImpl.java        |  6 +++++
 4 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java b/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java
index 2d7e0c5e..e1573c48 100644
--- a/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java
+++ b/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java
@@ -60,6 +60,10 @@ public class SimulationReportTemplateServiceImpl extends ServiceImpl<SimulationR
 
     @Override
     public SdmResponse createReportTemplate(ReportTemplateDto templateDto) {
+        if (!CollectionUtils.isEmpty(this.lambdaQuery().eq(SimulationReportTemplate::getTemplateName, templateDto.getTemplateName()).list())) {
+            return SdmResponse.failed("同名报告模板已存在，请修改");
+        }
+
         SimulationReportTemplate reportTemplate = new SimulationReportTemplate();
         BeanUtils.copyProperties(templateDto, reportTemplate);
         reportTemplate.setUuid(generateUuid("report_template_"));
diff --git a/common/src/main/java/com/sdm/common/entity/req/data/CopyFileToTaskReq.java b/common/src/main/java/com/sdm/common/entity/req/data/CopyFileToTaskReq.java
index 53c899f9..be37f656 100644
--- a/common/src/main/java/com/sdm/common/entity/req/data/CopyFileToTaskReq.java
+++ b/common/src/main/java/com/sdm/common/entity/req/data/CopyFileToTaskReq.java
@@ -1,8 +1,12 @@
 package com.sdm.common.entity.req.data;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.List;
+import java.util.Map;
+
 @Data
 public class CopyFileToTaskReq {
 
@@ -14,4 +18,25 @@ public class CopyFileToTaskReq {
 
     @Schema(description = "要复制到的文件夹id")
     private Long parentDirId;
+
+    // ----------------------------------------------------------------
+    // 很重要，用于设置标签，通过autoFillDictTags切面 ，设置dictTagIdsCache
+    /**
+     * 字典标签查询结果缓存
+     * key: dictClass（字典类）
+     * value: Map<dictValue, dictId>（字典值 -> 字典ID）
+     * 此字段由服务层填充，前端不需传入
+     */
+    @Schema(description = "字典标签查询结果缓存", hidden = true)
+    @JSONField(serialize = false)
+    private Map<String, Map<String, Integer>> dictTagIdsCache;
+
+    @Schema(description = "字典标签查询列表，格式：['fileTypeDictClass','fileTypeDictValue','disciplineTypeDictClass','disciplineDictValue']")
+    private List<String> dictTags;
+
+    @Schema(description = "文件类型字典类")
+    private String fileTypeDictClass;
+    @Schema(description = "文件类型字典值")
+    private String fileTypeDictValue;
+
 }
diff --git a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
index 5452cb2d..e248f20a 100644
--- a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
+++ b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
@@ -1810,7 +1810,14 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
             uploadFilesReq.setSize(sourceMetadataInfo.getFileSize());
             List<Long> ancestorDirIds = collectAncestorDirIds(targetParentMetadataInfo.getId());
             saveFileStorageStats(fileInfo, uploadFilesReq, ancestorDirIds);
-            saveCopyFileTags(uploadFilesReq, fileInfo, sourceMetadataInfo, ancestorDirIds);
+            if (StringUtil.isEmpty(req.getFileTypeDictValue())) {
+                saveCopyFileTags(uploadFilesReq, fileInfo, sourceMetadataInfo, ancestorDirIds);
+            } else {
+                UploadFilesReq uploadFilesReq1 = new UploadFilesReq();
+                BeanUtils.copyProperties(req, uploadFilesReq1);
+                uploadFilesReq1.setSize(fileInfo.getFileSize());
+                saveFileTags(uploadFilesReq1, fileInfo, sourceMetadataInfo, ancestorDirIds);
+            }
             createFilePermission(fileInfo.getId());
 
             return SdmResponse.success(fileInfo.getId());
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 d5ba3724..e170a2e6 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
@@ -2913,9 +2913,15 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
                 CopyFileToTaskReq copyFileToTaskReq = new CopyFileToTaskReq();
                 copyFileToTaskReq.setSourceFileId(fileId);
 
+                // 设置tag 因为归档用户可以再选文件类型
+                copyFileToTaskReq.setFileTypeDictClass(req.getFileTypeDictClass());
+                copyFileToTaskReq.setFileTypeDictValue(req.getFileTypeDictValue());
+                copyFileToTaskReq.setDictTags(req.getDictTags());
+
                 Long parentDirId = getParentDirId(simulationRun.getTaskId(), fileBizTypeService.getFileName(String.valueOf(req.getFileType())));
                 copyFileToTaskReq.setParentDirId(parentDirId);
                 SdmResponse response = dataFeignClient.copyFileToTask(copyFileToTaskReq);
+                log.info("[syncKeyResultToTask] copyFileToTask req:{},resp:{}", JSON.toJSONString(copyFileToTaskReq),  JSON.toJSONString(response));
                 if (!response.isSuccess()) {
                     return SdmResponse.failed("归档输入输出文件失败");
                 }