From eb02391a7bf8712ca8853a6797a3108409779146 Mon Sep 17 00:00:00 2001
From: gulongcheng <474084054@qq.com>
Date: Fri, 13 Mar 2026 10:08:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/data/DataClientFeignClientImpl.java  | 13 +++++++++++++
 .../feign/inter/data/IDataFeignClient.java    |  9 +++++----
 .../data/controller/DataFileController.java   | 19 +++++++++++++++++++
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/common/src/main/java/com/sdm/common/feign/impl/data/DataClientFeignClientImpl.java b/common/src/main/java/com/sdm/common/feign/impl/data/DataClientFeignClientImpl.java
index 1762714e..cd01dbce 100644
--- a/common/src/main/java/com/sdm/common/feign/impl/data/DataClientFeignClientImpl.java
+++ b/common/src/main/java/com/sdm/common/feign/impl/data/DataClientFeignClientImpl.java
@@ -167,6 +167,19 @@ public class DataClientFeignClientImpl implements IDataFeignClient {
         }
     }
 
+    @Override
+    public SdmResponse uploadFilesWithTag(UploadFilesReq uploadFilesReq, MultipartFile file) {
+        SdmResponse response;
+        try {
+            response = dataClient.uploadFilesWithTag(uploadFilesReq, file);
+            log.info("上传文件响应：" + response);
+            return response;
+        } catch (Exception e) {
+            log.error("上传文件失败", e);
+            return SdmResponse.failed("上传文件失败");
+        }
+    }
+
     @Override
     public SdmResponse<FileMetadataInfoResp> queryFileMetadataInfo(String uuid, String uuidOwnType, Long dirId) {
         SdmResponse<FileMetadataInfoResp> response;
diff --git a/common/src/main/java/com/sdm/common/feign/inter/data/IDataFeignClient.java b/common/src/main/java/com/sdm/common/feign/inter/data/IDataFeignClient.java
index 2de86ca7..2d0f3fee 100644
--- a/common/src/main/java/com/sdm/common/feign/inter/data/IDataFeignClient.java
+++ b/common/src/main/java/com/sdm/common/feign/inter/data/IDataFeignClient.java
@@ -12,10 +12,7 @@ import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -65,6 +62,10 @@ public interface IDataFeignClient {
     @PostMapping(value = "/data/uploadFiles",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     SdmResponse uploadFiles(UploadFilesReq req);
 
+    @PostMapping(value = "/data/uploadFilesWithTag", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    SdmResponse uploadFilesWithTag(@RequestPart("uploadFilesReq") UploadFilesReq uploadFilesReq,
+                                   @RequestPart("file") MultipartFile file);
+
     @GetMapping("/data/queryFileMetadataInfo")
     SdmResponse<FileMetadataInfoResp> queryFileMetadataInfo(@RequestParam(value = "uuid") String uuid, @RequestParam(value = "uuidOwnType") String uuidOwnType, @RequestParam(value = "dirId") Long dirId);
 
diff --git a/data/src/main/java/com/sdm/data/controller/DataFileController.java b/data/src/main/java/com/sdm/data/controller/DataFileController.java
index d4854724..b49b6351 100644
--- a/data/src/main/java/com/sdm/data/controller/DataFileController.java
+++ b/data/src/main/java/com/sdm/data/controller/DataFileController.java
@@ -430,6 +430,25 @@ public class DataFileController implements IDataFeignClient {
         return IDataFileService.uploadFiles(req);
     }
 
+    @PostMapping(value = "/uploadFilesWithTag", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @Operation(
+            summary = "上传文件",
+            description = "上传文件到服务器，支持同时上传文件和附加参数",
+            requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody(
+                    description = "文件上传请求",
+                    required = true,
+                    content = @Content(
+                            mediaType = MediaType.MULTIPART_FORM_DATA_VALUE,
+                            schema = @Schema(implementation = UploadFilesReq.class)
+                    )
+            )
+    )
+    public SdmResponse uploadFilesWithTag(@RequestPart("uploadFilesReq") UploadFilesReq uploadFilesReq,
+                                          @RequestPart("file") MultipartFile file) {
+        uploadFilesReq.setFile(file);
+        return IDataFileService.uploadFiles(uploadFilesReq);
+    }
+
 
     /**
      * 记录用户下载历史