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

REQ-3540: 资料库scope问题

Browse Source
This commit is contained in:
yanglin 2025-03-24 17:27:03 +08:00
parent 5c6174c3f8
commit f5c76d6014
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/IndexNodeParentScope.java
View File

@ -12,6 +12,6 @@ public interface IndexNodeParentScope {
return IndexNodeScope.TREE_ROOT_NODE_CODE;
}
IndexNodeParentScope TEMPLATE_DATABASE_ROOT = () -> IndexNodeScope.TEMPLATE_DATABASE;
IndexNodeParentScope TEMPLATE_DATABASE_ALL_SCOPES_ROOT = () -> IndexNodeScope.TEMPLATE_DATABASE_ALL_SCOPES;
}

2
doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/IndexNodeScope.java
View File

@ -25,6 +25,6 @@ public interface IndexNodeScope {
IndexNodeScope FILE_TEMPLATE = () -> IndexNodeContext.FILE_TEMPLATE;
IndexNodeScope TEMPLATE_DATABASE = () -> IndexNodeContext.TEMPLATE_DATABASE;
IndexNodeScope TEMPLATE_DATABASE_ALL_SCOPES = () -> IndexNodeContext.TEMPLATE_DATABASE;
}

2
doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/filedb/FileDatabaseService.java
View File

@ -230,7 +230,7 @@ public class FileDatabaseService {
List<String> seachTemplateDatabaseCodes = null;
if (StringUtils.isNotBlank(request.getDatabaseName())) {
List<IndexNode> templateNodes = indexQueryService.getNameLike(IndexNodeScope.TEMPLATE_DATABASE,
List<IndexNode> templateNodes = indexQueryService.getNameLike(IndexNodeScope.TEMPLATE_DATABASE_ALL_SCOPES,
request.getDatabaseName(), IndexNodeType.DATABASE);
if (templateNodes.isEmpty())
return Page.zero();

4
doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/templatedb/TemplateDatabaseApiController.java
View File

@ -108,7 +108,7 @@ public class TemplateDatabaseApiController implements TemplateDatabaseApi {
@Override
public CommonResponse<List<IndexNodeInfo>> getTree() {
List<IndexNode> subtreeNodes = indexQueryService.getTree(IndexNodeScope.TEMPLATE_DATABASE);
List<IndexNode> subtreeNodes = indexQueryService.getTree(IndexNodeScope.TEMPLATE_DATABASE_ALL_SCOPES);
RootNode<IndexNodeInfo> root = indexNodeTreeUtils.transform(subtreeNodes);
if (root.hasChildren()) {
IndexNodeInfo db = root.getChildren().get(0).tryGetValue();
@ -121,7 +121,7 @@ public class TemplateDatabaseApiController implements TemplateDatabaseApi {
@Override
public CommonResponse<Page<IndexNodeInfo>> search(IndexNodeSearchRequest request) {
log.info("search request:{}", request);
Page<IndexNode> page = indexQueryService.search(IndexNodeScope.TEMPLATE_DATABASE, request);
Page<IndexNode> page = indexQueryService.search(IndexNodeScope.TEMPLATE_DATABASE_ALL_SCOPES, request);
Page<IndexNodeInfo> infoPage = Page.toPage(page.getPageNum(), page.getPageSize(), page.getTotalElements(),
BeanMapper.copyList(page.getList(), IndexNodeInfo.class));
return CommonResponse.success(infoPage);

2
doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/templatedb/TemplateDatabaseQueryService.java
View File

@ -77,7 +77,7 @@ public class TemplateDatabaseQueryService {
List<String> codes = null;
if (StringUtils.isNotBlank(request.getName())) {
codes = indexQueryService.getNameLike( //
IndexNodeParentScope.TEMPLATE_DATABASE_ROOT, request.getName()).stream() //
IndexNodeParentScope.TEMPLATE_DATABASE_ALL_SCOPES_ROOT, request.getName()).stream() //
.map(IndexNode::getCode) //
.collect(toList());
if (codes.isEmpty())