diff --git a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/filetemplate/FileTemplateApi.java b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/filetemplate/FileTemplateApi.java index 7a2372a2..6a838978 100644 --- a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/filetemplate/FileTemplateApi.java +++ b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/filetemplate/FileTemplateApi.java @@ -18,7 +18,6 @@ import cn.axzo.nanopart.doc.api.filetemplate.response.FileTemplateGetFileInfoRes import cn.axzo.nanopart.doc.api.index.IndexNodeInfo; import cn.axzo.nanopart.doc.api.index.request.CopyNodeRequest; import cn.axzo.nanopart.doc.api.index.request.DeleteNodeRequest; -import cn.axzo.nanopart.doc.api.index.request.GetNodeChildrenRequest; import cn.axzo.nanopart.doc.api.index.request.IndexNodePageSearchRequest; import cn.axzo.nanopart.doc.api.index.request.MoveNodeRequest; import cn.axzo.nanopart.doc.api.index.request.RenameNodeRequest; @@ -79,10 +78,10 @@ public interface FileTemplateApi { CommonResponse delete(@RequestBody @Valid DeleteNodeRequest request); /** - * 文件模版: 获取子节点 + * 文件模版: 获取树 */ - @PostMapping("/api/fileTemplate/getChildren") - CommonResponse> getChildren(@RequestBody @Valid GetNodeChildrenRequest request); + @PostMapping("/api/fileTemplate/getTree") + CommonResponse> getTree(); /** * 文件模版: 搜索 diff --git a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/TemplateDatabaseApi.java b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/TemplateDatabaseApi.java index e9f072b6..c99f6c00 100644 --- a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/TemplateDatabaseApi.java +++ b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/TemplateDatabaseApi.java @@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestBody; import cn.axzo.nanopart.doc.api.index.IndexNodeInfo; import cn.axzo.nanopart.doc.api.index.request.CopyNodeRequest; import cn.axzo.nanopart.doc.api.index.request.DeleteNodeRequest; -import cn.axzo.nanopart.doc.api.index.request.GetNodeChildrenRequest; import cn.axzo.nanopart.doc.api.index.request.IndexNodePageSearchRequest; import cn.axzo.nanopart.doc.api.index.request.MoveNodeRequest; import cn.axzo.nanopart.doc.api.index.request.RenameNodeRequest; @@ -89,8 +88,8 @@ public interface TemplateDatabaseApi { /** * 项企资料库: 获取子节点 */ - @PostMapping("/api/templateDatabase/getChildren") - CommonResponse> getChildren(@RequestBody @Valid GetNodeChildrenRequest request); + @PostMapping("/api/templateDatabase/getTree") + CommonResponse> getTree(); /** * 项企资料库: 搜索 diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/dao/IndexNodeDao.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/dao/IndexNodeDao.java index f853d0ab..62a782cc 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/dao/IndexNodeDao.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/dao/IndexNodeDao.java @@ -1,7 +1,6 @@ package cn.axzo.nanopart.doc.dao; -import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.StringUtils; @@ -91,12 +90,6 @@ public class IndexNodeDao extends ServiceImpl { .update(); } - public List collectChildren(IndexNodeScope nodeScope, String parentCode, IndexNodeState... states) { - return parentOrScopeQuery(nodeScope, parentCode) // - .in(states.length > 0, IndexNode::getState, Arrays.asList(states)) // - .list(); - } - public int countValidChild(IndexNodeParentScope parentScope) { return parentOrScopeQuery(parentScope.nodeScope(), parentScope.parentCode()) // .eq(IndexNode::getState, IndexNodeState.VALID) // diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/filetemplate/FileTemplateApiController.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/filetemplate/FileTemplateApiController.java index eedd8242..3c73a3e7 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/filetemplate/FileTemplateApiController.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/filetemplate/FileTemplateApiController.java @@ -17,7 +17,6 @@ import cn.axzo.nanopart.doc.api.filetemplate.response.FileTemplateGetFileInfoRes import cn.axzo.nanopart.doc.api.index.IndexNodeInfo; import cn.axzo.nanopart.doc.api.index.request.CopyNodeRequest; import cn.axzo.nanopart.doc.api.index.request.DeleteNodeRequest; -import cn.axzo.nanopart.doc.api.index.request.GetNodeChildrenRequest; import cn.axzo.nanopart.doc.api.index.request.IndexNodePageSearchRequest; import cn.axzo.nanopart.doc.api.index.request.MoveNodeRequest; import cn.axzo.nanopart.doc.api.index.request.RenameNodeRequest; @@ -90,10 +89,8 @@ public class FileTemplateApiController implements FileTemplateApi { } @Override - public CommonResponse> getChildren(GetNodeChildrenRequest request) { - log.info("getChildren request:{}", request); - List children = indexQueryService.getChildren(IndexNodeScope.FILE_TEMPLATE_SCOPE, - request.getParentCode()); + public CommonResponse> getTree() { + List children = indexQueryService.getTree(IndexNodeScope.FILE_TEMPLATE_SCOPE); return CommonResponse.success(IndexNodes.wrap(children).toIndexNodeInfos()); } 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 52442d8d..fe7f207b 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,12 +1,12 @@ package cn.axzo.nanopart.doc.file.index; +import java.util.ArrayList; import java.util.List; import org.springframework.stereotype.Service; import cn.axzo.nanopart.doc.api.domain.IndexNodeScope; -import cn.axzo.nanopart.doc.api.enums.IndexNodeState; import cn.axzo.nanopart.doc.api.index.request.IndexNodePageSearchRequest; import cn.axzo.nanopart.doc.dao.IndexNodeDao; import cn.axzo.nanopart.doc.entity.IndexNode; @@ -22,8 +22,8 @@ public class IndexQueryService { private final IndexNodeDao indexNodeDao; - public List getChildren(IndexNodeScope nodeScope, String parentCode, IndexNodeState... states) { - return indexNodeDao.collectChildren(nodeScope, parentCode, states); + public List getTree(IndexNodeScope nodeScope) { + return new ArrayList<>(); } public Page search(IndexNodeScope nodeScope, IndexNodePageSearchRequest search) { diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/templatedb/TemplateDatabaseApiController.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/templatedb/TemplateDatabaseApiController.java index 7538b526..cc472445 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/templatedb/TemplateDatabaseApiController.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/templatedb/TemplateDatabaseApiController.java @@ -1,31 +1,30 @@ package cn.axzo.nanopart.doc.file.templatedb; +import java.util.List; + +import org.springframework.web.bind.annotation.RestController; + import cn.axzo.nanopart.doc.api.index.IndexNodeInfo; import cn.axzo.nanopart.doc.api.index.request.CopyNodeRequest; import cn.axzo.nanopart.doc.api.index.request.DeleteNodeRequest; -import cn.axzo.nanopart.doc.api.index.request.GetNodeChildrenRequest; import cn.axzo.nanopart.doc.api.index.request.IndexNodePageSearchRequest; import cn.axzo.nanopart.doc.api.index.request.MoveNodeRequest; import cn.axzo.nanopart.doc.api.index.request.RenameNodeRequest; +import cn.axzo.nanopart.doc.api.templatedb.TemplateDatabaseApi; import cn.axzo.nanopart.doc.api.templatedb.reqeust.TemplateDatabaseCreateDatabaseRequest; +import cn.axzo.nanopart.doc.api.templatedb.reqeust.TemplateDatabaseCreateDirRequest; import cn.axzo.nanopart.doc.api.templatedb.reqeust.TemplateDatabaseCreateFileRequest; import cn.axzo.nanopart.doc.api.templatedb.reqeust.TemplateDatabaseGetDatabaseOrDirInfoRequest; import cn.axzo.nanopart.doc.api.templatedb.reqeust.TemplateDatabaseUpdateDatabaseOrDirInfoRequest; import cn.axzo.nanopart.doc.api.templatedb.reqeust.TemplateDatabaseUploadFileRequest; import cn.axzo.nanopart.doc.api.templatedb.response.TemplateDatabaseGetDatabaseOrDirInfoResponse; -import cn.azxo.framework.common.model.Page; -import org.springframework.web.bind.annotation.RestController; - -import cn.axzo.nanopart.doc.api.templatedb.TemplateDatabaseApi; -import cn.axzo.nanopart.doc.api.templatedb.reqeust.TemplateDatabaseCreateDirRequest; import cn.axzo.nanopart.doc.file.index.IndexManager; import cn.azxo.framework.common.model.CommonResponse; +import cn.azxo.framework.common.model.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import java.util.List; - /** * @author yanglin */ @@ -78,7 +77,7 @@ public class TemplateDatabaseApiController implements TemplateDatabaseApi { } @Override - public CommonResponse> getChildren(GetNodeChildrenRequest request) { + public CommonResponse> getTree() { return null; }