From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java | 125 +++++++++++++++++++++--------------------
1 files changed, 63 insertions(+), 62 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
index 22c0531..6fa75be 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
@@ -38,72 +38,73 @@
@RequestMapping("/system/oss/config")
public class SysOssConfigController extends BaseController {
- private final ISysOssConfigService iSysOssConfigService;
+ private final ISysOssConfigService iSysOssConfigService;
- /**
- * 鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃
- */
- @ApiOperation("鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃")
- @SaCheckPermission("system:oss:list")
- @GetMapping("/list")
- public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo) {
- return iSysOssConfigService.queryPageList(bo);
- }
+ /**
+ * 鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃
+ */
+ @ApiOperation("鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃")
+ @SaCheckPermission("system:oss:list")
+ @GetMapping("/list")
+ public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo) {
+ return iSysOssConfigService.queryPageList(bo);
+ }
- /**
- * 鑾峰彇瀵硅薄瀛樺偍閰嶇疆璇︾粏淇℃伅
- */
- @ApiOperation("鑾峰彇瀵硅薄瀛樺偍閰嶇疆璇︾粏淇℃伅")
- @SaCheckPermission("system:oss:query")
- @GetMapping("/{ossConfigId}")
- public AjaxResult<SysOssConfigVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable("ossConfigId") Integer ossConfigId) {
- return AjaxResult.success(iSysOssConfigService.queryById(ossConfigId));
- }
+ /**
+ * 鑾峰彇瀵硅薄瀛樺偍閰嶇疆璇︾粏淇℃伅
+ */
+ @ApiOperation("鑾峰彇瀵硅薄瀛樺偍閰嶇疆璇︾粏淇℃伅")
+ @SaCheckPermission("system:oss:query")
+ @GetMapping("/{ossConfigId}")
+ public AjaxResult<SysOssConfigVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
+ @PathVariable("ossConfigId") Integer ossConfigId) {
+ return AjaxResult.success(iSysOssConfigService.queryById(ossConfigId));
+ }
- /**
- * 鏂板瀵硅薄瀛樺偍閰嶇疆
- */
- @ApiOperation("鏂板瀵硅薄瀛樺偍閰嶇疆")
- @SaCheckPermission("system:oss:add")
- @Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.INSERT)
- @RepeatSubmit()
- @PostMapping()
- public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
- return toAjax(iSysOssConfigService.insertByBo(bo) ? 1 : 0);
- }
+ /**
+ * 鏂板瀵硅薄瀛樺偍閰嶇疆
+ */
+ @ApiOperation("鏂板瀵硅薄瀛樺偍閰嶇疆")
+ @SaCheckPermission("system:oss:add")
+ @Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.INSERT)
+ @RepeatSubmit()
+ @PostMapping()
+ public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
+ return toAjax(iSysOssConfigService.insertByBo(bo) ? 1 : 0);
+ }
- /**
- * 淇敼瀵硅薄瀛樺偍閰嶇疆
- */
- @ApiOperation("淇敼瀵硅薄瀛樺偍閰嶇疆")
- @SaCheckPermission("system:oss:edit")
- @Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.UPDATE)
- @RepeatSubmit()
- @PutMapping()
- public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
- return toAjax(iSysOssConfigService.updateByBo(bo) ? 1 : 0);
- }
+ /**
+ * 淇敼瀵硅薄瀛樺偍閰嶇疆
+ */
+ @ApiOperation("淇敼瀵硅薄瀛樺偍閰嶇疆")
+ @SaCheckPermission("system:oss:edit")
+ @Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PutMapping()
+ public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
+ return toAjax(iSysOssConfigService.updateByBo(bo) ? 1 : 0);
+ }
- /**
- * 鍒犻櫎瀵硅薄瀛樺偍閰嶇疆
- */
- @ApiOperation("鍒犻櫎瀵硅薄瀛樺偍閰嶇疆")
- @SaCheckPermission("system:oss:remove")
- @Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ossConfigIds}")
- public AjaxResult<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable Long[] ossConfigIds) {
- return toAjax(iSysOssConfigService.deleteWithValidByIds(Arrays.asList(ossConfigIds), true) ? 1 : 0);
- }
+ /**
+ * 鍒犻櫎瀵硅薄瀛樺偍閰嶇疆
+ */
+ @ApiOperation("鍒犻櫎瀵硅薄瀛樺偍閰嶇疆")
+ @SaCheckPermission("system:oss:remove")
+ @Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ossConfigIds}")
+ public AjaxResult<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
+ @PathVariable Long[] ossConfigIds) {
+ return toAjax(iSysOssConfigService.deleteWithValidByIds(Arrays.asList(ossConfigIds), true) ? 1 : 0);
+ }
- /**
- * 鐘舵�佷慨鏀�
- */
- @SaCheckPermission("system:oss:edit")
- @Log(title = "瀵硅薄瀛樺偍鐘舵�佷慨鏀�", businessType = BusinessType.UPDATE)
- @PutMapping("/changeStatus")
- public AjaxResult changeStatus(@RequestBody SysOssConfigBo bo) {
- return toAjax(iSysOssConfigService.updateOssConfigStatus(bo));
- }
+ /**
+ * 鐘舵�佷慨鏀�
+ */
+ @ApiOperation("鐘舵�佷慨鏀�")
+ @SaCheckPermission("system:oss:edit")
+ @Log(title = "瀵硅薄瀛樺偍鐘舵�佷慨鏀�", businessType = BusinessType.UPDATE)
+ @PutMapping("/changeStatus")
+ public AjaxResult<Void> changeStatus(@RequestBody SysOssConfigBo bo) {
+ return toAjax(iSysOssConfigService.updateOssConfigStatus(bo));
+ }
}
--
Gitblit v1.9.3