From 8fd573a07a51f508fcab5cddc36fed73947dd661 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 25 四月 2024 09:59:53 +0800
Subject: [PATCH] fixbug:权限功能实现用户重复登录异常
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java | 100 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 89 insertions(+), 11 deletions(-)
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java
index 131b179..919fdb9 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java
@@ -1,15 +1,16 @@
package com.mes.menu.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mes.base.BaseController;
import com.mes.menu.entity.SysMenu;
-import com.mes.menu.service.SysMenuService;
+import com.mes.role.entity.SysRoleMenu;
import com.mes.utils.Result;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -24,16 +25,93 @@
@ApiModel("鑾峰彇鑿滃崟淇℃伅")
@RestController
@RequestMapping("/menu/sysMenu")
-public class SysMenuController {
-
- @Autowired
- SysMenuService sysMenuService;
-
+public class SysMenuController extends BaseController {
@ApiOperation("鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑鎵�鏈夎彍鍗�")
@GetMapping("/list")
- public Result<List<SysMenu>> getMenuTree() {
+ public Result<List<SysMenu>> getMenuTree(String userName) {
return Result.success(sysMenuService.getMenuTree());
}
+ @ApiOperation("鑾峰彇鐢ㄦ埛鐨勬潈闄�")
+ @GetMapping("/getAuthorityInfo")
+ public Result<List<String>> getAuthorityInfo(String userName) {
+ return Result.success(sysMenuService.getAuthorityInfo(userName));
+ }
+
+ /**
+ * 鐢ㄦ埛褰撳墠鐢ㄦ埛鐨勮彍鍗曞拰鏉冮檺淇℃伅
+ *
+ * @param userName
+ * @return
+ */
+ @GetMapping("/nav")
+ public Result nav(String userName) {
+// SysUser sysUser = sysUserService.listByUserNameName(userName);
+//
+// // 鑾峰彇鏉冮檺淇℃伅
+// sysUserService.getUserAuthorityInfo(sysUser.getId());// ROLE_admin,ROLE_normal,sys:user:list,....
+// String[] authorityInfoArray = StringUtils.tokenizeToStringArray(authorityInfo, ",");
+//
+// // 鑾峰彇瀵艰埅鏍忎俊鎭�
+// List<SysMenuDto> navs = sysMenuService.getCurrentUserNav();
+//
+// return Result.success(MapUtil.builder()
+// .put("authoritys", authorityInfoArray)
+// .put("nav", navs)
+// .map()
+// );
+ return null;
+ }
+
+ @GetMapping("/info/{id}")
+ @PreAuthorize("hasAuthority('sys:menu:list')")
+ public Result info(@PathVariable(name = "id") Long id) {
+ return Result.success(sysMenuService.getById(id));
+ }
+
+// @GetMapping("/list")
+// @PreAuthorize("hasAuthority('sys:menu:list')")
+// public Result list() {
+//
+//// List<SysMenu> menus = sysMenuService.tree();
+// return Result.success(null);
+// }
+
+ @PostMapping("/save")
+ @PreAuthorize("hasAuthority('sys:menu:save')")
+ public Result save(@Validated @RequestBody SysMenu sysMenu) {
+ return Result.success(sysMenuService.save(sysMenu));
+ }
+
+ @PostMapping("/update")
+ @PreAuthorize("hasAuthority('sys:menu:update')")
+ public Result update(@Validated @RequestBody SysMenu sysMenu) {
+
+ sysMenuService.updateById(sysMenu);
+
+ // 娓呴櫎鎵�鏈変笌璇ヨ彍鍗曠浉鍏崇殑鏉冮檺缂撳瓨
+ sysUserService.clearUserAuthorityInfoByMenuId(sysMenu.getId());
+ return Result.success(sysMenu);
+ }
+
+ @PostMapping("/delete/{id}")
+ @PreAuthorize("hasAuthority('sys:menu:delete')")
+ public Result delete(@PathVariable("id") Long id) {
+
+ int count = sysMenuService.count(new QueryWrapper<SysMenu>().eq("parent_id", id));
+ if (count > 0) {
+ return Result.error("璇峰厛鍒犻櫎瀛愯彍鍗�");
+ }
+
+ // 娓呴櫎鎵�鏈変笌璇ヨ彍鍗曠浉鍏崇殑鏉冮檺缂撳瓨
+ sysUserService.clearUserAuthorityInfoByMenuId(id);
+
+ sysMenuService.removeById(id);
+
+ // 鍚屾鍒犻櫎涓棿鍏宠仈琛�
+ sysRoleMenuService.remove(new QueryWrapper<SysRoleMenu>().eq("menu_id", id));
+ return Result.success("");
+ }
+
}
--
Gitblit v1.8.0