角色管理

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/RoleManagerController.java

@@ -3,6 +3,7 @@ package com.abi.qms.platform.controller.console;
 import com.abi.qms.platform.dto.req.*;
 import com.abi.qms.platform.dto.res.GetRoleInfoRes;
 import com.abi.qms.platform.dto.res.ListResourceRes;
+import com.abi.qms.platform.dto.res.ListResourceTreeByRoleCodeRes;
 import com.abi.qms.platform.dto.res.ListRoleRes;
 import com.abi.qms.platform.service.RoleManagerService;
 import com.abi.task.common.api.base.BaseResponse;
@@ -29,6 +30,24 @@ public class RoleManagerController {
     @Autowired
     private RoleManagerService roleManagerService;
 
+    @ApiOperation("查询当前用户能看到的资源")
+    @GetMapping("listResource")
+    public BaseResponse<ListResourceRes> listResource() throws Exception{
+        //查询当前用户能看到的资源
+        ListResourceRes  result = roleManagerService.listResource();
+        //包装出参
+        return BaseResponse.create(result);
+    }
+
+    @ApiOperation("获取登录角色下级的角色树")
+    @GetMapping("listResourceTreeByRoleCode")
+    public BaseResponse<ListResourceTreeByRoleCodeRes> listResourceTreeByRoleCode(@Validated ListResourceTreeByRoleCodeReq listResourceTreeByRoleCodeReq) throws Exception{
+        //获取登录角色下级的角色树
+        ListResourceTreeByRoleCodeRes  result = roleManagerService.listResourceTreeByRoleCode(listResourceTreeByRoleCodeReq);
+        //包装出参
+        return BaseResponse.create(result);
+    }
+
     @ApiOperation("创建角色")
     @PostMapping("createRole")
     public BaseResponse createRole(@Validated @RequestBody CreateRoleReq createRoleReq) throws Exception{
@@ -65,13 +84,22 @@ public class RoleManagerController {
         return BaseResponse.create(result);
     }
 
-    @ApiOperation("查询当前用户能看到的资源")
-    @GetMapping("listResource")
-    public BaseResponse<ListResourceRes> listResource() throws Exception{
-        //查询当前用户能看到的资源
-        ListResourceRes  result = roleManagerService.listResource();
+    @ApiOperation("启用角色")
+    @PostMapping("enableRole")
+    public BaseResponse enableRole(@Validated @RequestBody EnableRoleReq enableRoleReq) throws Exception{
+        //启用角色
+        roleManagerService.enableRole(enableRoleReq);
         //包装出参
-        return BaseResponse.create(result);
+        return BaseResponse.create();
+    }
+
+    @ApiOperation("禁用角色")
+    @PostMapping("disableRole")
+    public BaseResponse disableRole(@Validated @RequestBody DisableRoleReq disableRoleReq) throws Exception{
+        //禁用角色
+        roleManagerService.disableRole(disableRoleReq);
+        //包装出参
+        return BaseResponse.create();
     }
 
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/UserResourceMapper.java

@@ -2,6 +2,9 @@ package com.abi.qms.platform.dao.mapper;
 
 import com.abi.qms.platform.dao.entity.UserResource;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,4 +15,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface UserResourceMapper extends BaseMapper<UserResource> {
 
+    /**
+     * 查询角色下整个resource树
+     * @param roleCode
+     * @return
+     */
+    List<UserResource> listResourceTreeByRoleCode(@Param("roleCode")String roleCode);
+
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/UserRoleMapper.java

@@ -28,6 +28,11 @@ public interface UserRoleMapper extends BaseMapper<UserRole> {
                                                @Param("roleCode") String roleCode,
                                                @Param("roleLevel")Integer roleLevel);
 
+    /**
+     * 查询某个角色关联的用户
+     * @param roleCode
+     * @return
+     */
     Long countList(@Param("roleCode")String roleCode);
 
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/DisableRoleReq.java

@@ -0,0 +1,25 @@
+package com.abi.qms.platform.dto.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author:Andy.Tan
+ * @Description: 禁用角色入参
+ */
+@Data
+@ApiModel
+public class DisableRoleReq implements Serializable {
+
+  @NotNull(message = "角色code为空")
+  @ApiModelProperty(value = "角色code列表")
+  private List<String> roleCodeList;
+
+
+
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/EnableRoleReq.java

@@ -0,0 +1,25 @@
+package com.abi.qms.platform.dto.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author:Andy.Tan
+ * @Description: 启用角色入参
+ */
+@Data
+@ApiModel
+public class EnableRoleReq implements Serializable {
+
+  @NotNull(message = "角色code为空")
+  @ApiModelProperty(value = "角色code列表")
+  private List<String> roleCodeList;
+
+
+
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ListResourceTreeByRoleCodeReq.java

@@ -0,0 +1,21 @@
+package com.abi.qms.platform.dto.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * @author:Andy.Tan
+ * @Description: 获取登录角色下级的角色树入参
+ */
+@Data
+@ApiModel
+public class ListResourceTreeByRoleCodeReq implements Serializable {
+
+  @ApiModelProperty("是否需要转成树形结构 1-需要")
+  private Integer isTree;
+
+
+
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/DisableRoleRes.java

@@ -0,0 +1,38 @@
+package com.abi.qms.platform.dto.res;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+/**
+ * @author:Andy.Tan
+ * @Description: 禁用角色出参
+ */
+@Data
+@ApiModel
+public class DisableRoleRes implements Serializable {
+
+  @ApiModelProperty("xxxID")
+  private String xxxId;
+
+  /**
+     * XXX
+     */
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    @ApiModel(value = "DisableRoleRes_XxxBean")
+    public static class Xxx implements Serializable {
+
+      @ApiModelProperty("xxx")
+      private String xxx;
+
+    }
+
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/EnableRoleRes.java

@@ -0,0 +1,38 @@
+package com.abi.qms.platform.dto.res;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+/**
+ * @author:Andy.Tan
+ * @Description: 启用角色出参
+ */
+@Data
+@ApiModel
+public class EnableRoleRes implements Serializable {
+
+  @ApiModelProperty("xxxID")
+  private String xxxId;
+
+  /**
+     * XXX
+     */
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    @ApiModel(value = "EnableRoleRes_XxxBean")
+    public static class Xxx implements Serializable {
+
+      @ApiModelProperty("xxx")
+      private String xxx;
+
+    }
+
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListResourceTreeByRoleCodeRes.java

@@ -0,0 +1,51 @@
+package com.abi.qms.platform.dto.res;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author:Andy.Tan
+ * @Description: 获取登录角色下级的角色树出参
+ */
+@Data
+@ApiModel
+public class ListResourceTreeByRoleCodeRes implements Serializable {
+
+  @ApiModelProperty("资源列表")
+  private List<ResourceBean> resourceBeanList;
+
+    /**
+     * 资源
+     */
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    @ApiModel(value = "ListResourceTreeByRoleCodeRes_ResourceBean")
+    public static class ResourceBean implements Serializable {
+
+      @ApiModelProperty(value = "资源code")
+      private String resourceCode;
+
+      @ApiModelProperty(value = "资源名称")
+      private String resourceName;
+
+      @ApiModelProperty(value = "资源类型 1-页面路由 2-按钮 3-查看页面")
+      private String resourceType;
+
+      @ApiModelProperty(value = "资源内容")
+      private String content;
+
+      @ApiModelProperty("子资源列表 当返回要求是树形结构时，才会返回")
+      private List<ResourceBean> resourceBeanList;
+
+    }
+
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/interceptor/IwepTokenInterceptor.java

@@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletResponse;
  * @date 2021/1/20 17:57
  */
 @Configuration
-public class IwepTokenInterceptor extends HandlerInterceptorAdapter {
+public class TokenInterceptor extends HandlerInterceptorAdapter {
 
     @Resource
     private LoginService loginService;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/RoleManagerService.java

@@ -3,13 +3,10 @@ package com.abi.qms.platform.service;
 
 import com.abi.qms.platform.dao.entity.UserResource;
 import com.abi.qms.platform.dao.entity.UserRole;
-import com.abi.qms.platform.dto.req.CreateRoleReq;
-import com.abi.qms.platform.dto.req.GetRoleInfoReq;
-import com.abi.qms.platform.dto.req.ListResourceReq;
-import com.abi.qms.platform.dto.req.ListRoleReq;
-import com.abi.qms.platform.dto.req.UpdateRoleReq;
+import com.abi.qms.platform.dto.req.*;
 import com.abi.qms.platform.dto.res.GetRoleInfoRes;
 import com.abi.qms.platform.dto.res.ListResourceRes;
+import com.abi.qms.platform.dto.res.ListResourceTreeByRoleCodeRes;
 import com.abi.qms.platform.dto.res.ListRoleRes;
 
 import java.util.List;
@@ -56,7 +53,6 @@ public interface RoleManagerService {
 
     /**
      * 查询当前用户能看到的资源
-     * @param listResourceReq
      * @return
      * @throws Exception
      */
@@ -70,6 +66,28 @@ public interface RoleManagerService {
      */
     UserRole getRoleByCode(String roleCode);
 
+    /**
+     * 查询当前登陆用户角色的resource树
+     * @param listResourceTreeByRoleCodeReq
+     * @return
+     * @throws Exception
+     */
+    ListResourceTreeByRoleCodeRes listResourceTreeByRoleCode(ListResourceTreeByRoleCodeReq listResourceTreeByRoleCodeReq) throws Exception;
+
+    /**
+     * 启用角色
+     * @param enableRoleReq
+     * @throws Exception
+     */
+    void enableRole(EnableRoleReq enableRoleReq) throws Exception;
+
+    /**
+     * 禁用角色
+     * @param disableRoleReq
+     * @throws Exception
+     */
+    void disableRole(DisableRoleReq disableRoleReq) throws Exception;
+
 
 
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/RoleManagerServiceImpl.java

@@ -1,14 +1,18 @@
 package com.abi.qms.platform.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.abi.qms.platform.dao.entity.UserInfo;
+import com.abi.qms.platform.dao.entity.UserResource;
 import com.abi.qms.platform.dao.entity.UserRole;
 import com.abi.qms.platform.dao.enums.RoleLevelEnum;
 import com.abi.qms.platform.dao.mapper.UserMappingRoleResourceMapper;
+import com.abi.qms.platform.dao.mapper.UserResourceMapper;
 import com.abi.qms.platform.dao.mapper.UserRoleMapper;
 import com.abi.qms.platform.dao.vo.result.ListRoleVO;
 import com.abi.qms.platform.dto.req.*;
 import com.abi.qms.platform.dto.res.GetRoleInfoRes;
 import com.abi.qms.platform.dto.res.ListResourceRes;
+import com.abi.qms.platform.dto.res.ListResourceTreeByRoleCodeRes;
 import com.abi.qms.platform.dto.res.ListRoleRes;
 import com.abi.qms.platform.infrastructure.util.AssertUtil;
 import com.abi.qms.platform.infrastructure.util.PageUtil;
@@ -24,7 +28,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -40,14 +47,13 @@ public class RoleManagerServiceImpl implements RoleManagerService {
     private UserRoleMapper userRoleMapper;
 
     @Autowired
-    private UserMappingRoleResourceMapper userMappingRoleResourceMapper;
+    private UserResourceMapper userResourceMapper;
 
     @Autowired
-    private UserResourceService userResourceService;
+    private UserMappingRoleResourceMapper userMappingRoleResourceMapper;
 
     @Autowired
-    private UserUtil userUtil;
-
+    private UserResourceService userResourceService;
 
     /**
      * 创建角色
@@ -161,7 +167,7 @@ public class RoleManagerServiceImpl implements RoleManagerService {
     @Override
     public ListRoleRes listRole(ListRoleReq req) {
         //获取当前登录的用户
-        UserInfo user = userUtil.getUser();
+        UserInfo user = UserUtil.getUser();
         //获取当前用户的角色
         UserRole role = getRoleByCode(user.getRoleCode());
 
@@ -189,7 +195,7 @@ public class RoleManagerServiceImpl implements RoleManagerService {
     @Override
     public ListResourceRes listResource() {
         //获取当前登录的用户
-        UserInfo user = userUtil.getUser();
+        UserInfo user = UserUtil.getUser();
         //获取当前用户的角色
         UserRole role = getRoleByCode(user.getRoleCode());
 
@@ -220,4 +226,96 @@ public class RoleManagerServiceImpl implements RoleManagerService {
         return userRoleList.get(0);
     }
 
+    /**
+     * 获取登录角色下级的角色树
+     **/
+    @Override
+    public ListResourceTreeByRoleCodeRes listResourceTreeByRoleCode(ListResourceTreeByRoleCodeReq req) {
+        //获取当前登录的用户
+        UserInfo user = UserUtil.getUser();
+        //获取当前用户的角色
+        UserRole role = getRoleByCode(user.getRoleCode());
+
+        //1-查询角色树
+        List<UserResource> userResourceList = userResourceMapper.listResourceTreeByRoleCode(role.getRoleCode());
+
+        //构造出参
+        ListResourceTreeByRoleCodeRes res = new ListResourceTreeByRoleCodeRes();
+        List<ListResourceTreeByRoleCodeRes.ResourceBean> resourceBeanList = new ArrayList<>();
+
+        //2-转树形
+        if(req.getIsTree()!=null && req.getIsTree()==1){
+            //放一个map，用于快捷查找到list  key为父resourceCode
+            Map<String,List<ListResourceTreeByRoleCodeRes.ResourceBean>> resourceListMap = new HashMap<>();
+            //如果父类code为null，那么父list就是顶层list
+            resourceListMap.put(null,resourceBeanList);
+            //开始循环放入，因为查询语句排过序，所以查到的顺序，一定是先父后子
+            for(UserResource resource:userResourceList){
+                //先获取父类列表
+                List<ListResourceTreeByRoleCodeRes.ResourceBean> parentList = resourceListMap.get(resource.getParentResourceCode());
+                //然后放入自己
+                ListResourceTreeByRoleCodeRes.ResourceBean resourceBean = PojoConverterUtils.copy(resource, ListResourceTreeByRoleCodeRes.ResourceBean.class);
+                parentList.add(resourceBean);
+                //如果resourceCode是3位or6位，则需要创建子list
+                if(resourceBean.getResourceCode().length()<=6){
+                    resourceBean.setResourceBeanList(new ArrayList<>());
+                    resourceListMap.put(resourceBean.getResourceCode(),resourceBean.getResourceBeanList());
+                }
+            }
+        }else{
+            resourceBeanList = PojoConverterUtils.copyList(userResourceList, ListResourceTreeByRoleCodeRes.ResourceBean.class);
+
+        }
+
+        //放入出参
+        res.setResourceBeanList(resourceBeanList);
+
+        return res;
+    }
+
+    /**
+     * 启用角色
+     **/
+    @Override
+    public void enableRole(EnableRoleReq req) {
+        List<String> roleCodeList = req.getRoleCodeList();
+
+        //循环启用
+        for(String roleCode:roleCodeList){
+            //1-查询角色
+            UserRole role = getRoleByCode(roleCode);
+            AssertUtil.isNull(role,"角色不存在");
+            if(role.getIsEnable()==1){
+                continue;
+            }
+
+            //2-修改状态
+            role.setIsEnable(1);
+            userRoleMapper.updateById(role);
+        }
+
+    }
+
+    /**
+     * 禁用角色
+     **/
+    @Override
+    public void disableRole(DisableRoleReq req) {
+        List<String> roleCodeList = req.getRoleCodeList();
+
+        //循环禁用
+        for(String roleCode:roleCodeList){
+            //1-查询角色
+            UserRole role = getRoleByCode(roleCode);
+            AssertUtil.isNull(role,"角色不存在");
+            if(role.getIsEnable()==0){
+                continue;
+            }
+
+            //2-修改状态
+            role.setIsEnable(0);
+            userRoleMapper.updateById(role);
+        }
+
+    }
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/UserResourceServiceImpl.java

@@ -123,4 +123,7 @@ public class UserResourceServiceImpl extends ServiceImpl<UserMappingRoleResource
 
         return resourceCodeList;
     }
+
+
+
 }

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/UserResourceMapper.xml

@@ -22,4 +22,26 @@
         id, parent_resource_code, resource_code, resource_name, content, sort, create_time, create_by, update_time, is_delete
     </sql>
 
+    <select id="listResourceTreeByRoleCode" resultType="com.abi.qms.platform.dao.entity.UserResource">
+        select *
+        from user_resource
+        where resource_code in (
+            select resource_code
+            from user_mapping_role_resource
+            where role_code=#{roleCode} and is_delete=0
+
+            union all
+            select left(resource_code,6)
+            from user_mapping_role_resource
+            where role_code=#{roleCode} and is_delete=0
+
+            union all
+            select left(resource_code,3)
+            from user_mapping_role_resource
+            where role_code=#{roleCode} and is_delete=0
+        )
+        order by resource_code
+
+    </select>
+
 </mapper>

version.txt

@@ -1 +1 @@
-feature1.0.02104191913
+feature1.0.02104212008