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-19 18:25:27 +08:00
parent 3d96f2c04c
commit b423209b17
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/doc-server/src/main/java/cn/axzo/nanopart/doc/entity/IndexNode.java
View File

@ -152,6 +152,16 @@ public class IndexNode extends BaseEntity<IndexNode> implements NodeValue, Index
indexNode.setScopeCode(scope.scopeCode());
}
public boolean isParentOf(IndexNode node) {
if (isSameNode(node))
return false;
return node.path.startsWith(path);
}
public boolean isSameNode(IndexNode node) {
return id.equals(node.id);
}
@JsonIgnore
@JSONField(serialize = false, deserialize = false)
public String getFullFileName() {

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

@ -158,6 +158,8 @@ public class IndexManager {
BizAssertions.assertTrue(indexNodeDao.validSubtreeFileCount(srcNode) <= docProps.getIndexNodeMaxCopyFileSize(),
"拷贝文件数超过限制: {}", docProps.getIndexNodeMaxCopyFileSize());
IndexNode destParentNode = findOrNull(destParentCode);
if (destParentNode != null)
checkBeforeMoveOrCopy(srcNode, destParentNode, "拷贝");
return async(() -> {
// don't inline in transaction
CopyFileVisitor copyNodeVisitor = new CopyFileVisitor(copySubtreeOssFiles(srcNode));
@ -179,7 +181,7 @@ public class IndexManager {
IndexNode srcNode = getOrThrow(srcCode);
IndexNode destParentNode = StringUtils.isBlank(destParentCode) ? null : getOrThrow(destParentCode);
if (destParentNode != null)
BizAssertions.assertFalse(srcNode.isDirectory() && destParentNode.isFile(), "不能移动文件夹到文件下");
checkBeforeMoveOrCopy(srcNode, destParentNode, "移动");
return async(() -> {
RootNode<IndexNode> moveRoot = TreeBuilder.build(collectValidSubtreeAsValueRoot(srcNode));
return transaction.execute(unused -> {
@ -189,6 +191,12 @@ public class IndexManager {
});
}
private static void checkBeforeMoveOrCopy(IndexNode srcNode, IndexNode destParentNode, String op) {
BizAssertions.assertFalse(srcNode.isDirectory() && destParentNode.isFile(), "不能{}文件夹到文件下", op);
BizAssertions.assertFalse(srcNode.isSameNode(destParentNode), "不能{}到同一节点下", op);
BizAssertions.assertFalse(srcNode.isParentOf(destParentNode), "不能{}到子节点下", op);
}
@BizTransactional
public IndexNode copySubTree(IndexNode src, @Nullable IndexNode destParent, CopyNodeVisitor copyNodeVisitor) {
RootNode<IndexNode> srcRoot = TreeUtils.transform(collectValidSubtreeAsValueRoot(src), IndexNode.class);