feat:权限

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

@@ -44,4 +44,15 @@ public interface HaobanRoleApiService {
      */
     ServiceResponse getByEnterpriseIdAndClerkType(String enterpriseId,String wxEnterpriseId,Integer clerkType);
 
+
+    /**
+     * 通过wx企业id和角色id 查询菜单
+     *
+     * @param wxEnterpriseId wx企业标识
+     * @param roleId         角色id
+     * @return {@link ServiceResponse }
+     * @author mozhu
+     * @date 2022-09-13 14:56:09
+     */
+    ServiceResponse getByWxEnterpriseIdAndRoleId(String wxEnterpriseId,Long roleId);
 }

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

+package com.gic.haoban.manage.web.controller.test;
+
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.haoban.manage.api.dto.role.HaobanMenuDTO;
+import com.gic.haoban.manage.api.service.role.HaobanMenuApiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author xuwenqian
+ * @date 2022/9/13 3:07 下午
+ */
+@RequestMapping("role")
+@RestController
+public class HaobanRoleController {
+
+    @Autowired
+    private HaobanMenuApiService haobanMenuApiService;
+
+    /**
+     * 获取菜单树
+     * @return
+     */
+    @RequestMapping("/getMenuTreeList")
+    private RestResponse<List<HaobanMenuDTO>> getMenuTreeList() {
+        ServiceResponse<List<HaobanMenuDTO>> serviceMenuTreeList = haobanMenuApiService.getMenuTreeList();
+        return RestResponse.successResult(serviceMenuTreeList.getResult());
+    }
+
+}

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

@@ -62,5 +62,17 @@ public interface TabHaobanRoleMenuMapper {
      * @date 2022-09-09 17:19:31
      */
     int deleteByRoleId(Long roleId);
+
+    /**
+     * 通过wx企业id和角色id 查询菜单
+     *
+     * @param wxEnterpriseId wx企业标识
+     * @param roleId         角色id
+     * @return {@link List }<{@link String }>
+     * @author mozhu
+     * @date 2022-09-13 14:58:22
+     */
+    List<String> getByWxEnterpriseIdAndRoleId(@Param("wxEnterpriseId") String wxEnterpriseId,
+                                              @Param("roleId") Long roleId);
 }
 

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

@@ -162,4 +162,10 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
         List<HaobanRoleBO> haobanRoleBOList = haobanRoleService.getByEnterpriseIdAndClerkType(enterpriseId, wxEnterpriseId, clerkType);
         return ServiceResponse.success(haobanRoleBOList);
     }
+
+    @Override
+    public ServiceResponse getByWxEnterpriseIdAndRoleId(String wxEnterpriseId, Long roleId) {
+        List<String> menuCodes = haobanRoleMenuService.getByWxEnterpriseIdAndRoleId(wxEnterpriseId, roleId);
+        return ServiceResponse.success(menuCodes);
+    }
 }

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

@@ -65,4 +65,14 @@ public interface HaobanRoleMenuService {
      */
     boolean deleteByRoleId(Long roleId);
 
+    /**
+     * 通过wx企业id和角色id 查询菜单
+     *
+     * @param wxEnterpriseId wx企业标识
+     * @param roleId         角色id
+     * @return {@link List }<{@link String }>
+     * @author mozhu
+     * @date 2022-09-13 14:57:34
+     */
+    List<String> getByWxEnterpriseIdAndRoleId(String wxEnterpriseId, Long roleId);
 }

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

@@ -80,4 +80,9 @@ public class HaobanRoleMenuServiceImpl implements HaobanRoleMenuService {
     public boolean deleteByRoleId(Long roleId) {
         return tabHaobanRoleMenuMapper.deleteByRoleId(roleId) > 0;
     }
+
+    @Override
+    public List<String> getByWxEnterpriseIdAndRoleId(String wxEnterpriseId, Long roleId) {
+        return tabHaobanRoleMenuMapper.getByWxEnterpriseIdAndRoleId(wxEnterpriseId,roleId);
+    }
 }

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

@@ -76,5 +76,13 @@
         delete from tab_haoban_role_menu where role_id = #{roleId}
     </delete>
 
+
+    <select id="getByWxEnterpriseIdAndRoleId" resultType="java.lang.String">
+        select
+        menu_code
+        from tab_haoban_role_menu
+        where wx_enterprise_id = #{wxEnterpriseId} and role_id = #{roleId}
+    </select>
+
 </mapper>
 

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

@@ -5,7 +5,6 @@ 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.service.role.HaobanMenuApiService;
 import com.gic.haoban.manage.api.service.role.HaobanRoleApiService;
 import org.slf4j.Logger;
@@ -16,8 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  * @author mozhu
  * @date 2022/9/7 3:03 下午
@@ -33,7 +30,11 @@ public class HaobanRoleController extends WebBaseController{
     @Autowired
     private HaobanMenuApiService haobanMenuApiService;
 
-
+    /**
+     * 新增
+     * @param haobanRoleQDTO
+     * @return
+     */
     @RequestMapping(value = "/add",method = RequestMethod.POST)
     private RestResponse add(@RequestBody HaobanRoleQDTO haobanRoleQDTO) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
@@ -41,26 +42,38 @@ public class HaobanRoleController extends WebBaseController{
         return RestResponse.successResult();
     }
 
-
+    /**
+     * 修改
+     * @param haobanRoleQDTO
+     * @return
+     */
     @RequestMapping(value = "/edit",method = RequestMethod.POST)
     private RestResponse edit(@RequestBody HaobanRoleQDTO haobanRoleQDTO) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         return RestResponse.successResult(haobanRoleApiService.edit(haobanRoleQDTO,login));
     }
 
-
-    @RequestMapping(value = "/queryMenuByClerkType",method = RequestMethod.GET)
-    private RestResponse queryMenuByClerkType() {
+    /**
+     * 根据类型查询角色
+     * @return
+     */
+    @RequestMapping(value = "/queryRoleByClerkType",method = RequestMethod.GET)
+    private RestResponse queryRoleByClerkType(Integer clerkType) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-
-        return RestResponse.successResult();
+        ServiceResponse serviceResponse = haobanRoleApiService.getByEnterpriseIdAndClerkType(login.getEnterpriseId(), login.getWxEnterpriseId(), clerkType);
+        return RestResponse.successResult(serviceResponse.getResult());
     }
 
-
-    @RequestMapping("/getMenuTreeList")
-    private RestResponse<List<HaobanMenuDTO>> getMenuTreeList() {
-        ServiceResponse<List<HaobanMenuDTO>> serviceMenuTreeList = haobanMenuApiService.getMenuTreeList();
-        return RestResponse.successResult(serviceMenuTreeList.getResult());
+    /**
+     * 根据角色查询菜单
+     * @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);
+        return RestResponse.successResult(serviceResponse.getResult());
     }
 
 }