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 4695dc9375a28359c0ac1c3c3fd0ac148ecdadd6..97ce8306125149a273a513aab9b3a745c89b4ded 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 @@ -29,6 +29,7 @@ import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.module.cmdb.dao.mapper.resourcecenter.ResourceEntityMapper; import neatlogic.module.cmdb.utils.ResourceEntityFactory; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -73,7 +74,7 @@ public class ListResourceEntityApi extends PrivateApiComponentBase { List resultList = new ArrayList<>(); List viewNameList = ResourceEntityFactory.getViewNameList(); List resourceEntityList = resourceEntityMapper.getResourceEntityListByNameList(viewNameList); - Map resourceEntityVoMap = resourceEntityList.stream().collect(Collectors.toMap(e -> e.getName(), e -> e)); + Map resourceEntityVoMap = resourceEntityList.stream().collect(Collectors.toMap(ResourceEntityVo::getName, e -> e)); List sceneEntityList = ResourceEntityFactory.getSceneEntityList(); for (SceneEntityVo sceneEntityVo : sceneEntityList) { ResourceEntityVo resourceEntityVo = resourceEntityVoMap.get(sceneEntityVo.getName()); @@ -84,6 +85,17 @@ public class ListResourceEntityApi extends PrivateApiComponentBase { resourceEntityVo.setName(sceneEntityVo.getName()); resourceEntityVo.setLabel(sceneEntityVo.getLabel()); resourceEntityVo.setDescription(sceneEntityVo.getDescription()); + try { + resourceEntityMapper.getResourceEntityViewDataList(sceneEntityVo.getName(), 0, 1); + } catch (Exception e) { + resourceEntityVo.setStatus(Status.ERROR.getValue()); + String error = resourceEntityVo.getError(); + if (StringUtils.isNotBlank(error)) { + resourceEntityVo.setError(error + e.getMessage()); + } else { + resourceEntityVo.setError(e.getMessage()); + } + } resultList.add(resourceEntityVo); } return resultList; diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml b/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml index 3fc8afdfb94927a70a22b21334bdb928f069f6b5..c29d5a17f7aad91a9a0561d027fb98f3150f5a64 100644 --- a/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml +++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml @@ -1458,7 +1458,7 @@ along with this program. If not, see .--> SELECT a.`id`, - a.`value` AS NAME, + a.`value` AS name, a.`sort` AS envSeqNo FROM `cmdb_global_attritem` a JOIN `cmdb_global_attr` b ON b.`id` = a.`attr_id` AND b.`name` = 'app_environment' @@ -1561,7 +1561,7 @@ along with this program. If not, see .--> SELECT a.`id`, - a.`value` AS NAME, + a.`value` AS name, a.`sort` AS envSeqNo FROM `cmdb_global_attritem` a JOIN `cmdb_global_attr` b ON b.`id` = a.`attr_id` AND b.`name` = 'app_environment'