From eafff2aee96f0dabf05631b55b7d361f50387728 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 12 Dec 2024 11:12:54 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E6=89=93=E5=BC=80?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2=E6=97=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=A7=86=E5=9B=BE=E6=98=AF=E5=90=A6=E8=83=BD?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1309986813083648]打开视图设置页面时查询视图是否能正常使用 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1309986813083648 --- .../config/ListResourceEntityApi.java | 14 +++++++++++++- .../dao/mapper/resourcecenter/ResourceMapper.xml | 8 ++++---- 2 files changed, 17 insertions(+), 5 deletions(-) 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 4695dc93..97ce8306 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 3fc8afdf..c29d5a17 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' -- Gitee