changes

liuhaonan

2022-09-07 20e4636014540c4c27b0d2d337927eed8593d93a

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java

@@ -1,30 +1,24 @@
package com.sandu.ximon.admin.service;

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.enums.RoleLevelStatus;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.execption.EntityExistException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.param.MenuParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.bo.MenuNode;
import com.sandu.ximon.dao.domain.AdminRoleRelation;
import com.sandu.ximon.dao.domain.Menu;
import com.sandu.ximon.dao.domain.Role;
import com.sandu.ximon.dao.domain.RoleMenuRelation;
import com.sandu.ximon.dao.mapper.AdminRoleRelationMapper;
import com.sandu.ximon.dao.mapper.MenuMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;

/**
@@ -42,7 +36,8 @@
     * 获取角色下的菜单
     */
    public List<Menu> listByRoleIds(List<Long> roleIdList) {
        List<Long> menuIdList = roleMenuRelationService.list(Wrappers.lambdaQuery(RoleMenuRelation.class).in(RoleMenuRelation::getRoleId, roleIdList).select(RoleMenuRelation::getMenuId))
        List<Long> menuIdList = roleMenuRelationService.list(Wrappers.lambdaQuery(RoleMenuRelation.class)
                        .in(RoleMenuRelation::getRoleId, roleIdList).select(RoleMenuRelation::getMenuId))
                .stream().map(RoleMenuRelation::getMenuId).distinct().collect(Collectors.toList());
        if (CollectionUtil.isEmpty(menuIdList)) {
            return null;
@@ -56,21 +51,6 @@
        BeanUtils.copyProperties(param, menu);
        return save(menu);
    }

//    public Set<Menu> listMenuByRoles(Set<Role> roles) {
//        List<Long> roleIds = roles.stream().map(Role::getId).collect(Collectors.toList());
//        Set<Menu> menus = menuDao.listMenuByRoleIds(roleIds);
//        return menus;
//    }
//
//    /**
//     * 把菜单转成树形结构
//     */
//    public List<MenuNode> buildTree(List<Menu> menuList) {
//        return menuList.stream()
//                .filter(menu -> menu.getPid().equals(0L))
//                .map(menu -> covertMenuNode(menu, menuList)).collect(Collectors.toList());
//    }

    private MenuNode covertMenuNode(Menu menu, List<Menu> menuList) {
        MenuNode node = new MenuNode();
@@ -88,6 +68,10 @@
            throw new BusinessException("找不到菜单信息");
        }

        if (one.getPid() == 0 && param.getPid() != 0) {
            throw new BusinessException("目录已是最顶层菜单,无法设置上级目录 !");
        }

        List<Role> roles = SpringContextHolder.getBean(RoleService.class).listByAdminId(SecurityUtils.getUserId());
        Integer roleLevel = roles.stream().map(Role::getLevel).min(Integer::compareTo).orElse(RoleLevelStatus.COMMON.getCode());
        if (!RoleLevelStatus.SUPER.getCode().equals(roleLevel)) {
@@ -96,6 +80,7 @@

        Menu menu = new Menu();
        BeanUtils.copyProperties(param, menu);
        menu.setType(one.getType());
        menu.setId(menuId);
        return updateById(menu);
    }