feat(2046) 班组管理员添加支持批量设置与清除

tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/dto/IdentityInfo.java

@@ -0,0 +1,24 @@
+package cn.axzo.tyr.client.model.roleuser.dto;
+
+import cn.axzo.tyr.client.model.enums.IdentityType;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author tanjie@axzo.cn
+ * @date 2024/1/10 10:38
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Data
+public class IdentityInfo {
+    private Long personId;
+
+    private Long identityId;
+
+    private IdentityType identityType;
+
+}

tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/WorkerManagerRoleUserReq.java

@@ -3,6 +3,7 @@ package cn.axzo.tyr.client.model.roleuser.req;
 import cn.axzo.tyr.client.common.enums.SaasPositionEnum;
 import cn.axzo.tyr.client.model.enums.IdentityType;
 import cn.axzo.tyr.client.model.enums.WorkerLeaderRoleEnum;
+import cn.axzo.tyr.client.model.roleuser.dto.IdentityInfo;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -10,6 +11,7 @@ import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -39,8 +41,8 @@ public class WorkerManagerRoleUserReq {
     private Long resourceId;
 
     private IdentityType identityType;
-    private Long identityId;
+    @Builder.Default
-    private Long personId;
+    private List<IdentityInfo> identityInfos = new ArrayList<>();
     /**
      * 这个字段在设置后续产品重构了班组管理员、代班长相关功能的时候，要替换成ROLE ID。
      * 现在保留权限集ID是因为只是做统一权限角色，查询链路先暂时不变（REQ-2046)
@@ -70,4 +72,5 @@ public class WorkerManagerRoleUserReq {
 
 
 
+
 }

tyr-server/src/main/java/cn/axzo/tyr/server/model/RoleUserInfo.java

@@ -1,6 +1,7 @@
 package cn.axzo.tyr.server.model;
 
 import cn.axzo.tyr.client.model.enums.IdentityType;
+import cn.axzo.tyr.client.model.roleuser.dto.IdentityInfo;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -23,9 +24,9 @@ public class RoleUserInfo {
     private Integer resourceType;
     private Long resourceId;
     private IdentityType identityType;
-    private Long identityId;
+    private List<IdentityInfo> identityInfos;
-    private Long personId;
     private Set<Long> roleId;
 
 
+
 }

tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleUserRelationDao.java

@@ -4,6 +4,7 @@ import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
 import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
 import cn.axzo.tyr.client.model.BaseWorkspaceModel;
 import cn.axzo.tyr.client.model.enums.IdentityType;
+import cn.axzo.tyr.client.model.roleuser.dto.IdentityInfo;
 import cn.axzo.tyr.server.model.RoleUserInfo;
 import cn.axzo.tyr.server.repository.entity.SaasRoleUserRelation;
 import cn.axzo.tyr.server.repository.mapper.SaasRoleUserRelationMapper;
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 @Repository
 public class SaasRoleUserRelationDao extends ServiceImpl<SaasRoleUserRelationMapper, SaasRoleUserRelation> {
@@ -98,11 +100,11 @@ public class SaasRoleUserRelationDao extends ServiceImpl<SaasRoleUserRelationMap
 	}
 
 	public List<SaasRoleUserRelation> findByResource(RoleUserInfo req) {
-		return lambdaQuery().eq(SaasRoleUserRelation::getIdentityId, req.getIdentityId())
+		return lambdaQuery()
 				.eq(SaasRoleUserRelation::getIdentityType, req.getIdentityType().getCode())
 				.in(CollectionUtil.isNotEmpty(req.getRoleId()), SaasRoleUserRelation::getRoleId, req.getRoleId())
 				.eq(SaasRoleUserRelation::getOuId, req.getOuId())
-				.eq(SaasRoleUserRelation::getNaturalPersonId,req.getPersonId())
+				.in(CollectionUtil.isNotEmpty(req.getIdentityInfos()),SaasRoleUserRelation::getIdentityId,req.getIdentityInfos().stream().map(IdentityInfo::getIdentityId))
 				.eq(SaasRoleUserRelation::getWorkspaceId, req.getWorkspaceId())
 				.eq(SaasRoleUserRelation::getResourceType, req.getResourceType())
 				.eq(SaasRoleUserRelation::getRoleId, req.getResourceId())
@@ -110,15 +112,16 @@ public class SaasRoleUserRelationDao extends ServiceImpl<SaasRoleUserRelationMap
 	}
 
 	public void removeByResource(RoleUserInfo req) {
-		lambdaUpdate().eq(SaasRoleUserRelation::getIdentityId, req.getIdentityId())
+		lambdaUpdate()
 				.eq(SaasRoleUserRelation::getIdentityType, req.getIdentityType().getCode())
 				.in(SaasRoleUserRelation::getRoleId, req.getRoleId())
 				.eq(SaasRoleUserRelation::getOuId, req.getOuId())
-				.eq(SaasRoleUserRelation::getNaturalPersonId, req.getPersonId())
+				.eq(CollectionUtil.isNotEmpty(req.getIdentityInfos()), SaasRoleUserRelation::getIdentityId, req.getIdentityInfos().stream().map(IdentityInfo::getIdentityId).collect(Collectors.toSet()))
 				.eq(SaasRoleUserRelation::getWorkspaceId, req.getWorkspaceId())
 				.eq(SaasRoleUserRelation::getResourceType, req.getResourceType())
 				.eq(SaasRoleUserRelation::getRoleId, req.getResourceId())
 				.setSql(" is_delete = id");
+
 	}
 }
 

tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java

@@ -4,6 +4,7 @@ import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
 import cn.axzo.basics.common.exception.ServiceException;
 import cn.axzo.basics.common.util.AssertUtil;
 import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
+import cn.axzo.pokonyan.util.KeysUtil;
 import cn.axzo.tyr.client.common.enums.RoleTypeEnum;
 import cn.axzo.tyr.client.common.enums.SaasPositionEnum;
 import cn.axzo.tyr.client.model.BaseWorkspaceModel;
@@ -342,28 +343,38 @@ public class RoleUserService implements SaasRoleUserService {
                 .resourceId(req.getResourceId())
                 .workspaceId(req.getWorkspaceId())
                 .ouId(req.getOuId())
-                .identityId(req.getIdentityId())
                 .identityType(req.getIdentityType())
-                .roleId(roleInfos.stream().map(BaseEntity::getId).distinct().collect(Collectors.toSet()))
+                .identityInfos(req.getIdentityInfos())
+                .roleId(roleInfos.stream().map(BaseEntity::getId).collect(Collectors.toSet()))
                 .build();
         // 授权
         if (!req.isUngrant()) {
+            if (CollectionUtil.isEmpty(roleUserBaseInfo.getIdentityInfos())) {
+                throw new ServiceException("grant team manager error, not found person info");
+            }
             List<SaasRoleUserRelation> exist = roleUserRelationDao.findByResource(roleUserBaseInfo);
-            Set<Long> existRole = exist.stream().map(SaasRoleUserRelation::getRoleId).collect(Collectors.toSet());
+            Set<String> existKey = exist.stream().map(e -> KeysUtil.createKey(e.getNaturalPersonId(), e.getOuId(), e.getWorkspaceId(), e.getResourceId(), e.getResourceType(),e.getRoleId())).collect(Collectors.toSet());
-            // 防止重复插入数据，过滤一次
+            // 防止重复插入数据，过滤一次原始数据
-            roleUserRelationDao.saveBatch(roleInfos.stream().filter(e -> !existRole.contains(e.getId())).map(e -> {
+            // 第一个维度，人
-                SaasRoleUserRelation saasRoleUserRelation = new SaasRoleUserRelation();
+            roleUserRelationDao.saveBatch(roleUserBaseInfo.getIdentityInfos().stream().map(e -> {
-                saasRoleUserRelation.setIdentityId(req.getIdentityId());
+                // 第二个维度，角色
-                saasRoleUserRelation.setIdentityType(req.getIdentityType().getCode());
+                return roleUserBaseInfo.getRoleId().stream().map(roleId -> {
-                saasRoleUserRelation.setRoleId(e.getId());
+                    if (existKey.contains(KeysUtil.createKey(e.getPersonId(), roleUserBaseInfo.getOuId(), roleUserBaseInfo.getWorkspaceId(), roleUserBaseInfo.getResourceId(), roleUserBaseInfo.getResourceType(), roleId))) {
-                saasRoleUserRelation.setNaturalPersonId(req.getPersonId());
+                        return null;
-                saasRoleUserRelation.setOuId(req.getOuId());
+                    }
-                saasRoleUserRelation.setWorkspaceId(req.getWorkspaceId());
+                    SaasRoleUserRelation saasRoleUserRelation = new SaasRoleUserRelation();
-                saasRoleUserRelation.setResourceType(req.getResourceType());
+                    saasRoleUserRelation.setIdentityId(e.getIdentityId());
-                saasRoleUserRelation.setResourceId(req.getResourceId());
+                    saasRoleUserRelation.setIdentityType(req.getIdentityType().getCode());
-                return saasRoleUserRelation;
+                    saasRoleUserRelation.setRoleId(roleId);
-            }).collect(Collectors.toList()));
+                    saasRoleUserRelation.setNaturalPersonId(e.getPersonId());
+                    saasRoleUserRelation.setOuId(req.getOuId());
+                    saasRoleUserRelation.setWorkspaceId(req.getWorkspaceId());
+                    saasRoleUserRelation.setResourceType(req.getResourceType());
+                    saasRoleUserRelation.setResourceId(req.getResourceId());
+                    return saasRoleUserRelation;
+                }).filter(Objects::nonNull).collect(Collectors.toList());
 
+            }).flatMap(Collection::stream).collect(Collectors.toList()));
             return;
         }
         // 取消授权