From 4138169877013c895b1eaea53d8ff8ee4523eeb4 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 7 Apr 2025 18:58:47 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=8F=91=E5=99=A8=E5=BA=94=E7=94=A8=E5=B7=A1?= =?UTF-8?q?=E6=A3=80=E4=BD=9C=E4=B8=9A=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=8C=96?= =?UTF-8?q?=E9=9C=80=E9=80=82=E9=85=8D=E5=8A=A8=E6=80=81=E8=A7=86=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1394049406173184]应用清单发器应用巡检作业，自动化需适配动态视图 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1394049406173184 --- .../AppModuleResourceTypeListApi.java | 6 ---- .../mapper/resourcecenter/ResourceMapper.java | 8 ++++- .../mapper/resourcecenter/ResourceMapper.xml | 12 ++++++++ .../DefaultResourceCenterDataSourceImpl.java | 29 ++++++++++--------- 4 files changed, 35 insertions(+), 20 deletions(-) diff --git a/src/main/java/neatlogic/module/cmdb/api/resourcecenter/appmodule/AppModuleResourceTypeListApi.java b/src/main/java/neatlogic/module/cmdb/api/resourcecenter/appmodule/AppModuleResourceTypeListApi.java index 169c8ed7..695f3893 100644 --- a/src/main/java/neatlogic/module/cmdb/api/resourcecenter/appmodule/AppModuleResourceTypeListApi.java +++ b/src/main/java/neatlogic/module/cmdb/api/resourcecenter/appmodule/AppModuleResourceTypeListApi.java @@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.cmdb.auth.label.CMDB; import neatlogic.framework.cmdb.dto.ci.CiVo; -import neatlogic.framework.cmdb.dto.resourcecenter.ResourceSearchVo; import neatlogic.framework.cmdb.dto.resourcecenter.ResourceVo; import neatlogic.framework.cmdb.exception.ci.CiNotFoundException; import neatlogic.framework.cmdb.resourcecenter.datasource.core.IResourceCenterDataSource; @@ -83,8 +82,6 @@ public class AppModuleResourceTypeListApi extends PrivateApiComponentBase { for (CiVo ci : allCiVoList) { allCiVoMap.put(ci.getId(), ci); } - ResourceSearchVo searchVo = new ResourceSearchVo(); - searchVo.setAppModuleId(appModuleId); //无配置环境 ResourceVo noSettingEnvResourceVo = new ResourceVo(); noSettingEnvResourceVo.setId(-2L); @@ -92,13 +89,10 @@ public class AppModuleResourceTypeListApi extends PrivateApiComponentBase { envResourceList.add(noSettingEnvResourceVo); for (ResourceVo envResource : envResourceList) { JSONObject returnObj = new JSONObject(); - searchVo.setEnvId(envResource.getId()); Set typeIdSet = new HashSet<>(); IResourceCenterDataSource resourceCenterDataSource = ResourceCenterDataSourceFactory.getResourceCenterDataSource(); Map> viewName2TypeIdListMap = resourceCenterDataSource.getAppResourceTypeIdListByAppSystemIdAndAppModuleIdAndEnvId(null, appModuleId, envResource.getId()); for (Map.Entry> entry : viewName2TypeIdListMap.entrySet()) { - String viewName = entry.getKey(); - searchVo.setViewName(viewName); typeIdSet.addAll(entry.getValue()); } Set returnCiVoSet = new HashSet<>(); diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.java b/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.java index 9885f27a..cf1558dd 100644 --- a/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.java +++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.java @@ -175,7 +175,13 @@ public interface ResourceMapper extends IResourceCrossoverMapper { List getResourceTypeIdListByAuth(ResourceSearchVo searchVo); - List getAppResourceTypeIdListByViewNameAndAppSystemId(@Param("viewName") String viewName, @Param("appSystemId") Long appSystemId, @Param("appModuleId") Long appModuleId, @Param("envId") Long envId); + List getAppResourceTypeIdListByViewNameAndAppSystemId( + @Param("viewName") String viewName, + @Param("appSystemId") Long appSystemId, + @Param("appModuleId") Long appModuleId, + @Param("envId") Long envId, + @Param("inspectStatusList") List inspectStatusList + ); List getAppSystemIdListById(@Param("viewName") String viewName, @Param("id") Long id); } 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 2e10df83..aef65ae5 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 @@ -607,6 +607,9 @@ along with this program. If not, see .--> AND a.`env_id` is null + + AND a.`type_id` = #{typeId} + AND a.`inspect_status` IN @@ -632,6 +635,9 @@ along with this program. If not, see .--> AND a.`env_id` is null + + AND a.`type_id` = #{typeId} + AND a.`inspect_status` IN @@ -1770,6 +1776,12 @@ along with this program. If not, see .--> AND a.`env_id` is null + + AND a.`inspect_status` IN + + #{inspectStatus} + + diff --git a/src/main/java/neatlogic/module/cmdb/resourcecenter/datasource/handler/DefaultResourceCenterDataSourceImpl.java b/src/main/java/neatlogic/module/cmdb/resourcecenter/datasource/handler/DefaultResourceCenterDataSourceImpl.java index 798c4060..e0b73188 100644 --- a/src/main/java/neatlogic/module/cmdb/resourcecenter/datasource/handler/DefaultResourceCenterDataSourceImpl.java +++ b/src/main/java/neatlogic/module/cmdb/resourcecenter/datasource/handler/DefaultResourceCenterDataSourceImpl.java @@ -409,10 +409,15 @@ public class DefaultResourceCenterDataSourceImpl implements IResourceCenterDataS @Override public List getAppResourceList(ResourceSearchVo searchVo, boolean needPage) { List resultList = new ArrayList<>(); - int rowNum = resourceMapper.getAppResourceCount(searchVo); + int rowNum = 0; + if (searchVo.getRowNum() == 0) { + rowNum = resourceMapper.getAppResourceCount(searchVo); + } else { + rowNum = searchVo.getRowNum(); + } if (rowNum > 0) { searchVo.setRowNum(rowNum); - if (needPage) { + if (!needPage) { searchVo.setPageSize(100); } Integer pageCount = searchVo.getPageCount(); @@ -1107,24 +1112,21 @@ public class DefaultResourceCenterDataSourceImpl implements IResourceCenterDataS @Override public Map> getAppResourceTypeIdListByAppSystemId(Long appSystemId) { - Map> viewName2TypeIdListMap = new HashMap<>(); - List appViewList = getAppViewList(); - if (CollectionUtils.isNotEmpty(appViewList)) { - for (ResourceEntityVo resourceEntityVo : appViewList) { - List typeIdList = resourceMapper.getAppResourceTypeIdListByViewNameAndAppSystemId(resourceEntityVo.getName(), appSystemId, null, null); - viewName2TypeIdListMap.put(resourceEntityVo.getName(), typeIdList); - } - } - return viewName2TypeIdListMap; + return getAppResourceTypeIdListByAppSystemIdAndAppModuleIdAndEnvIdAndInspectStatusList(appSystemId, null, null, null); } @Override public Map> getAppResourceTypeIdListByAppSystemIdAndAppModuleIdAndEnvId(Long appSystemId, Long appModuleId, Long envId) { + return getAppResourceTypeIdListByAppSystemIdAndAppModuleIdAndEnvIdAndInspectStatusList(appSystemId, appModuleId, envId, null); + } + + @Override + public Map> getAppResourceTypeIdListByAppSystemIdAndAppModuleIdAndEnvIdAndInspectStatusList(Long appSystemId, Long appModuleId, Long envId, List inspectStatusList) { Map> viewName2TypeIdListMap = new HashMap<>(); List appViewList = getAppViewList(); if (CollectionUtils.isNotEmpty(appViewList)) { for (ResourceEntityVo resourceEntityVo : appViewList) { - List typeIdList = resourceMapper.getAppResourceTypeIdListByViewNameAndAppSystemId(resourceEntityVo.getName(), appSystemId, appModuleId, envId); + List typeIdList = resourceMapper.getAppResourceTypeIdListByViewNameAndAppSystemId(resourceEntityVo.getName(), appSystemId, appModuleId, envId, inspectStatusList); viewName2TypeIdListMap.put(resourceEntityVo.getName(), typeIdList); } } @@ -1144,7 +1146,8 @@ public class DefaultResourceCenterDataSourceImpl implements IResourceCenterDataS return appSystemIdList; } - private List getAppViewList() { + @Override + public List getAppViewList() { List resultList = new ArrayList<>(); List resourceEntityList = resourceEntityMapper.getResourceEntityList(); for (ResourceEntityVo resourceEntityVo : resourceEntityList) { -- Gitee