From 62a8267fe595c5d1b404e4a821f2e5d93f949320 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 25 四月 2026 17:34:52 +0800
Subject: [PATCH] feat(production): 生产订单的bom的增删改
---
src/main/java/com/ruoyi/project/common/CommonController.java | 119 ++++++++++++++++++++++++++---------------------------------
1 files changed, 52 insertions(+), 67 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..9ee3c93 100644
--- a/src/main/java/com/ruoyi/project/common/CommonController.java
+++ b/src/main/java/com/ruoyi/project/common/CommonController.java
@@ -1,18 +1,22 @@
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.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+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,18 +28,16 @@
*
* @author ruoyi
*/
-@Api(tags = "閫氱敤鎺ュ彛")
+@Tag(name = "閫氱敤鎺ュ彛")
@AllArgsConstructor
@RestController
@RequestMapping("/common")
public class CommonController {
private static final Logger log = LoggerFactory.getLogger(CommonController.class);
- private ServerConfig serverConfig;
-
- private static final String FILE_DELIMETER = ",";
private final StorageBlobService storageBlobService;
+ private final FileUtil fileUtil;
// /**
@@ -71,16 +73,6 @@
// }
//
// /**
-// * minio閫氱敤涓婁紶璇锋眰锛堝涓級
-// */
-// @PostMapping("/minioUploads")
-// @ApiOperation(value = "minio閫氱敤涓婁紶璇锋眰")
-// public AjaxResult minioUploadFiles(List<MultipartFile> files, String bucketName, Long type) throws Exception
-// {
-// return AjaxResult.success();
-// }
-//
-// /**
// * 閫氱敤涓婁紶璇锋眰锛堝崟涓級
// */
// @PostMapping("/upload")
@@ -98,43 +90,6 @@
// ajax.put("fileName", fileName);
// ajax.put("newFileName", FileUtils.getName(fileName));
// ajax.put("originalFilename", file.getOriginalFilename());
-// return ajax;
-// }
-// catch (Exception e)
-// {
-// return AjaxResult.error(e.getMessage());
-// }
-// }
-//
-// /**
-// * 閫氱敤涓婁紶璇锋眰锛堝涓級
-// */
-// @PostMapping("/uploads")
-// public AjaxResult uploadFiles(List<MultipartFile> files) throws Exception
-// {
-// try
-// {
-// // 涓婁紶鏂囦欢璺緞
-// String filePath = RuoYiConfig.getUploadPath();
-// List<String> urls = new ArrayList<String>();
-// List<String> fileNames = new ArrayList<String>();
-// List<String> newFileNames = new ArrayList<String>();
-// List<String> originalFilenames = new ArrayList<String>();
-// for (MultipartFile file : files)
-// {
-// // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
-// String fileName = FileUploadUtils.upload(filePath, file);
-// String url = serverConfig.getUrl() + fileName;
-// urls.add(url);
-// fileNames.add(fileName);
-// newFileNames.add(FileUtils.getName(fileName));
-// originalFilenames.add(file.getOriginalFilename());
-// }
-// AjaxResult ajax = AjaxResult.success();
-// ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
-// ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
-// ajax.put("newFileNames", StringUtils.join(newFileNames, FILE_DELIMETER));
-// ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
// return ajax;
// }
// catch (Exception e)
@@ -171,32 +126,62 @@
// log.error("涓嬭浇鏂囦欢澶辫触", e);
// }
// }
-
@PostMapping({"/upload"})
- @ApiOperation(value = "鏂囦欢涓婁紶")
- public R upload(@RequestParam("files") List<MultipartFile> files) throws Exception {
- return R.ok(storageBlobService.upload(files));
+ @Operation(summary = "鏂囦欢涓婁紶")
+ public R upload(@RequestParam("files") List<MultipartFile> files) {
+ return R.ok(storageBlobService.upload(files, false));
}
+ /**
+ * 鍏叡鏂囦欢涓婁紶
+ * 姝ゆ帴鍙ｄ笂浼犵殑鏂囦欢姘镐箙鏈夋晥锛屾厧鐢�
+ */
+ @PostMapping({"/public/upload"})
+ @Operation(summary = "鏂囦欢涓婁紶")
+ public R publicUpload(@RequestParam("files") List<MultipartFile> files) {
+ return R.ok(storageBlobService.upload(files, true));
+ }
@GetMapping("/download/{fileName}")
@Anonymous
- public void download(@PathVariable String fileName, @RequestParam("token") String token, HttpServletResponse response) throws Exception {
- File file = storageBlobService.getFileByToken(fileName, token);
+ public void download(@PathVariable String fileName,
+ @RequestParam(value = "token", required = false) String token,
+ @RequestParam(value = "publicKey", required = false) String publicKey,
+ HttpServletResponse response) throws Exception {
+ File file;
+ if (publicKey != null) {
+ file = fileUtil.compressFile(storageBlobService.getPublicFile(fileName, publicKey));
+ } else {
+ file = fileUtil.compressFile(storageBlobService.getFileByToken(fileName, token));
+ }
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(value = "token", required = false) String token,
+ @RequestParam(value = "publicKey", required = false) String publicKey) throws Exception {
+ File file;
+ if (publicKey != null) {
+ file = fileUtil.compressFile(storageBlobService.getPublicFile(fileName, publicKey));
+ } else {
+ 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