用户路由权限

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysMenuItemMapper.java

@@ -85,4 +85,6 @@ public interface TabSysMenuItemMapper {
      * @return  java.util.List<com.gic.auth.entity.TabSysMenuItem>

     
 */
     List<TabSysMenuItem> listMenuItemByMenuId(@Param("menuId") Integer menuId);
+
+    List<TabSysMenuItem> listMenuItemByMenuIdList(@Param("list") List<Integer> menuIdList);
 }
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysMenuRoleMapper.java

@@ -85,4 +85,14 @@ public interface TabSysMenuRoleMapper {
      * @return  java.util.List<com.gic.auth.dto.MenuRoleDTO>

     
 */
     List<TabSysMenuRole> listMenuRoleByRoleId(@Param("roleId") Integer roleId);
+
+    /**
+     * 根据角色ID查询列表
+     * @Title: listMenuRoleByRoleIdList

+     * @Description:
+    
 * @author guojuxing
+     * @param roleIdList

+     * @return  java.util.List<com.gic.auth.entity.TabSysMenuRole>

+    
 */
+    List<TabSysMenuRole> listMenuRoleByRoleIdList(@Param("list") List<Integer> roleIdList);
 }
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/service/MenuItemService.java

@@ -42,4 +42,6 @@ public interface MenuItemService {
      * @return  java.util.List<com.gic.auth.entity.TabSysMenuItem>

     
 */
     List<TabSysMenuItem> listMenuItemByMenuId(Integer menuId);
+
+    List<TabSysMenuItem> listMenuItemByMenuId(List<Integer> menuIdList);
 }

gic-platform-auth-service/src/main/java/com/gic/auth/service/MenuRoleService.java

@@ -52,4 +52,14 @@ public interface MenuRoleService {
      * @return  java.util.List<com.gic.auth.dto.MenuRoleDTO>

     
 */
     List<MenuRoleDTO> listMenuRoleByRoleId(Integer roleId);
+
+    /**
+     * 根据角色ID查询列表
+     * @Title: listMenuRoleByRoleId

+     * @Description:
+    
 * @author guojuxing
+     * @param roleIdList

+     * @return  java.util.List<com.gic.auth.dto.MenuRoleDTO>

+    
 */
+    List<MenuRoleDTO> listMenuRoleByRoleId(List<Integer> roleIdList);
 }

gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/MenuItemServiceImpl.java

@@ -4,10 +4,12 @@ import com.gic.auth.dao.mapper.TabSysMenuItemMapper;
 import com.gic.auth.dto.MenuItemDTO;
 import com.gic.auth.entity.TabSysMenuItem;
 import com.gic.auth.service.MenuItemService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service("menuItemService")
@@ -31,4 +33,12 @@ public class MenuItemServiceImpl implements MenuItemService{
     public List<TabSysMenuItem> listMenuItemByMenuId(Integer menuId) {
         return tabSysMenuItemMapper.listMenuItemByMenuId(menuId);
     }
+
+    @Override
+    public List<TabSysMenuItem> listMenuItemByMenuId(List<Integer> menuId) {
+        if (CollectionUtils.isEmpty(menuId)) {
+            return null;
+        }
+        return tabSysMenuItemMapper.listMenuItemByMenuIdList(menuId);
+    }
 }

gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/MenuRoleServiceImpl.java

@@ -43,4 +43,16 @@ public class MenuRoleServiceImpl implements MenuRoleService{
         }
         return new ArrayList<>();
     }
+
+    @Override
+    public List<MenuRoleDTO> listMenuRoleByRoleId(List<Integer> roleIdList) {
+        if (CollectionUtils.isNotEmpty(roleIdList)) {
+            return new ArrayList<>();
+        }
+        List<TabSysMenuRole> list = tabSysMenuRoleMapper.listMenuRoleByRoleIdList(roleIdList);
+        if (CollectionUtils.isNotEmpty(list)) {
+            return EntityUtil.changeEntityListNew(MenuRoleDTO.class, list);
+        }
+        return new ArrayList<>();
+    }
 }

gic-platform-auth-service/src/main/resources/mapper/TabSysMenuItemMapper.xml

@@ -137,4 +137,15 @@
     where menu_id = #{menuId}
     and status = 1
   </select>
+
+  <select id="listMenuItemByMenuIdList" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_sys_menu_item
+    where  status = 1
+    and menu_id in
+    <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+      #{item}
+    </foreach>
+  </select>
 </mapper>
\ No newline at end of file

gic-platform-auth-service/src/main/resources/mapper/TabSysMenuMapper.xml

@@ -335,7 +335,7 @@
     <include refid="Base_Column_List" />
     from tab_sys_menu
     where status=1
-    <if test="null != menuIdList">
+    <if test="null != menuIdList and menuIdList.size() > 0">
       and menu_id in
       <foreach collection="menuIdList" index="index" item="item" open="(" separator="," close=")">
         #{item}

gic-platform-auth-service/src/main/resources/mapper/TabSysMenuRoleMapper.xml

@@ -146,4 +146,15 @@
     where role_id = #{roleId}
     and status = 1
   </select>
+
+  <select id="listMenuRoleByRoleIdList" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_sys_menu_role
+    where status = 1
+    and role_id in
+    <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+      #{item}
+    </foreach>
+  </select>
 </mapper>
\ No newline at end of file

gic-platform-auth-web/pom.xml

@@ -132,6 +132,11 @@
             <artifactId>gic-platform-enterprise-api</artifactId>
             <version>${gic-platform-enterprise-api}</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-open-platform-api</artifactId>
+            <version>4.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/LoginController.java

 package com.gic.auth.web.controller;
 
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.auth.dto.MenuDTO;
 import com.gic.auth.dto.UserDTO;
+import com.gic.auth.service.MenuApiService;
 import com.gic.auth.service.UserApiService;
 import com.gic.commons.util.Md5Util;
 import com.gic.commons.util.ToolUtil;
@@ -22,7 +24,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 @RestController
@@ -33,6 +37,8 @@ public class LoginController {
     private EnterpriseApiService enterpriseApiService;
     @Autowired
     private UserApiService userApiService;
+    @Autowired
+    private MenuApiService menuApiService;
 
     @RequestMapping("list-enterprise-by-phone")
     public RestResponse listUserEnterprise(String phoneNumber){
@@ -89,6 +95,16 @@ public class LoginController {
                     userDetail.setEnterpriseId(enterpriseDTO.getEnterpriseId());
                     userDetail.setEnterpriseInfo(enterpriseDTO);
                     UserDetailUtils.setUserDetail(userDetail);
+
+                    ServiceResponse<List<MenuDTO>> menuResult = menuApiService.listUserMenu(userDetail.getUserId());
+                    if (menuResult.isSuccess()) {
+                        List<MenuDTO> menuList = menuResult.getResult();
+                        Map<String, Object> map = new HashMap<>(16);
+                        for (MenuDTO menuDTO : menuList) {
+                            map.put(menuDTO.getMenuUrl(), "1");
+                        }
+                        userDetail.setMenuUrlMap(map);
+                    }
                     return RestResponse.success(userDetail);
                 }
             }

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/MenuController.java

@@ -2,14 +2,12 @@ package com.gic.auth.web.controller;
 
 import java.util.List;
 
-import org.apache.dubbo.rpc.RpcContext;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.dto.MenuDTO;
 import com.gic.auth.service.MenuApiService;
@@ -30,9 +28,17 @@ public class MenuController {
     @RequestMapping("login-user-menu")
     public RestResponse loginUserMenu(Integer currentMenu) {
         Integer userId = UserDetailUtils.getUserDetail().getUserId();
-        Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
-        System.out.println(JSON.toJSONString(RpcContext.getContext().getAttachments()));
-        ServiceResponse<List<MenuDTO>> userMenu = this.menuApiService.getUserMenu(userId, enterpriseId, currentMenu);
+        ServiceResponse<List<MenuDTO>> userMenu = this.menuApiService.getUserMenuOfGic(userId, currentMenu);
+        if (userMenu.isSuccess()) {
+            return RestResponse.success(userMenu.getResult());
+        }
+        return EnterpriseRestResponse.failure(userMenu);
+    }
+
+    @RequestMapping("login-user-operation-item")
+    public RestResponse loginUserOperationItem() {
+        Integer userId = UserDetailUtils.getUserDetail().getUserId();
+        ServiceResponse<List<MenuDTO>> userMenu = this.menuApiService.getUserOperationItemOfGic(userId);
         if (userMenu.isSuccess()) {
             return RestResponse.success(userMenu.getResult());
         }

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/RoleController.java

@@ -9,6 +9,8 @@ import com.alibaba.fastjson.JSON;
 import com.gic.auth.constant.MenuLevelConstants;
 import com.gic.auth.constant.MenuProjectConstants;
 import com.gic.auth.qo.MenuListQO;
+import com.gic.open.api.dto.ApplicationDTO;
+import com.gic.open.api.service.AppTokenApiService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -38,6 +40,8 @@ public class RoleController {
     private MenuApiService menuApiService;
     @Autowired
     private UserApiService userApiService;
+    @Autowired
+    private AppTokenApiService appTokenApiService;
 
     @RequestMapping("/get-detail")
     public RestResponse getDetail(Integer id) {
@@ -80,7 +84,7 @@ public class RoleController {
         if (userResponse.isSuccess()) {
             UserDTO admin = userResponse.getResult();
             Integer userId = admin.getUserId();
-            ServiceResponse<List<MenuDTO>> menuResponse = menuApiService.getSuperAdminMenu(userId, enterpriseId);
+            ServiceResponse<List<MenuDTO>> menuResponse = menuApiService.getSuperAdminMenu(userId);
             if (menuResponse.isSuccess()) {
                 return RestResponse.success(menuResponse.getResult());
             } else {
@@ -102,11 +106,18 @@ public class RoleController {
     public RestResponse listMenuTree() {
         ServiceResponse<List<MenuDTO>> result = menuApiService.listMenuTreeForRole(MenuProjectConstants.DEFAULT_PROJECT);
         if (result.isSuccess()) {
-            return RestResponse.success(changeListToTree(MenuLevelConstants.FIRST_LEVEL_PARENT_ID, result.getResult()));
+            return RestResponse.success(changeListToTree(MenuLevelConstants.FIRST_LEVEL_PARENT_ID,  result.getResult()));
         }
         return EnterpriseRestResponse.failure(result);
     }
 
+    @RequestMapping("/list-app-menu-tree")
+    public RestResponse listAppMenuTree() {
+        Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
+        ServiceResponse<List<ApplicationDTO>> appResult = appTokenApiService.listApplicationByEnterpriseId(Long.valueOf(enterpriseId), null);
+        return EnterpriseRestResponse.failure(appResult);
+    }
+
     public static List<Map<String, Object>> changeListToTree(int storeGroupId, List<MenuDTO> list) {
         List<Map<String, Object>> result = new ArrayList<>();
         if (list != null) {
@@ -116,10 +127,6 @@ public class RoleController {
                     data.put("menuId", menuDTO.getMenuId());
                     data.put("menuName", menuDTO.getMenuName());
                     data.put("project", menuDTO.getProject());
-                    data.put("sort", menuDTO.getSort());
-                    data.put("menuCode", menuDTO.getMenuCode());
-                    data.put("parentCode", menuDTO.getParentCode());
-                    data.put("menuVersionName", menuDTO.getMenuVersionName());
                     List<Map<String, Object>> children = changeListToTree(menuDTO.getMenuId(), list);
                     if (children == null || children.size() < 1) {
                         data.put("children", null);

gic-platform-auth-web/src/main/resources/dubbo-gic-platform-auth-web.xml

@@ -54,4 +54,8 @@
     <dubbo:reference interface="com.gic.auth.service.AuditorApiService" id="auditorApiService" timeout="6000" />
     <!--受审项目-->
     <dubbo:reference interface= "com.gic.enterprise.service.ProjectApiService" id="projectApiService" timeout="6000" />
+
+    <!--应用市场应用列表-->
+    <dubbo:reference interface="com.gic.open.api.service.AppTokenApiService" id="appTokenApiService" timeout="6000" />
+
 </beans>
\ No newline at end of file