From b827cc7374ac21795e0a9e74c76308b51b7d27e3 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Sat, 11 Nov 2023 20:31:51 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=8F=8F=E8=BF=B0=E8=A1=A5=E5=85=85=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1020123538751488]视图设置描述补充引用方 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1020123538751488
---
 .../resourcecenter/config/GetResourceEntityApi.java    |  1 +
 .../resourcecenter/config/ListResourceEntityApi.java   | 10 +++++-----
 .../module/cmdb/utils/ResourceEntityFactory.java       |  3 +++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/neatlogic/module/cmdb/api/resourcecenter/config/GetResourceEntityApi.java b/src/main/java/neatlogic/module/cmdb/api/resourcecenter/config/GetResourceEntityApi.java
index faa02d89..4ba92175 100644
--- a/src/main/java/neatlogic/module/cmdb/api/resourcecenter/config/GetResourceEntityApi.java
+++ b/src/main/java/neatlogic/module/cmdb/api/resourcecenter/config/GetResourceEntityApi.java
@@ -89,6 +89,7 @@ public class GetResourceEntityApi extends PrivateApiComponentBase {
                 resourceEntityVo.setCi(ciVo);
             }
         }
+        resourceEntityVo.setDescription(sceneEntityVo.getDescription());
         List<ValueTextVo> fieldList = ResourceEntityFactory.getFieldListByViewName(name);
         resourceEntityVo.setFieldList(fieldList);
         return resourceEntityVo;
diff --git a/src/main/java/neatlogic/module/cmdb/api/resourcecenter/config/ListResourceEntityApi.java b/src/main/java/neatlogic/module/cmdb/api/resourcecenter/config/ListResourceEntityApi.java
index ce51ea76..3ce937b3 100644
--- a/src/main/java/neatlogic/module/cmdb/api/resourcecenter/config/ListResourceEntityApi.java
+++ b/src/main/java/neatlogic/module/cmdb/api/resourcecenter/config/ListResourceEntityApi.java
@@ -16,20 +16,19 @@
 
 package neatlogic.module.cmdb.api.resourcecenter.config;
 
+import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.auth.core.AuthAction;
+import neatlogic.framework.cmdb.auth.label.RESOURCECENTER_MODIFY;
 import neatlogic.framework.cmdb.dto.resourcecenter.config.ResourceEntityVo;
 import neatlogic.framework.cmdb.dto.resourcecenter.config.SceneEntityVo;
 import neatlogic.framework.cmdb.enums.resourcecenter.Status;
-import neatlogic.framework.cmdb.enums.resourcecenter.ViewType;
 import neatlogic.framework.restful.annotation.Description;
 import neatlogic.framework.restful.annotation.OperationType;
 import neatlogic.framework.restful.annotation.Output;
 import neatlogic.framework.restful.annotation.Param;
 import neatlogic.framework.restful.constvalue.OperationTypeEnum;
 import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase;
-import neatlogic.framework.cmdb.auth.label.RESOURCECENTER_MODIFY;
 import neatlogic.module.cmdb.dao.mapper.resourcecenter.ResourceEntityMapper;
-import com.alibaba.fastjson.JSONObject;
 import neatlogic.module.cmdb.utils.ResourceEntityFactory;
 import org.springframework.stereotype.Service;
 
@@ -81,10 +80,11 @@ public class ListResourceEntityApi extends PrivateApiComponentBase {
             ResourceEntityVo resourceEntityVo = resourceEntityVoMap.get(sceneEntityVo.getName());
             if (resourceEntityVo == null) {
                 resourceEntityVo = new ResourceEntityVo();
-                resourceEntityVo.setName(sceneEntityVo.getName());
-                resourceEntityVo.setLabel(sceneEntityVo.getLabel());
                 resourceEntityVo.setStatus(Status.PENDING.getValue());
             }
+            resourceEntityVo.setName(sceneEntityVo.getName());
+            resourceEntityVo.setLabel(sceneEntityVo.getLabel());
+            resourceEntityVo.setDescription(sceneEntityVo.getDescription());
             resultList.add(resourceEntityVo);
         }
         return resultList;
diff --git a/src/main/java/neatlogic/module/cmdb/utils/ResourceEntityFactory.java b/src/main/java/neatlogic/module/cmdb/utils/ResourceEntityFactory.java
index 4958d06c..ebad3cd6 100644
--- a/src/main/java/neatlogic/module/cmdb/utils/ResourceEntityFactory.java
+++ b/src/main/java/neatlogic/module/cmdb/utils/ResourceEntityFactory.java
@@ -126,6 +126,7 @@ public class ResourceEntityFactory {
                     sceneEntityVo = new SceneEntityVo();
                     sceneEntityVo.setName(rt.name());
                     sceneEntityVo.setLabel(rt.label());
+                    sceneEntityVo.setDescription(String.join("；", rt.functionPathList()));
                 }
             }
             if (sceneEntityVo == null) {
@@ -164,6 +165,7 @@ public class ResourceEntityFactory {
                     SceneEntityVo sceneEntityVo = new SceneEntityVo();
                     sceneEntityVo.setName(rt.name());
                     sceneEntityVo.setLabel(rt.label());
+                    sceneEntityVo.setDescription(String.join("；", rt.functionPathList()));
                     for (Field field : c.getDeclaredFields()) {
                         ResourceField rf = field.getAnnotation(ResourceField.class);
                         if (rf != null) {
@@ -199,6 +201,7 @@ public class ResourceEntityFactory {
                 sceneEntityVo = new SceneEntityVo();
                 sceneEntityVo.setName(sceneEntity.getName());
                 sceneEntityVo.setLabel(sceneEntity.getLabel());
+                sceneEntityVo.setDescription(sceneEntity.getDescription());
             }
         }
         return sceneEntityVo;
-- 
Gitee