更新菜单树列表

portal-manager/src/main/java/com/mortals/xhx/module/menu/service/MenuService.java

 package com.mortals.xhx.module.menu.service;
+
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.framework.service.IUser;
@@ -8,32 +9,21 @@ import java.util.List;
 import java.util.Set;
 
 /**
-* MenuService
-*
-* 菜单信息业务 service接口
-*
-* @author zxfei
-* @date 2022-05-25
-*/
-public interface MenuService extends ICRUDService<MenuEntity,Long>{
-    /**
-     * 获取所有可用菜单
+ * MenuService
+ * <p>
+ * 菜单信息业务 service接口
  *
-     * @return
-     * @throws AppException
+ * @author zxfei
+ * @date 2022-05-25
  */
-     List<MenuEntity> findAllEnable() throws AppException;
-
+public interface MenuService extends ICRUDService<MenuEntity, Long> {
     /**
-     * 查询有权限的菜单
+     * 获取所有可用菜单，树结构
      *
-     * @param user 当前用户
-     * @param urls 有权限的访问地址集合
      * @return
      * @throws AppException
      */
-     List<MenuEntity> findTreeMenu(IUser user, Set<String> urls) throws AppException;
-
+    List<MenuEntity> findAllEnable() throws AppException;
 
     /**
      * 查询用户所有权限的菜单
@@ -44,19 +34,9 @@ public interface MenuService extends ICRUDService<MenuEntity,Long>{
      */
     List<MenuEntity> findTreeMenuByUser(IUser user) throws AppException;
 
-
-
-    /**
-     * 查看所有菜单
-     *
-     * @return
-     * @throws AppException
-     */
-     List<MenuEntity> findTreeMenu() throws AppException;
-
-
     /**
      * 更新排列顺序
+     *
      * @param id
      * @param type
      */

portal-manager/src/main/java/com/mortals/xhx/module/menu/service/impl/MenuServiceImpl.java

@@ -27,93 +27,33 @@ import java.util.*;
 public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity, Long> implements MenuService {
     @Override
     public List<MenuEntity> findAllEnable() throws AppException {
-        MenuQuery params = new MenuQuery();
-        params.setStatus(YesNo.YES.getValue());
-        params.setMenuType(0);//主菜单
+        MenuQuery query = new MenuQuery();
+        query.setStatus(YesNo.YES.getValue());
         List<OrderCol> orderColList = new ArrayList<OrderCol>();
         orderColList.add(new OrderCol("parentId"));
         orderColList.add(new OrderCol("orderId"));
-        params.setOrderColList(orderColList);
-        return dao.getList(params);
-    }
+        query.setOrderColList(orderColList);
 
-    @Override
-    public List<MenuEntity> findTreeMenu(IUser user, Set<String> urls) throws AppException {
-        //保存已有菜单
-        Set<Long> authIds = new HashSet<>();
-        Map<Long, MenuEntity> menuMap = new HashMap<>();
-        //获取所有启用的菜单
-        List<MenuEntity> userModuleList = this.findAllEnable();
-        for (MenuEntity sysModule : userModuleList) {
-            if (sysModule == null) {
-                continue;
-            }
-            menuMap.put(sysModule.getId(), sysModule);
-            if (!user.isAdmin() && urls.contains(StringUtils.trim(sysModule.getUrl()))) {
-                authIds.add(sysModule.getId());
-            }
-        }
-        if (!user.isAdmin()) {
-            Long[] ids = authIds.toArray(new Long[authIds.size()]);
-            for (Long id : ids) {
-                MenuEntity menu = menuMap.get(id);
-                //找父节点
-                while (menu != null) {
-                    authIds.add(menu.getId());
-                    menu = menuMap.get(menu.getParentId());
-                }
-            }
-        }
-        List<MenuEntity> outlookBar = new ArrayList<>();
-        List<MenuEntity> norightList = new ArrayList<>();
-        for (MenuEntity sysModule : userModuleList) {
-            if (!user.isAdmin() && !authIds.contains(sysModule.getId())) {
-                norightList.add(sysModule);
-                continue;
-            }
-            if (sysModule.getParentId() == null || sysModule.getParentId().longValue() == 0) {
-                outlookBar.add(sysModule);
-                continue;
-            }
-            MenuEntity sysModuleParent = menuMap.get(sysModule.getParentId());
-            if (sysModuleParent != null) {
-                sysModuleParent.getChildList().add(sysModule);
-            }
-        }
-        return outlookBar;
+        List<MenuEntity> menuEntityList = this.find(query);
+        List<MenuEntity> menuTreeList = getChildPerms(menuEntityList, -1);
+
+        return menuTreeList;
     }
 
     @Override
     public List<MenuEntity> findTreeMenuByUser(IUser user) throws AppException {
+        if (!user.isAdmin()) {
             List<MenuEntity> menuList = dao.selectMenuTreeByUserId(user.getId());
             //转换为树结构
             List<MenuEntity> menuTreeList = getChildPerms(menuList, -1);
             return menuTreeList;
+        } else {
+            return findAllEnable();
         }
-
-    public List<MenuEntity> findTreeMenu() throws AppException {
-        Map<Long, MenuEntity> menuMap = new HashMap<>();
-        List<MenuEntity> userModuleList = this.findAllEnable();
-        for (MenuEntity sysModule : userModuleList) {
-            if (sysModule == null) {
-                continue;
-            }
-            menuMap.put(sysModule.getId(), sysModule);
-        }
-        List<MenuEntity> outlookBar = new ArrayList<>();
-        for (MenuEntity sysModule : userModuleList) {
-            if (sysModule.getParentId() == null || sysModule.getParentId().longValue() == 0) {
-                outlookBar.add(sysModule);
-                continue;
-            }
-            MenuEntity sysModuleParent = menuMap.get(sysModule.getParentId());
-            if (sysModuleParent != null) {
-                sysModuleParent.getChildList().add(sysModule);
-            }
-        }
-        return outlookBar;
     }
 
+
+
     @Override
     public void upOrDown(Long id, Integer type) {
 
@@ -191,7 +131,7 @@ public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity
     public List<MenuEntity> getChildPerms(List<MenuEntity> list, int parentId) {
         List<MenuEntity> returnList = new ArrayList<MenuEntity>();
         for (Iterator<MenuEntity> iterator = list.iterator(); iterator.hasNext(); ) {
-            MenuEntity t =iterator.next();
+            MenuEntity t = iterator.next();
             // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点
             if (t.getParentId() == parentId) {
                 recursionFn(list, t);
@@ -225,7 +165,7 @@ public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity
         List<MenuEntity> tlist = new ArrayList<>();
         Iterator<MenuEntity> it = list.iterator();
         while (it.hasNext()) {
-            MenuEntity n =it.next();
+            MenuEntity n = it.next();
             if (n.getParentId().longValue() == t.getId().longValue()) {
                 tlist.add(n);
             }