diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java index 9474af7..e782225 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java @@ -263,33 +263,6 @@ public class AuthController extends CoreBaseController { } } - /** - * 获取登录用户功能权限信息 - * - * @return 处理结果 - */ - @GetMapping(value = "/menu/module-menu-list") - @ApiOperation(value = "获取登录用户功能权限信息", notes = "获取首页权限信息") - public ResultBean findMenuListByModule() { - List list = null; - if (AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)) { - SysMenu sysMenu = new SysMenu(); - sysMenu.setMenuType(CommonEnumUtil.METHOD_LEVEL.PLUGIN.getValue()); - sysMenuService.findAllByBean(sysMenu); - } else { - List menuList = memTreeService.packTreeSysMenuByUserId(getSessionUser().getUser().getId()); - list = memTreeService.packTreeSysMenuByParentIdAndMenuType(menuList, CommonConstWords.SYSTEM_MENU_ROOT_ID, CommonEnumUtil.METHOD_LEVEL.PLUGIN.getValue()); - } - - if (list != null && list.size() > 0) { - // 内存排序 Sort 降序 code 升序 - list.sort(Comparator.comparing(SysMenu::getMenuSort).reversed().thenComparing(SysMenu::getMenuCode)); - return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(list); - } else { - return ResultBean.fail("操作失败").setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode()).setErrorMsg("菜单信息不存在"); - } - } - // /** // * 根据递归获取所有父节点 ID 获取所有 菜单 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java index cf8ec56..35f7a75 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java @@ -21,6 +21,7 @@ import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.ListUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -200,6 +201,46 @@ public class BackstageController extends CoreBaseController { } } + @GetMapping(value = "/update-clean-menu-soft-type") + @ApiOperation(value = "更新并清理功能软件模块数据", notes = "更新并清理功能软件模块数据") + public ResultBean updateCleanMenuSoftType(){ + try { + SysMenu sysMenu = new SysMenu(); + sysMenu.setMenuType(CommonEnumUtil.METHOD_LEVEL.PLUGIN.getValue()); + List list = menuService.findAllByBean(sysMenu).stream() + .filter(menu -> menu.getId() != 100000000L) + .collect(Collectors.toList()); + + List allList = menuService.findAll(); + Map> ds = allList.stream().collect(Collectors.groupingBy(SysMenu::getParentId)); + packSysMenuTree(list, ds, null); + + for (List sysMenuList : ListUtils.partition(allList, 100)) { + new Thread(() -> menuService.saveBatch(sysMenuList)).start(); + } + return ResultBean.success("操作成功").setResultList(list); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ResultBean.fail(e).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + public void packSysMenuTree(List sysMenuList, Map> ds,Integer softType) { + if (CollectionUtils.isEmpty(sysMenuList)) { + return; + } + for (SysMenu sysMenu : sysMenuList) { + if (softType != null) { + sysMenu.setSoftType(softType); + } + if (ds.containsKey(sysMenu.getId())) { + sysMenu.setChildList(ds.get(sysMenu.getId())); + packSysMenuTree(sysMenu.getChildList(), ds, sysMenu.getSoftType()); + } + } + } + @GetMapping(value = "/update-clean-ref-role-menu") @ApiOperation(value = "更新并清理角色功能数据", notes = "更新并清理角色功能数据") public ResultBean updateRefRoleMenu(){