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

REQ-3540: 更新表

Browse Source
This commit is contained in:
yanglin 2025-03-12 11:44:15 +08:00
parent cee6f39515
commit dd88e4d889
6 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/filetemplate/FileTemplateApi.java
View File

@ -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<Void> delete(@RequestBody @Valid DeleteNodeRequest request);
/**
* 文件模版: 获取子节点
* 文件模版: 获取树
*/
@PostMapping("/api/fileTemplate/getChildren")
CommonResponse<List<IndexNodeInfo>> getChildren(@RequestBody @Valid GetNodeChildrenRequest request);
@PostMapping("/api/fileTemplate/getTree")
CommonResponse<List<IndexNodeInfo>> getTree();
/**
* 文件模版: 搜索

5
doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/TemplateDatabaseApi.java
View File

@ -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<List<IndexNodeInfo>> getChildren(@RequestBody @Valid GetNodeChildrenRequest request);
@PostMapping("/api/templateDatabase/getTree")
CommonResponse<List<IndexNodeInfo>> getTree();
/**
* 项企资料库: 搜索

7
doc/doc-server/src/main/java/cn/axzo/nanopart/doc/dao/IndexNodeDao.java
View File

@ -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<IndexNodeMapper, IndexNode> {
.update();
}
public List<IndexNode> 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) //

7
doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/filetemplate/FileTemplateApiController.java
View File

@ -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<List<IndexNodeInfo>> getChildren(GetNodeChildrenRequest request) {
log.info("getChildren request:{}", request);
List<IndexNode> children = indexQueryService.getChildren(IndexNodeScope.FILE_TEMPLATE_SCOPE,
request.getParentCode());
public CommonResponse<List<IndexNodeInfo>> getTree() {
List<IndexNode> children = indexQueryService.getTree(IndexNodeScope.FILE_TEMPLATE_SCOPE);
return CommonResponse.success(IndexNodes.wrap(children).toIndexNodeInfos());
}

6
doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexQueryService.java
View File

@ -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<IndexNode> getChildren(IndexNodeScope nodeScope, String parentCode, IndexNodeState... states) {
return indexNodeDao.collectChildren(nodeScope, parentCode, states);
public List<IndexNode> getTree(IndexNodeScope nodeScope) {
return new ArrayList<>();
}
public Page<IndexNode> search(IndexNodeScope nodeScope, IndexNodePageSearchRequest search) {

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

@ -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<List<IndexNodeInfo>> getChildren(GetNodeChildrenRequest request) {
public CommonResponse<List<IndexNodeInfo>> getTree() {
return null;
}