From 00b90439157a92c857d0ef32ffa1887b3bef92f1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 18 七月 2021 20:27:37 +0800
Subject: [PATCH] add 增加 OSS 模块业务代码

---
 ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java b/ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java
index a629626..9d1e917 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java
@@ -8,11 +8,18 @@
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.system.bo.SysOssQueryBo;
 import com.ruoyi.system.domain.SysOss;
 import com.ruoyi.system.service.ISysOssService;
+import com.ruoyi.system.vo.SysOssVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -26,6 +33,8 @@
  *
  * @author Lion Li
  */
+@Validated
+@Api(value = "OSS浜戝瓨鍌ㄦ帶鍒跺櫒", tags = {"OSS浜戝瓨鍌ㄧ鐞�"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/oss")
@@ -34,22 +43,27 @@
 	private final ISysOssService iSysOssService;
 
 	/**
-	 * 鏌ヨ鏂囦欢涓婁紶鍒楄〃
+	 * 鏌ヨOSS浜戝瓨鍌ㄥ垪琛�
 	 */
+	@ApiOperation("鏌ヨOSS浜戝瓨鍌ㄥ垪琛�")
 	@PreAuthorize("@ss.hasPermi('system:oss:list')")
 	@GetMapping("/list")
-	public TableDataInfo<SysOss> list(SysOss sysOss) {
-		return iSysOssService.queryPageList(sysOss);
+	public TableDataInfo<SysOssVo> list(@Validated SysOssQueryBo bo) {
+		return iSysOssService.queryPageList(bo);
 	}
 
 	/**
-	 * 涓婁紶鍥剧墖
+	 * 涓婁紶OSS浜戝瓨鍌�
 	 */
+	@ApiOperation("涓婁紶OSS浜戝瓨鍌�")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "file", value = "鏂囦欢", dataType = "java.io.File", required = true),
+	})
 	@PreAuthorize("@ss.hasPermi('system:oss:upload')")
 	@Log(title = "OSS浜戝瓨鍌�", businessType = BusinessType.INSERT)
 	@RepeatSubmit
 	@PostMapping("/upload")
-	public AjaxResult<Map<String, String>> upload(@RequestParam("file") MultipartFile file) {
+	public AjaxResult<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
 		if (file.isEmpty()) {
 			throw new CustomException("涓婁紶鏂囦欢涓嶈兘涓虹┖");
 		}
@@ -63,12 +77,13 @@
 	/**
 	 * 鍒犻櫎OSS浜戝瓨鍌�
 	 */
+	@ApiOperation("鍒犻櫎OSS浜戝瓨鍌�")
 	@PreAuthorize("@ss.hasPermi('system:oss:remove')")
 	@Log(title = "OSS浜戝瓨鍌�" , businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ossIds}")
 	public AjaxResult<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
 								   @PathVariable Long[] ossIds) {
-		return toAjax(iSysOssService.deleteByIds(Arrays.asList(ossIds)) ? 1 : 0);
+		return toAjax(iSysOssService.deleteWithValidByIds(Arrays.asList(ossIds), true) ? 1 : 0);
 	}
 
 }

--
Gitblit v1.9.3