From 8498ead56c2146a47bf389cba45a27aed0d19abd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 14 十二月 2022 14:23:40 +0800
Subject: [PATCH] !262 优化：删除无用依赖 Merge pull request !262 from hzf/dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java | 64 +++++++++++---------------------
1 files changed, 22 insertions(+), 42 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
index e71ef9f..606895a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
@@ -15,15 +15,12 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.oss.core.OssClient;
+import com.ruoyi.oss.factory.OssFactory;
import com.ruoyi.system.domain.SysOss;
import com.ruoyi.system.domain.bo.SysOssBo;
import com.ruoyi.system.domain.vo.SysOssVo;
import com.ruoyi.system.service.ISysOssService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.enums.ParameterIn;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
@@ -44,7 +41,6 @@
* @author Lion Li
*/
@Validated
-@Tag(name ="瀵硅薄瀛樺偍鎺у埗鍣�", description = "瀵硅薄瀛樺偍绠＄悊")
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/oss")
@@ -55,7 +51,6 @@
/**
* 鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃
*/
- @Operation(summary = "鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃")
@SaCheckPermission("system:oss:list")
@GetMapping("/list")
public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) {
@@ -64,32 +59,30 @@
/**
* 鏌ヨOSS瀵硅薄鍩轰簬id涓�
+ *
+ * @param ossIds OSS瀵硅薄ID涓�
*/
- @Operation(summary = "鏌ヨOSS瀵硅薄鍩轰簬ID")
@SaCheckPermission("system:oss:list")
@GetMapping("/listByIds/{ossIds}")
- public R<List<SysOssVo>> listByIds(@Parameter(name = "OSS瀵硅薄ID涓�")
- @NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable Long[] ossIds) {
+ public R<List<SysOssVo>> listByIds(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
+ @PathVariable Long[] ossIds) {
List<SysOssVo> list = iSysOssService.listByIds(Arrays.asList(ossIds));
return R.ok(list);
}
/**
* 涓婁紶OSS瀵硅薄瀛樺偍
+ *
+ * @param file 鏂囦欢
*/
- @Operation(summary = "涓婁紶OSS瀵硅薄瀛樺偍")
- @Parameters({
- @Parameter(name = "file", description = "鏂囦欢", in = ParameterIn.QUERY, required = true)
- })
@SaCheckPermission("system:oss:upload")
@Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.INSERT)
- @PostMapping("/upload")
+ @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
public R<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
if (ObjectUtil.isNull(file)) {
throw new ServiceException("涓婁紶鏂囦欢涓嶈兘涓虹┖");
}
- SysOss oss = iSysOssService.upload(file);
+ SysOssVo oss = iSysOssService.upload(file);
Map<String, String> map = new HashMap<>(2);
map.put("url", oss.getUrl());
map.put("fileName", oss.getOriginalName());
@@ -97,41 +90,28 @@
return R.ok(map);
}
- @Operation(summary = "涓嬭浇OSS瀵硅薄瀛樺偍")
+ /**
+ * 涓嬭浇OSS瀵硅薄
+ *
+ * @param ossId OSS瀵硅薄ID
+ */
@SaCheckPermission("system:oss:download")
@GetMapping("/download/{ossId}")
- public void download(@Parameter(name = "OSS瀵硅薄ID") @PathVariable Long ossId, HttpServletResponse response) throws IOException {
- SysOss sysOss = iSysOssService.getById(ossId);
- if (ObjectUtil.isNull(sysOss)) {
- throw new ServiceException("鏂囦欢鏁版嵁涓嶅瓨鍦�!");
- }
- response.reset();
- FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName());
- response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8");
- long data;
- try {
- data = HttpUtil.download(sysOss.getUrl(), response.getOutputStream(), false);
- } catch (HttpException e) {
- if (e.getMessage().contains("403")) {
- throw new ServiceException("鏃犺鍙栨潈闄�, 璇峰湪瀵瑰簲鐨凮SS寮�鍚�'鍏湁璇�'鏉冮檺!");
- } else {
- throw new ServiceException(e.getMessage());
- }
- }
- response.setContentLength(Convert.toInt(data));
+ public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException {
+ iSysOssService.download(ossId,response);
}
/**
* 鍒犻櫎OSS瀵硅薄瀛樺偍
+ *
+ * @param ossIds OSS瀵硅薄ID涓�
*/
- @Operation(summary = "鍒犻櫎OSS瀵硅薄瀛樺偍")
@SaCheckPermission("system:oss:remove")
@Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.DELETE)
@DeleteMapping("/{ossIds}")
- public R<Void> remove(@Parameter(name = "OSS瀵硅薄ID涓�")
- @NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable Long[] ossIds) {
- return toAjax(iSysOssService.deleteWithValidByIds(Arrays.asList(ossIds), true) ? 1 : 0);
+ public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
+ @PathVariable Long[] ossIds) {
+ return toAjax(iSysOssService.deleteWithValidByIds(Arrays.asList(ossIds), true));
}
}
--
Gitblit v1.9.3