From 33d8416c5a16fee7464df9774678bc60e47ff956 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 19 三月 2024 09:53:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java | 83 +++++++++++++++++++++++++++++++++++++----
1 files changed, 74 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java
index d26b2a6..40166e5 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.feign.ICodeClassifyClient;
@@ -13,8 +12,8 @@
import com.vci.ubcs.system.mapper.ClassifyAuthMapper;
import com.vci.ubcs.system.service.IClassifyAuthService;
import com.vci.ubcs.system.service.IMenuService;
+import com.vci.ubcs.system.service.IRoleService;
import com.vci.ubcs.system.vo.ClassifyAuthVO;
-import com.vci.ubcs.system.vo.MenuVO;
import com.vci.ubcs.system.wrapper.ClassifyAuthWrapper;
import lombok.AllArgsConstructor;
import org.springblade.core.log.exception.ServiceException;
@@ -22,7 +21,6 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -44,6 +42,14 @@
private final ICodeClassifyClient codeClassifyClient;
+ private final IRoleService roleService;
+
+ /**
+ * 涓夊憳绠＄悊瑙掕壊缂栧彿閰嶇疆锛氬垎鍒负绯荤粺绠＄悊鍛橈紝瀹夊叏绠＄悊鍛橈紝瀹¤绠＄悊鍛橀『搴�
+ */
+ @Value("#{'${ssa.ssa-names}'.split(',')}")
+ private List<String> SSANAMES;
+
/**
* 鍒嗙被鎺堟潈淇濆瓨鎺ュ彛
* @param classifyAuthListDTO
@@ -55,10 +61,12 @@
// 鏄竻绌烘巿鏉冨垪琛�
if(classifyAuthListDTO.getIsCLear()){
if(Func.isEmpty(classifyAuthListDTO.getClassifyId())){
- return R.fail("娓呯┖鎺堟潈鍒楄〃鏃讹紝鏈幏鍙栫殑鍒嗙被id");
+ return R.fail("娓呯┖鎺堟潈鍒楄〃鏃讹紝鏈幏鍙栧埌鍒嗙被id");
}
- this.classifyAuthMapper.delete(Wrappers.<ClassifyAuth>update()
+ this.classifyAuthMapper.delete(
+ Wrappers.<ClassifyAuth>update()
.lambda().eq(ClassifyAuth::getClassifyId, classifyAuthListDTO.getClassifyId())
+ .eq(ClassifyAuth::getAuthType,classifyAuthListDTO.getAuthType())
);
return R.success("鎺堟潈鍒楄〃娓呯┖鎴愬姛");
}
@@ -82,6 +90,7 @@
// 鍒犻櫎
LambdaUpdateWrapper<ClassifyAuth> updateWrapper = Wrappers.<ClassifyAuth>update()
.lambda().eq(ClassifyAuth::getClassifyId, classifyAuthListDTO.getClassifyAuthList().get(0).getClassifyId())
+ .eq(ClassifyAuth::getAuthType,classifyAuthListDTO.getAuthType())
.notIn(ClassifyAuth::getRoleId, roleIds);
try {
this.classifyAuthMapper.delete(updateWrapper);
@@ -168,15 +177,23 @@
.eq(ClassifyAuth::getAuthType,authType)
.in(ClassifyAuth::getRoleId, roleIds)
);
- //鍙褰撳墠鑺傜偣鐨勪笂灞傝妭鐐逛腑鎵惧埌浜嗗垎绫绘巿鏉冧俊鎭氨涓嶅啀缁х画缃戜笂鎵句簡
+ //鍙褰撳墠鑺傜偣鐨勪笂灞傝妭鐐逛腑鎵惧埌浜嗗垎绫绘巿鏉冧俊鎭氨涓嶅啀缁х画寰�涓婃壘浜�
if(!classifyAuths.isEmpty()){
break;
}
}
}
- //鍑虹幇浜嗛敊璇暟鎹紝鍚屼竴涓鑹插拰鍚屼竴涓垎绫籭d瀛樺湪澶氭潯鎺堟潈璁板綍
+ //鍑虹幇浜嗗鏉℃暟鎹�
if(classifyAuths.size()>1){
- throw new ServiceException("瑙掕壊鍜屽垎绫婚厤缃瓨鍦ㄥ鏉¤褰曪紝璇疯仈绯荤鐞嗕汉鍛樻竻鐞嗛敊璇厤缃紒");
+ // 鏍￠獙鏄惁瀛樺湪閿欒鏁版嵁锛屽悓涓�涓鑹插拰鍚屼竴涓垎绫籭d瀛樺湪澶氭潯鎺堟潈璁板綍
+ List<ClassifyAuth> finalClassifyAuths = classifyAuths;
+ boolean hasDuplicate = classifyAuths.stream()
+ .anyMatch(auth1 -> finalClassifyAuths.stream()
+ .filter(auth2 -> auth1 != auth2)
+ .anyMatch(auth2 -> auth1.getRoleId().equals(auth2.getRoleId()) && auth1.getClassifyId().equals(auth2.getClassifyId())));
+ if (hasDuplicate) {
+ throw new ServiceException("瑙掕壊鍜屽垎绫婚厤缃瓨鍦ㄥ鏉¤褰曪紝璇疯仈绯荤鐞嗕汉鍛樻竻鐞嗛敊璇厤缃紒");
+ }
}
// 鏄惁涓鸿秴绠�
Boolean isAdmin = VciBaseUtil.checkAdminTenant();
@@ -187,7 +204,10 @@
List<String> ids = new ArrayList<>();
// 濡傛灉涓嶆槸瓒呯鐢ㄦ埛
if(!isAdmin){
- ids.addAll(Arrays.asList(classifyAuths.get(0).getButtonIds().split(",")));
+ String concatenatedButtonIds = classifyAuths.stream()
+ .map(ClassifyAuth::getButtonIds) // 鑾峰彇姣忎釜classifyAuths瀵硅薄鐨刡uttonIds
+ .collect(Collectors.joining(",")); // 鐢ㄩ�楀彿鍒嗛殧鎷兼帴鎴愪竴涓瓧绗︿覆
+ ids.addAll(Arrays.asList(concatenatedButtonIds.split(",")));
}
return menuService.getMenuListByCode(ids,menuCode,roleIds);
}
@@ -205,4 +225,49 @@
return this.classifyAuthMapper.getViewClassByRoleIds(roleIds, authType,buttonCode,menuCode);
}
+ /**
+ * 鏍规嵁瑙掕壊鍚嶇О鍒嗙被id鎺堜簣榛樿鐨勫垎绫绘潈闄愬拰涓绘暟鎹闂潈闄�
+ * @param classifyAuthDTO
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public R saveAddClassifyDefaultAuth(ClassifyAuthDTO classifyAuthDTO) throws ServiceException{
+ if (Func.isEmpty(classifyAuthDTO.getClassifyId())) {
+ return R.fail("鏈幏鍙栧埌鍒嗙被id");
+ }
+ // 閰嶇疆鐨勭郴缁熺鐞嗗憳鍚嶇О
+ String sysAdmin = SSANAMES.get(0);
+ List<ClassifyAuth> classifyAuths = new ArrayList<>();
+ //鍏堥粯璁ょ敓鎴愮郴缁熺鐞嗗憳鐨勬巿鏉冩暟鎹�
+ ClassifyAuth classifyAuth = new ClassifyAuth();
+ classifyAuth.setClassifyId(classifyAuthDTO.getClassifyId());
+ classifyAuth.setAuthType("classify_auth");
+ String roleIds = roleService.getRoleIds(AuthUtil.getTenantId(), sysAdmin);
+ if(Func.isBlank(roleIds)){
+ return R.fail(AuthUtil.getTenantId()+"绉熸埛涓嬫湭鎵惧埌锛屽悕涓�"+sysAdmin+"绯荤粺绠＄悊鍛樿鑹诧紒");
+ }
+ classifyAuth.setRoleId(roleIds);
+ List<Menu> classifyTreeMenus = menuService.getButtonsByRoleId(roleIds, "classifyTree");
+ if(!classifyTreeMenus.isEmpty()){
+ String menuIds = classifyTreeMenus.stream()
+ .map(menu -> String.valueOf(menu.getId()))
+ .collect(Collectors.joining(","));
+ classifyAuth.setButtonIds(menuIds);
+ classifyAuths.add(classifyAuth);
+ }
+ /*ClassifyAuth dataAuth = new ClassifyAuth();
+ dataAuth.setAuthType("data_auth");
+ dataAuth.setClassifyId(classifyAuthDTO.getClassifyId());
+ dataAuth.setRoleId(roleIds);
+ List<Menu> masterDatas = menuService.getButtonsByRoleId(roleIds, classifyAuthDTO.getClassId());
+ if(!masterDatas.isEmpty()){
+ String menuIds = masterDatas.stream()
+ .map(menu -> String.valueOf(menu.getId()))
+ .collect(Collectors.joining(","));
+ dataAuth.setButtonIds(menuIds);
+ classifyAuths.add(dataAuth);
+ }*/
+ return R.status(this.saveBatch(classifyAuths));
+ }
+
}
--
Gitblit v1.9.3