From 825f9893f4ab673c4ef38d92c7a97840e88ca72d Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Sun, 24 Mar 2024 00:03:32 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E4=BF=AE=E6=94=B9):=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=89=80=E6=9C=89=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manger/controller/SysMenuController.java | 26 +++++++++++++++++++ .../manger/controller/SysRoleController.java | 6 ++--- .../spzx/manger/mapper/SysRoleUserMapper.java | 9 +++++++ .../spzx/manger/service/SysRoleService.java | 2 +- .../service/impl/SysRoleServiceImpl.java | 8 ++++-- .../resources/mapper/SysRoleUserMapper.xml | 8 ++++++ .../spzx/model/vo/system/AllRolesVo.java | 2 ++ 7 files changed, 55 insertions(+), 6 deletions(-) create mode 100644 spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysMenuController.java diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysMenuController.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysMenuController.java new file mode 100644 index 0000000..ce3a954 --- /dev/null +++ b/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> findNodes() { + List list = sysMenuService.findNodes(); + return Result.build(list, ResultCodeEnum.SUCCESS); + } + +} \ No newline at end of file diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysRoleController.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysRoleController.java index b9020e6..940bc24 100644 --- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysRoleController.java +++ b/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") - public Result findAllRoles() { - AllRolesVo allRolesList = sysRoleService.findAllRoles(); + @GetMapping(value = "findAllRoles/{userId}") + public Result findAllRoles(@PathVariable(value = "userId") Long userId) { + AllRolesVo allRolesList = sysRoleService.findAllRoles(userId); return Result.success(allRolesList); } diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/mapper/SysRoleUserMapper.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/mapper/SysRoleUserMapper.java index 3781c52..0adbfee 100644 --- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/mapper/SysRoleUserMapper.java +++ b/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 findSysUserRoleByUserId(Long userId); } diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/SysRoleService.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/SysRoleService.java index b340666..8dddd79 100644 --- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/SysRoleService.java +++ b/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); /** * 保存角色数据 diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysRoleServiceImpl.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysRoleServiceImpl.java index d59172f..08cf254 100644 --- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysRoleServiceImpl.java +++ b/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 sysRoleList = sysRoleMapper.findAllRoles(); - return AllRolesVo.builder().allRolesList(sysRoleList).build(); + + // 查询当前登录用户的角色数据 + List sysRoles = sysRoleUserMapper.findSysUserRoleByUserId(userId); + return AllRolesVo.builder().allRolesList(sysRoleList).sysUserRoles(sysRoles).build(); } /** diff --git a/spzx-manager/src/main/resources/mapper/SysRoleUserMapper.xml b/spzx-manager/src/main/resources/mapper/SysRoleUserMapper.xml index 55385df..c4aaee0 100644 --- a/spzx-manager/src/main/resources/mapper/SysRoleUserMapper.xml +++ b/spzx-manager/src/main/resources/mapper/SysRoleUserMapper.xml @@ -14,4 +14,12 @@ from sys_user_role where user_id = #{userId} + + + diff --git a/spzx-model/src/main/java/com/atguigu/spzx/model/vo/system/AllRolesVo.java b/spzx-model/src/main/java/com/atguigu/spzx/model/vo/system/AllRolesVo.java index 80caeae..473fc27 100644 --- a/spzx-model/src/main/java/com/atguigu/spzx/model/vo/system/AllRolesVo.java +++ b/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 allRolesList; + @Schema(description = "所有用户的角色") + private List sysUserRoles; }