From e1a6e20d22fbcb862247fac0a671a2a2722e7755 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 29 八月 2025 14:07:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 26 ++++++++++++++++++++++----
1 files changed, 22 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 bf81449..76a1b44 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,5 +1,6 @@
package com.ruoyi.web.controller.common;
+import com.google.common.collect.Iterables;
import com.ruoyi.basic.service.StorageBlobService;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.Constants;
@@ -11,17 +12,17 @@
import com.ruoyi.framework.config.ServerConfig;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
+import lombok.Getter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
/**
@@ -42,6 +43,10 @@
@Autowired
private StorageBlobService storageBlobService;
+
+ @Getter
+ @Value("${minio.default-bucket}")
+ private String defaultBucket;
/**
* 閫氱敤涓嬭浇璇锋眰
@@ -175,4 +180,17 @@
log.error("涓嬭浇鏂囦欢澶辫触", e);
}
}
+
+ /**
+ * 鏍规嵁 storage_blob 琛╥d 杩斿洖minio鏂囦欢鍒楄〃
+ * @param ids
+ */
+ @PostMapping("/findFileListByIds")
+ public R findFileListByIds(@RequestBody List<Long> ids){
+ if (Iterables.isEmpty(ids)){
+ return R.ok();
+ }
+ return R.ok(storageBlobService.findStorageByIds(ids,defaultBucket));
+ }
+
}
--
Gitblit v1.9.3