diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/entity/domain/IndexNodeCodeProvider.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/entity/domain/IndexNodeCodeProvider.java index e4e66a18..ec840e3b 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/entity/domain/IndexNodeCodeProvider.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/entity/domain/IndexNodeCodeProvider.java @@ -1,6 +1,14 @@ package cn.axzo.nanopart.doc.entity.domain; +import static java.util.stream.Collectors.toList; + +import java.util.Collections; +import java.util.List; + +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; + /** * @author yanglin */ @@ -8,4 +16,12 @@ public interface IndexNodeCodeProvider { String indexNodeCode(); + static List collectIndexNodeCodes(List nodes) { + if (CollectionUtils.isEmpty(nodes)) + return Collections.emptyList(); + return nodes.stream() // + .map(IndexNodeCodeProvider::indexNodeCode) // + .filter(StringUtils::isNotBlank) // + .collect(toList()); + } } diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexQueryService.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexQueryService.java index d3841d41..2facb71e 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexQueryService.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexQueryService.java @@ -1,8 +1,6 @@ package cn.axzo.nanopart.doc.file.index; -import static java.util.stream.Collectors.toList; - import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -82,12 +80,7 @@ public class IndexQueryService { } public List get(List nodes) { - if (CollectionUtils.isEmpty(nodes)) - return Collections.emptyList(); - List codes = nodes.stream() // - .map(IndexNodeCodeProvider::indexNodeCode) // - .filter(StringUtils::isNotBlank) // - .collect(toList()); + List codes = IndexNodeCodeProvider.collectIndexNodeCodes(nodes); if (CollectionUtils.isEmpty(codes)) return Collections.emptyList(); return indexNodeDao.lambdaQuery().in(IndexNode::getCode, codes).list(); diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/templatedb/TemplateDatabaseQueryService.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/templatedb/TemplateDatabaseQueryService.java index b1341037..99d3afad 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/templatedb/TemplateDatabaseQueryService.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/templatedb/TemplateDatabaseQueryService.java @@ -87,7 +87,8 @@ public class TemplateDatabaseQueryService { .eq(TemplateDatabase::getState, TemplateDatabaseState.VALID) // .in(codes != null, TemplateDatabase::getCode, codes) // .page(request.toPage()); - return Page.toPage(request.getPage(), page.getSize(), page.getTotal(), toTemplateDatabaseInfo(page.getRecords())); + return Page.toPage(request.getPage(), page.getSize(), page.getTotal(), + toTemplateDatabaseInfo(page.getRecords())); } public List toTemplateDatabaseInfo(List templateDatabases) { @@ -106,12 +107,7 @@ public class TemplateDatabaseQueryService { } public List get(List nodes) { - if (CollectionUtils.isEmpty(nodes)) - return Collections.emptyList(); - List codes = nodes.stream() // - .map(IndexNodeCodeProvider::indexNodeCode) // - .filter(StringUtils::isNotBlank) // - .collect(toList()); + List codes = IndexNodeCodeProvider.collectIndexNodeCodes(nodes); if (CollectionUtils.isEmpty(codes)) return Collections.emptyList(); return templateDatabaseDao.lambdaQuery() //