From 4b2a52eecd3b425bfe592ff7fc2959ef7391b4b6 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 24 四月 2026 14:14:41 +0800
Subject: [PATCH] 发货文件上传修改
---
src/main/java/com/ruoyi/project/common/CommonController.java | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/common/CommonController.java b/src/main/java/com/ruoyi/project/common/CommonController.java
index f4ca6ca..e327a95 100644
--- a/src/main/java/com/ruoyi/project/common/CommonController.java
+++ b/src/main/java/com/ruoyi/project/common/CommonController.java
@@ -1,18 +1,23 @@
package com.ruoyi.project.common;
import com.ruoyi.basic.service.StorageBlobService;
+import com.ruoyi.basic.utils.FileUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Anonymous;
import com.ruoyi.framework.config.ServerConfig;
import com.ruoyi.framework.web.domain.R;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.http.ContentDisposition;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.File;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
@@ -24,7 +29,7 @@
*
* @author ruoyi
*/
-@Api(tags = "閫氱敤鎺ュ彛")
+@Tag(name = "閫氱敤鎺ュ彛")
@AllArgsConstructor
@RestController
@RequestMapping("/common")
@@ -36,6 +41,7 @@
private static final String FILE_DELIMETER = ",";
private final StorageBlobService storageBlobService;
+ private final FileUtil fileUtil;
// /**
@@ -68,16 +74,6 @@
// {
// log.error("涓嬭浇鏂囦欢澶辫触", e);
// }
-// }
-//
-// /**
-// * minio閫氱敤涓婁紶璇锋眰锛堝涓級
-// */
-// @PostMapping("/minioUploads")
-// @ApiOperation(value = "minio閫氱敤涓婁紶璇锋眰")
-// public AjaxResult minioUploadFiles(List<MultipartFile> files, String bucketName, Long type) throws Exception
-// {
-// return AjaxResult.success();
// }
//
// /**
@@ -171,9 +167,8 @@
// log.error("涓嬭浇鏂囦欢澶辫触", e);
// }
// }
-
@PostMapping({"/upload"})
- @ApiOperation(value = "鏂囦欢涓婁紶")
+ @Operation(summary = "鏂囦欢涓婁紶")
public R upload(@RequestParam("files") List<MultipartFile> files) throws Exception {
return R.ok(storageBlobService.upload(files));
}
@@ -186,17 +181,25 @@
String originalFileName = storageBlobService.getDownloadFileName(fileName);
String encodedFileName = URLEncoder.encode(originalFileName, StandardCharsets.UTF_8.name()).replace("+", "%20");
response.setHeader("Content-Disposition", "attachment;filename*=UTF-8''" + encodedFileName);
+ response.setContentLengthLong(file.length());
Files.copy(file.toPath(), response.getOutputStream());
}
@GetMapping("/preview/{fileName}")
@Anonymous
- public void preview(@PathVariable String fileName, @RequestParam("token") String token, HttpServletResponse response) throws Exception {
- File file = storageBlobService.getFileByToken(fileName, token);
+ public ResponseEntity<FileSystemResource> preview(@PathVariable String fileName,
+ @RequestParam("token") String token) throws Exception {
+ File file = fileUtil.compressFile(storageBlobService.getFileByToken(fileName, token));
String contentType = Files.probeContentType(file.toPath());
- response.setContentType(contentType == null ? "application/octet-stream" : contentType);
- String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.name()).replace("+", "%20");
- response.setHeader("Content-Disposition", "inline;filename*=UTF-8''" + encodedFileName);
- Files.copy(file.toPath(), response.getOutputStream());
+
+ ContentDisposition contentDisposition = ContentDisposition.inline()
+ .filename(fileName, StandardCharsets.UTF_8)
+ .build();
+
+ return ResponseEntity.ok()
+ .contentType(MediaType.parseMediaType(contentType != null ? contentType : "application/octet-stream"))
+ .contentLength(file.length())
+ .header("Content-Disposition", contentDisposition.toString())
+ .body(new FileSystemResource(file));
}
}
--
Gitblit v1.9.3