From b082da73a1e0259738ccb33ebf7d80cad3dc3a10 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 27 九月 2021 17:27:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java | 32 +++++++++-----------------------
1 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
index f418541..9ab5796 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
@@ -1,19 +1,15 @@
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;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
-import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysMenuService;
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.*;
@@ -33,26 +29,21 @@
@Autowired
private ISysMenuService menuService;
- @Autowired
- private TokenService tokenService;
-
/**
* 鑾峰彇鑿滃崟鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:menu:list')")
+ @SaCheckPermission("system:menu:list")
@GetMapping("/list")
public AjaxResult list(SysMenu menu)
{
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- Long userId = loginUser.getUser().getUserId();
- List<SysMenu> menus = menuService.selectMenuList(menu, userId);
+ List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
return AjaxResult.success(menus);
}
/**
* 鏍规嵁鑿滃崟缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:menu:query')")
+ @SaCheckPermission("system:menu:query")
@GetMapping(value = "/{menuId}")
public AjaxResult getInfo(@PathVariable Long menuId)
{
@@ -65,9 +56,7 @@
@GetMapping("/treeselect")
public AjaxResult treeselect(SysMenu menu)
{
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- Long userId = loginUser.getUser().getUserId();
- List<SysMenu> menus = menuService.selectMenuList(menu, userId);
+ List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
}
@@ -77,8 +66,7 @@
@GetMapping(value = "/roleMenuTreeselect/{roleId}")
public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
{
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- List<SysMenu> menus = menuService.selectMenuList(loginUser.getUser().getUserId());
+ List<SysMenu> menus = menuService.selectMenuList(getUserId());
Map<String,Object> ajax = new HashMap<>();
ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
ajax.put("menus", menuService.buildMenuTreeSelect(menus));
@@ -88,7 +76,7 @@
/**
* 鏂板鑿滃崟
*/
- @PreAuthorize("@ss.hasPermi('system:menu:add')")
+ @SaCheckPermission("system:menu:add")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody SysMenu menu)
@@ -101,14 +89,13 @@
{
return AjaxResult.error("鏂板鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屽湴鍧�蹇呴』浠ttp(s)://寮�澶�");
}
- menu.setCreateBy(SecurityUtils.getUsername());
return toAjax(menuService.insertMenu(menu));
}
/**
* 淇敼鑿滃崟
*/
- @PreAuthorize("@ss.hasPermi('system:menu:edit')")
+ @SaCheckPermission("system:menu:edit")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysMenu menu)
@@ -125,14 +112,13 @@
{
return AjaxResult.error("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屼笂绾ц彍鍗曚笉鑳介�夋嫨鑷繁");
}
- menu.setUpdateBy(SecurityUtils.getUsername());
return toAjax(menuService.updateMenu(menu));
}
/**
* 鍒犻櫎鑿滃崟
*/
- @PreAuthorize("@ss.hasPermi('system:menu:remove')")
+ @SaCheckPermission("system:menu:remove")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{menuId}")
public AjaxResult remove(@PathVariable("menuId") Long menuId)
--
Gitblit v1.9.3