fixbug:权限功能实现用户重复登录异常

zhoushihao

2024-04-25 2c2d541aa1c5060b47c1ba5c6e3d192b2ff82fef

 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("请先删除子菜单");
        }

        // 清除所有与该菜单相关的权限缓存