From ecef4e046635a6eb78c92cd72dd96a84401164d9 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 07 四月 2025 16:40:59 +0800
Subject: [PATCH] 1.检验项查询拼接类型 2，设备检验项优化
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
index cec5006..6378290 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -1,9 +1,13 @@
package com.ruoyi.web.controller.common;
+import java.io.IOException;
+import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.List;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.utils.file.MinioUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,13 +27,12 @@
/**
* 閫氱敤璇锋眰澶勭悊
- *
+ *
* @author ruoyi
*/
@RestController
@RequestMapping("/common")
-public class CommonController
-{
+public class CommonController {
private static final Logger log = LoggerFactory.getLogger(CommonController.class);
@Autowired
@@ -37,9 +40,12 @@
private static final String FILE_DELIMETER = ",";
+ @Resource
+ private MinioUtils minioUtils;
+
/**
* 閫氱敤涓嬭浇璇锋眰
- *
+ *
* @param fileName 鏂囦欢鍚嶇О
* @param delete 鏄惁鍒犻櫎
*/
@@ -160,4 +166,37 @@
log.error("涓嬭浇鏂囦欢澶辫触", e);
}
}
+
+ /**
+ * 閫氱敤鏂囦欢涓嬭浇鏂规硶
+ *
+ * @param fileUrl Minio涓殑鏂囦欢璺緞锛堝锛歩mages/2023/report.pdf锛�
+ * @param fileName 涓嬭浇鏃舵樉绀虹殑鏂囦欢鍚嶏紙濡傦細骞村害鎶ュ憡.pdf锛�
+ * @param response HttpServletResponse瀵硅薄
+ */
+ @GetMapping("/downloadMinio")
+ public void downloadFile(String fileUrl, String fileName, HttpServletResponse response) {
+ Logger logger = LoggerFactory.getLogger(this.getClass());
+ if (StringUtils.isBlank(fileUrl) || StringUtils.isBlank(fileName)) {
+ response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+ try (PrintWriter writer = response.getWriter()) {
+ writer.write("鏂囦欢璺緞鍜屾枃浠跺悕涓嶈兘涓虹┖");
+ } catch (IOException e) {
+ logger.error("璁剧疆鍝嶅簲淇℃伅鍑洪敊", e);
+ }
+ return;
+ }
+ String bucketName = "radio-frequency";
+ try {
+ minioUtils.download(bucketName, fileUrl, fileName, response);
+ } catch (Exception e) {
+ logger.error("鏂囦欢涓嬭浇澶辫触", e);
+ response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ try (PrintWriter writer = response.getWriter()) {
+ writer.write("鏂囦欢涓嬭浇澶辫触: " + e.getMessage());
+ } catch (IOException ioException) {
+ logger.error("璁剧疆鍝嶅簲淇℃伅鍑洪敊", ioException);
+ }
+ }
+ }
}
--
Gitblit v1.9.3