From d1c296f59ea0ac750763ccaaa6c2132ce9166085 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 28 八月 2025 14:04:17 +0800
Subject: [PATCH] :fire: 销售出路 新增应收 合同管理 附件 添加文件上传
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 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 31fc707..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,28 +1,29 @@
package com.ruoyi.web.controller.common;
-import java.util.ArrayList;
-import java.util.List;
-
+import com.google.common.collect.Iterables;
import com.ruoyi.basic.service.StorageBlobService;
-import com.ruoyi.common.core.domain.R;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-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.multipart.MultipartFile;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
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.*;
+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;
/**
* 閫氱敤涓嬭浇璇锋眰
@@ -142,9 +147,9 @@
* minio閫氱敤涓婁紶璇锋眰锛堝涓級
*/
@PostMapping("/minioUploads")
- public R minioUploadFiles(List<MultipartFile> files, String bucketName) throws Exception
+ public R minioUploadFiles(List<MultipartFile> files, String bucketName,Long type) throws Exception
{
- return R.ok(storageBlobService.updateStorageBlobs(files, bucketName));
+ return R.ok(storageBlobService.updateStorageBlobs(files, bucketName,type));
}
/**
@@ -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