src/main/java/com/whyc/controller/RoleController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/RoleMenuService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/RoleService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/UserRoleService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/RoleController.java
@@ -73,18 +73,18 @@ @GetMapping("getUserByRoleId") @ApiOperation(value = "通过角色id获取用户信息",notes = "点击权限人员时触发获取") public Response<PageInfo<User>> getUserByRoleId(@RequestParam int pageNum,@RequestParam int pageSize,@RequestParam int roleId){ return roleService.getUserByRoleId(pageNum,pageSize,roleId); return userRoleService.getUserByRoleId(pageNum,pageSize,roleId); } @GetMapping("getUsersByRoleId") @ApiOperation(value = "获取角色用户信息",notes = "点击添加人员是触发获取") public Response getUsersByRoleId(@RequestParam int roleId){ return roleService.getUsersByRoleId(roleId); return userRoleService.getUsersByRoleId(roleId); } @PutMapping("updateRoleUser") @ApiOperation(value = "更新角色用户信息",notes = "配置人员信息保存") public void updateRoleUser(@RequestParam int roleId,@RequestBody List<User> users){ roleService.updateRoleUser(roleId,users); public Response updateRoleUser(@RequestParam int roleId,@RequestParam int[] userIds){ return userRoleService.updateRoleUser(roleId,userIds); } @PostMapping src/main/java/com/whyc/service/RoleMenuService.java
@@ -82,7 +82,7 @@ private List<Menu> getChild(Integer MenuId , List<Menu> Menus){ List<Menu> childs = new ArrayList<>(); for (Menu e: Menus) { if(e.getMenuId()!=null){ if(e.getMenuId()!=0){ if(e.getMenuId().equals( MenuId )){ // 子菜单的下级菜单 childs.add( e ); src/main/java/com/whyc/service/RoleService.java
@@ -26,8 +26,7 @@ private RoleMapper mapper; @Resource private UserRoleMapper userRoleMapper; @Resource private UserMapper userMapper; public List<Role> getAll() { return mapper.selectList(null); @@ -73,37 +72,7 @@ } } //绑定用户 public Response getUsersByRoleId(int roleId){ List<User> userList = userMapper.selectList(null); QueryWrapper<UserRole> queryWrapper= new QueryWrapper(); queryWrapper.eq("role_id",roleId); List<UserRole> userRoleList = userRoleMapper.selectList(queryWrapper); for (UserRole ur:userRoleList) { for (User u:userList) { if(ur.getUserId().equals(u.getId())){ u.setSelected(true); break; } } } return new Response().set(1,userList); } public void updateRoleUser(int roleId,List<User> users){ QueryWrapper<UserRole> queryWrapper = new QueryWrapper<UserRole>().eq("role_id",roleId); userRoleMapper.delete(queryWrapper); for (User user:users) { if(user.isSelected()){ UserRole userRole = new UserRole(); userRole.setUserId(user.getId()); userRole.setRoleId(roleId); userRoleMapper.insert(userRole); } } } @@ -112,19 +81,7 @@ } public Response<PageInfo<User>> getUserByRoleId(int pageNum,int pageSize,int roleId){ PageHelper.startPage(pageNum,pageSize); QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.select("user_id").eq("role_id",roleId); List<UserRole> userIds = userRoleMapper.selectList(queryWrapper); List<User> userList = new ArrayList<>(); for (UserRole userRole:userIds) { User user = userMapper.selectById(userRole.getUserId()); userList.add(user); } PageInfo<User> pageInfo = new PageInfo<>(userList); return new Response<PageInfo<User>>().set(1,pageInfo); } public Response updateRoleState(int roleId,int state){ Role role = mapper.selectById(roleId); src/main/java/com/whyc/service/UserRoleService.java
@@ -1,5 +1,10 @@ package com.whyc.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.whyc.dto.Response; import com.whyc.mapper.UserMapper; import com.whyc.mapper.UserRoleMapper; import com.whyc.pojo.Role; import com.whyc.pojo.User; @@ -8,10 +13,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.*; /** * 用户对应角色 @@ -21,6 +23,8 @@ @Resource private UserRoleMapper mapper; @Resource private UserMapper userMapper; public List<User> getUserWithNoRole() { return mapper.getUserWithNoRole(); @@ -59,4 +63,53 @@ public boolean bindingUserWithRoleBatch(List<UserRole> userRoles) { return mapper.insertBatchSomeColumn(userRoles)==userRoles.size(); } //绑定用户 public Response getUsersByRoleId(int roleId){ List<User> userList = userMapper.selectList(null); QueryWrapper<UserRole> queryWrapper= new QueryWrapper(); queryWrapper.eq("role_id",roleId); List<UserRole> userRoleList = mapper.selectList(queryWrapper); for (UserRole ur:userRoleList) { for (User u:userList) { if(ur.getUserId().equals(u.getId())){ u.setSelected(true); break; } } } return new Response().set(1,userList); } public Response updateRoleUser(int roleId,int[] userIds){ QueryWrapper<UserRole> queryWrapper = new QueryWrapper<UserRole>().eq("role_id",roleId); mapper.delete(queryWrapper); List<UserRole> list = new ArrayList<>(); for (int userId:userIds) { UserRole userRole = new UserRole(); userRole.setUserId(userId); userRole.setRoleId(roleId); list.add(userRole); } if (mapper.insertBatchSomeColumn(list)==list.size()){ return new Response().setMsg(1,"更新成功"); }else { return new Response().setMsg(0,"更新失败"); } } public Response<PageInfo<User>> getUserByRoleId(int pageNum, int pageSize, int roleId){ PageHelper.startPage(pageNum,pageSize); QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.select("user_id").eq("role_id",roleId); List<UserRole> userIds = mapper.selectList(queryWrapper); List<User> userList = new ArrayList<>(); for (UserRole userRole:userIds) { User user = userMapper.selectById(userRole.getUserId()); userList.add(user); } PageInfo<User> pageInfo = new PageInfo<>(userList); return new Response<PageInfo<User>>().set(1,pageInfo); } }