fix:uploadFiles接口接收字符串tag标签

common/src/main/java/com/sdm/common/entity/req/data/UploadFilesReq.java

@@ -79,6 +79,8 @@ public class UploadFilesReq {
     @Schema(description= "算例下文件的排序字段，数值越小越靠前")
     private Integer sortOrder;
 
+    @Schema(description = "标签请求参数字符串")
+    private String tagReqStr;
     /**
      * 标签请求参数 设置tag1-tag10 ,taskId, runId记录文件所属节点信息
      */

common/src/main/java/com/sdm/common/feign/impl/data/DataClientFeignClientImpl.java

@@ -167,19 +167,6 @@ 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;

common/src/main/java/com/sdm/common/feign/inter/data/IDataFeignClient.java

@@ -62,10 +62,6 @@ 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);
 

data/src/main/java/com/sdm/data/controller/DataFileController.java

@@ -430,26 +430,6 @@ 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);
-    }
-
-
     /**
      * 记录用户下载历史
      *

data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java

@@ -2207,6 +2207,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public SdmResponse uploadFiles(UploadFilesReq req) {
+        req.setTagReq(JSONObject.parseObject(req.getTagReqStr(),TagReq.class));
         SdmResponse<FileMetadataInfo> dirResponse = resolveUploadDirectory(req);
         if (!dirResponse.isSuccess()) {
             return dirResponse;