REQ-3540: icons
This commit is contained in:
parent
41d5604174
commit
664c52bc38
@ -33,14 +33,11 @@ public class IndexQueryService {
|
||||
private final DocProps docProps;
|
||||
|
||||
public List<IndexNode> getTree(IndexNodeScope nodeScope) {
|
||||
List<IndexNode> nodes = indexNodeDao.scopeQuery(nodeScope) //
|
||||
List<IndexNode> indexNodes = indexNodeDao.scopeQuery(nodeScope) //
|
||||
.eq(IndexNode::getState, IndexNodeState.VALID) //
|
||||
.list();
|
||||
for (IndexNode indexNode : nodes) {
|
||||
if (StringUtils.isBlank(indexNode.getIcon()))
|
||||
indexNode.setIcon(determineDefaultIcon(indexNode));
|
||||
}
|
||||
return nodes;
|
||||
setIcons(indexNodes);
|
||||
return indexNodes;
|
||||
}
|
||||
|
||||
public Page<IndexNode> search(IndexNodeScope nodeScope, IndexNodeSearchRequest search) {
|
||||
@ -49,6 +46,7 @@ public class IndexQueryService {
|
||||
.like(IndexNode::getName, search.getName()) //
|
||||
.in(CollectionUtils.isNotEmpty(search.getNodeTypes()), IndexNode::getNodeType, search.getNodeTypes()) //
|
||||
.page(search.toPage());
|
||||
setIcons(page.getRecords());
|
||||
return Page.toPage(page.getPages(), page.getSize(), page.getTotal(), page.getRecords());
|
||||
}
|
||||
|
||||
@ -66,6 +64,13 @@ public class IndexQueryService {
|
||||
return indexNodeDao.lambdaQuery().in(IndexNode::getCode, codes).list();
|
||||
}
|
||||
|
||||
private void setIcons(List<IndexNode> indexNodes) {
|
||||
for (IndexNode indexNode : indexNodes) {
|
||||
if (StringUtils.isBlank(indexNode.getIcon()))
|
||||
indexNode.setIcon(determineDefaultIcon(indexNode));
|
||||
}
|
||||
}
|
||||
|
||||
private String determineDefaultIcon(IndexNode indexNode) {
|
||||
if (indexNode.getNodeType() == IndexNodeType.DATABASE)
|
||||
return docProps.getDefaultIconDatabase();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user