whycxzp
2021-09-27 d815151a1b5fc0d70df80cf80cb01b7636468d36
更新用户-角色-菜单-权限
8个文件已修改
108 ■■■■■ 已修改文件
src/main/java/com/whyc/controller/RoleController.java 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/RoleMenuController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/RolePermissionController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/UserController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/RoleMenuService.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/UserBridgeService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/UserService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/RoleMenuMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/RoleController.java
@@ -1,5 +1,6 @@
package com.whyc.controller;
import com.whyc.dto.Response;
import com.whyc.pojo.*;
import com.whyc.service.RoleMenuService;
import com.whyc.service.RolePermissionService;
@@ -20,7 +21,7 @@
@RequestMapping("role")
@RestController
@Slf4j
@Api(value ="role value",tags = "角色相关-用户,权限,菜单")
@Api(tags = "角色")
public class RoleController {
    @Autowired
@@ -37,14 +38,16 @@
    @GetMapping("all")
    @ApiOperation(value = "查询所有角色")
    public List<Role> getRoleAll(){
        return roleService.getAll();
    public Response getRoleAll(){
        List<Role> roles = roleService.getAll();
        return new Response().set(1,roles);
    }
    @PostMapping
    @ApiOperation(value = "新增角色")
    public boolean add(@RequestBody Role role){
        return roleService.add(role);
    public Response add(@RequestBody Role role){
        roleService.add(role);
        return new Response().setMsg(1,"新增成功");
    }
    /**
@@ -86,24 +89,5 @@
    public boolean bindingRoleWithPermissionBatch(@RequestBody List<RolePermission> rolePermissions){
        return rolePermissionService.bindingUserWithRoleBatch(rolePermissions);
    }
    @GetMapping("permissions")
    @ApiOperation(value = "获取当前用户的权限")
    public List<Permission> getPermissions(HttpServletRequest request){
        User user = CommonUtil.getUser(request);
        return rolePermissionService.getPermissions(user.getId());
    }
    /**==============用户-角色-菜单================**/
    @GetMapping("userMenu")
    @ApiOperation(value = "获取当前用户的菜单")
    public List<Menu> getUserMenu(HttpServletRequest request){
        User user = CommonUtil.getUser(request);
        return roleMenuService.getUserMenu(user.getId());
    }
}
src/main/java/com/whyc/controller/RoleMenuController.java
@@ -3,7 +3,9 @@
import com.whyc.dto.Response;
import com.whyc.pojo.Menu;
import com.whyc.pojo.RoleMenu;
import com.whyc.pojo.User;
import com.whyc.service.RoleMenuService;
import com.whyc.util.CommonUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
@@ -12,6 +14,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
@@ -23,7 +26,7 @@
 */
@RequestMapping("roleMenu")
@RestController
@Api(tags = "角色菜单")
@Api(tags = "角色-菜单")
public class RoleMenuController {
    @Resource
@@ -32,7 +35,7 @@
    @GetMapping("menuByRoleId")
    @ApiOperation(value = "查询角色对应的菜单")
    public Response getMenuByRoleId(@RequestParam Integer roleId){
        List<Menu> roleMenus = service.getMenuByRoleId(roleId);
        List<Menu> roleMenus = service.getMenuByRoleId(roleId,1);
        return new Response().set(1,roleMenus);
    }
@@ -40,19 +43,18 @@
    @GetMapping("allMenuByRoleId")
    @ApiOperation(value = "查询角色对应所有状态的菜单")
    public Response getAllMenuByRoleId(@RequestParam Integer roleId){
        List<Menu> roleMenus = service.getAllMenuByRoleId(roleId);
        List<Menu> roleMenus = service.getMenuByRoleId(roleId,null);
        return new Response().set(1,roleMenus);
    }
    public Response getMenu(@RequestParam Integer roleId){
        List<Menu> roleMenus = service.getMenuByRoleId(roleId);
    @GetMapping("currentUserMenu")
    @ApiOperation(value = "获取当前用户的菜单")
    public Response getCurrentUserMenu(HttpServletRequest request){
        Integer roleId = CommonUtil.getUser(request).getRoleId();
        List<Menu> roleMenus = service.getMenuByRoleId(roleId,1);
        return new Response().set(1,roleMenus);
    }
}
src/main/java/com/whyc/controller/RolePermissionController.java
@@ -17,7 +17,7 @@
@RestController
@RequestMapping("rolePermission")
@Api(tags = "角色权限")
@Api(tags = "角色-权限")
public class RolePermissionController {
    @Autowired
src/main/java/com/whyc/controller/UserController.java
@@ -62,4 +62,11 @@
        return userService.delete(id);
    }
    @PutMapping("disable")
    @ApiOperation(value = "禁用")
    public Response disable(@RequestParam int id){
        userService.disable(id);
        return new Response().setMsg(1,"更新成功");
    }
}
src/main/java/com/whyc/service/RoleMenuService.java
@@ -21,40 +21,9 @@
    @Resource
    private RoleMenuMapper mapper;
    public List<Menu> getUserMenu(Integer id) {
        return mapper.getUserMenu(id);
    }
    public List<Menu> getMenuByRoleId(Integer roleId,Integer status) {
    public List<Menu> getMenuByRoleId(Integer roleId) {
        List<Menu> menuList = mapper.getMenuByRoleId(roleId,1);
        for (int i = 0; i < menuList.size(); i++) {
            Integer parentId = menuList.get(i).getParentId();
            if(parentId !=0){
                //将这个menu插入到parent中
                for (int j = 0; j < menuList.size(); j++) {
                    if(menuList.get(j).getId()==parentId){
                        List<Menu> menuListTemp = menuList.get(j).getMenuList();
                        if(menuListTemp==null) {
                            menuListTemp = new LinkedList<>();
                        }
                        menuListTemp.add(menuList.get(i));
                        menuList.get(j).setMenuList(menuListTemp);
                        menuList.remove(i);
                        i--;
                        break;
                    }
                }
            }
        }
        return menuList;
    }
    public List<Menu> getAllMenuByRoleId(Integer roleId) {
        List<Menu> menuList = mapper.getMenuByRoleId(roleId,null);
        List<Menu> menuList = mapper.getMenuByRoleId(roleId,status);
        for (int i = 0; i < menuList.size(); i++) {
            Integer parentId = menuList.get(i).getParentId();
src/main/java/com/whyc/service/UserBridgeService.java
@@ -47,7 +47,7 @@
    public User findPasswordAndSlatByUserName(String userName) {
        QueryWrapper<User> queryWrapper = Wrappers.query();
        queryWrapper.select("id", "name", "password", "salt").eq("name", userName);
        queryWrapper.select("id", "name", "password", "salt","role_id").eq("name", userName);
        User user = userMapper.selectOne(queryWrapper);
        if (user == null) {
            return new User(0, "用户不存在");
src/main/java/com/whyc/service/UserService.java
@@ -71,4 +71,11 @@
        return userMapper.deleteById(id)>0;
    }
    public boolean disable(int id) {
        User user = new User();
        user.setId(id);
        user.setStatus(0);
        return userMapper.updateById(user)>0;
    }
}
src/main/resources/mapper/RoleMenuMapper.xml
@@ -16,9 +16,6 @@
        </foreach>
    </update>
    <select id="getUserMenu" resultType="com.whyc.pojo.Menu">
    </select>
    <select id="getMenuByRoleId" resultMap="Map_Menu">
        SELECT
            rm.status,