jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 修正 PR 相关问题

Browse Source
This commit is contained in:
疯狂的狮子li
2021-08-13 12:37:34 +08:00
parent c9f7314cd0
commit 824635df7f
13 changed files with 341 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,19 +1,13 @@
package com.ruoyi.web.controller.system;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysOssConfig;
import com.ruoyi.system.domain.bo.SysOssConfigBo;
import com.ruoyi.system.domain.vo.SysOssConfigVo;
import com.ruoyi.system.service.ISysOssConfigService;
@ -28,19 +22,19 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
import java.util.List;
/**
* 云存储配置Controller
*
* @author ruoyi
* @date 2021-08-11
* @author Lion Li
* @author 孤舟烟雨
* @date 2021-08-13
*/
@Validated
@Api(value = "云存储配置控制器", tags = {"云存储配置管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/system/sysOssConfig")
@RequestMapping("/system/oss/config")
public class SysOssConfigController extends BaseController {
private final ISysOssConfigService iSysOssConfigService;
@ -49,7 +43,7 @@ public class SysOssConfigController extends BaseController {
* 查询云存储配置列表
*/
@ApiOperation("查询云存储配置列表")
@PreAuthorize("@ss.hasPermi('system:sysOssConfig:list')")
@PreAuthorize("@ss.hasPermi('system:oss:list')")
@GetMapping("/list")
public TableDataInfo<SysOssConfigVo> list(@Validated SysOssConfigBo bo) {
return iSysOssConfigService.queryPageList(bo);
@ -59,7 +53,7 @@ public class SysOssConfigController extends BaseController {
* 获取云存储配置详细信息
*/
@ApiOperation("获取云存储配置详细信息")
@PreAuthorize("@ss.hasPermi('system:sysOssConfig:query')")
@PreAuthorize("@ss.hasPermi('system:oss:query')")
@GetMapping("/{ossConfigId}")
public AjaxResult<SysOssConfigVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("ossConfigId") Integer ossConfigId) {
@ -70,15 +64,11 @@ public class SysOssConfigController extends BaseController {
* 新增云存储配置
*/
@ApiOperation("新增云存储配置")
@PreAuthorize("@ss.hasPermi('system:sysOssConfig:add')")
@PreAuthorize("@ss.hasPermi('system:oss:add')")
@Log(title = "云存储配置", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
if (StringUtils.isNotEmpty(bo.getConfigKey())
&& UserConstants.NOT_UNIQUE.equals(iSysOssConfigService.checkConfigKeyUnique(bo))) {
return AjaxResult.error("新增云配置'" + bo.getConfigKey() + "'失败，configKey已存在");
}
return toAjax(iSysOssConfigService.insertByBo(bo) ? 1 : 0);
}
@ -86,15 +76,11 @@ public class SysOssConfigController extends BaseController {
* 修改云存储配置
*/
@ApiOperation("修改云存储配置")
@PreAuthorize("@ss.hasPermi('system:sysOssConfig:edit')")
@PreAuthorize("@ss.hasPermi('system:oss:edit')")
@Log(title = "云存储配置", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
if (StringUtils.isNotEmpty(bo.getConfigKey())
&& UserConstants.NOT_UNIQUE.equals(iSysOssConfigService.checkConfigKeyUnique(bo))) {
return AjaxResult.error("修改云配置'" + bo.getConfigKey() + "'失败，configKey已存在");
}
return toAjax(iSysOssConfigService.updateByBo(bo) ? 1 : 0);
}
@ -102,25 +88,21 @@ public class SysOssConfigController extends BaseController {
* 删除云存储配置
*/
@ApiOperation("删除云存储配置")
@PreAuthorize("@ss.hasPermi('system:sysOssConfig:remove')")
@PreAuthorize("@ss.hasPermi('system:oss:remove')")
@Log(title = "云存储配置", businessType = BusinessType.DELETE)
@DeleteMapping("/{ossConfigIds}")
public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Integer[] ossConfigIds) {
List<SysOssConfig> list = iSysOssConfigService.list();
if(ObjectUtil.isNotNull(list)&&list.size()==1){
return AjaxResult.error("必须保留一条云配置文件");
}
return toAjax(iSysOssConfigService.deleteWithValidByIds(Arrays.asList(ossConfigIds), true) ? 1 : 0);
}
/**
* 状态修改
*/
@PreAuthorize("@ss.hasPermi('system:sysOssConfig:edit')")
@PreAuthorize("@ss.hasPermi('system:oss:edit')")
@Log(title = "云存储状态修改", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysOssConfig sysOssConfig) {
return toAjax(iSysOssConfigService.updateOssConfigStatus(sysOssConfig));
public AjaxResult changeStatus(@RequestBody SysOssConfigBo bo) {
return toAjax(iSysOssConfigService.updateOssConfigStatus(bo));
}
}