From 6eb719c7410e74db0f46fc56b075196cb53c6d7b Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Wed, 20 Dec 2023 14:57:19 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-CMDB-?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E3=80=81?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E6=9F=A5=E8=AF=A2=E7=9A=84=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=A0=91?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1047056406249472]后端-CMDB-模型详情页面、配置项查询的详情页面，增加树目录 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1047056406249472
---
 .../cmdb/dto/cicatalog/CiCatalogNodeVo.java   | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/main/java/neatlogic/framework/cmdb/dto/cicatalog/CiCatalogNodeVo.java b/src/main/java/neatlogic/framework/cmdb/dto/cicatalog/CiCatalogNodeVo.java
index fb52c76..2b2c171 100644
--- a/src/main/java/neatlogic/framework/cmdb/dto/cicatalog/CiCatalogNodeVo.java
+++ b/src/main/java/neatlogic/framework/cmdb/dto/cicatalog/CiCatalogNodeVo.java
@@ -1,6 +1,7 @@
 package neatlogic.framework.cmdb.dto.cicatalog;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import neatlogic.framework.cmdb.dto.ci.CiVo;
 import neatlogic.framework.common.constvalue.ApiParamType;
 import neatlogic.framework.restful.annotation.EntityField;
 import org.apache.commons.collections4.CollectionUtils;
@@ -25,9 +26,23 @@ public class CiCatalogNodeVo extends CiCatalogVo {
     @EntityField(name = "common.type", type = ApiParamType.STRING)
     private String type;
 
+    @EntityField(name = "图标", type = ApiParamType.STRING)
+    private String icon;
+
     @JSONField(serialize=false)
     private CiCatalogNodeVo parent;
 
+    public CiCatalogNodeVo() {
+    }
+
+    public CiCatalogNodeVo(CiVo ciVo) {
+        this.setId(ciVo.getId());
+        this.setName(ciVo.getLabel() + "(" + ciVo.getName() + ")");
+        this.setParentId(ciVo.getCatalogId());
+        this.setType(CiCatalogNodeVo.CI);
+        this.setIcon(ciVo.getIcon());
+    }
+
     public List<CiCatalogNodeVo> getChildren() {
         if (children == null && Objects.equals(type, CiCatalogNodeVo.CATALOG)) {
             children = new ArrayList<>();
@@ -58,6 +73,14 @@ public class CiCatalogNodeVo extends CiCatalogVo {
         this.type = type;
     }
 
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
     public CiCatalogNodeVo getParent() {
         return parent;
     }
-- 
Gitee