From e61a898fe563214cb13e97c08804534a61aad46b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 07 十一月 2023 17:32:40 +0800
Subject: [PATCH] 主数据管理按钮返回缓存问题修改

---
 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java |  127 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 113 insertions(+), 14 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 dac120f..035269d 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
@@ -16,10 +16,14 @@
  */
 package com.vci.ubcs.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 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.starter.web.util.VciBaseUtil;
+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.*;
@@ -93,7 +97,8 @@
 		List<Menu> allMenus = baseMapper.allMenu();
 		List<Menu> roleMenus;
 		// 瓒呯骇绠＄悊鍛樺苟涓斾笉鏄《閮ㄨ彍鍗曡姹傚垯杩斿洖鍏ㄩ儴鑿滃崟
-		if (AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) {
+		// if (AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) {
+		if (VciBaseUtil.checkAdminTenant() && Func.isEmpty(topMenuId)) {
 			roleMenus = allMenus;
 		}
 		// 闈炶秴绾х鐞嗗憳骞朵笖涓嶆槸椤堕儴鑿滃崟璇锋眰鍒欒繑鍥炲搴旇鑹叉潈闄愯彍鍗�
@@ -136,7 +141,7 @@
 
 	@Override
 	public List<MenuVO> buttons(String roleId) {
-		List<Menu> buttons = (AuthUtil.isAdministrator()) ? baseMapper.allButtons() : baseMapper.buttons(Func.toLongList(roleId));
+		List<Menu> buttons = (VciBaseUtil.checkAdminTenant()) ? baseMapper.allButtons() : baseMapper.buttons(Func.toLongList(roleId));
 		MenuWrapper menuWrapper = new MenuWrapper();
 		return menuWrapper.listNodeVO(buttons);
 	}
@@ -148,13 +153,17 @@
 
 	@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()));*/
+		// 淇敼涓烘墍鏈夌敤鎴烽兘鑳芥煡璇㈡墍鏈夛紝鍥犱负娌℃潈闄愮殑鐢ㄦ埛涓嶅叿澶囪繖涓彍鍗曢〉闈㈢殑鏉冮檺锛屼篃灏辨病蹇呰闄愬埗鐢ㄦ埛鏌ヨ嚜宸辩殑
+		List<TreeNode> menuTree = baseMapper.grantTree();
 		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()));
 	}
 
@@ -217,12 +226,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
@@ -270,15 +279,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);
@@ -298,10 +311,56 @@
 		return saveOrUpdate(menu);
 	}
 
+	/**
+	 * 鑾峰彇鑿滃崟涓嬮潰鐨勬寜閽�
+	 * @param btmType 涓氬姟绫诲瀷
+	 * @return List<Menu>
+	 */
     @Override
-    public List<Menu> getMenuButtonByType(String btmType) {
-		return baseMapper.selectMenuChildByBtnType(btmType);
+	@Cacheable(cacheNames = MENU_CACHE, key = "'auth:menuButton:'+ #btmType +':'+ #userId ")
+    public List<Menu> getMenuButtonByType(String btmType,Long userId) {
+		List<String> roleIds = null;
+		if(!VciBaseUtil.checkAdminTenant()){
+			roleIds = Arrays.asList(AuthUtil.getUser().getRoleId().split(","));
+		}
+		return baseMapper.selectMenuChildByBtnType(btmType,roleIds);
     }
+
+	/**
+	 * 鏍规嵁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(!VciBaseUtil.checkAdminTenant()){
+			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鍊艰浆鎹㈡垚甯冨皵绫诲瀷杩涜灏佽
@@ -319,4 +378,44 @@
 		});
 	}
 
+	/**
+	 * 鍏嬮殕鍏朵粬鑿滃崟涓嬫寜閽�
+	 * @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