feat:权限接口调整

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/role/HaobanRoleQDTO.java

@@ -30,6 +30,8 @@ public class HaobanRoleQDTO implements Serializable {
      */
     private HaobanRoleMenuQDTO managerMenus;
 
+    private String wxEnterpriseId;
+
     public String getRoleName() {
         return roleName;
     }
@@ -61,5 +63,13 @@ public class HaobanRoleQDTO implements Serializable {
     public void setManagerMenus(HaobanRoleMenuQDTO managerMenus) {
         this.managerMenus = managerMenus;
     }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
 }
 

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/role/HaobanRoleDTO.java

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.api.dto.role;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 好办小程序权限(TabHaobanRole)实体类
@@ -42,6 +43,8 @@ public class HaobanRoleDTO implements Serializable {
 
     private Date updateTime;
 
+    private List<String> menuCodes;
+
 
     public Long getRoleId() {
         return roleId;
@@ -130,5 +133,13 @@ public class HaobanRoleDTO implements Serializable {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    public List<String> getMenuCodes() {
+        return menuCodes;
+    }
+
+    public void setMenuCodes(List<String> menuCodes) {
+        this.menuCodes = menuCodes;
+    }
 }
 

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/role/HaobanRoleApiService.java

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.api.service.role;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleQDTO;
+import com.gic.haoban.manage.api.dto.role.HaobanRoleDTO;
 
 /**
  * @author xuwenqian
@@ -32,14 +33,12 @@ public interface HaobanRoleApiService {
     ServiceResponse edit(HaobanRoleQDTO haobanRoleQDTO,WebLoginDTO login);
 
     /**
-     * 通过wx企业id和角色id 查询菜单
+     * 获取类型菜单
      *
      * @param wxEnterpriseId wx企业标识
-     * @param roleId         角色id
-     * @return {@link ServiceResponse }
-     * @author mozhu
-     * @date 2022-09-13 14:56:09
+     * @param clerkType      职员类型
+     * @return {@link ServiceResponse}
      */
-    ServiceResponse getByWxEnterpriseIdAndRoleId(String wxEnterpriseId,Long roleId);
+    ServiceResponse<HaobanRoleDTO> getMenuByWxEnterpriseIdAndClerkType(String wxEnterpriseId, Integer clerkType);
 
 }

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/EnterpriseController.java

 package com.gic.haoban.manage.web.controller;
 
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.authcenter.commons.dto.AuthcenterUserDetails;
@@ -44,18 +20,10 @@ import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.common.utils.UuidUtil;
-import com.gic.haoban.manage.api.dto.BindStoreInfoDTO;
-import com.gic.haoban.manage.api.dto.DepartmentDTO;
-import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
-import com.gic.haoban.manage.api.dto.StoreOrGroupInfoDTO;
-import com.gic.haoban.manage.api.dto.StoreRangeInfoDTO;
-import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
-import com.gic.haoban.manage.api.dto.WxEnterpriseRelationDetailDTO;
-import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
 import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
-import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
@@ -67,8 +35,21 @@ import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import cn.hutool.core.collection.CollectionUtil;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @RestController
 public class EnterpriseController extends WebBaseController {

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/HaobanRoleController.java

 package com.gic.haoban.manage.web.controller;
 
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.authcenter.commons.dto.AuthcenterUserDetails;
+import com.gic.authcenter.commons.util.SessionContextUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
-import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleQDTO;
 import com.gic.haoban.manage.api.dto.role.HaobanMenuDTO;
+import com.gic.haoban.manage.api.dto.role.HaobanRoleDTO;
 import com.gic.haoban.manage.api.service.role.HaobanMenuApiService;
 import com.gic.haoban.manage.api.service.role.HaobanRoleApiService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -45,20 +48,23 @@ public class HaobanRoleController {
      * @return
      */
     @RequestMapping(value = "/edit",method = RequestMethod.POST)
-    private RestResponse edit(@RequestBody HaobanRoleQDTO haobanRoleQDTO) {
-        WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
+    private RestResponse edit(@RequestBody HaobanRoleQDTO haobanRoleQDTO, HttpServletRequest request) {
+        AuthcenterUserDetails loginUser = (AuthcenterUserDetails) SessionContextUtil.getUser(request) ;
+        String operationUserId = String.valueOf(loginUser.getId());
+        WebLoginDTO login = new WebLoginDTO();
+        login.setWxEnterpriseId(haobanRoleQDTO.getWxEnterpriseId());
+        login.setClerkId(operationUserId);
+        login.setClerkName(loginUser.getLoginName());
         return RestResponse.successResult(haobanRoleApiService.edit(haobanRoleQDTO,login));
     }
 
     /**
-     * 根据角色查询菜单
-     * @param roleId
+     * 根据类型查询菜单
      * @return
      */
     @RequestMapping(value = "/queryMenuByRoleId",method = RequestMethod.GET)
-    private RestResponse queryMenuByRoleId(Long roleId) {
-        WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        ServiceResponse serviceResponse = haobanRoleApiService.getByWxEnterpriseIdAndRoleId(login.getWxEnterpriseId(), roleId);
+    private RestResponse<HaobanRoleDTO> queryMenuByRoleId(Integer clerkType, String wxEnterpriseId) {
+        ServiceResponse<HaobanRoleDTO> serviceResponse = haobanRoleApiService.getMenuByWxEnterpriseIdAndClerkType(wxEnterpriseId, clerkType);
         return RestResponse.successResult(serviceResponse.getResult());
     }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/role/TabHaobanRoleMapper.java

@@ -64,7 +64,7 @@ public interface TabHaobanRoleMapper {
      * @author mozhu
      * @date 2022-09-07 14:09:07
      */
-    List<TabHaobanRole> getByWxEnterpriseIdAndClerkType(@Param("wxEnterpriseId") String wxEnterpriseId,
+    TabHaobanRole getByWxEnterpriseIdAndClerkType(@Param("wxEnterpriseId") String wxEnterpriseId,
                                                         @Param("clerkType") Integer clerkType);
 
 
@@ -78,6 +78,15 @@ public interface TabHaobanRoleMapper {
      */
     int getCountByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
 
+
+    /**
+     * 根据wx企业id获取列表
+     *
+     * @param wxEnterpriseId wx企业标识
+     * @return {@link List}<{@link TabHaobanRole}>
+     */
+    List<TabHaobanRole> getListByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
+
     /**
      * 根据wx企业id 删除
      *

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/role/HaobanRoleBO.java

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.service.pojo.bo.role;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 好办小程序权限(TabHaobanRole)实体类
@@ -42,6 +43,7 @@ public class HaobanRoleBO implements Serializable {
 
     private Date updateTime;
 
+    private List<String> menuCodes;
 
     public Long getRoleId() {
         return roleId;
@@ -130,5 +132,13 @@ public class HaobanRoleBO implements Serializable {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    public List<String> getMenuCodes() {
+        return menuCodes;
+    }
+
+    public void setMenuCodes(List<String> menuCodes) {
+        this.menuCodes = menuCodes;
+    }
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseApiServiceImpl.java

@@ -522,7 +522,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
 
     @Override
     public void addHaobanRole(String wxEnterpriseId) {
-        List<HaobanRoleBO> haobanRoleBOList = haobanRoleService.getByWxEnterpriseIdAndClerkType("-1", null);
+        List<HaobanRoleBO> haobanRoleBOList = haobanRoleService.getListByWxEnterpriseId("-1");
         HaobanRoleQDTO haobanRoleQDTO = new HaobanRoleQDTO();
 
         HaobanRoleQDTO haobanRoleSystemQDTO = new HaobanRoleQDTO();

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java

 package com.gic.haoban.manage.service.service.out.impl.role;
 
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.UniqueIdUtils;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleMenuQDTO;
 import com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleQDTO;
+import com.gic.haoban.manage.api.dto.role.HaobanRoleDTO;
 import com.gic.haoban.manage.api.enums.role.RoleClerkTypeEnum;
 import com.gic.haoban.manage.api.service.role.HaobanRoleApiService;
 import com.gic.haoban.manage.service.entity.role.TabHaobanRole;
 import com.gic.haoban.manage.service.entity.role.TabHaobanRoleMenu;
+import com.gic.haoban.manage.service.pojo.bo.role.HaobanRoleBO;
 import com.gic.haoban.manage.service.service.role.HaobanRoleMenuService;
 import com.gic.haoban.manage.service.service.role.HaobanRoleService;
 import org.apache.logging.log4j.LogManager;
@@ -158,9 +161,14 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
         return tabHaobanRole;
     }
 
+
     @Override
-    public ServiceResponse getByWxEnterpriseIdAndRoleId(String wxEnterpriseId, Long roleId) {
-        List<String> menuCodes = haobanRoleMenuService.getByWxEnterpriseIdAndRoleId(wxEnterpriseId, roleId);
-        return ServiceResponse.success(menuCodes);
+    public ServiceResponse<HaobanRoleDTO> getMenuByWxEnterpriseIdAndClerkType(String wxEnterpriseId, Integer clerkType) {
+        HaobanRoleBO haobanRoleBO = haobanRoleService.getByWxEnterpriseIdAndClerkType(wxEnterpriseId, clerkType);
+        if (haobanRoleBO != null) {
+            List<String> menuCodes = haobanRoleMenuService.getByWxEnterpriseIdAndRoleId(wxEnterpriseId, haobanRoleBO.getRoleId());
+            haobanRoleBO.setMenuCodes(menuCodes);
+        }
+        return ServiceResponse.success(EntityUtil.changeEntityNew(HaobanRoleDTO.class,haobanRoleBO));
     }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/HaobanRoleService.java

@@ -75,7 +75,16 @@ public interface HaobanRoleService {
      * @author mozhu
      * @date 2022-09-07 14:08:19
      */
-    List<HaobanRoleBO> getByWxEnterpriseIdAndClerkType(String wxEnterpriseId, Integer clerkType);
+    HaobanRoleBO getByWxEnterpriseIdAndClerkType(String wxEnterpriseId, Integer clerkType);
+
+
+    /**
+     * 查询wx企业id列表
+     *
+     * @param wxEnterpriseId wx企业标识
+     * @return {@link List}<{@link HaobanRoleBO}>
+     */
+    List<HaobanRoleBO> getListByWxEnterpriseId(String wxEnterpriseId);
 
     /**
      * 查询wx企业id数量

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/impl/HaobanRoleServiceImpl.java

@@ -86,9 +86,15 @@ public class HaobanRoleServiceImpl implements HaobanRoleService {
     }
 
     @Override
-    public List<HaobanRoleBO> getByWxEnterpriseIdAndClerkType(String wxEnterpriseId, Integer clerkType) {
-        List<TabHaobanRole> haobanRoles = tabHaobanRoleMapper.getByWxEnterpriseIdAndClerkType(wxEnterpriseId, clerkType);
-        return EntityUtil.changeEntityListNew(HaobanRoleBO.class, haobanRoles);
+    public HaobanRoleBO getByWxEnterpriseIdAndClerkType(String wxEnterpriseId, Integer clerkType) {
+        TabHaobanRole tabHaobanRole = tabHaobanRoleMapper.getByWxEnterpriseIdAndClerkType(wxEnterpriseId, clerkType);
+        return EntityUtil.changeEntityNew(HaobanRoleBO.class, tabHaobanRole);
+    }
+
+    @Override
+    public List<HaobanRoleBO> getListByWxEnterpriseId(String wxEnterpriseId) {
+        List<TabHaobanRole> tabHaobanRoles = tabHaobanRoleMapper.getListByWxEnterpriseId(wxEnterpriseId);
+        return EntityUtil.changeEntityListNew(HaobanRoleBO.class,tabHaobanRoles);
     }
 
     @Override

haoban-manage3-service/src/main/resources/mapper/role/TabHaobanRoleMapper.xml

@@ -97,6 +97,7 @@
         <if test="clerkType != null">
             and clerk_type = #{clerkType}
         </if>
+        limit 1
     </select>
 
     <select id="getCountByWxEnterpriseId" resultType="java.lang.Integer">
@@ -106,6 +107,12 @@
         where wx_enterprise_id = #{wxEnterpriseId}
     </select>
 
+    <select id="getListByWxEnterpriseId" resultMap="TabHaobanRoleMap">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_role
+        where wx_enterprise_id = #{wxEnterpriseId}
+    </select>
 
     <delete id="deleteByWxEnterpriseId">
         delete from tab_haoban_role where wx_enterprise_id = #{wxEnterpriseId}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/HaobanRoleController.java

@@ -5,6 +5,7 @@ import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleQDTO;
+import com.gic.haoban.manage.api.dto.role.HaobanRoleDTO;
 import com.gic.haoban.manage.api.service.role.HaobanMenuApiService;
 import com.gic.haoban.manage.api.service.role.HaobanRoleApiService;
 import org.slf4j.Logger;
@@ -67,13 +68,12 @@ public class HaobanRoleController extends WebBaseController{
 
     /**
      * 根据角色查询菜单
-     * @param roleId
      * @return
      */
     @RequestMapping(value = "/queryMenuByRoleId",method = RequestMethod.GET)
-    private RestResponse queryMenuByRoleId(Long roleId) {
+    private RestResponse<HaobanRoleDTO> queryMenuByRoleId(Integer clerkType) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        ServiceResponse serviceResponse = haobanRoleApiService.getByWxEnterpriseIdAndRoleId(login.getWxEnterpriseId(), roleId);
+        ServiceResponse<HaobanRoleDTO> serviceResponse = haobanRoleApiService.getMenuByWxEnterpriseIdAndClerkType(login.getWxEnterpriseId(), clerkType);
         return RestResponse.successResult(serviceResponse.getResult());
     }