wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(REQ-20240731): 同步优化

Browse Source
This commit is contained in:
李昆鹏 2024-07-31 16:16:07 +08:00
parent abe48655b7
commit 44ff2a52b1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/FeatureResourceSyncServiceImpl.java
View File

@ -281,6 +281,7 @@ public class FeatureResourceSyncServiceImpl implements FeatureResourceSyncServic
.uniCode(featureResource.getUniCode()) .uniCode(featureResource.getUniCode())
.build(); .build();
roleCodes = roleCodes.stream().filter(StringUtils::isNotBlank).collect(Collectors.toList());
if (CollectionUtils.isEmpty(roleCodes)) { if (CollectionUtils.isEmpty(roleCodes)) {
return logResourceBindRoleDO; return logResourceBindRoleDO;
} }
@ -357,15 +358,19 @@ public class FeatureResourceSyncServiceImpl implements FeatureResourceSyncServic
.collect(Collectors.groupingBy(SaasPgroupRoleRelation::getGroupId, .collect(Collectors.groupingBy(SaasPgroupRoleRelation::getGroupId,
Collectors.mapping(SaasPgroupRoleRelation::getRoleId, Collectors.toList()))); Collectors.mapping(SaasPgroupRoleRelation::getRoleId, Collectors.toList())));
Map<Long, String> roleIdToRoleCodeMap = roles.stream() Map<Long, String> roleIdToRoleCodeMap = Maps.newHashMap();
.collect(Collectors.toMap(SaasRole::getId, SaasRole::getRoleCode)); for (SaasRole role : roles) {
if (StringUtils.isNotBlank(role.getRoleCode())) {
roleIdToRoleCodeMap.put(role.getId(), role.getRoleCode());
}
}
Map<Long, List<String>> featureRoleMap = new HashMap<>(); Map<Long, List<String>> featureRoleMap = new HashMap<>();
featureIdToGroupIdsMap.forEach((featureId, groupIds) -> { featureIdToGroupIdsMap.forEach((featureId, groupIds) -> {
List<String> roleCodes = groupIds.stream() List<String> roleCodes = groupIds.stream()
.flatMap(groupId -> groupIdToRoleIdsMap.getOrDefault(groupId, Collections.emptyList()).stream()) .flatMap(groupId -> groupIdToRoleIdsMap.getOrDefault(groupId, Collections.emptyList()).stream())
.map(roleIdToRoleCodeMap::get) .map(roleIdToRoleCodeMap::get)
.filter(Objects::nonNull) .filter(StringUtils::isNotBlank)
.collect(Collectors.toList()); .collect(Collectors.toList());
featureRoleMap.put(featureId, roleCodes); featureRoleMap.put(featureId, roleCodes);