From dafa0969296fe32ccd9d5e9a60a5f18c2752ae8b Mon Sep 17 00:00:00 2001 From: yanglin Date: Wed, 19 Mar 2025 19:14:58 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3540:=20=E6=B7=BB=E5=8A=A0=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/axzo/nanopart/doc/entity/IndexNode.java | 8 ++------ .../cn/axzo/nanopart/doc/file/index/IndexManager.java | 2 +- .../cn/axzo/nanopart/doc/file/index/IndexSupport.java | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/entity/IndexNode.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/entity/IndexNode.java index ba76699f..38a443db 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/entity/IndexNode.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/entity/IndexNode.java @@ -142,10 +142,6 @@ public class IndexNode extends BaseEntity implements NodeValue, Index return Path.wrap(path); } - public static boolean idEquals(IndexNode n1, IndexNode n2) { - return Objects.equals(n1.getId(), n2.getId()); - } - public static void setScope(IndexNode indexNode, IndexNodeScope scope) { indexNode.setContext(scope.context()); indexNode.setScope(scope.scope()); @@ -153,12 +149,12 @@ public class IndexNode extends BaseEntity implements NodeValue, Index } public boolean isParentOf(IndexNode node) { - if (isSameNode(node)) + if (isSameNodeWith(node)) return false; return node.path.startsWith(path); } - public boolean isSameNode(IndexNode node) { + public boolean isSameNodeWith(IndexNode node) { return id.equals(node.id); } diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexManager.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexManager.java index c1e69f23..a717e0ff 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexManager.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexManager.java @@ -193,7 +193,7 @@ 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.isSameNodeWith(destParentNode), "不能{}到同一节点下", op); BizAssertions.assertFalse(srcNode.isParentOf(destParentNode), "不能{}到子节点下", op); } diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexSupport.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexSupport.java index 10a259d0..b3610c08 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexSupport.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexSupport.java @@ -99,7 +99,7 @@ class IndexSupport { void incrNameIfDuplicate(IndexNode rename) { lockParentAndReleaseOnCommit(rename); List nameLikeNodes = indexNodeDao.findValidChildrenNameRightLike(rename); - if (nameLikeNodes.size() == 1 && IndexNode.idEquals(rename, nameLikeNodes.get(0))) + if (nameLikeNodes.size() == 1 && rename.isSameNodeWith(nameLikeNodes.get(0))) return; Pattern pattern = Pattern.compile(Pattern.quote(rename.getName()) + "\\(副本(\\d+)\\)"); int maxSeq = 0;