From 6ca853516671882e8e54d9630a4299f12fbcf9aa Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 一月 2022 11:14:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/satoken' into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
index cd58077..851cf4e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
@@ -1,8 +1,10 @@
package com.ruoyi.web.controller.system;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
@@ -12,9 +14,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.*;
@@ -38,16 +40,16 @@
private final ISysDictTypeService dictTypeService;
@ApiOperation("鏌ヨ瀛楀吀鏁版嵁鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:dict:list')")
+ @SaCheckPermission("system:dict:list")
@GetMapping("/list")
- public TableDataInfo<SysDictData> list(SysDictData dictData) {
- return dictDataService.selectPageDictDataList(dictData);
+ public TableDataInfo<SysDictData> list(SysDictData dictData, PageQuery pageQuery) {
+ return dictDataService.selectPageDictDataList(dictData, pageQuery);
}
@ApiOperation("瀵煎嚭瀛楀吀鏁版嵁鍒楄〃")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:dict:export')")
- @GetMapping("/export")
+ @SaCheckPermission("system:dict:export")
+ @PostMapping("/export")
public void export(SysDictData dictData, HttpServletResponse response) {
List<SysDictData> list = dictDataService.selectDictDataList(dictData);
ExcelUtil.exportExcel(list, "瀛楀吀鏁版嵁", SysDictData.class, response);
@@ -57,9 +59,9 @@
* 鏌ヨ瀛楀吀鏁版嵁璇︾粏
*/
@ApiOperation("鏌ヨ瀛楀吀鏁版嵁璇︾粏")
- @PreAuthorize("@ss.hasPermi('system:dict:query')")
+ @SaCheckPermission("system:dict:query")
@GetMapping(value = "/{dictCode}")
- public AjaxResult<SysDictData> getInfo(@PathVariable Long dictCode) {
+ public AjaxResult<SysDictData> getInfo(@ApiParam("瀛楀吀code") @PathVariable Long dictCode) {
return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
}
@@ -68,7 +70,7 @@
*/
@ApiOperation("鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅")
@GetMapping(value = "/type/{dictType}")
- public AjaxResult<List<SysDictData>> dictType(@PathVariable String dictType) {
+ public AjaxResult<List<SysDictData>> dictType(@ApiParam("瀛楀吀绫诲瀷") @PathVariable String dictType) {
List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
if (StringUtils.isNull(data)) {
data = new ArrayList<>();
@@ -80,7 +82,7 @@
* 鏂板瀛楀吀绫诲瀷
*/
@ApiOperation("鏂板瀛楀吀绫诲瀷")
- @PreAuthorize("@ss.hasPermi('system:dict:add')")
+ @SaCheckPermission("system:dict:add")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult<Void> add(@Validated @RequestBody SysDictData dict) {
@@ -91,7 +93,7 @@
* 淇敼淇濆瓨瀛楀吀绫诲瀷
*/
@ApiOperation("淇敼淇濆瓨瀛楀吀绫诲瀷")
- @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+ @SaCheckPermission("system:dict:edit")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult<Void> edit(@Validated @RequestBody SysDictData dict) {
@@ -102,10 +104,10 @@
* 鍒犻櫎瀛楀吀绫诲瀷
*/
@ApiOperation("鍒犻櫎瀛楀吀绫诲瀷")
- @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+ @SaCheckPermission("system:dict:remove")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictCodes}")
- public AjaxResult<Void> remove(@PathVariable Long[] dictCodes) {
+ public AjaxResult<Void> remove(@ApiParam("瀛楀吀code涓�") @PathVariable Long[] dictCodes) {
dictDataService.deleteDictDataByIds(dictCodes);
return success();
}
--
Gitblit v1.9.3