From a2301fe29f3835adb43337d29590a12cbd3304f0 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 19 十月 2023 18:15:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java |  130 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 118 insertions(+), 12 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
index 7a54011..06b47de 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
@@ -17,8 +17,11 @@
 package com.vci.ubcs.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.starter.util.MybatisParameterUtil;
+import com.vci.ubcs.system.cache.NacosConfigCache;
 import com.vci.ubcs.system.cache.SysCache;
 import com.vci.ubcs.system.dto.MenuDTO;
 import com.vci.ubcs.system.entity.*;
@@ -31,6 +34,8 @@
 import com.vci.ubcs.system.wrapper.MenuWrapper;
 import lombok.AllArgsConstructor;
 import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
@@ -64,6 +69,7 @@
 	private final ITopMenuSettingService topMenuSettingService;
 	private final static String PARENT_ID = "parentId";
 	private final static Integer MENU_CATEGORY = 1;
+	private final NacosConfigCache nacosConfigCache;
 
 	@Override
 	public List<MenuVO> lazyList(Long parentId, Map<String, Object> param) {
@@ -74,11 +80,11 @@
 	}
 
 	@Override
-	public List<MenuVO> lazyMenuList(Long parentId, Map<String, Object> param) {
+	public IPage<MenuVO> lazyMenuPage(Long parentId, Map<String, Object> param, Query query) {
 		if (Func.isEmpty(Func.toStr(param.get(PARENT_ID)))) {
 			parentId = null;
 		}
-		return baseMapper.lazyMenuList(parentId, param);
+		return baseMapper.lazyMenuPage(parentId, param, Condition.getPage(query));
 	}
 
 
@@ -145,13 +151,15 @@
 
 	@Override
 	public List<TreeNode> grantTree(BladeUser user) {
-		List<TreeNode> menuTree = user.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? baseMapper.grantTree() : baseMapper.grantTreeByRole(Func.toLongList(user.getRoleId()));
+		List<TreeNode> menuTree = user.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId())
+			&& user.getUserId().equals(nacosConfigCache.getAdminUserInfo().getUserId())
+			? baseMapper.grantTree() : baseMapper.grantTreeByRole(Func.toLongList(user.getRoleId()));
 		return ForestNodeMerger.merge(tenantPackageTree(menuTree, user.getTenantId()));
 	}
 
 	@Override
 	public List<TreeNode> grantTopTree(BladeUser user) {
-		List<TreeNode> menuTree = user.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? baseMapper.grantTopTree() : baseMapper.grantTopTreeByRole(Func.toLongList(user.getRoleId()));
+		List<TreeNode> menuTree = user.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId()) ? baseMapper.grantTopTree() : baseMapper.grantTopTreeByRole(Func.toLongList(user.getRoleId()));
 		return ForestNodeMerger.merge(tenantPackageTree(menuTree, user.getTenantId()));
 	}
 
@@ -214,12 +222,12 @@
 
 	@Override
 	public List<TreeNode> grantDataScopeTree(BladeUser user) {
-		return ForestNodeMerger.merge(user.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? baseMapper.grantDataScopeTree() : baseMapper.grantDataScopeTreeByRole(Func.toLongList(user.getRoleId())));
+		return ForestNodeMerger.merge(user.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId()) ? baseMapper.grantDataScopeTree() : baseMapper.grantDataScopeTreeByRole(Func.toLongList(user.getRoleId())));
 	}
 
 	@Override
 	public List<TreeNode> grantApiScopeTree(BladeUser user) {
-		return ForestNodeMerger.merge(user.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? baseMapper.grantApiScopeTree() : baseMapper.grantApiScopeTreeByRole(Func.toLongList(user.getRoleId())));
+		return ForestNodeMerger.merge(user.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId()) ? baseMapper.grantApiScopeTree() : baseMapper.grantApiScopeTreeByRole(Func.toLongList(user.getRoleId())));
 	}
 
 	@Override
@@ -267,15 +275,19 @@
 	@Override
 	public boolean submit(Menu 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)
-			);
+			//妫�楠屾槸鍚﹂噸澶嶈彍鍗曞埆鍚嶏紝鍙牎楠屽悓涓�鐖跺垎绫昏彍鍗曚笅鐨勭紪鍙锋槸鍚﹂噸澶�
+			menuQueryWrapper.eq(Menu::getParentId,menu.getParentId()!=null ? menu.getParentId():BladeConstant.TOP_PARENT_ID)
+				.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(
-				wrapper -> wrapper.eq(Menu::getCode, menu.getCode()).or(
-					o -> o.eq(Menu::getName, menu.getName()).eq(Menu::getCategory, MENU_CATEGORY)
-				)
+				wrapper -> wrapper.eq(Menu::getCode, menu.getCode())
+					.eq(Menu::getParentId,menu.getParentId())
+					.or(o -> o.eq(Menu::getName, menu.getName()).eq(Menu::getCategory, MENU_CATEGORY))
 			);
 		}
 		Long cnt = baseMapper.selectCount(menuQueryWrapper);
@@ -300,4 +312,98 @@
 		return baseMapper.selectMenuChildByBtnType(btmType);
     }
 
+	/**
+	 * 鏍规嵁code鏌ヨ鑿滃崟淇℃伅
+	 * @param codes
+	 * @param userId
+	 * @return
+	 */
+	@Override
+	public List<Menu> getMenuByCodes(List<String> codes,Long userId) {
+		if(codes.isEmpty()){
+			return new ArrayList<>();
+		}
+		// 鏌ヨ鑿滃崟淇℃伅
+		LambdaQueryWrapper<Menu> wrapper = Wrappers.<Menu>query()
+			.lambda()
+			.in(Menu::getCode, codes)
+			.eq(Menu::getIsDeleted,0) /*鏈鍒犻櫎*/
+			.eq(Menu::getCategory,1) /*鑿滃崟绫诲瀷涓嶈兘涓烘寜閽�*/
+			.orderByAsc(Menu::getCode);  /*鏍规嵁code鎺掑簭涓巆lassify鐨刡tmtypeid瀵瑰簲*/
+		// 瓒呯涓嶇敤鏍规嵁瑙掕壊鏉ユ煡璇�
+		if(!AuthUtil.getTenantId().equals(NacosConfigCache.getAdminUserInfo().getTenantId())
+			&& !AuthUtil.getUserId().equals(NacosConfigCache.getAdminUserInfo().getUserId())
+		){
+			if(Func.isBlank(userId.toString()) && Func.isBlank(AuthUtil.getUserId().toString())){
+				throw new ServiceException("鑾峰彇鐢ㄦ埛id澶辫触");
+			}
+			List<Long> menuIds = roleMenuService.getMenuIdByUserId(userId);
+			if(menuIds.isEmpty()){
+				return new ArrayList<>();
+			}
+			if(menuIds.size()>=1000){
+				MybatisParameterUtil.cutInParameter(wrapper,Menu::getId,menuIds);
+			}else {
+				wrapper.in(Menu::getId,menuIds);
+			}
+		}
+		return this.list(wrapper);
+	}
+
+	/**
+	 * 瀵筀eepAlive鍊艰浆鎹㈡垚甯冨皵绫诲瀷杩涜灏佽
+	 *
+	 * @param childMenu
+	 * @return
+	 */
+	@Override
+	public void handleKeepAlive(List<MenuVO> childMenu) {
+		childMenu.forEach(list->{
+			list.getMeta().put("keepAlive","true".equals(list.getKeepAlive()));
+			if(list.getChildren().size()>0){
+				handleKeepAlive(list.getChildren());
+			}
+		});
+	}
+
+	/**
+	 * 鍏嬮殕鍏朵粬鑿滃崟涓嬫寜閽�
+	 * @param menuId 瑕佸厠闅嗙殑鑿滃崟鎸夐挳涓婚敭
+	 * @param buttonIds 琚厠闅嗙殑鎸夐挳涓婚敭
+	 * @return
+	 */
+	@Override
+	public R cloneMenuButton(Long menuId, List<String> buttonIds) {
+		if(Func.isEmpty(menuId)){
+			return R.fail("瑕佸厠闅嗙殑鑿滃崟涓婚敭涓嶈兘涓虹┖锛�");
+		}
+		if(buttonIds.isEmpty() || buttonIds.size() <= 0){
+			return R.fail("琚厠闅嗙殑鎸夐挳涓婚敭涓嶈兘涓虹┖锛�");
+		}
+		// 鍏堟牴鎹富閿煡璇㈠嚭鎵�鏈夋寜閽殑淇℃伅
+		List<Menu> buttons = this.listByIds(buttonIds);
+		List<Menu> newButtons = new ArrayList<>();
+		List<String> addButtonCodes = new ArrayList();
+		buttons.parallelStream().forEach(item->{
+			// 鍒ゆ柇鏄惁涓烘寜閽紝闈炴寜閽笉澶勭悊
+			if(item.getCategory().equals(2)){
+				// 鏀瑰彉鐖惰妭鐐逛俊鎭�
+				item.setParentId(menuId);
+				// 灏嗕富閿祴绌�
+				item.setId(null);
+				addButtonCodes.add(item.getCode());
+				newButtons.add(item);
+			}
+		});
+		//妫�楠屾槸鍚﹂噸澶嶈彍鍗曞埆鍚嶏紝鍙牎楠屽悓涓�鐖跺垎绫昏彍鍗曚笅鐨勭紪鍙锋槸鍚﹂噸澶�
+		LambdaQueryWrapper<Menu> menuQueryWrapper = Wrappers.<Menu>lambdaQuery()
+			.eq(Menu::getParentId,menuId)
+			.and(a -> a.in( Menu::getCode, addButtonCodes));
+		Long cnt = baseMapper.selectCount(menuQueryWrapper);
+		if (cnt > 0L) {
+			return R.fail("璇ヨ彍鍗曚笅宸插瓨鍦ㄧ殑缂栧彿涓庤鍏嬮殕鐨勬寜閽紪鍙峰瓨鍦ㄩ噸澶�!");
+		}
+		return this.saveBatch(newButtons) ? R.success("鎸夐挳鍏嬮殕鎴愬姛锛�"):R.fail("鎸夐挳鍏嬮殕澶辫触锛�");
+	}
+
 }

--
Gitblit v1.9.3