Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-09-27 b082da73a1e0259738ccb33ebf7d80cad3dc3a10

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java

@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.system;

import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -16,7 +17,6 @@
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.*;

@@ -25,14 +25,14 @@
import java.util.Arrays;

/**
 * 云存储配置Controller
 * 对象存储配置Controller
 *
 * @author Lion Li
 * @author 孤舟烟雨
 * @date 2021-08-13
 */
@Validated
@Api(value = "云存储配置控制器", tags = {"云存储配置管理"})
@Api(value = "对象存储配置控制器", tags = {"对象存储配置管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/system/oss/config")
@@ -41,20 +41,20 @@
   private final ISysOssConfigService iSysOssConfigService;

   /**
    * 查询云存储配置列表
    * 查询对象存储配置列表
    */
   @ApiOperation("查询云存储配置列表")
   @PreAuthorize("@ss.hasPermi('system:oss:list')")
   @ApiOperation("查询对象存储配置列表")
   @SaCheckPermission("system:oss:list")
   @GetMapping("/list")
   public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo) {
      return iSysOssConfigService.queryPageList(bo);
   }

   /**
    * 获取云存储配置详细信息
    * 获取对象存储配置详细信息
    */
   @ApiOperation("获取云存储配置详细信息")
   @PreAuthorize("@ss.hasPermi('system:oss:query')")
   @ApiOperation("获取对象存储配置详细信息")
   @SaCheckPermission("system:oss:query")
   @GetMapping("/{ossConfigId}")
   public AjaxResult<SysOssConfigVo> getInfo(@NotNull(message = "主键不能为空")
                                   @PathVariable("ossConfigId") Integer ossConfigId) {
@@ -62,11 +62,11 @@
   }

   /**
    * 新增云存储配置
    * 新增对象存储配置
    */
   @ApiOperation("新增云存储配置")
   @PreAuthorize("@ss.hasPermi('system:oss:add')")
   @Log(title = "云存储配置", businessType = BusinessType.INSERT)
   @ApiOperation("新增对象存储配置")
   @SaCheckPermission("system:oss:add")
   @Log(title = "对象存储配置", businessType = BusinessType.INSERT)
   @RepeatSubmit()
   @PostMapping()
   public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
@@ -74,11 +74,11 @@
   }

   /**
    * 修改云存储配置
    * 修改对象存储配置
    */
   @ApiOperation("修改云存储配置")
   @PreAuthorize("@ss.hasPermi('system:oss:edit')")
   @Log(title = "云存储配置", businessType = BusinessType.UPDATE)
   @ApiOperation("修改对象存储配置")
   @SaCheckPermission("system:oss:edit")
   @Log(title = "对象存储配置", businessType = BusinessType.UPDATE)
   @RepeatSubmit()
   @PutMapping()
   public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
@@ -86,11 +86,11 @@
   }

   /**
    * 删除云存储配置
    * 删除对象存储配置
    */
   @ApiOperation("删除云存储配置")
   @PreAuthorize("@ss.hasPermi('system:oss:remove')")
   @Log(title = "云存储配置", businessType = BusinessType.DELETE)
   @ApiOperation("删除对象存储配置")
   @SaCheckPermission("system:oss:remove")
   @Log(title = "对象存储配置", businessType = BusinessType.DELETE)
   @DeleteMapping("/{ossConfigIds}")
   public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ossConfigIds) {
@@ -100,8 +100,8 @@
   /**
    * 状态修改
    */
   @PreAuthorize("@ss.hasPermi('system:oss:edit')")
   @Log(title = "云存储状态修改", businessType = BusinessType.UPDATE)
   @SaCheckPermission("system:oss:edit")
   @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
   @PutMapping("/changeStatus")
   public AjaxResult changeStatus(@RequestBody SysOssConfigBo bo) {
      return toAjax(iSysOssConfigService.updateOssConfigStatus(bo));