更新资源文件

bill-manager/src/main/java/com/mortals/xhx/base/system/menu/service/MenuService.java

@@ -33,17 +33,6 @@ public interface MenuService extends ICRUDService<MenuEntity,Long> {
      */
      List<MenuEntity> findAllEnable() throws AppException;
 
-    /**
-     * 查询有权限的菜单
-     *
-     * @param user 当前用户
-     * @param urls 有权限的访问地址集合
-     * @return
-     * @throws AppException
-     */
-     List<MenuEntity> findTreeMenu(IUser user, Set<String> urls) throws AppException;
-
-
     /**
      * 查询有权限的菜单
      *

bill-manager/src/main/java/com/mortals/xhx/base/system/menu/service/impl/MenuServiceImpl.java

@@ -47,12 +47,6 @@ import java.util.stream.Collectors;
 @Service("menuService")
 public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity, Long> implements MenuService {
 
-    @Autowired
-    private RoleUserService roleUserService;
-    @Autowired
-    private RoleAuthService roleAuthService;
-
-
     @Override
     public List<MenuEntity> findAllEnable() throws AppException {
         MenuQuery params = new MenuQuery();
@@ -65,58 +59,13 @@ public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity
         return dao.getList(params);
     }
 
-    @Override
-    public List<MenuEntity> findTreeMenu(IUser user, Set<String> urls) throws AppException {
-        //todo 重新写 菜单树 通过角色获取菜单
-
-        Set<Long> authIds = new HashSet<>();
-        Map<Long, MenuEntity> menuMap = new HashMap<Long, MenuEntity>();
-        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<MenuEntity>();
-        List<MenuEntity> norightList = new ArrayList<MenuEntity>();
-        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.getChildren().add(sysModule);
-            }
-        }
-        return outlookBar;
-    }
-
     @Override
     public List<MenuEntity> findTreeMenu(IUser user) throws AppException {
         //todo 重新写 菜单树 通过角色获取菜单
         if (user.isAdmin()) {
             //全菜单列表获取
             MenuQuery menuQuery = new MenuQuery();
-            List<OrderCol> orderColList = new ArrayList<OrderCol>();
+            List<OrderCol> orderColList = new ArrayList<>();
             orderColList.add(new OrderCol("parentId"));
             orderColList.add(new OrderCol("orderId"));
             menuQuery.setOrderColList(orderColList);
@@ -125,17 +74,6 @@ public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity
             return returnTreeList;
         }
         List<MenuEntity> menuEntities = this.getDao().getListByUserId(user.getId()).stream().distinct().collect(Collectors.toList());
-/*        RoleUserQuery roleUserQuery = new RoleUserQuery();
-        roleUserQuery.setUserId(user.getId());
-        List<Long> roleIdList = roleUserService.find(roleUserQuery).stream().map(roleUser -> roleUser.getRoleId()).collect(Collectors.toList());
-        if(ObjectUtils.isEmpty(roleIdList)) return Collections.EMPTY_LIST;
-        RoleAuthQuery roleAuthQuery = new RoleAuthQuery();
-        roleAuthQuery.setRoleIdList(roleIdList);
-        List<Long> menuIdList = roleAuthService.find(roleAuthQuery).stream().map(roleAuth -> roleAuth.getMenuId()).filter(f -> f != null).collect(Collectors.toList());
-        if(ObjectUtils.isEmpty(menuIdList)) return Collections.EMPTY_LIST;
-        MenuQuery menuQuery = new MenuQuery();
-        menuQuery.setIdList(menuIdList);
-        List<MenuEntity> menuEntities = this.find(menuQuery);*/
         List<MenuEntity> returnTreeList = this.buildMenuTree(menuEntities);
         return returnTreeList;
 

bill-manager/src/main/java/com/mortals/xhx/base/system/menu/web/MenuController.java

@@ -41,7 +41,6 @@ public class MenuController extends BaseCRUDJsonBodyMappingController<MenuServic
         super.setModuleDesc("菜单信息");
     }
 
-
     @Override
     protected void doListBefore(MenuEntity query, Map<String, Object> model, Context context) throws AppException {
         List<OrderCol> orderColList = new ArrayList<>();