feat(修改): 查询所有角色

spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysMenuController.java

@@ -0,0 +1,26 @@
+package com.atguigu.spzx.manger.controller;
+
+import com.atguigu.spzx.model.entity.system.SysMenu;
+import com.atguigu.spzx.model.vo.result.Result;
+import com.atguigu.spzx.model.vo.result.ResultCodeEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping(value = "/admin/system/sysMenu")
+public class SysMenuController {
+
+    @Autowired
+    private SysMenuService sysMenuService;
+
+    @GetMapping("/findNodes")
+    public Result<List<SysMenu>> findNodes() {
+        List<SysMenu> list = sysMenuService.findNodes();
+        return Result.build(list, ResultCodeEnum.SUCCESS);
+    }
+
+}

spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysRoleController.java

@@ -49,9 +49,9 @@ public class SysRoleController {
     }
 
     @Operation(summary = "查询所有角色", description = "查询所有角色信息")
-    @GetMapping(value = "findAllRoles")
+    @GetMapping(value = "findAllRoles/{userId}")
-    public Result<AllRolesVo> findAllRoles() {
+    public Result<AllRolesVo> findAllRoles(@PathVariable(value = "userId") Long userId) {
-        AllRolesVo allRolesList = sysRoleService.findAllRoles();
+        AllRolesVo allRolesList = sysRoleService.findAllRoles(userId);
         return Result.success(allRolesList);
     }
 

spzx-manager/src/main/java/com/atguigu/spzx/manger/mapper/SysRoleUserMapper.java

@@ -2,6 +2,8 @@ package com.atguigu.spzx.manger.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface SysRoleUserMapper {
     /**
@@ -18,4 +20,11 @@ public interface SysRoleUserMapper {
      * @param roleId 角色id
      */
     void doAssign(Long userId, Long roleId);
+
+    /**
+     * 根据用户id查询内容
+     *
+     * @param userId 用户id
+     */
+    List<Long> findSysUserRoleByUserId(Long userId);
 }

spzx-manager/src/main/java/com/atguigu/spzx/manger/service/SysRoleService.java

@@ -43,7 +43,7 @@ public interface SysRoleService {
      *
      * @return 所有角色信息
      */
-    AllRolesVo findAllRoles();
+    AllRolesVo findAllRoles(Long userId);
 
     /**
      * 保存角色数据

spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysRoleServiceImpl.java

@@ -84,9 +84,13 @@ public class SysRoleServiceImpl implements SysRoleService {
      * @return 所有角色信息
      */
     @Override
-    public AllRolesVo findAllRoles() {
+    public AllRolesVo findAllRoles(Long userId) {
+        // 查询所有的角色数据
         List<SysRole> sysRoleList = sysRoleMapper.findAllRoles();
-        return AllRolesVo.builder().allRolesList(sysRoleList).build();
+
+        // 查询当前登录用户的角色数据
+        List<Long> sysRoles = sysRoleUserMapper.findSysUserRoleByUserId(userId);
+        return AllRolesVo.builder().allRolesList(sysRoleList).sysUserRoles(sysRoles).build();
     }
 
     /**

spzx-manager/src/main/resources/mapper/SysRoleUserMapper.xml

@@ -14,4 +14,12 @@
         from sys_user_role
         where user_id = #{userId}
     </delete>
+
+    <!-- 根据用户id查询内容 -->
+    <select id="findSysUserRoleByUserId" resultType="java.lang.Long">
+        select role_id
+        from sys_user_role sur
+        where sur.user_id = #{userId}
+          and is_deleted = 0
+    </select>
 </mapper>

spzx-model/src/main/java/com/atguigu/spzx/model/vo/system/AllRolesVo.java

@@ -17,4 +17,6 @@ import java.util.List;
 public class AllRolesVo {
     @Schema(description = "所有角色")
     private List<SysRole> allRolesList;
+    @Schema(description = "所有用户的角色")
+    private List<Long> sysUserRoles;
 }