Merge branch 'developer' into 'master'

Developer

See merge request !14

gic-platform-auth-api/src/main/java/com/gic/auth/service/MenuApiService.java

@@ -158,10 +158,10 @@ public interface MenuApiService {
      * @Title: getSuperAdminGicMenuNotTree

      * @Description:
     
 * @author guojuxing
-     * @param enterpriseId

+     * @param versionCode

      * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.MenuDTO>>

     
 */
-    ServiceResponse<List<MenuDTO>> getSuperAdminMenuNotTree(Integer enterpriseId);
+    ServiceResponse<List<MenuDTO>> getAllMenuNotTree(String versionCode);
 
     /**
      * 查询gic菜单页面树数据
@@ -417,6 +417,8 @@ public interface MenuApiService {
     
*/
     ServiceResponse<Void> syncProductMenu(String menuCode);
 
+    ServiceResponse<List<MenuDTO>> test(String menuCode);
+
     /**
      * 过滤运维用户部门职位权限
      * @param resultList

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

@@ -217,5 +217,9 @@ public interface TabSysMenuMapper {
 
     List<TabSysMenu> listMenuTemp(String project);
 
+    List<TabSysMenu> listMenuTempByMenuCode(String menuCode);
+
+    List<TabSysMenu> listMenuTempByMenuIdList(@Param("list") List<Integer> menuIdList);
+
     List<TabSysMenu> getAuthItemByDevMenuId(Integer menuId);
 }
\ No newline at end of file

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

@@ -210,6 +210,16 @@ public interface MenuService {
     List<TabSysMenu> listMenuTemp(String project);
 
     /**
+     * 查询临时gic菜单，某一个一级菜单下面
+     * @Title: listMenuTempForGic

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

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

+    
*/
+    List<TabSysMenu> listMenuTempForGic(String menuCode);
+
+    /**
      * 查询生产表的最新ID
      * @Title: getAuthItemByDevMenuId

      * @Description:

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

@@ -3,6 +3,7 @@ package com.gic.auth.service.impl;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import com.gic.auth.dto.AuthItemListDTO;
 import com.gic.auth.entity.TabSysUser;
@@ -45,7 +46,7 @@ public class MenuServiceImpl implements MenuService {
         record.setStatus(1);
         if (StringUtils.isBlank(menuDTO.getMenuCode())) {
             //权限项没有菜单code数据，但是这样会导致不好批量上传到生产，给一个默认的数据
-            record.setMenuCode(String.valueOf(System.currentTimeMillis()));
+            record.setMenuCode(menuDTO.getParentCode() + "-" + menuDTO.getLevel() + menuDTO.getSort());
         }
         tabSysMenuMapper.insertSelective(record);
         return record.getMenuId();
@@ -202,6 +203,31 @@ public class MenuServiceImpl implements MenuService {
     }
 
     @Override
+    public List<TabSysMenu> listMenuTempForGic(String menuCode) {
+        List<TabSysMenu> result = new ArrayList<>();
+        List<TabSysMenu> firstLevelData = tabSysMenuMapper.listMenuTempByMenuCode(menuCode);
+        if (CollectionUtils.isNotEmpty(firstLevelData)) {
+            result.addAll(firstLevelData);
+            List<TabSysMenu> temp = tabSysMenuMapper.listMenuTempByMenuIdList(firstLevelData
+                    .stream()
+                    .filter(e -> e != null)
+                    .map(e -> e.getMenuId())
+                    .collect(Collectors.toList()));
+            while (CollectionUtils.isNotEmpty(temp)) {
+                result.addAll(temp);
+                List<Integer> parentIdList = temp
+                        .stream()
+                        .filter(e -> e != null)
+                        .map(e -> e.getMenuId())
+                        .collect(Collectors.toList());
+                temp.clear();
+                temp = tabSysMenuMapper.listMenuTempByMenuIdList(parentIdList);
+            }
+        }
+        return result;
+    }
+
+    @Override
     public List<TabSysMenu> getAuthItemByDevMenuId(Integer menuId) {
         return tabSysMenuMapper.getAuthItemByDevMenuId(menuId);
     }

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

@@ -139,7 +139,7 @@ public class MenuApiServiceImpl implements MenuApiService {
             params.setMenuType(MenuTypeEnum.PAGE.getCode());
             temp.addAll(this.menuService.listMenu(params));
 
-            result = EntityUtil.changeEntityListNew(MenuDTO.class, temp);
+            result = EntityUtil.changeEntityListNew(MenuDTO.class, filterOperationUserDepartAuth(temp, tabSysUser));
         } else {
             List<TabSysMenu> menuList = getUserMenuList(userId);
             result = EntityUtil.changeEntityListNew(MenuDTO.class, menuList);
@@ -231,14 +231,21 @@ public class MenuApiServiceImpl implements MenuApiService {
     }
 
     @Override
-    public ServiceResponse<List<MenuDTO>> getSuperAdminMenuNotTree(Integer enterpriseId) {
-        //查询超级管理员
-        TabSysUser tabSysUser = userService.getUserByEnterpriseId(enterpriseId);
-        if (tabSysUser == null) {
-            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "没有超级管理员，数据错误");
-        }
-        String versionCode = enterpriseApiService.getEnterpriseById(enterpriseId).getResult().getVersionCode();
-        return listUserMenu(tabSysUser.getUserId(), versionCode);
+    public ServiceResponse<List<MenuDTO>> getAllMenuNotTree(String versionCode) {
+        List<TabSysMenu> temp = new ArrayList<>();
+        //超级管理员
+        MenuListQO params = new MenuListQO();
+        //查询gic的菜单
+        params.setIsGIC(MenuProjectConstants.DEFAULT_PROJECT_CODE);
+        params.setVersionCode(versionCode);
+        params.setMenuType(MenuTypeEnum.PAGE.getCode());
+        temp.addAll(this.menuService.listMenu(params));
+        //查询应用的菜单
+        params.setVersionCode("");
+        params.setIsGIC(MenuProjectConstants.APP_PROJECT_CODE);
+        params.setMenuType(MenuTypeEnum.PAGE.getCode());
+        temp.addAll(this.menuService.listMenu(params));
+        return ServiceResponse.success(EntityUtil.changeEntityListNew(MenuDTO.class, temp));
     }
 
     @Override
@@ -652,14 +659,27 @@ public class MenuApiServiceImpl implements MenuApiService {
     }
 
     @Override
+    public ServiceResponse<List<MenuDTO>> test(String menuCode) {
+        TabSysMenu tabSysMenu = menuService.getMenuByMenuCode(menuCode);
+        List<TabSysMenu> devMenuList = menuService.listMenuTempForGic(menuCode);
+        devMenuList.add(tabSysMenu);
+        return ServiceResponse.success(treeMenu(devMenuList, 1, 0));
+    }
+
+    @Override
     public ServiceResponse<Void> syncProductMenu(String menuCode) {
         TabSysMenu tabSysMenu = menuService.getMenuByMenuCode(menuCode);
         if (tabSysMenu == null || tabSysMenu.getLevel() != 1) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "不存在或者不是应用对应的code");
         }
-        String appId = tabSysMenu.getProject();
         //临时表（测试环境的菜单数据）
-        List<TabSysMenu> devMenuList = menuService.listMenuTemp(appId);
+        List<TabSysMenu> devMenuList;
+        if (tabSysMenu.getProject().equals("gic")) {
+            devMenuList = menuService.listMenuTempForGic(tabSysMenu.getMenuCode());
+        } else {
+            String appId = tabSysMenu.getProject();
+            devMenuList = menuService.listMenuTemp(appId);
+        }
         if (CollectionUtils.isNotEmpty(devMenuList)) {
             devMenuList.forEach(menu -> {
                 TabSysMenu temp = menuService.getMenuByMenuCode(menu.getMenuCode());

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

@@ -575,6 +575,23 @@
     and project = #{project}
   </select>
 
+  <select id="listMenuTempByMenuCode" resultMap="BaseResultMap">
+    select <include refid="Base_Column_List"></include>
+    from tab_sys_menu_dev
+    where status = 1
+    and parent_code = #{menuCode}
+  </select>
+
+  <select id="listMenuTempByMenuIdList" resultMap="BaseResultMap">
+    select <include refid="Base_Column_List"></include>
+    from tab_sys_menu_dev
+    where status = 1
+    and parent_id in
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+      #{item}
+    </foreach>
+  </select>
+
   <select id="getAuthItemByDevMenuId" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />

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

@@ -156,7 +156,7 @@ public class LoginController {
                         //查询全部的操作模块
                         Map<String, MenuInfo> moduleMap = new HashMap<>(16);
                         ServiceResponse<List<MenuDTO>> allGicMenu = menuApiService
-                                .getSuperAdminMenuNotTree(enterpriseId);
+                                .getAllMenuNotTree(enterpriseDTO.getVersionCode());
                         if (allGicMenu.isSuccess()) {
                             List<MenuDTO> temp = allGicMenu.getResult();
                             List<MenuInfo> tempMenuInfoList = EntityUtil.changeEntityListNew(MenuInfo.class, temp);

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

@@ -109,8 +109,8 @@ public class MenuController {
         return RestResponse.success(getAppId(null, menuCode));
     }
 
-    @RequestMapping("sync-menu-to-pro")
     @IgnoreLogin
+    @RequestMapping("sync-menu-to-pro")
     public RestResponse syncMenuToPro(String menuCode) {
         return RestResponse.success(menuApiService.syncProductMenu(menuCode));
     }