center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix:优化了查询授权树模型的代码

Browse Source
This commit is contained in:
zhantiao@tiduyun.com 2022-11-10 16:14:49 +08:00
parent 1429653e35
commit 897782c26e
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/dataease/dto/authModel/VAuthModelDTO.java
View File

@ -18,12 +18,13 @@ public class VAuthModelDTO extends VAuthModelWithBLOBs implements ITreeBase<VAut
private List<VAuthModelDTO> children;
private long allLeafs = 0l;
private long allLeafs = 0L;
private String innerId;
private Boolean isPlugin = false;
@Override
public String toString(){
return this.getName();
}

25
backend/src/main/java/io/dataease/service/authModel/VAuthModelService.java
View File

@ -45,13 +45,10 @@ public class VAuthModelService {
return result;
}
if (request.getPrivileges() != null) {
result = result.stream().filter(vAuthModelDTO -> {
if (vAuthModelDTO.getNodeType().equalsIgnoreCase("spine") || (vAuthModelDTO.getNodeType().equalsIgnoreCase("leaf") && vAuthModelDTO.getPrivileges() != null && vAuthModelDTO.getPrivileges().contains(request.getPrivileges()))) {
return true;
} else {
return false;
}
}).collect(Collectors.toList());
result = result.stream().filter(vAuthModelDTO -> "spine".equalsIgnoreCase(vAuthModelDTO.getNodeType())
|| ("leaf".equalsIgnoreCase(vAuthModelDTO.getNodeType())
&& vAuthModelDTO.getPrivileges() != null
&& vAuthModelDTO.getPrivileges().contains(request.getPrivileges()))).collect(Collectors.toList());
}
return result;
}
@ -60,10 +57,10 @@ public class VAuthModelService {
if (CollectionUtils.isEmpty(result)) {
return;
}
Iterator iterator = result.listIterator();
Iterator<VAuthModelDTO> iterator = result.listIterator();
while (iterator.hasNext()) {
VAuthModelDTO tmp = (VAuthModelDTO) iterator.next();
if (tmp.getNodeType().equalsIgnoreCase("spine") && tmp.getAllLeafs() == 0) {
VAuthModelDTO tmp = iterator.next();
if ("spine".equalsIgnoreCase(tmp.getNodeType()) && tmp.getAllLeafs() == 0) {
iterator.remove();
} else {
removeEmptyDir(tmp.getChildren());
@ -77,9 +74,9 @@ public class VAuthModelService {
vAuthModelDTO.setAllLeafs(0);
continue;
}
long leafs = 0l;
long leafs = 0L;
for (VAuthModelDTO child : vAuthModelDTO.getChildren()) {
if (child.getNodeType().equalsIgnoreCase("leaf")) {
if ("leaf".equalsIgnoreCase(child.getNodeType())) {
leafs = leafs + 1;
} else {
leafs = +leafs + getLeafs(child);
@ -90,13 +87,13 @@ public class VAuthModelService {
}
private long getLeafs(VAuthModelDTO child) {
long leafs = 0l;
long leafs = 0L;
if (CollectionUtils.isEmpty(child.getChildren())) {
child.setAllLeafs(0);
return leafs;
}
for (VAuthModelDTO childChild : child.getChildren()) {
if (childChild.getNodeType().equalsIgnoreCase("leaf")) {
if ("leaf".equalsIgnoreCase(childChild.getNodeType())) {
leafs = leafs + 1;
} else {
leafs = +leafs + getLeafs(childChild);