完成角色的授权的功能

2025-10-31 10:18:42 +08:00 · 2021-01-09 18:53:43 +08:00
parent ad1d1978d2
commit 2651f9bce3
16 changed files with 343 additions and 164 deletions
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysMenuController.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysMenuController.java
@@ -1,10 +1,8 @@
 package cn.iocoder.dashboard.modules.system.controller.permission;

+import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
 import cn.iocoder.dashboard.common.pojo.CommonResult;
-import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuCreateReqVO;
-import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuListReqVO;
-import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuRespVO;
-import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuUpdateReqVO;
+import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.*;
 import cn.iocoder.dashboard.modules.system.convert.permission.SysMenuConvert;
 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;
 import cn.iocoder.dashboard.modules.system.service.permission.SysMenuService;
@@ -15,6 +13,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

 import javax.annotation.Resource;
+import java.util.Comparator;
 import java.util.List;

 import static cn.iocoder.dashboard.common.pojo.CommonResult.success;
@@ -30,8 +29,22 @@ public class SysMenuController {
    @ApiOperation("获取菜单列表")
 //    @PreAuthorize("@ss.hasPermi('system:menu:list')")
    @GetMapping("/list")
-    public CommonResult<List<SysMenuRespVO>> list(SysMenuListReqVO reqVO) {
-        return success(menuService.listMenus(reqVO));
+    public CommonResult<List<SysMenuRespVO>> listMenus(SysMenuListReqVO reqVO) {
+        List<SysMenuDO> list = menuService.listMenus(reqVO);
+        list.sort(Comparator.comparing(SysMenuDO::getSort));
+        return success(SysMenuConvert.INSTANCE.convertList(list));
+    }
+
+    @ApiOperation(value = "获取菜单精简信息列表", notes = "只包含被开启的菜单，主要用于前端的下拉选项")
+    @GetMapping("/list-all-simple")
+    public CommonResult<List<SysMenuSimpleRespVO>> listSimpleMenus() {
+        // 获得菜单列表，只要开启状态的
+        SysMenuListReqVO reqVO = new SysMenuListReqVO();
+        reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
+        List<SysMenuDO> list = menuService.listMenus(reqVO);
+        // 排序后，返回个诶前端
+        list.sort(Comparator.comparing(SysMenuDO::getSort));
+        return success(SysMenuConvert.INSTANCE.convertList02(list));
    }

    @ApiOperation("获取菜单信息")
@@ -42,17 +55,6 @@ public class SysMenuController {
        return success(SysMenuConvert.INSTANCE.convert(menu));
    }

-//    /**
-//     * 获取菜单下拉树列表
-//     */
-//    @GetMapping("/treeselect")
-//    public AjaxResult treeselect(SysMenu menu) {
-//        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-//        Long userId = loginUser.getUser().getUserId();
-//        List<SysMenu> menus = menuService.selectMenuList(menu, userId);
-//        return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
-//    }
-//
 //    /**
 //     * 加载对应角色菜单列表树
 //     */
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysPermissionController.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysPermissionController.java
@@ -0,0 +1,62 @@
+package cn.iocoder.dashboard.modules.system.controller.permission;
+
+import cn.iocoder.dashboard.common.pojo.CommonResult;
+import cn.iocoder.dashboard.modules.system.controller.permission.vo.permission.SysPermissionAssignRoleMenuReqVO;
+import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Set;
+
+import static cn.iocoder.dashboard.common.pojo.CommonResult.success;
+
+/**
+ * 权限 Controller，提供赋予用户、角色的权限的 API 接口
+ *
+ * @author 芋道源码
+ */
+@Api(tags = "权限 API")
+@RestController
+@RequestMapping("/system/permission")
+public class SysPermissionController {
+
+    @Resource
+    private SysPermissionService permissionService;
+
+    @ApiOperation("获得角色拥有的菜单编号")
+    @GetMapping("/list-role-resources")
+    @ApiImplicitParam(name = "roleId", value = "角色编号", required = true)
+//    @RequiresPermissions("system:permission:assign-role-menu")
+    public CommonResult<Set<Long>> listRoleMenus(Long roleId) {
+        return success(permissionService.listRoleMenuIds(roleId));
+    }
+
+    @PostMapping("/assign-role-menu")
+    @ApiOperation("赋予角色菜单")
+//    @RequiresPermissions("system:permission:assign-role-resource")
+    public CommonResult<Boolean> assignRoleMenu(@Validated @RequestBody SysPermissionAssignRoleMenuReqVO reqVO) {
+        permissionService.assignRoleMenu(reqVO.getRoleId(), reqVO.getMenuIds());
+        return success(true);
+    }
+
+//    @GetMapping("/list-admin-roles")
+//    @ApiOperation("获得管理员拥有的角色编号列表")
+////    @RequiresPermissions("system:permission:assign-admin-role")
+//    @ApiImplicitParam(name = "adminId", value = "管理员编号", required = true)
+//    public CommonResult<Set<Integer>> listAdminRoles(Integer adminId) {
+//        return success(permissionManager.listAdminRoles(adminId));
+//    }
+
+//    @PostMapping("/assign-admin-role")
+//    @ApiOperation("赋予用户角色")
+////    @RequiresPermissions("system:permission:assign-admin-role")
+//    public CommonResult<Boolean> assignAdminRole(PermissionAssignAdminRoleDTO assignAdminRoleDTO) {
+//        permissionManager.assignAdminRole(assignAdminRoleDTO);
+//        return success(true);
+//    }
+
+}
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuSimpleRespVO.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuSimpleRespVO.java
@@ -0,0 +1,24 @@
+package cn.iocoder.dashboard.modules.system.controller.permission.vo.menu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@ApiModel("菜单精简信息 Response VO")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SysMenuSimpleRespVO {
+
+    @ApiModelProperty(value = "菜单编号", required = true, example = "1024")
+    private Integer id;
+
+    @ApiModelProperty(value = "菜单名称", required = true, example = "芋道")
+    private String name;
+
+    @ApiModelProperty(value = "父菜单 ID", required = true, example = "1024")
+    private Long parentId;
+
+}
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/permission/SysPermissionAssignRoleMenuReqVO.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/permission/SysPermissionAssignRoleMenuReqVO.java
@@ -0,0 +1,22 @@
+package cn.iocoder.dashboard.modules.system.controller.permission.vo.permission;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.Collections;
+import java.util.Set;
+
+@ApiModel("赋予角色菜单 Request VO")
+@Data
+public class SysPermissionAssignRoleMenuReqVO {
+
+    @ApiModelProperty(value = "角色名", required = true, example = "1")
+    @NotNull(message = "角色编号不能为空")
+    private Long roleId;
+
+    @ApiModelProperty(value = "菜单编号列表", example = "1,3,5")
+    private Set<Long> menuIds = Collections.emptySet(); // 兜底
+
+}
--- a/src/main/java/cn/iocoder/dashboard/modules/system/convert/permission/SysMenuConvert.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/convert/permission/SysMenuConvert.java
@@ -2,6 +2,7 @@ package cn.iocoder.dashboard.modules.system.convert.permission;

 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuCreateReqVO;
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuRespVO;
+import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuSimpleRespVO;
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuUpdateReqVO;
 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;
 import org.mapstruct.Mapper;
@@ -22,4 +23,6 @@ public interface SysMenuConvert {

    SysMenuRespVO convert(SysMenuDO bean);

+    List<SysMenuSimpleRespVO> convertList02(List<SysMenuDO> list);
+
 }
--- a/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/permission/SysRoleMenuMapper.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/permission/SysRoleMenuMapper.java
@@ -1,9 +1,35 @@
 package cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission;

 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleMenuDO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;

+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
@Mapper
 public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenuDO> {
+
+    default List<SysRoleMenuDO> selectListByRoleId(Long roleId) {
+        return selectList(new QueryWrapper<SysRoleMenuDO>().eq("role_id", roleId));
+    }
+
+    default void insertList(Long roleId, Collection<Long> menuIds) {
+        List<SysRoleMenuDO> list = menuIds.stream().map(menuId -> {
+            SysRoleMenuDO entity = new SysRoleMenuDO();
+            entity.setRoleId(roleId);
+            entity.setMenuId(menuId);
+            return entity;
+        }).collect(Collectors.toList());
+        // TODO 芋艿，mybatis plus 增加批量插入的功能
+        list.forEach(this::insert);
+    }
+
+    default void deleteListByRoleIdAndMenuIds(Long roleId, Collection<Long> menuIds) {
+        delete(new QueryWrapper<SysRoleMenuDO>().eq("role_id", roleId)
+                .in("menu_id", menuIds));
+    }
+
 }
--- a/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuService.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuService.java
@@ -2,7 +2,6 @@ package cn.iocoder.dashboard.modules.system.service.permission;

 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuCreateReqVO;
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuListReqVO;
-import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuRespVO;
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuUpdateReqVO;
 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;

@@ -21,13 +20,20 @@ public interface SysMenuService {
     */
    void init();

+    /**
+     * 获得所有菜单列表
+     *
+     * @return 菜单列表
+     */
+    List<SysMenuDO> listMenus();
+
    /**
     * 筛选菜单列表
     *
     * @param reqVO 筛选条件请求 VO
     * @return 菜单列表
     */
-    List<SysMenuRespVO> listMenus(SysMenuListReqVO reqVO);
+    List<SysMenuDO> listMenus(SysMenuListReqVO reqVO);

    /**
     * 获得所有菜单，从缓存中
--- a/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionService.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionService.java
@@ -43,6 +43,22 @@ public interface SysPermissionService {
     */
    Set<Long> listUserRoleIds(Long userId, @Nullable Collection<Integer> roleStatuses);

+    /**
+     * 获得角色拥有的菜单编号集合
+     *
+     * @param roleId 角色编号
+     * @return 菜单编号集合
+     */
+    Set<Long> listRoleMenuIds(Long roleId);
+
+    /**
+     * 赋予赋予角色菜单
+     *
+     * @param roleId 角色编号
+     * @param menuIds 菜单编号集合
+     */
+    void assignRoleMenu(Long roleId, Set<Long> menuIds);
+
    /**
     * 处理角色删除时，删除关联授权角色
     *
--- a/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysMenuServiceImpl.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysMenuServiceImpl.java
@@ -3,7 +3,6 @@ package cn.iocoder.dashboard.modules.system.service.permission.impl;
 import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil;
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuCreateReqVO;
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuListReqVO;
-import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuRespVO;
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuUpdateReqVO;
 import cn.iocoder.dashboard.modules.system.convert.permission.SysMenuConvert;
 import cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission.SysMenuMapper;
@@ -78,10 +77,13 @@ public class SysMenuServiceImpl implements SysMenuService {
    }

    @Override
-    public List<SysMenuRespVO> listMenus(SysMenuListReqVO reqVO) {
-        List<SysMenuDO> list = menuMapper.selectList(reqVO);
-        // TODO 排序
-        return SysMenuConvert.INSTANCE.convertList(list);
+    public List<SysMenuDO> listMenus() {
+        return menuMapper.selectList();
+    }
+
+    @Override
+    public List<SysMenuDO> listMenus(SysMenuListReqVO reqVO) {
+        return menuMapper.selectList(reqVO);
    }

    @Override
--- a/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java
@@ -1,5 +1,6 @@
 package cn.iocoder.dashboard.modules.system.service.permission.impl;

+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission.SysRoleMenuMapper;
 import cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission.SysUserRoleMapper;
@@ -16,6 +17,7 @@ import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;

 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
@@ -110,6 +112,36 @@ public class SysPermissionServiceImpl implements SysPermissionService {
        return CollectionUtils.convertSet(userRoleList, SysUserRoleDO::getRoleId);
    }

+    @Override
+    public Set<Long> listRoleMenuIds(Long roleId) {
+        // 如果是管理员的情况下，获取全部菜单编号
+        SysRoleDO role = roleService.getRole(roleId);
+        if (roleService.hasAnyAdmin(Collections.singletonList(role))) {
+            return CollectionUtils.convertSet(menuService.listMenus(), SysMenuDO::getId);
+        }
+        // 如果是非管理员的情况下，获得拥有的菜单编号
+        return CollectionUtils.convertSet(roleMenuMapper.selectListByRoleId(roleId),
+                SysRoleMenuDO::getMenuId);
+    }
+
+    @Override
+    @Transactional
+    public void assignRoleMenu(Long roleId, Set<Long> menuIds) {
+        // 获得角色拥有菜单编号
+        Set<Long> dbMenuIds = CollectionUtils.convertSet(roleMenuMapper.selectListByRoleId(roleId),
+                SysRoleMenuDO::getMenuId);
+        // 计算新增和删除的菜单编号
+        Collection<Long> createMenuIds = CollUtil.subtract(menuIds, dbMenuIds);
+        Collection<Long> deleteMenuIds = CollUtil.subtract(dbMenuIds, menuIds);
+        // 执行新增和删除。对于已经授权的菜单，不用做任何处理
+        if (!CollectionUtil.isEmpty(createMenuIds)) {
+            roleMenuMapper.insertList(roleId, createMenuIds);
+        }
+        if (!CollectionUtil.isEmpty(deleteMenuIds)) {
+            roleMenuMapper.deleteListByRoleIdAndMenuIds(roleId, deleteMenuIds);
+        }
+    }
+
    @Override
    public void processRoleDeleted(Long roleId) {
        // TODO 实现我
--- a/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysRoleServiceImpl.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysRoleServiceImpl.java
@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.collect.ImmutableMap;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;

 import javax.annotation.PostConstruct;
@@ -115,6 +116,7 @@ public class SysRoleServiceImpl implements SysRoleService {
    }

    @Override
+    @Transactional
    public void deleteRole(Long id) {
        // 校验是否可以更新
        this.checkUpdateRole(id);
@@ -129,7 +131,6 @@ public class SysRoleServiceImpl implements SysRoleService {
        return roleMapper.selectById(id);
    }

-
    @Override
    public PageResult<SysRoleDO> pageRole(SysRolePageReqVO reqVO) {
        IPage<SysRoleDO> roleDOPage = roleMapper.selectPage(reqVO);