From 2c2d541aa1c5060b47c1ba5c6e3d192b2ff82fef Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 28 四月 2024 14:15:21 +0800
Subject: [PATCH] fixbug:权限功能实现用户重复登录异常
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java | 63 ++++++++++++-------------------
1 files changed, 24 insertions(+), 39 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 347731d..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,23 +1,17 @@
package com.mes.menu.controller;
-import cn.hutool.core.map.MapUtil;
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.userinfo.entity.SysUser;
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.security.access.prepost.PreAuthorize;
-import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.time.LocalDateTime;
import java.util.List;
/**
@@ -32,10 +26,6 @@
@RestController
@RequestMapping("/menu/sysMenu")
public class SysMenuController extends BaseController {
-
- @Autowired
- SysMenuService sysMenuService;
-
@ApiOperation("鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑鎵�鏈夎彍鍗�")
@GetMapping("/list")
public Result<List<SysMenu>> getMenuTree(String userName) {
@@ -56,20 +46,21 @@
*/
@GetMapping("/nav")
public Result nav(String userName) {
- SysUser sysUser = sysUserService.getByUsername(userName);
-
- // 鑾峰彇鏉冮檺淇℃伅
- String authorityInfo = 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()
- );
+// 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}")
@@ -78,29 +69,23 @@
return Result.success(sysMenuService.getById(id));
}
- @GetMapping("/list")
- @PreAuthorize("hasAuthority('sys:menu:list')")
- public Result list() {
-
- List<SysMenu> menus = sysMenuService.tree();
- return Result.success(menus);
- }
+// @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) {
-
- sysMenu.setCreated(LocalDateTime.now());
-
- sysMenuService.save(sysMenu);
- return Result.success(sysMenu);
+ return Result.success(sysMenuService.save(sysMenu));
}
@PostMapping("/update")
@PreAuthorize("hasAuthority('sys:menu:update')")
public Result update(@Validated @RequestBody SysMenu sysMenu) {
-
- sysMenu.setUpdated(LocalDateTime.now());
sysMenuService.updateById(sysMenu);
@@ -115,7 +100,7 @@
int count = sysMenuService.count(new QueryWrapper<SysMenu>().eq("parent_id", id));
if (count > 0) {
- return Result.fail("璇峰厛鍒犻櫎瀛愯彍鍗�");
+ return Result.error("璇峰厛鍒犻櫎瀛愯彍鍗�");
}
// 娓呴櫎鎵�鏈変笌璇ヨ彍鍗曠浉鍏崇殑鏉冮檺缂撳瓨
--
Gitblit v1.8.0