From 0db89bd9c78302a2a72b8cc623b2dbe3b204b587 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 15 七月 2025 17:13:22 +0800
Subject: [PATCH] 硬件数据推送
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java
index cea9bb7..1dafd6e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java
@@ -4,6 +4,8 @@
import java.util.List;
import java.util.Map;
+import com.ruoyi.common.security.annotation.Logical;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.system.domain.SysMenus;
import io.swagger.annotations.Api;
@@ -29,6 +31,8 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.service.ISysMenuService;
+import javax.annotation.Resource;
+
/**
* 菜单信息
*
@@ -45,6 +49,7 @@
/**
* 获取菜单列表
*/
+ @RequiresPermissions(value = {"/roleManagement"}, logical = Logical.OR)
@GetMapping("/list")
@ApiOperation("所有菜单列表")
public AjaxResult list()
@@ -61,14 +66,15 @@
{
return success(menuService.selectMenuById(menuId));
}
-
+ @Resource
+ private TokenService tokenService;
/**
* 获取菜单下拉树列表
*/
@GetMapping("/treeselect")
public AjaxResult treeselect(SysMenu menu)
{
- Long userId = SecurityUtils.getUserId();
+ Long userId = tokenService.getLoginUser().getUserid();
List<SysMenu> menus = menuService.selectMenuList(menu, userId);
ArrayList<SysMenus> sysMenus = new ArrayList<>();
for (SysMenu sysMenu : menus) {
@@ -86,7 +92,7 @@
@GetMapping(value = "/roleMenuTreeselect/{roleId}")
public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
{
- Long userId = SecurityUtils.getUserId();
+ Long userId = tokenService.getLoginUser().getUserid();
List<SysMenu> menus = menuService.selectMenuList(userId);
AjaxResult ajax = AjaxResult.success();
ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
@@ -162,7 +168,7 @@
@GetMapping("getRouters")
public AjaxResult getRouters()
{
- Long userId = SecurityUtils.getUserId();
+ Long userId = tokenService.getLoginUser().getUserid();
List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
return success(menuService.buildMenus(menus));
}
--
Gitblit v1.7.1