From 64cfb487d642b0d336d6542f66d8db59acabf055 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 27 三月 2023 13:47:37 +0800
Subject: [PATCH] !313 修改controller中校验直接返回R.fail Merge pull request !313 from Yjoioooo/5.X
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java
index d03bfcd..89fb860 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java
@@ -38,7 +38,7 @@
@RequestMapping("/system/oss")
public class SysOssController extends BaseController {
- private final ISysOssService sysOssService;
+ private final ISysOssService ossService;
/**
* 鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃
@@ -46,7 +46,7 @@
@SaCheckPermission("system:oss:list")
@GetMapping("/list")
public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) {
- return sysOssService.queryPageList(bo, pageQuery);
+ return ossService.queryPageList(bo, pageQuery);
}
/**
@@ -58,7 +58,7 @@
@GetMapping("/listByIds/{ossIds}")
public R<List<SysOssVo>> listByIds(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable Long[] ossIds) {
- List<SysOssVo> list = sysOssService.listByIds(Arrays.asList(ossIds));
+ List<SysOssVo> list = ossService.listByIds(Arrays.asList(ossIds));
return R.ok(list);
}
@@ -72,9 +72,9 @@
@PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
public R<SysOssUploadVo> upload(@RequestPart("file") MultipartFile file) {
if (ObjectUtil.isNull(file)) {
- throw new ServiceException("涓婁紶鏂囦欢涓嶈兘涓虹┖");
+ R.fail("涓婁紶鏂囦欢涓嶈兘涓虹┖");
}
- SysOssVo oss = sysOssService.upload(file);
+ SysOssVo oss = ossService.upload(file);
SysOssUploadVo uploadVo = new SysOssUploadVo();
uploadVo.setUrl(oss.getUrl());
uploadVo.setFileName(oss.getOriginalName());
@@ -90,7 +90,7 @@
@SaCheckPermission("system:oss:download")
@GetMapping("/download/{ossId}")
public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException {
- sysOssService.download(ossId, response);
+ ossService.download(ossId, response);
}
/**
@@ -103,7 +103,7 @@
@DeleteMapping("/{ossIds}")
public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable Long[] ossIds) {
- return toAjax(sysOssService.deleteWithValidByIds(List.of(ossIds), true));
+ return toAjax(ossService.deleteWithValidByIds(List.of(ossIds), true));
}
}
--
Gitblit v1.9.3