diff --git a/src/main/java/neatlogic/module/inspect/api/configfile/ListInspectConfigFileResourceApi.java b/src/main/java/neatlogic/module/inspect/api/configfile/ListInspectConfigFileResourceApi.java index c9be836de40f9e19870eeed8af44f32455ad3700..af4be9cf23daa67301e417001556c0b2fe8f900a 100644 --- a/src/main/java/neatlogic/module/inspect/api/configfile/ListInspectConfigFileResourceApi.java +++ b/src/main/java/neatlogic/module/inspect/api/configfile/ListInspectConfigFileResourceApi.java @@ -99,6 +99,7 @@ public class ListInspectConfigFileResourceApi extends PrivateApiComponentBase { ResourceSearchVo searchVo = resourceCrossoverService.assembleResourceSearchVo(paramObj); if (CollectionUtils.isNotEmpty(searchVo.getIdList())) { List idList = searchVo.getIdList(); + // 该SQL语句可以使用 resourceMapper.getResourceListByIdList 代替 inspectResourceList = inspectConfigFileMapper.getInspectResourceListByIdList(idList); List autoexecJobPhaseNodeList = autoexecJobMapper.getAutoexecJobNodeListByResourceIdList(idList); Map autoexecJobPhaseNodeMap = autoexecJobPhaseNodeList.stream().collect(Collectors.toMap(e -> e.getResourceId(), e -> e)); @@ -112,6 +113,7 @@ public class ListInspectConfigFileResourceApi extends PrivateApiComponentBase { } else { resourceCrossoverService.handleBatchSearchList(searchVo); resourceCrossoverService.setIpFieldAttrIdAndNameFieldAttrId(searchVo); + // 该SQL语句可以使用 inspectMapper.getInspectResourceCount 代替 int count = inspectConfigFileMapper.getInspectResourceCount(searchVo); if (count > 0) { searchVo.setRowNum(count); @@ -121,6 +123,7 @@ public class ListInspectConfigFileResourceApi extends PrivateApiComponentBase { Map> tagMap = resourceCrossoverService.getResourceTagByResourceIdList(idList); List autoexecJobPhaseNodeList = autoexecJobMapper.getAutoexecJobNodeListByResourceIdList(idList); Map autoexecJobPhaseNodeMap = autoexecJobPhaseNodeList.stream().collect(Collectors.toMap(e -> e.getResourceId(), e -> e)); + // 该SQL语句可以使用 resourceMapper.getResourceListByIdList 代替 inspectResourceList = inspectConfigFileMapper.getInspectResourceListByIdList(idList); List inspectConfigFilePathList = inspectConfigFileMapper.getInspectConfigFileLastChangeTimeListByResourceIdList(idList); Map inspectConfigFilePathMap = inspectConfigFilePathList.stream().collect(Collectors.toMap(e -> e.getResourceId(), e -> e)); diff --git a/src/main/java/neatlogic/module/inspect/dao/mapper/InspectConfigFileMapper.java b/src/main/java/neatlogic/module/inspect/dao/mapper/InspectConfigFileMapper.java index 4905ae04ba1db6e65fc29b4406b1ec514e8b4a0e..88df475686b240048494f595d805c8a416250d77 100644 --- a/src/main/java/neatlogic/module/inspect/dao/mapper/InspectConfigFileMapper.java +++ b/src/main/java/neatlogic/module/inspect/dao/mapper/InspectConfigFileMapper.java @@ -24,6 +24,8 @@ import java.util.List; public interface InspectConfigFileMapper { + List getInspectConfigFilePathListBySql(String sql); + int getInspectResourceCount(ResourceSearchVo searchVo); List getInspectResourceIdList(ResourceSearchVo searchVo); diff --git a/src/main/java/neatlogic/module/inspect/dao/mapper/InspectConfigFileMapper.xml b/src/main/java/neatlogic/module/inspect/dao/mapper/InspectConfigFileMapper.xml index 1fe6d20fc43ff0fe9cb1edaa08152c5d4c3fb9bf..81c0592c4422d2fa34a9d3871950751af19627e1 100644 --- a/src/main/java/neatlogic/module/inspect/dao/mapper/InspectConfigFileMapper.xml +++ b/src/main/java/neatlogic/module/inspect/dao/mapper/InspectConfigFileMapper.xml @@ -2,6 +2,10 @@ + + @@ -45,14 +49,14 @@ - + FROM @{DATA_SCHEMA}.`scence_ipobject_detail` a