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

feat: 优化

Browse Source
This commit is contained in:
TanJ 2023-10-16 21:04:07 +08:00
parent 4a4a6019e9
commit aae3396474
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tyr-api/src/main/java/cn/axzo/tyr/client/model/req/IdentityAuthReq.java
View File

@ -2,6 +2,7 @@ package cn.axzo.tyr.client.model.req;
import cn.axzo.framework.auth.domain.TerminalInfo;
import cn.axzo.tyr.client.common.enums.WorkspaceJoinType;
import cn.axzo.tyr.client.model.enums.FeatureType;
import cn.axzo.tyr.client.model.enums.IdentityType;
import lombok.AllArgsConstructor;
import lombok.Builder;
@ -11,7 +12,11 @@ import lombok.NoArgsConstructor;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/**
* @author tanjie@axzo.cn
@ -46,6 +51,10 @@ public class IdentityAuthReq {
* {@link TerminalInfo#NT()}
*/
private String terminal;
@Builder.Default
private Set<Long> featureId = new HashSet<>();
@Builder.Default
private Set<String> featureCode = new HashSet<>();
@Data

16
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java
View File

@ -461,11 +461,21 @@ public class TyrSaasAuthServiceImpl implements TyrSaasAuthService {
.build());
workspacePermission.getPermissionPoint().addAll(allPermissionPoint.stream()
.filter(permissionPointTreeNode -> {
if (CollectionUtil.isEmpty(identityAuthReq.getFeatureId()) && CollectionUtil.isEmpty(identityAuthReq.getFeatureCode())) {
return Boolean.TRUE;
}
return (identityAuthReq.getFeatureId().contains(permissionPointTreeNode.getPermissionPointId())) ||
identityAuthReq.getFeatureCode().contains(permissionPointTreeNode.getCode());
}
)
.map(permissionPointTreeNode -> IdentityAuthRes.PermissionPoint.builder()
.featureCode(permissionPointTreeNode.getCode())
.featureCode(permissionPointTreeNode.getCode())
.featureId(permissionPointTreeNode.getPermissionPointId())
// .terminal(permissionPointTreeNode.getTerminal())
// .featureType(FeatureType.apply(permissionPointTreeNode.getFeatureType()))
// .terminal(permissionPointTreeNode.getTerminal())
// .featureType(FeatureType.apply(permissionPointTreeNode.getFeatureType()))
.build())
.collect(Collectors.toList()));