Merge remote-tracking branch 'origin/master'

user_center/src/main/java/com/huaxu/config/ResourceServerConfig.java

@@ -17,7 +17,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                 .and()
                 .authorizeRequests()
                 .antMatchers("/swagger-ui.html","/webjars/**", "/webjars/**", "/swagger-resources/**",
-                       "/v2/**","/menu/**","/user/**")
+                       "/v2/**")
                 .permitAll() //配置不需要身份认证的请求路径
                 .anyRequest().authenticated() //其他所有访问路径都需要身份认证
                 .and()

user_center/src/main/java/com/huaxu/controller/RoleController.java

@@ -46,7 +46,7 @@ public class RoleController {
     @RequestMapping(value = "get", method = RequestMethod.POST)
     @ApiOperation(value = "查询角色")
     public AjaxMessage<Role> selectOne(
-            @ApiParam(value = "角色id", required = true)@RequestParam Integer id) {
+            @ApiParam(value = "角色id", required = true) @RequestParam Integer id) {
 
         Role result = roleService.selectById(id);
 
@@ -77,7 +77,7 @@ public class RoleController {
     @ApiOperation(value = "更新角色")
     public AjaxMessage<Integer> update(@ApiParam(value = "设置配置", required = true) @RequestBody RoleRequestDto role) {
         int result = roleService.update(role);
-        if(result==-1){
+        if (result == -1) {
             return new AjaxMessage<>(ResultStatus.ROLE_HAS_USER);
         }
         return new AjaxMessage<>(ResultStatus.OK, result);
@@ -94,7 +94,7 @@ public class RoleController {
      */
     @RequestMapping(value = "selectPage", method = RequestMethod.POST)
     @ApiOperation(value = "查询角色列表")
-    public AjaxMessage<Pagination<RoleDto>> selectPage(Integer pageNum, Integer pageSize,String roleName) {
+    public AjaxMessage<Pagination<RoleDto>> selectPage(Integer pageNum, Integer pageSize, String roleName) {
         Role role = new Role();
         role.setRoleName(roleName);
         IPage<RoleDto> iPage = new Page<>(pageNum, pageSize);
@@ -102,40 +102,51 @@ public class RoleController {
         Pagination<RoleDto> pages = new Pagination<>(iPage);
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
+
     @RequestMapping(value = "selectAll", method = RequestMethod.POST)
     @ApiOperation(value = "查询所有角色")
     public AjaxMessage<List<Role>> selectAll() {
-        Role role=new Role();
+        Role role = new Role();
         return new AjaxMessage<>(ResultStatus.OK, roleService.selectList(role));
     }
+
     @RequestMapping(value = "findUsersByUserGroup", method = RequestMethod.POST)
     @ApiOperation(value = "查询角色对应user")
-    AjaxMessage<List<UserEntity>>  findUsersByRole(@ApiParam(value = "角色id", required = true)@RequestParam Integer id){
-        Role role=new Role();
+    AjaxMessage<List<UserEntity>> findUsersByRole(@ApiParam(value = "角色id", required = true) @RequestParam Integer id) {
+        Role role = new Role();
         role.setId(id);
         return new AjaxMessage<>(ResultStatus.OK,
-              roleService.findUsersByRole(role) );
+                roleService.findUsersByRole(role));
     }
+
     @RequestMapping(value = "deleteAll", method = RequestMethod.POST)
     @ApiOperation(value = "删除角色")
-    AjaxMessage<List<String>> deleteAll(@ApiParam(value = "角色id", required = true)@RequestBody List<Integer> ids){
+    AjaxMessage<List<String>> deleteAll(@ApiParam(value = "角色id", required = true) @RequestBody List<Integer> ids) {
 
         return new AjaxMessage<>(ResultStatus.OK,
                 roleService.deleteAll(ids));
     }
+
     @RequestMapping(value = "confirmRoleMunu", method = RequestMethod.POST)
     @ApiOperation(value = "配置角色菜单")
-    AjaxMessage<Integer> confirmRoleMunu(@ApiParam(value = "角色id", required = true)@RequestBody RoleRequestDto role){
+    AjaxMessage<Integer> confirmRoleMunu(@ApiParam(value = "角色id", required = true) @RequestBody RoleRequestDto role) {
 
         return new AjaxMessage<>(ResultStatus.OK,
                 roleService.updateRoleMenuRelations(role));
     }
+
     @RequestMapping(value = "getRoleOrgs", method = RequestMethod.POST)
     @ApiOperation(value = "配置角色菜单")
-    AjaxMessage<List<RoleOrg>> getRoleOrgs(@ApiParam(value = "角色id", required = true)@RequestParam Integer id){
-        RoleOrg roleOrg=new RoleOrg();
+    AjaxMessage<List<RoleOrg>> getRoleOrgs(@ApiParam(value = "角色id", required = true) @RequestParam Integer id) {
+        RoleOrg roleOrg = new RoleOrg();
         roleOrg.setRoleId(id);
         return new AjaxMessage<>(ResultStatus.OK,
                 roleService.getRoleOrgs(roleOrg));
     }
+
+    @RequestMapping(value = "getRoleMenuByRoleId", method = RequestMethod.POST)
+    @ApiOperation(value = "根据角色ID查询菜单")
+    AjaxMessage<Role> getRoleMenuByRoleId(@ApiParam(value = "角色id", required = true) @RequestParam Integer id) {
+        return new AjaxMessage<Role>(ResultStatus.OK, roleService.getRoleMenuByRoleId(id));
+    }
 }

user_center/src/main/java/com/huaxu/entity/Role.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 角色(Role)实体类
@@ -72,4 +73,7 @@ public class Role implements Serializable {
     private Date dateUpdate;
     @ApiModelProperty(value = "")
     private String updateBy;
+    @ApiModelProperty(value = "菜单IDs")
+    private List<Long> menuIds;
+
 }

user_center/src/main/java/com/huaxu/service/RoleService.java

@@ -72,7 +72,8 @@ public interface RoleService {
      * @return 影响行数
      */
     int deleteById(Integer id);
-    List<String> deleteAll(List<Integer>ids);
+
+    List<String> deleteAll(List<Integer> ids);
 
     /**
      * 查询总数据数
@@ -82,8 +83,12 @@ public interface RoleService {
     int count();
 
     IPage<RoleDto> selectPage(Role role, IPage<RoleDto> page);
-     List<UserEntity>findUsersByRole(Role role);
-     int updateRoleMenuRelations(RoleRequestDto dto);
-     List<RoleOrg>getRoleOrgs(RoleOrg roleOrg);
 
+    List<UserEntity> findUsersByRole(Role role);
+
+    int updateRoleMenuRelations(RoleRequestDto dto);
+
+    List<RoleOrg> getRoleOrgs(RoleOrg roleOrg);
+
+    Role getRoleMenuByRoleId(Integer id);
 }

user_center/src/main/java/com/huaxu/service/impl/RoleServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huaxu.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huaxu.dao.MenuMapper;
 import com.huaxu.dao.RoleMapper;
 import com.huaxu.dao.RoleMenuMapper;
 import com.huaxu.dao.RoleOrgMapper;
@@ -36,6 +37,8 @@ public class RoleServiceImpl implements RoleService {
     private RoleMenuMapper roleMenuMapper;
     @Autowired
     private RedisUtil redisUtil;
+    @Autowired
+    private MenuMapper menuMapper;
 
 
     /**
@@ -235,7 +238,21 @@ public class RoleServiceImpl implements RoleService {
 
     @Override
     public List<RoleOrg> getRoleOrgs(RoleOrg roleOrg) {
-       ;
         return  roleOrgMapper.selectList(roleOrg);
     }
+    @Override
+    public  Role getRoleMenuByRoleId(Integer id) {
+        Role role = roleMapper.selectById(id);
+        RoleMenu roleMenu = new RoleMenu();
+        roleMenu.setRoleId(id);
+        roleMenu.setStatus(1);
+        List<RoleMenu> roleMenus = roleMenuMapper.selectList(roleMenu);
+        List<Long> menuIds = new ArrayList<>();
+        for (RoleMenu item : roleMenus)
+        {
+            menuIds.add(Long.valueOf(item.getMenuId()));
+        }
+        role.setMenuIds(menuIds);
+        return role;
+    }
 }