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 faa02d8910cb5bb728438b2b96de87d6fb3f3d2e..4ba92175f748ccf1a024b3867d75d3bb9fa9e0b9 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 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 ce51ea76091971e2fee4858024b1fc99a4b19348..3ce937b3ad91a7d585812b46dae53e00bbbca1d2 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 4958d06cc8aa3199ea03b64dd774378b90581cff..ebad3cd602a56bcd246683de27cf72bd9b8f73b8 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;