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

Merge remote-tracking branch 'origin/feature/REQ-3540' into feature/REQ-3540

Browse Source
This commit is contained in:
xudawei 2025-03-21 10:12:10 +08:00
commit 381eda12c7
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,6 @@ package cn.axzo.nanopart.doc.file;
import java.util.List;
import com.alibaba.fastjson.serializer.SimplePropertyPreFilter;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -11,12 +10,13 @@ import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.parser.Feature;
import com.alibaba.fastjson.serializer.SimplePropertyPreFilter;
import cn.axzo.maokai.api.vo.response.tree.Node;
import cn.axzo.maokai.api.vo.response.tree.TreeBuilder;
import cn.axzo.nanopart.doc.entity.IndexNode;
import cn.axzo.nanopart.doc.file.index.IndexQueryService;
import cn.axzo.nanopart.doc.integration.OssClient;
import cn.axzo.nanopart.doc.utils.IndexNodeTreeUtils;
import lombok.RequiredArgsConstructor;
/**
@ -41,7 +41,7 @@ public class DocPrivateController {
SimplePropertyPreFilter filter = new SimplePropertyPreFilter();
filter.getExcludes().add("parent");
filter.getExcludes().add("treeRoot");
Node node = TreeBuilder.build(indexNodes).getChildren().get(0);
Node node = IndexNodeTreeUtils.build(indexNodes).getChildren().get(0);
return JSON.parseObject(JSON.toJSONString(node, filter), Feature.DisableCircularReferenceDetect);
}

9
doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexManager.java
View File

@ -14,7 +14,6 @@ import org.springframework.transaction.support.TransactionTemplate;
import cn.axzo.maokai.api.util.Ref;
import cn.axzo.maokai.api.vo.response.tree.RootNode;
import cn.axzo.maokai.api.vo.response.tree.TreeBuilder;
import cn.axzo.maokai.api.vo.response.tree.TreeUtils;
import cn.axzo.nanopart.doc.api.domain.NodeCreate;
import cn.axzo.nanopart.doc.api.domain.OssFile;
@ -33,6 +32,7 @@ import cn.axzo.nanopart.doc.file.index.domain.NameUsedException;
import cn.axzo.nanopart.doc.file.mq.FileBroadcaster;
import cn.axzo.nanopart.doc.integration.OssClient;
import cn.axzo.nanopart.doc.utils.BizTransactional;
import cn.axzo.nanopart.doc.utils.IndexNodeTreeUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@ -184,7 +184,8 @@ public class IndexManager {
return async(() -> transaction.execute(unused -> {
if (docProps.isLockSubtreeWhenMove())
indexSupport.lockSubtree(srcNode);
RootNode<IndexNode> moveRoot = TreeBuilder.build(indexSupport.collectValidSubtreeAsValueRoot(srcNode));
List<IndexNode> subtreeNodes = indexSupport.collectValidSubtreeAsValueRoot(srcNode);
RootNode<IndexNode> moveRoot = IndexNodeTreeUtils.build(subtreeNodes);
docLogDao.log("indexNode:asyncMove", srcCode, "srcCode", srcCode, "destParentCode", destParentCode);
return connectNodes(moveRoot, destParentNode);
}));
@ -202,8 +203,8 @@ public class IndexManager {
@BizTransactional
public IndexNode copySubTree(IndexNode src, @Nullable IndexNode destParent, CopyNodeVisitor copyNodeVisitor) {
RootNode<IndexNode> srcRoot = TreeUtils.transform(indexSupport.collectValidSubtreeAsValueRoot(src),
IndexNode.class);
List<IndexNode> subtreeNodes = indexSupport.collectValidSubtreeAsValueRoot(src);
RootNode<IndexNode> srcRoot = TreeUtils.transform(subtreeNodes, IndexNode.class, true);
srcRoot.walkDown(copyNodeVisitor);
indexNodeDao.saveBatch(TreeUtils.collectValues(srcRoot));
return connectNodes(srcRoot, destParent);

8
doc/doc-server/src/main/java/cn/axzo/nanopart/doc/utils/IndexNodeTreeUtils.java
View File

@ -10,7 +10,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import cn.axzo.maokai.api.vo.response.tree.RootNode;
import cn.axzo.maokai.api.vo.response.tree.TreeBuilder;
import cn.axzo.maokai.api.vo.response.tree.TreeUtils;
import cn.axzo.maokai.api.vo.response.tree.Value;
import cn.axzo.maokai.api.vo.response.tree.ValueNode;
import cn.axzo.maokai.api.vo.response.tree.ValueNodeRecursiveVisitor;
import cn.axzo.maokai.api.vo.response.tree.WalkingDecision;
@ -29,8 +31,12 @@ public class IndexNodeTreeUtils {
private final DocProps docProps;
public static <T extends Value> RootNode<T> build(List<T> values) {
return TreeBuilder.build(values, true);
}
public RootNode<IndexNodeInfo> transform(List<IndexNode> subtreeNodes) {
RootNode<IndexNodeInfo> root = TreeUtils.transform(subtreeNodes, IndexNodeInfo.class);
RootNode<IndexNodeInfo> root = TreeUtils.transform(subtreeNodes, IndexNodeInfo.class, true);
TreeUtils.connectValueChildren(root);
for (ValueNode<IndexNodeInfo> valueNode : root.getValueNodes()) {
IndexNodeInfo indexNode = valueNode.getValue();