From 42295ef2ac0a5e78674cf24b62d6834138f0ffdc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 十一月 2021 13:56:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
index 1e21a41..1e54404 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.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.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
@@ -11,9 +12,9 @@
import com.ruoyi.system.service.ISysDictTypeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
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.*;
@@ -35,7 +36,7 @@
private final ISysDictTypeService dictTypeService;
@ApiOperation("鏌ヨ瀛楀吀绫诲瀷鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:dict:list')")
+ @SaCheckPermission("system:dict:list")
@GetMapping("/list")
public TableDataInfo<SysDictType> list(SysDictType dictType) {
return dictTypeService.selectPageDictTypeList(dictType);
@@ -43,8 +44,8 @@
@ApiOperation("瀵煎嚭瀛楀吀绫诲瀷鍒楄〃")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:dict:export')")
- @GetMapping("/export")
+ @SaCheckPermission("system:dict:export")
+ @PostMapping("/export")
public void export(SysDictType dictType, HttpServletResponse response) {
List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
ExcelUtil.exportExcel(list, "瀛楀吀绫诲瀷", SysDictType.class, response);
@@ -54,9 +55,9 @@
* 鏌ヨ瀛楀吀绫诲瀷璇︾粏
*/
@ApiOperation("鏌ヨ瀛楀吀绫诲瀷璇︾粏")
- @PreAuthorize("@ss.hasPermi('system:dict:query')")
+ @SaCheckPermission("system:dict:query")
@GetMapping(value = "/{dictId}")
- public AjaxResult<SysDictType> getInfo(@PathVariable Long dictId) {
+ public AjaxResult<SysDictType> getInfo(@ApiParam("瀛楀吀ID") @PathVariable Long dictId) {
return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
}
@@ -64,14 +65,13 @@
* 鏂板瀛楀吀绫诲瀷
*/
@ApiOperation("鏂板瀛楀吀绫诲瀷")
- @PreAuthorize("@ss.hasPermi('system:dict:add')")
+ @SaCheckPermission("system:dict:add")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult<Void> add(@Validated @RequestBody SysDictType dict) {
if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
return AjaxResult.error("鏂板瀛楀吀'" + dict.getDictName() + "'澶辫触锛屽瓧鍏哥被鍨嬪凡瀛樺湪");
}
- dict.setCreateBy(getUsername());
return toAjax(dictTypeService.insertDictType(dict));
}
@@ -79,14 +79,13 @@
* 淇敼瀛楀吀绫诲瀷
*/
@ApiOperation("淇敼瀛楀吀绫诲瀷")
- @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+ @SaCheckPermission("system:dict:edit")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult<Void> edit(@Validated @RequestBody SysDictType dict) {
if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
return AjaxResult.error("淇敼瀛楀吀'" + dict.getDictName() + "'澶辫触锛屽瓧鍏哥被鍨嬪凡瀛樺湪");
}
- dict.setUpdateBy(getUsername());
return toAjax(dictTypeService.updateDictType(dict));
}
@@ -94,10 +93,10 @@
* 鍒犻櫎瀛楀吀绫诲瀷
*/
@ApiOperation("鍒犻櫎瀛楀吀绫诲瀷")
- @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+ @SaCheckPermission("system:dict:remove")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictIds}")
- public AjaxResult<Void> remove(@PathVariable Long[] dictIds) {
+ public AjaxResult<Void> remove(@ApiParam("瀛楀吀ID涓�") @PathVariable Long[] dictIds) {
dictTypeService.deleteDictTypeByIds(dictIds);
return success();
}
@@ -106,7 +105,7 @@
* 鍒锋柊瀛楀吀缂撳瓨
*/
@ApiOperation("鍒锋柊瀛楀吀缂撳瓨")
- @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+ @SaCheckPermission("system:dict:remove")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.CLEAN)
@DeleteMapping("/refreshCache")
public AjaxResult<Void> refreshCache() {
--
Gitblit v1.9.3