From c2e43cc7817174c42b8cbe205d8e38329fe28749 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 26 九月 2021 17:16:55 +0800
Subject: [PATCH] update 修复合并异常
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java | 81 ++++++++++++++++------------------------
1 files changed, 32 insertions(+), 49 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 669fcb9..22c0531 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
@@ -1,19 +1,15 @@
package com.ruoyi.web.controller.system;
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import cn.dev33.satoken.annotation.SaCheckPermission;
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.core.validate.QueryGroup;
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;
@@ -21,45 +17,44 @@
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 javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
-import java.util.List;
/**
- * 浜戝瓨鍌ㄩ厤缃瓹ontroller
+ * 瀵硅薄瀛樺偍閰嶇疆Controller
*
- * @author ruoyi
- * @date 2021-08-11
+ * @author Lion Li
+ * @author 瀛よ垷鐑熼洦
+ * @date 2021-08-13
*/
@Validated
-@Api(value = "浜戝瓨鍌ㄩ厤缃帶鍒跺櫒", tags = {"浜戝瓨鍌ㄩ厤缃鐞�"})
+@Api(value = "瀵硅薄瀛樺偍閰嶇疆鎺у埗鍣�", tags = {"瀵硅薄瀛樺偍閰嶇疆绠＄悊"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
-@RequestMapping("/system/sysOssConfig")
+@RequestMapping("/system/oss/config")
public class SysOssConfigController extends BaseController {
private final ISysOssConfigService iSysOssConfigService;
/**
- * 鏌ヨ浜戝瓨鍌ㄩ厤缃垪琛�
+ * 鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃
*/
- @ApiOperation("鏌ヨ浜戝瓨鍌ㄩ厤缃垪琛�")
- @PreAuthorize("@ss.hasPermi('system:sysOssConfig:list')")
+ @ApiOperation("鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃")
+ @SaCheckPermission("system:oss:list")
@GetMapping("/list")
- public TableDataInfo<SysOssConfigVo> list(@Validated SysOssConfigBo bo) {
+ public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo) {
return iSysOssConfigService.queryPageList(bo);
}
/**
- * 鑾峰彇浜戝瓨鍌ㄩ厤缃缁嗕俊鎭�
+ * 鑾峰彇瀵硅薄瀛樺偍閰嶇疆璇︾粏淇℃伅
*/
- @ApiOperation("鑾峰彇浜戝瓨鍌ㄩ厤缃缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:sysOssConfig:query')")
+ @ApiOperation("鑾峰彇瀵硅薄瀛樺偍閰嶇疆璇︾粏淇℃伅")
+ @SaCheckPermission("system:oss:query")
@GetMapping("/{ossConfigId}")
public AjaxResult<SysOssConfigVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable("ossConfigId") Integer ossConfigId) {
@@ -67,60 +62,48 @@
}
/**
- * 鏂板浜戝瓨鍌ㄩ厤缃�
+ * 鏂板瀵硅薄瀛樺偍閰嶇疆
*/
- @ApiOperation("鏂板浜戝瓨鍌ㄩ厤缃�")
- @PreAuthorize("@ss.hasPermi('system:sysOssConfig: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) {
- if (StringUtils.isNotEmpty(bo.getConfigKey())
- && UserConstants.NOT_UNIQUE.equals(iSysOssConfigService.checkConfigKeyUnique(bo))) {
- return AjaxResult.error("鏂板浜戦厤缃�'" + bo.getConfigKey() + "'澶辫触锛宑onfigKey宸插瓨鍦�");
- }
return toAjax(iSysOssConfigService.insertByBo(bo) ? 1 : 0);
}
/**
- * 淇敼浜戝瓨鍌ㄩ厤缃�
+ * 淇敼瀵硅薄瀛樺偍閰嶇疆
*/
- @ApiOperation("淇敼浜戝瓨鍌ㄩ厤缃�")
- @PreAuthorize("@ss.hasPermi('system:sysOssConfig: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) {
- if (StringUtils.isNotEmpty(bo.getConfigKey())
- && UserConstants.NOT_UNIQUE.equals(iSysOssConfigService.checkConfigKeyUnique(bo))) {
- return AjaxResult.error("淇敼浜戦厤缃�'" + bo.getConfigKey() + "'澶辫触锛宑onfigKey宸插瓨鍦�");
- }
return toAjax(iSysOssConfigService.updateByBo(bo) ? 1 : 0);
}
/**
- * 鍒犻櫎浜戝瓨鍌ㄩ厤缃�
+ * 鍒犻櫎瀵硅薄瀛樺偍閰嶇疆
*/
- @ApiOperation("鍒犻櫎浜戝瓨鍌ㄩ厤缃�")
- @PreAuthorize("@ss.hasPermi('system:sysOssConfig: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 Integer[] ossConfigIds) {
- List<SysOssConfig> list = iSysOssConfigService.list();
- if(ObjectUtil.isNotNull(list)&&list.size()==1){
- return AjaxResult.error("蹇呴』淇濈暀涓�鏉′簯閰嶇疆鏂囦欢");
- }
+ @PathVariable Long[] ossConfigIds) {
return toAjax(iSysOssConfigService.deleteWithValidByIds(Arrays.asList(ossConfigIds), true) ? 1 : 0);
}
/**
* 鐘舵�佷慨鏀�
*/
- @PreAuthorize("@ss.hasPermi('system:sysOssConfig:edit')")
- @Log(title = "浜戝瓨鍌ㄧ姸鎬佷慨鏀�", businessType = BusinessType.UPDATE)
+ @SaCheckPermission("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));
}
}
--
Gitblit v1.9.3