From aded6d51dd8cc3b7d2b5a9a0be54378c5b2ee924 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 15:11:15 +0800
Subject: [PATCH] merge

---
 medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysRoleServiceImpl.java |   89 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 88 insertions(+), 1 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysRoleServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysRoleServiceImpl.java
index 998d382..c7194ea 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysRoleServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysRoleServiceImpl.java
@@ -1,5 +1,6 @@
 package com.sinata.system.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sinata.common.annotation.DataScope;
@@ -7,6 +8,7 @@
 import com.sinata.common.core.domain.entity.SysMenu;
 import com.sinata.common.core.domain.entity.SysRole;
 import com.sinata.common.core.domain.entity.SysUser;
+import com.sinata.common.core.domain.model.LoginUser;
 import com.sinata.common.entity.PageDTO;
 import com.sinata.common.exception.ServiceException;
 import com.sinata.common.utils.BeanUtils;
@@ -20,6 +22,7 @@
 import com.sinata.system.domain.dto.SysRoleDTO;
 import com.sinata.system.domain.query.KeyWordQuery;
 import com.sinata.system.domain.vo.SysRoleVO;
+import com.sinata.system.mapper.SysMenuMapper;
 import com.sinata.system.mapper.SysRoleDeptMapper;
 import com.sinata.system.mapper.SysRoleMapper;
 import com.sinata.system.mapper.SysRoleMenuMapper;
@@ -59,6 +62,8 @@
     private SysRoleDeptMapper roleDeptMapper;
     @Autowired
     private ISysMenuService menuService;
+    @Autowired
+    private SysMenuMapper menuMapper;
 
     /**
      * 根据条件分页查询角色数据
@@ -461,11 +466,17 @@
     @Override
     public void saveRole(SysRoleDTO dto) {
         SysRole sysRole = BeanUtils.copyBean(dto, SysRole.class);
-        if (Objects.nonNull(sysRole.getRoleId())) {
+        if (!this.checkRoleNameUnique(sysRole)) {
+            throw new ServiceException("保存角色'" + sysRole.getRoleName() + "'失败，角色名称已存在");
+        }
+        if (Objects.isNull(sysRole.getRoleId())) {
             baseMapper.insert(sysRole);
         } else {
+            // 删除角色与菜单关联
+            roleMenuMapper.deleteRoleMenuByRoleId(sysRole.getRoleId());
             baseMapper.updateById(sysRole);
         }
+        insertRoleMenu(sysRole);
     }
 
     /**
@@ -485,4 +496,80 @@
         }
         return sysRoleVO;
     }
+
+    /**
+     * 获取当前登录用户可管理角色列表
+     *
+     * @param loginUser
+     * @return
+     */
+    @Override
+    public List<SysRoleVO> getManageRoleList(LoginUser loginUser) {
+        List<SysRoleVO> res = CollUtils.emptyList();
+        Long userId = loginUser.getUserId();
+        SysUserRole sysUserRole = userRoleMapper.selectOne(Wrappers.lambdaQuery(SysUserRole.class).eq(SysUserRole::getUserId, userId).last("LIMIT 1"));
+        if (Objects.nonNull(sysUserRole)) {
+            SysRole role = this.getById(sysUserRole.getRoleId());
+            if (Objects.nonNull(role)) {
+                List<SysRole> list = this.lambdaQuery().in(SysRole::getRoleId, Arrays.asList(role.getManageRoleIdStr().split(","))).list();
+                if (CollUtils.isNotEmpty(list)) {
+                    res = BeanUtils.copyToList(list, SysRoleVO.class);
+                }
+            }
+        }
+        return res;
+    }
+
+    @Override
+    public List<SysMenu> getMenuLevelList(List<Long> menusId) {
+        //获取当前的权限菜单
+        List<SysMenu> all = menuMapper.getAllInIds(menusId);
+        // 第三级
+        List<SysMenu> s3 = all.stream().filter(e -> e.getMenuType().equals("F"))
+                .collect(Collectors.toList());
+        // 第二级
+        List<SysMenu> s2 = all.stream().filter(e -> e.getMenuType().equals("C"))
+                .collect(Collectors.toList());
+        // 第一级
+        List<SysMenu> s1 = all.stream().filter(e -> e.getMenuType().equals("M"))
+                .collect(Collectors.toList());
+
+        for (SysMenu menu : s2) {
+            List<SysMenu> collect = s3.stream()
+                    .filter(e -> e.getParentId().equals(menu.getMenuId()))
+                    .collect(Collectors.toList());
+            menu.setChildren(collect);
+        }
+        for (SysMenu menu : s1) {
+            List<SysMenu> collect = s2.stream()
+                    .filter(e -> e.getParentId().equals(menu.getMenuId()))
+                    .collect(Collectors.toList());
+            menu.setChildren(collect);
+        }
+        return s1;
+    }
+
+    @Override
+    public List<SysMenu> roleInfoFromUserId(Long userId) {
+        SysRole sysRole = roleMapper.selectRoleByUserId(userId);
+        // 获取当前角色的菜单列表
+        List<SysMenu> menus = menuMapper.selectListByRoleId(sysRole.getRoleId());
+        if (menus.size() == 0) {
+            return new ArrayList<>();
+        }
+        List<Long> menusId = menus.stream().map(SysMenu::getMenuId).collect(Collectors.toList());
+        // 获取当前的权限菜单(有层级)
+        return this.getMenuLevelList(menusId);
+    }
+
+    /**
+     * 角色列表
+     *
+     * @return
+     */
+    @Override
+    public List<SysRoleVO> queryList() {
+        List<SysRole> list = list();
+        return BeanUtils.copyToList(list, SysRoleVO.class);
+    }
 }

--
Gitblit v1.7.1