From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java | 61 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
index d1f91f6..0d9abea 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
@@ -16,11 +16,15 @@
*/
package org.springblade.modules.system.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.common.cache.SysCache;
+import org.springblade.common.constant.CommonConstant;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
@@ -43,6 +47,8 @@
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.io.Serializable;
import java.util.*;
import java.util.stream.Collectors;
@@ -70,7 +76,14 @@
if (Func.isEmpty(Func.toStr(param.get(PARENT_ID)))) {
parentId = null;
}
- return baseMapper.lazyList(parentId, param);
+ List<MenuVO> menuVOS = baseMapper.lazyList(parentId, param);
+ for (MenuVO menuVO : menuVOS) {
+ if (StringUtils.isNotBlank(menuVO.getLabelStr())) {
+ List<List<String>> lists = (List<List<String>>) JSON.parse(menuVO.getLabelStr());
+ menuVO.setLabelList(lists);
+ }
+ }
+ return menuVOS;
}
@Override
@@ -78,15 +91,26 @@
if (Func.isEmpty(Func.toStr(param.get(PARENT_ID)))) {
parentId = null;
}
- return baseMapper.lazyMenuList(parentId, param);
+ List<MenuVO> menuVOS = baseMapper.lazyList(parentId, param);
+ for (MenuVO menuVO : menuVOS) {
+ if (StringUtils.isNotBlank(menuVO.getLabelStr())) {
+ List<List<String>> lists = (List<List<String>>) JSON.parse(menuVO.getLabelStr());
+ menuVO.setLabelList(lists);
+ }
+ }
+ return menuVOS;
}
+ public static final List<Integer> list1 = Arrays.asList(1, 2, 3, 4, 5, 6, 11, null);
+ public static final List<Integer> list2 = Arrays.asList(1, 11, null);
+
+
@Override
- public List<MenuVO> routes(String roleId, Long topMenuId) {
+ public List<MenuVO> routes(String roleId, Long topMenuId, Integer labelType, Integer menuType, String roleName) {
if (StringUtil.isBlank(roleId)) {
return null;
}
- List<Menu> allMenus = baseMapper.allMenu();
+ List<Menu> allMenus = baseMapper.selectList(Wrappers.<Menu>lambdaQuery().eq(Menu::getCategory, 1).eq(Menu::getMenuType, menuType));
List<Menu> roleMenus;
// 超级管理员并且不是顶部菜单请求则返回全部菜单
if (AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) {
@@ -94,12 +118,16 @@
}
// 非超级管理员并且不是顶部菜单请求则返回对应角色权限菜单
else if (!AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) {
- roleMenus = tenantPackageMenu(baseMapper.roleMenuByRoleId(Func.toLongList(roleId)));
+ roleMenus = tenantPackageMenu(baseMapper.roleMenuByRoleId(Func.toLongList(roleId), menuType));
+ // 1:居民，居民需要通过人的标签来显示取保候审
+ if (CommonConstant.RESIDENT.equals(roleName)) {
+ // extracted(labelType, roleMenus);
+ }
}
// 顶部菜单请求返回对应角色权限菜单
else {
// 角色配置对应菜单
- List<Menu> roleIdMenus = baseMapper.roleMenuByRoleId(Func.toLongList(roleId));
+ List<Menu> roleIdMenus = baseMapper.roleMenuByRoleId(Func.toLongList(roleId), menuType);
// 反向递归角色菜单所有父级
List<Menu> routes = new LinkedList<>(roleIdMenus);
roleIdMenus.forEach(roleMenu -> recursion(allMenus, routes, roleMenu));
@@ -110,7 +138,17 @@
routes.stream().anyMatch(route -> route.getId().longValue() == x.getId().longValue())
).collect(Collectors.toList());
}
+
return buildRoutes(allMenus, roleMenus);
+ }
+
+ /**
+ * 房屋的时候才通过人的标签过滤
+ *
+ * @param roleMenus
+ * @param labelType
+ */
+ private void extracted(Integer labelType, List<Menu> roleMenus) {
}
@Override
@@ -273,14 +311,14 @@
}
@Override
- public boolean submit(Menu menu) {
+ public boolean submit(MenuDTO menu) {
LambdaQueryWrapper<Menu> menuQueryWrapper = Wrappers.lambdaQuery();
if (menu.getId() == null) {
menuQueryWrapper.eq(Menu::getCode, menu.getCode()).or(
wrapper -> wrapper.eq(Menu::getName, menu.getName()).eq(Menu::getCategory, MENU_CATEGORY)
);
} else {
- menuQueryWrapper.ne(Menu::getId, menu.getId()).and(
+ menuQueryWrapper.ne(Menu::getId, menu.getId()).eq(Menu::getIsDeleted, 0).and(
wrapper -> wrapper.eq(Menu::getCode, menu.getCode()).or(
o -> o.eq(Menu::getName, menu.getName()).eq(Menu::getCategory, MENU_CATEGORY)
)
@@ -299,6 +337,13 @@
throw new ServiceException("父节点只可选择菜单类型!");
}
}
+ menu.setLabelStr(JSON.toJSONString(menu.getLabelList()));
+ List<List<String>> labelList = menu.getLabelList();
+ StringBuffer stringBuffer = new StringBuffer();
+ for (List<String> strings : labelList) {
+ stringBuffer.append(strings.get(strings.size() - 1)).append(",");
+ }
+ menu.setLabelId(stringBuffer.toString());
menu.setIsDeleted(BladeConstant.DB_NOT_DELETED);
return saveOrUpdate(menu);
}
--
Gitblit v1.9.3