From 63d93f64e7643624a4d078c0ac3ec3d465897b11 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 29 十二月 2023 13:05:23 +0800
Subject: [PATCH] 分类授权：主题库定义按钮授权相关接口提交
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 3 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 0eb2627..b9350dc 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.code.feign.ICodeClassifyClient;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.system.entity.ClassifyAuth;
import com.vci.ubcs.system.entity.Menu;
@@ -37,6 +38,8 @@
private final IMenuService menuService;
+ private final ICodeClassifyClient codeClassifyClient;
+
/**
* 鍒嗙被鎺堟潈淇濆瓨鎺ュ彛
* @param classifyAuthList
@@ -48,6 +51,17 @@
if(classifyAuthList.isEmpty()){
R.fail("鎺堟潈鍒楄〃涓嶈兘涓虹┖锛�");
}
+ // 鍒ら噸锛屾煡鐪嬫槸鍚﹀瓨鍦ㄥ悓涓�涓猚lassid涓嬮厤缃簡鐩稿悓鐨勮鑹�
+ Map<String, Long> roleidCounts = classifyAuthList.stream()
+ .collect(Collectors.groupingBy(ClassifyAuth::getRoleId, Collectors.counting()));
+
+ // 妫�鏌ユ槸鍚︽湁roleid鍑虹幇娆℃暟澶т簬1鐨勬儏鍐�
+ boolean hasDuplicateRoleid = roleidCounts.values().stream()
+ .anyMatch(count -> count > 1);
+ if(hasDuplicateRoleid){
+ R.fail("瑙掕壊鍜屽垎绫诲凡缁忓瓨鍦紝璇烽噸鏂伴厤缃紒");
+ }
+
// 濡傛灉浼犺繃鏉ョ殑闆嗗悎涓鍒嗙被id涓嬪垹闄や簡閮ㄥ垎瑙掕壊鐨勬巿鏉冿紝灏遍渶瑕佸皢璇ュ簱涓璫lassifyId涓嬩笉瀛樺湪鐨勬暟鎹垹鎺�
List<String> roleIds = classifyAuthList.stream().map(ClassifyAuth::getRoleId).collect(Collectors.toList());
// 鍒犻櫎
@@ -75,10 +89,10 @@
LambdaQueryWrapper<ClassifyAuth> wrapper = Wrappers.<ClassifyAuth>query()
.lambda().eq(ClassifyAuth::getClassifyId,classifyAuthVO.getClassifyId());
List<ClassifyAuth> classifyAuths = this.classifyAuthMapper.selectList(wrapper);
- if(!classifyAuths.isEmpty()){
- return ClassifyAuthWrapper.build().listVO(classifyAuths);
+ if(classifyAuths.isEmpty()){
+ return new ArrayList<ClassifyAuthVO>();
}
- return new ArrayList<ClassifyAuthVO>();
+ return ClassifyAuthWrapper.build().listVO(classifyAuths);
}
/**
@@ -87,12 +101,37 @@
* @return
*/
public Map<String,Boolean> getAuthButtonList(String classifyId){
+ if(Func.isBlank(classifyId)){
+ return new HashMap<>();
+ }
+ //鏌ヨ鍒嗙被鑺傜偣鐨勬墍鏈夌埗绾ц妭鐐�
+ R<List<String>> listR = codeClassifyClient.selectAllParentOid(classifyId);
+ if (!listR.isSuccess() && !listR.getData().isEmpty()) {
+ throw new ServiceException("鑾峰彇鍒嗙被淇℃伅澶辫触锛�");
+ }
+ // 杩斿洖鐨勫垎绫籵id鏄綋鍓嶈妭鐐逛负绗竴涓紝鍚庨潰渚濇鏄粬鐨勪笂灞傝妭鐐�
+ List<String> classifyOidList = listR.getData();
final String roleIds = AuthUtil.getUser().getRoleId();
// 鍏堟煡璇㈡寜閽甶d鍒楄〃
LambdaQueryWrapper<ClassifyAuth> wrapper = Wrappers.<ClassifyAuth>query()
.lambda().eq(ClassifyAuth::getClassifyId, classifyId)
.in(ClassifyAuth::getRoleId, roleIds);
List<ClassifyAuth> classifyAuths = this.classifyAuthMapper.selectList(wrapper);
+ //濡傛灉褰撳墠鍒嗙被娌℃湁鎵惧埌鎺堟潈閰嶇疆锛屽氨渚濇浠庡綋鍓嶈妭鐐瑰線涓婂眰鑺傜偣鎵炬巿鏉冮厤缃紝鎵惧埌浜嗗氨鍋滄锛屾病鎵惧埌灏变竴鐩存壘鍒版渶鍚�
+ if(classifyAuths.isEmpty()){
+ // 涓嬫爣浠�1寮�濮嬪洜涓哄綋鍓嶈妭鐐�0宸茬粡鏌ヨ杩�
+ for (int i = 1; i < classifyOidList.size(); i++) {
+ classifyAuths = this.classifyAuthMapper.selectList(
+ Wrappers.<ClassifyAuth>query()
+ .lambda().eq(ClassifyAuth::getClassifyId, classifyOidList.get(i))
+ .in(ClassifyAuth::getRoleId, roleIds)
+ );
+ if(!classifyAuths.isEmpty()){
+ break;
+ }
+ }
+ }
+ //鍑虹幇浜嗛敊璇暟鎹紝鍚屼竴涓鑹插拰鍚屼竴涓垎绫籭d瀛樺湪澶氭潯鎺堟潈璁板綍
if(classifyAuths.size()>1){
throw new ServiceException("瑙掕壊鍜屽垎绫婚厤缃瓨鍦ㄥ鏉¤褰曪紝璇疯仈绯荤鐞嗕汉鍛樻竻鐞嗛敊璇厤缃紒");
}
@@ -116,4 +155,17 @@
return buttonMaps;
}
+ /**
+ * 鏍规嵁瑙掕壊id鏌ョ湅鏈夊摢浜涘垎绫诲叿澶囨煡鐪嬫潈闄�
+ * @param roleIds
+ * @return
+ */
+ @Override
+ public List<String> getViewClassByRoleIds(List<String> roleIds) {
+ if(roleIds.isEmpty()){
+ return new ArrayList<>();
+ }
+ return this.classifyAuthMapper.getViewClassByRoleIds(roleIds);
+ }
+
}
--
Gitblit v1.9.3