From b7f68fc7a66a6487a324ae1919c36503abc632b3 Mon Sep 17 00:00:00 2001 From: yanglin Date: Fri, 21 Mar 2025 14:42:40 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3540:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doc/api/domain/DirectoryAttributes.java | 5 ----- .../doc/api/domain/IndexNodeAttributes.java | 5 +++++ .../reqeust/NodeCreateTemplateDatabase.java | 15 ++++++++++++++- .../reqeust/TemplateDatabaseCreateDirRequest.java | 8 +++----- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/DirectoryAttributes.java b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/DirectoryAttributes.java index a8cbc7a5..6f981d7d 100644 --- a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/DirectoryAttributes.java +++ b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/DirectoryAttributes.java @@ -11,9 +11,4 @@ import lombok.Setter; @Getter public class DirectoryAttributes { - /** - * 是否为资料库文件夹 - */ - private Boolean isTemplateDatabaseDir; - } diff --git a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/IndexNodeAttributes.java b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/IndexNodeAttributes.java index 388994a7..05e22110 100644 --- a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/IndexNodeAttributes.java +++ b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/IndexNodeAttributes.java @@ -20,6 +20,11 @@ public class IndexNodeAttributes { */ private Boolean customIcon; + /** + * 是否资料库创建的节点 + */ + private Boolean templateDatabaseNode; + /** * 数据库属性 */ diff --git a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/NodeCreateTemplateDatabase.java b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/NodeCreateTemplateDatabase.java index 7e9098f7..1e4166df 100644 --- a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/NodeCreateTemplateDatabase.java +++ b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/NodeCreateTemplateDatabase.java @@ -3,11 +3,13 @@ package cn.axzo.nanopart.doc.api.templatedb.reqeust; import javax.validation.constraints.NotBlank; +import org.apache.commons.lang3.StringUtils; + +import cn.axzo.nanopart.doc.api.domain.IndexNodeAttributes; import cn.axzo.nanopart.doc.api.domain.IndexNodeScope; import cn.axzo.nanopart.doc.api.domain.NodeCreate; import lombok.Getter; import lombok.Setter; -import org.apache.commons.lang3.StringUtils; /** * @author yanglin @@ -48,4 +50,15 @@ abstract class NodeCreateTemplateDatabase implements NodeCreate { public Long operatorId() { return operatorId; } + + @Override + public final IndexNodeAttributes attributes() { + IndexNodeAttributes attributes = IndexNodeAttributes.create(); + attributes.setTemplateDatabaseNode(true); + postProcessAttributes(attributes); + return attributes; + } + + protected void postProcessAttributes(IndexNodeAttributes attributes) { + } } diff --git a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/TemplateDatabaseCreateDirRequest.java b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/TemplateDatabaseCreateDirRequest.java index 2ea43169..6c63f16b 100644 --- a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/TemplateDatabaseCreateDirRequest.java +++ b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/TemplateDatabaseCreateDirRequest.java @@ -3,9 +3,10 @@ package cn.axzo.nanopart.doc.api.templatedb.reqeust; import javax.validation.constraints.NotBlank; -import com.alibaba.fastjson.JSON; import org.apache.commons.lang3.StringUtils; +import com.alibaba.fastjson.JSON; + import cn.axzo.nanopart.doc.api.domain.IndexNodeAttributes; import lombok.Getter; import lombok.Setter; @@ -51,11 +52,8 @@ public class TemplateDatabaseCreateDirRequest extends NodeCreateTemplateDatabase } @Override - public IndexNodeAttributes attributes() { - IndexNodeAttributes attributes = IndexNodeAttributes.create(); - attributes.getOrCreateDirectoryAttributes().setIsTemplateDatabaseDir(true); + protected void postProcessAttributes(IndexNodeAttributes attributes) { attributes.setCustomIcon(customIcon); - return attributes; } @Override