From 06350fe1ffb4ac5973d8adfcde1b727ca1a95aba Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 25 Sep 2025 08:49:08 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B0=86=E6=B6=89?= =?UTF-8?q?=E5=8F=8Ascence=5Fipobject=5Fdetail=E8=A7=86=E5=9B=BE=E7=9A=84S?= =?UTF-8?q?QL=E8=AF=AD=E5=8F=A5=E6=94=B9=E6=88=90=E5=8A=A8=E6=80=81sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1469827334504448]将涉及scence_ipobject_detail视图的SQL语句改成动态sql http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1469827334504448 --- ...chAddInspectConfigFileResourcePathApi.java | 8 ++-- ...ClearInspectConfigFileResourceFileApi.java | 8 ++-- ...eleteInspectConfigFileResourcePathApi.java | 8 ++-- .../ListInspectConfigFilePathApi.java | 10 +++-- .../ListInspectConfigFileResourceApi.java | 6 ++- ...GetInspectResourceThresholdsSourceApi.java | 6 ++- .../CreateInspectResourceEntityJobApi.java | 6 +-- .../InspectAutoexecJobReportNotifyApi.java | 6 ++- .../ExportInspectResourceReportApi.java | 14 ++++--- .../GetInspectAccessEndPointScriptApi.java | 15 ++++--- .../api/report/InspectCiCombopGetApi.java | 6 +-- .../api/report/InspectReportExportApi.java | 6 +-- .../SaveInspectAccessEndPointScriptApi.java | 8 ++-- .../service/InspectReportServiceImpl.java | 39 ++++++++++--------- 14 files changed, 83 insertions(+), 63 deletions(-) diff --git a/src/main/java/neatlogic/module/inspect/api/configfile/BatchAddInspectConfigFileResourcePathApi.java b/src/main/java/neatlogic/module/inspect/api/configfile/BatchAddInspectConfigFileResourcePathApi.java index bbf37d8..eadd94f 100644 --- a/src/main/java/neatlogic/module/inspect/api/configfile/BatchAddInspectConfigFileResourcePathApi.java +++ b/src/main/java/neatlogic/module/inspect/api/configfile/BatchAddInspectConfigFileResourcePathApi.java @@ -28,12 +28,12 @@ import neatlogic.framework.cmdb.exception.ci.CiNotFoundException; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.inspect.auth.INSPECT_CONFIG_FILE_MODIFY; -import neatlogic.framework.inspect.dao.mapper.InspectMapper; import neatlogic.framework.inspect.dto.InspectConfigFilePathVo; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.module.inspect.dao.mapper.InspectConfigFileMapper; +import neatlogic.module.inspect.service.InspectService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; @@ -52,7 +52,7 @@ public class BatchAddInspectConfigFileResourcePathApi extends PrivateApiComponen @Resource private InspectConfigFileMapper inspectConfigFileMapper; @Resource - private InspectMapper inspectMapper; + private InspectService inspectService; @Override public String getToken() { @@ -113,14 +113,14 @@ public class BatchAddInspectConfigFileResourcePathApi extends PrivateApiComponen IResourceCenterResourceCrossoverService resourceCenterResourceCrossoverService = CrossoverServiceFactory.getApi(IResourceCenterResourceCrossoverService.class); List typeIdList = resourceCenterResourceCrossoverService.getDownwardCiIdListByCiIdList(Arrays.asList(searchVo.getTypeId())); searchVo.setTypeIdList(typeIdList); - int count = inspectMapper.getInspectResourceCount(searchVo); + int count = inspectService.getInspectResourceCount(searchVo); if (count > 0) { searchVo.setPageSize(100); searchVo.setRowNum(count); int pageCount = searchVo.getPageCount(); for (int currentPage = 1; currentPage <= pageCount; currentPage++) { searchVo.setCurrentPage(currentPage); - List resourceIdList = inspectMapper.getInspectResourceIdList(searchVo); + List resourceIdList = inspectService.getInspectResourceIdList(searchVo); addPath(resourceIdList, pathArray); } } diff --git a/src/main/java/neatlogic/module/inspect/api/configfile/BatchClearInspectConfigFileResourceFileApi.java b/src/main/java/neatlogic/module/inspect/api/configfile/BatchClearInspectConfigFileResourceFileApi.java index 5689c15..3406bf9 100644 --- a/src/main/java/neatlogic/module/inspect/api/configfile/BatchClearInspectConfigFileResourceFileApi.java +++ b/src/main/java/neatlogic/module/inspect/api/configfile/BatchClearInspectConfigFileResourceFileApi.java @@ -28,13 +28,13 @@ import neatlogic.framework.cmdb.exception.ci.CiNotFoundException; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.inspect.auth.INSPECT_CONFIG_FILE_MODIFY; -import neatlogic.framework.inspect.dao.mapper.InspectMapper; import neatlogic.framework.inspect.dto.InspectConfigFilePathVo; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.module.inspect.dao.mapper.InspectConfigFileMapper; import neatlogic.module.inspect.service.InspectConfigFileService; +import neatlogic.module.inspect.service.InspectService; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -53,7 +53,7 @@ public class BatchClearInspectConfigFileResourceFileApi extends PrivateApiCompon @Resource private InspectConfigFileMapper inspectConfigFileMapper; @Resource - private InspectMapper inspectMapper; + private InspectService inspectService; @Resource private InspectConfigFileService inspectConfigFileService; @@ -112,14 +112,14 @@ public class BatchClearInspectConfigFileResourceFileApi extends PrivateApiCompon IResourceCenterResourceCrossoverService resourceCenterResourceCrossoverService = CrossoverServiceFactory.getApi(IResourceCenterResourceCrossoverService.class); List typeIdList = resourceCenterResourceCrossoverService.getDownwardCiIdListByCiIdList(Arrays.asList(searchVo.getTypeId())); searchVo.setTypeIdList(typeIdList); - int count = inspectMapper.getInspectResourceCount(searchVo); + int count = inspectService.getInspectResourceCount(searchVo); if (count > 0) { searchVo.setPageSize(100); searchVo.setRowNum(count); int pageCount = searchVo.getPageCount(); for (int currentPage = 1; currentPage <= pageCount; currentPage++) { searchVo.setCurrentPage(currentPage); - List resourceIdList = inspectMapper.getInspectResourceIdList(searchVo); + List resourceIdList = inspectService.getInspectResourceIdList(searchVo); List inspectResourceConfigFilePathList = inspectConfigFileMapper.getInspectConfigFilePathListByResourceIdList(resourceIdList); inspectConfigFileService.clearFile(resourceIdList, inspectResourceConfigFilePathList); } diff --git a/src/main/java/neatlogic/module/inspect/api/configfile/BatchDeleteInspectConfigFileResourcePathApi.java b/src/main/java/neatlogic/module/inspect/api/configfile/BatchDeleteInspectConfigFileResourcePathApi.java index 6668155..98a9c2b 100644 --- a/src/main/java/neatlogic/module/inspect/api/configfile/BatchDeleteInspectConfigFileResourcePathApi.java +++ b/src/main/java/neatlogic/module/inspect/api/configfile/BatchDeleteInspectConfigFileResourcePathApi.java @@ -28,12 +28,12 @@ import neatlogic.framework.cmdb.exception.ci.CiNotFoundException; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.inspect.auth.INSPECT_CONFIG_FILE_MODIFY; -import neatlogic.framework.inspect.dao.mapper.InspectMapper; import neatlogic.framework.inspect.dto.InspectConfigFilePathVo; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.module.inspect.dao.mapper.InspectConfigFileMapper; +import neatlogic.module.inspect.service.InspectService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; @@ -52,7 +52,7 @@ public class BatchDeleteInspectConfigFileResourcePathApi extends PrivateApiCompo @Resource private InspectConfigFileMapper inspectConfigFileMapper; @Resource - private InspectMapper inspectMapper; + private InspectService inspectService; @Override public String getToken() { @@ -115,14 +115,14 @@ public class BatchDeleteInspectConfigFileResourcePathApi extends PrivateApiCompo IResourceCenterResourceCrossoverService resourceCenterResourceCrossoverService = CrossoverServiceFactory.getApi(IResourceCenterResourceCrossoverService.class); List typeIdList = resourceCenterResourceCrossoverService.getDownwardCiIdListByCiIdList(Arrays.asList(searchVo.getTypeId())); searchVo.setTypeIdList(typeIdList); - int count = inspectMapper.getInspectResourceCount(searchVo); + int count = inspectService.getInspectResourceCount(searchVo); if (count > 0) { searchVo.setPageSize(100); searchVo.setRowNum(count); int pageCount = searchVo.getPageCount(); for (int currentPage = 1; currentPage <= pageCount; currentPage++) { searchVo.setCurrentPage(currentPage); - List resourceIdList = inspectMapper.getInspectResourceIdList(searchVo); + List resourceIdList = inspectService.getInspectResourceIdList(searchVo); deletePath(resourceIdList, pathArray); } } diff --git a/src/main/java/neatlogic/module/inspect/api/configfile/ListInspectConfigFilePathApi.java b/src/main/java/neatlogic/module/inspect/api/configfile/ListInspectConfigFilePathApi.java index 22a636f..4ee13ab 100644 --- a/src/main/java/neatlogic/module/inspect/api/configfile/ListInspectConfigFilePathApi.java +++ b/src/main/java/neatlogic/module/inspect/api/configfile/ListInspectConfigFilePathApi.java @@ -26,6 +26,7 @@ import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.framework.util.TableResultUtil; import neatlogic.module.inspect.dao.mapper.InspectConfigFileMapper; +import neatlogic.module.inspect.service.InspectService; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; @@ -43,6 +44,9 @@ public class ListInspectConfigFilePathApi extends PrivateApiComponentBase { @Resource private InspectConfigFileMapper inspectConfigFileMapper; + @Resource + private InspectService inspectService; + @Override public String getToken() { return "inspect/configfile/path/list"; @@ -72,13 +76,13 @@ public class ListInspectConfigFilePathApi extends PrivateApiComponentBase { @Override public Object myDoService(JSONObject paramObj) throws Exception { InspectConfigFilePathSearchVo searchVo = JSONObject.toJavaObject(paramObj, InspectConfigFilePathSearchVo.class); - int rowNum = inspectConfigFileMapper.getInspectConfigFilePathCount(searchVo); + int rowNum = inspectService.getInspectConfigFilePathCount(searchVo); if (rowNum > 0) { searchVo.setRowNum(rowNum); - List idList = inspectConfigFileMapper.getInspectConfigFilePathIdList(searchVo); + List idList = inspectService.getInspectConfigFilePathIdList(searchVo); if (CollectionUtils.isNotEmpty(idList)) { List tbodyList = new ArrayList<>(); - List inspectResourceConfigFilePathList = inspectConfigFileMapper.getInspectConfigFilePathList(idList); + List inspectResourceConfigFilePathList = inspectService.getInspectConfigFilePathList(idList); Map map = inspectResourceConfigFilePathList.stream().collect(Collectors.toMap(InspectConfigFilePathVo::getId, e -> e)); List inspectResourceConfigFileVersionCountList = inspectConfigFileMapper.getInspectConfigFileVersionCountByPathIdList(idList); Map versionCountMap = inspectResourceConfigFileVersionCountList.stream().collect(Collectors.toMap(InspectConfigFilePathVo::getId, InspectConfigFilePathVo::getVersionCount)); 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 af4be9c..f979833 100644 --- a/src/main/java/neatlogic/module/inspect/api/configfile/ListInspectConfigFileResourceApi.java +++ b/src/main/java/neatlogic/module/inspect/api/configfile/ListInspectConfigFileResourceApi.java @@ -33,6 +33,7 @@ import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.framework.util.TableResultUtil; import neatlogic.module.inspect.dao.mapper.InspectConfigFileMapper; +import neatlogic.module.inspect.service.InspectService; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; @@ -52,6 +53,9 @@ public class ListInspectConfigFileResourceApi extends PrivateApiComponentBase { private InspectConfigFileMapper inspectConfigFileMapper; @Resource private AutoexecJobMapper autoexecJobMapper; + + @Resource + private InspectService inspectService; @Override public String getToken() { return "inspect/configfile/resource/list"; @@ -118,7 +122,7 @@ public class ListInspectConfigFileResourceApi extends PrivateApiComponentBase { if (count > 0) { searchVo.setRowNum(count); resourceCrossoverService.setIsIpFieldSortAndIsNameFieldSort(searchVo); - List idList = inspectConfigFileMapper.getInspectResourceIdList(searchVo); + List idList = inspectService.getInspectResourceIdList(searchVo); if (CollectionUtils.isNotEmpty(idList)) { Map> tagMap = resourceCrossoverService.getResourceTagByResourceIdList(idList); List autoexecJobPhaseNodeList = autoexecJobMapper.getAutoexecJobNodeListByResourceIdList(idList); diff --git a/src/main/java/neatlogic/module/inspect/api/definition/GetInspectResourceThresholdsSourceApi.java b/src/main/java/neatlogic/module/inspect/api/definition/GetInspectResourceThresholdsSourceApi.java index 9c358cd..ec63a2b 100644 --- a/src/main/java/neatlogic/module/inspect/api/definition/GetInspectResourceThresholdsSourceApi.java +++ b/src/main/java/neatlogic/module/inspect/api/definition/GetInspectResourceThresholdsSourceApi.java @@ -16,6 +16,7 @@ package neatlogic.module.inspect.api.definition; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; +import neatlogic.framework.cmdb.crossover.IResourceCenterResourceCrossoverService; import neatlogic.framework.cmdb.crossover.IResourceCrossoverMapper; import neatlogic.framework.cmdb.crossover.ISyncCrossoverMapper; import neatlogic.framework.cmdb.dto.resourcecenter.ResourceVo; @@ -74,8 +75,8 @@ public class GetInspectResourceThresholdsSourceApi extends PrivateApiComponentBa public Object myDoService(JSONObject paramObj) throws Exception { JSONObject returnObj = new JSONObject(); Long resourceId = paramObj.getLong("resourceId"); - IResourceCrossoverMapper iResourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); - ResourceVo resourceVo = iResourceCrossoverMapper.getResourceById(resourceId); + IResourceCenterResourceCrossoverService resourceCenterResourceCrossoverService = CrossoverServiceFactory.getApi(IResourceCenterResourceCrossoverService.class); + ResourceVo resourceVo = resourceCenterResourceCrossoverService.getResourceById(resourceId); if (resourceVo == null) { throw new ResourceNotFoundException(resourceId); } @@ -85,6 +86,7 @@ public class GetInspectResourceThresholdsSourceApi extends PrivateApiComponentBa returnObj.put("collectionName", collectionName); List returnAppSystemIdList = inspectCollectService.getCollectionThresholdsAppSystemIdListByResourceId(resourceId); if (CollectionUtils.isNotEmpty(returnAppSystemIdList)) { + IResourceCrossoverMapper iResourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); returnObj.put("appSystemVoList", iResourceCrossoverMapper.searchAppSystemListByIdList(returnAppSystemIdList)); } return returnObj; diff --git a/src/main/java/neatlogic/module/inspect/api/job/CreateInspectResourceEntityJobApi.java b/src/main/java/neatlogic/module/inspect/api/job/CreateInspectResourceEntityJobApi.java index 9b4032e..a40ad95 100644 --- a/src/main/java/neatlogic/module/inspect/api/job/CreateInspectResourceEntityJobApi.java +++ b/src/main/java/neatlogic/module/inspect/api/job/CreateInspectResourceEntityJobApi.java @@ -31,7 +31,7 @@ import neatlogic.framework.autoexec.exception.AutoexecCombopNotFoundException; import neatlogic.framework.autoexec.job.action.core.AutoexecJobActionHandlerFactory; import neatlogic.framework.autoexec.job.action.core.IAutoexecJobActionHandler; import neatlogic.framework.cmdb.crossover.ICiCrossoverMapper; -import neatlogic.framework.cmdb.crossover.IResourceCrossoverMapper; +import neatlogic.framework.cmdb.crossover.IResourceCenterResourceCrossoverService; import neatlogic.framework.cmdb.dto.ci.CiVo; import neatlogic.framework.cmdb.dto.resourcecenter.ResourceVo; import neatlogic.framework.cmdb.exception.ci.CiNotFoundException; @@ -80,8 +80,8 @@ public class CreateInspectResourceEntityJobApi extends PrivateApiComponentBase { @Override public Object myDoService(JSONObject paramObj) throws Exception { Long resourceId = paramObj.getLong("resourceId"); - IResourceCrossoverMapper resourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); - ResourceVo resourceVo = resourceCrossoverMapper.getResourceById(resourceId); + IResourceCenterResourceCrossoverService resourceCenterResourceCrossoverService = CrossoverServiceFactory.getApi(IResourceCenterResourceCrossoverService.class); + ResourceVo resourceVo = resourceCenterResourceCrossoverService.getResourceById(resourceId); if (resourceVo == null) { throw new ResourceNotFoundException(resourceId); } diff --git a/src/main/java/neatlogic/module/inspect/api/job/InspectAutoexecJobReportNotifyApi.java b/src/main/java/neatlogic/module/inspect/api/job/InspectAutoexecJobReportNotifyApi.java index da290e1..cdb19c6 100644 --- a/src/main/java/neatlogic/module/inspect/api/job/InspectAutoexecJobReportNotifyApi.java +++ b/src/main/java/neatlogic/module/inspect/api/job/InspectAutoexecJobReportNotifyApi.java @@ -55,6 +55,7 @@ import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.framework.util.TimeUtil; import neatlogic.module.inspect.dao.mapper.InspectConfigFileMapper; import neatlogic.module.inspect.service.InspectReportService; +import neatlogic.module.inspect.service.InspectService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; @@ -80,6 +81,9 @@ public class InspectAutoexecJobReportNotifyApi extends PrivateApiComponentBase { @Resource private InspectConfigFileMapper inspectConfigFileMapper; + @Resource + private InspectService inspectService; + @Resource AutoexecJobMapper autoexecJobMapper; @@ -201,7 +205,7 @@ public class InspectAutoexecJobReportNotifyApi extends PrivateApiComponentBase { * @return 表格数据 */ private JSONObject getFileChangeAuditTable(Long jobId) { - List inspectResourceConfigFilePathList = inspectConfigFileMapper.getInspectConfigFilePathListByJobId(jobId); + List inspectResourceConfigFilePathList = inspectService.getInspectConfigFilePathListByJobId(jobId); if (CollectionUtils.isEmpty(inspectResourceConfigFilePathList)) { return null; } diff --git a/src/main/java/neatlogic/module/inspect/api/report/ExportInspectResourceReportApi.java b/src/main/java/neatlogic/module/inspect/api/report/ExportInspectResourceReportApi.java index d292c8d..837cfd3 100644 --- a/src/main/java/neatlogic/module/inspect/api/report/ExportInspectResourceReportApi.java +++ b/src/main/java/neatlogic/module/inspect/api/report/ExportInspectResourceReportApi.java @@ -40,6 +40,7 @@ import neatlogic.framework.util.FileUtil; import neatlogic.framework.util.TimeUtil; import neatlogic.framework.util.excel.ExcelBuilder; import neatlogic.framework.util.excel.SheetBuilder; +import neatlogic.module.inspect.service.InspectService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.util.HSSFColor; @@ -69,6 +70,9 @@ public class ExportInspectResourceReportApi extends PrivateBinaryStreamApiCompon @Resource private InspectMapper inspectMapper; + @Resource + private InspectService inspectService; + @Override public String getToken() { return "inspect/resource/report/export"; @@ -127,7 +131,7 @@ public class ExportInspectResourceReportApi extends PrivateBinaryStreamApiCompon JSONArray defaultValue = paramObj.getJSONArray("defaultValue"); if (CollectionUtils.isNotEmpty(defaultValue)) { List idList = defaultValue.toJavaList(Long.class); - inspectResourceVoList = inspectMapper.getInspectResourceListByIdList(idList); + inspectResourceVoList = inspectService.getInspectResourceListByIdList(idList); for (ResourceVo resourceVo : inspectResourceVoList) { Map dataMap = resourceConvertDataMap(resourceVo); sheetBuilder.addData(dataMap); @@ -142,11 +146,11 @@ public class ExportInspectResourceReportApi extends PrivateBinaryStreamApiCompon searchVo.setPageSize(100); searchVo.setRowNum(rowNum); if (StringUtils.isNotBlank(searchVo.getKeyword())) { - int ipKeywordCount = inspectMapper.getInspectResourceCountByIpKeyword(searchVo); + int ipKeywordCount = inspectService.getInspectResourceCountByIpKeyword(searchVo); if (ipKeywordCount > 0) { searchVo.setIsIpFieldSort(1); } else { - int nameKeywordCount = inspectMapper.getInspectResourceCountByNameKeyword(searchVo); + int nameKeywordCount = inspectService.getInspectResourceCountByNameKeyword(searchVo); if (nameKeywordCount > 0) { searchVo.setIsNameFieldSort(1); } @@ -154,9 +158,9 @@ public class ExportInspectResourceReportApi extends PrivateBinaryStreamApiCompon } for (int i = 1; i <= searchVo.getPageCount(); i++) { searchVo.setCurrentPage(i); - List idList = inspectMapper.getInspectResourceIdList(searchVo); + List idList = inspectService.getInspectResourceIdList(searchVo); if (CollectionUtils.isNotEmpty(idList)) { - inspectResourceVoList = inspectMapper.getInspectResourceListByIdList(idList); + inspectResourceVoList = inspectService.getInspectResourceListByIdList(idList); for (ResourceVo resourceVo : inspectResourceVoList) { Map dataMap = resourceConvertDataMap(resourceVo); sheetBuilder.addData(dataMap); diff --git a/src/main/java/neatlogic/module/inspect/api/report/GetInspectAccessEndPointScriptApi.java b/src/main/java/neatlogic/module/inspect/api/report/GetInspectAccessEndPointScriptApi.java index 06dd0ad..7282539 100644 --- a/src/main/java/neatlogic/module/inspect/api/report/GetInspectAccessEndPointScriptApi.java +++ b/src/main/java/neatlogic/module/inspect/api/report/GetInspectAccessEndPointScriptApi.java @@ -1,18 +1,17 @@ package neatlogic.module.inspect.api.report; -import neatlogic.framework.asynchronization.threadlocal.TenantContext; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; -import neatlogic.framework.cmdb.crossover.IResourceCrossoverMapper; -import neatlogic.framework.crossover.CrossoverServiceFactory; -import neatlogic.framework.inspect.dao.mapper.InspectMapper; -import neatlogic.framework.inspect.dto.InspectResourceScriptVo; +import neatlogic.framework.cmdb.crossover.IResourceCenterResourceCrossoverService; import neatlogic.framework.cmdb.exception.resourcecenter.ResourceNotFoundException; import neatlogic.framework.common.constvalue.ApiParamType; +import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.inspect.auth.INSPECT_MODIFY; +import neatlogic.framework.inspect.dao.mapper.InspectMapper; +import neatlogic.framework.inspect.dto.InspectResourceScriptVo; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; -import com.alibaba.fastjson.JSONObject; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -50,8 +49,8 @@ public class GetInspectAccessEndPointScriptApi extends PrivateApiComponentBase { @Override public Object myDoService(JSONObject paramObj) throws Exception { Long resourceId = paramObj.getLong("resourceId"); - IResourceCrossoverMapper resourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); - if (resourceCrossoverMapper.getResourceIdByResourceId(resourceId) == null) { + IResourceCenterResourceCrossoverService resourceCenterResourceCrossoverService = CrossoverServiceFactory.getApi(IResourceCenterResourceCrossoverService.class); + if (resourceCenterResourceCrossoverService.getResourceIdByResourceId(resourceId) == null) { throw new ResourceNotFoundException(resourceId); } return inspectMapper.getResourceScriptByResourceId(resourceId); diff --git a/src/main/java/neatlogic/module/inspect/api/report/InspectCiCombopGetApi.java b/src/main/java/neatlogic/module/inspect/api/report/InspectCiCombopGetApi.java index 7e4eaa7..6b17e64 100644 --- a/src/main/java/neatlogic/module/inspect/api/report/InspectCiCombopGetApi.java +++ b/src/main/java/neatlogic/module/inspect/api/report/InspectCiCombopGetApi.java @@ -20,7 +20,7 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.autoexec.dao.mapper.AutoexecCombopMapper; import neatlogic.framework.autoexec.dto.combop.AutoexecCombopVo; import neatlogic.framework.cmdb.crossover.ICiCrossoverMapper; -import neatlogic.framework.cmdb.crossover.IResourceCrossoverMapper; +import neatlogic.framework.cmdb.crossover.IResourceCenterResourceCrossoverService; import neatlogic.framework.cmdb.dto.ci.CiVo; import neatlogic.framework.cmdb.dto.resourcecenter.ResourceVo; import neatlogic.framework.cmdb.exception.ci.CiNotFoundException; @@ -75,8 +75,8 @@ public class InspectCiCombopGetApi extends PrivateApiComponentBase { Long ciId = paramObj.getLong("ciId"); Long resourceId = paramObj.getLong("resourceId"); if(resourceId != null){ - IResourceCrossoverMapper resourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); - List resourceVoList = resourceCrossoverMapper.getResourceByIdList(Collections.singletonList(resourceId)); + IResourceCenterResourceCrossoverService resourceCenterResourceCrossoverService = CrossoverServiceFactory.getApi(IResourceCenterResourceCrossoverService.class); + List resourceVoList = resourceCenterResourceCrossoverService.getResourceByIdList(Collections.singletonList(resourceId)); if(CollectionUtils.isEmpty(resourceVoList)){ throw new ResourceNotFoundException(resourceId); } diff --git a/src/main/java/neatlogic/module/inspect/api/report/InspectReportExportApi.java b/src/main/java/neatlogic/module/inspect/api/report/InspectReportExportApi.java index 8b36045..5f7aec5 100644 --- a/src/main/java/neatlogic/module/inspect/api/report/InspectReportExportApi.java +++ b/src/main/java/neatlogic/module/inspect/api/report/InspectReportExportApi.java @@ -19,7 +19,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; -import neatlogic.framework.cmdb.crossover.IResourceCrossoverMapper; +import neatlogic.framework.cmdb.crossover.IResourceCenterResourceCrossoverService; import neatlogic.framework.cmdb.dto.resourcecenter.ResourceVo; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.crossover.CrossoverServiceFactory; @@ -109,8 +109,8 @@ public class InspectReportExportApi extends PrivateBinaryStreamApiComponentBase String id = paramObj.getString("id"); Long jobId = paramObj.getLong("jobId"); String type = paramObj.getString("type"); - IResourceCrossoverMapper resourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); - ResourceVo resource = resourceCrossoverMapper.getResourceById(resourceId); + IResourceCenterResourceCrossoverService resourceCenterResourceCrossoverService = CrossoverServiceFactory.getApi(IResourceCenterResourceCrossoverService.class); + ResourceVo resource = resourceCenterResourceCrossoverService.getResourceById(resourceId); String fileName = resourceId.toString(); if (resource != null && resource.getName() != null) { fileName = resource.getName(); diff --git a/src/main/java/neatlogic/module/inspect/api/report/SaveInspectAccessEndPointScriptApi.java b/src/main/java/neatlogic/module/inspect/api/report/SaveInspectAccessEndPointScriptApi.java index 88ecbb9..a9c2e7f 100644 --- a/src/main/java/neatlogic/module/inspect/api/report/SaveInspectAccessEndPointScriptApi.java +++ b/src/main/java/neatlogic/module/inspect/api/report/SaveInspectAccessEndPointScriptApi.java @@ -1,10 +1,11 @@ package neatlogic.module.inspect.api.report; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.autoexec.dao.mapper.AutoexecScriptMapper; import neatlogic.framework.autoexec.dto.script.AutoexecScriptVo; import neatlogic.framework.autoexec.exception.AutoexecScriptNotFoundException; -import neatlogic.framework.cmdb.crossover.IResourceCrossoverMapper; +import neatlogic.framework.cmdb.crossover.IResourceCenterResourceCrossoverService; import neatlogic.framework.cmdb.exception.resourcecenter.ResourceNotFoundException; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.crossover.CrossoverServiceFactory; @@ -17,7 +18,6 @@ import neatlogic.framework.restful.annotation.OperationType; import neatlogic.framework.restful.annotation.Param; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; -import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -65,8 +65,8 @@ public class SaveInspectAccessEndPointScriptApi extends PrivateApiComponentBase Long scriptId = null; Long resourceId = paramObj.getLong("resourceId"); JSONObject paramConfig = paramObj.getJSONObject("config"); - IResourceCrossoverMapper resourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); - if (resourceCrossoverMapper.getResourceIdByResourceId(resourceId) == null) { + IResourceCenterResourceCrossoverService resourceCenterResourceCrossoverService = CrossoverServiceFactory.getApi(IResourceCenterResourceCrossoverService.class); + if (resourceCenterResourceCrossoverService.getResourceIdByResourceId(resourceId) == null) { throw new ResourceNotFoundException(resourceId); } inspectMapper.deleteResourceScriptByResourceId(resourceId); diff --git a/src/main/java/neatlogic/module/inspect/service/InspectReportServiceImpl.java b/src/main/java/neatlogic/module/inspect/service/InspectReportServiceImpl.java index aa51f05..2ebd7d6 100644 --- a/src/main/java/neatlogic/module/inspect/service/InspectReportServiceImpl.java +++ b/src/main/java/neatlogic/module/inspect/service/InspectReportServiceImpl.java @@ -70,6 +70,9 @@ public class InspectReportServiceImpl implements InspectReportService { @Resource InspectMapper inspectMapper; + @Resource + private InspectService inspectService; + @Override public Document getInspectReport(Long resourceId, String id, Long jobId) { MongoCollection collection; @@ -116,22 +119,22 @@ public class InspectReportServiceImpl implements InspectReportService { @Override public List getInspectAutoexecJobNodeList(Long jobId, ResourceSearchVo searchVo) { List inspectResourceVoList = null; - int resourceCount = inspectMapper.getInspectAutoexecJobNodeResourceCount(searchVo, jobId); + int resourceCount = inspectService.getInspectAutoexecJobNodeResourceCount(searchVo, jobId); if (resourceCount > 0) { searchVo.setRowNum(resourceCount); if (StringUtils.isNotBlank(searchVo.getKeyword())) { - int ipKeywordCount = inspectMapper.getInspectAutoexecJobNodeResourceCountByIpKeyword(searchVo, jobId); + int ipKeywordCount = inspectService.getInspectAutoexecJobNodeResourceCountByIpKeyword(searchVo, jobId); if (ipKeywordCount > 0) { searchVo.setIsIpFieldSort(1); } else { - int nameKeywordCount = inspectMapper.getInspectAutoexecJobNodeResourceCountByNameKeyword(searchVo, jobId); + int nameKeywordCount = inspectService.getInspectAutoexecJobNodeResourceCountByNameKeyword(searchVo, jobId); if (nameKeywordCount > 0) { searchVo.setIsNameFieldSort(1); } } } - List resourceIdList = inspectMapper.getInspectAutoexecJobNodeResourceIdList(searchVo, jobId); - inspectResourceVoList = inspectMapper.getInspectResourceListByIdListAndJobId(resourceIdList, jobId); + List resourceIdList = inspectService.getInspectAutoexecJobNodeResourceIdList(searchVo, jobId); + inspectResourceVoList = inspectService.getInspectResourceListByIdListAndJobId(resourceIdList, jobId); //排序 List resultList = new ArrayList<>(); for (Long id : resourceIdList) { @@ -154,22 +157,22 @@ public class InspectReportServiceImpl implements InspectReportService { public List getInspectResourceReportList(ResourceSearchVo searchVo) { if (CollectionUtils.isEmpty(searchVo.getIdList())) { List inspectResourceVoList = null; - int resourceCount = inspectMapper.getInspectResourceCount(searchVo); + int resourceCount = inspectService.getInspectResourceCount(searchVo); if (resourceCount > 0) { searchVo.setRowNum(resourceCount); if (StringUtils.isNotBlank(searchVo.getKeyword())) { - int ipKeywordCount = inspectMapper.getInspectResourceCountByIpKeyword(searchVo); + int ipKeywordCount = inspectService.getInspectResourceCountByIpKeyword(searchVo); if (ipKeywordCount > 0) { searchVo.setIsIpFieldSort(1); } else { - int nameKeywordCount = inspectMapper.getInspectResourceCountByNameKeyword(searchVo); + int nameKeywordCount = inspectService.getInspectResourceCountByNameKeyword(searchVo); if (nameKeywordCount > 0) { searchVo.setIsNameFieldSort(1); } } } - List resourceIdList = inspectMapper.getInspectResourceIdList(searchVo); - inspectResourceVoList = inspectMapper.getInspectResourceListByIdList(resourceIdList); + List resourceIdList = inspectService.getInspectResourceIdList(searchVo); + inspectResourceVoList = inspectService.getInspectResourceListByIdList(resourceIdList); Map inspectResourceMap = inspectResourceVoList.stream().collect(Collectors.toMap(InspectResourceVo::getId, e -> e)); List resourceScriptVoList = inspectMapper.getResourceScriptListByResourceIdList(resourceIdList); if (CollectionUtils.isNotEmpty(resourceScriptVoList)) { @@ -192,7 +195,7 @@ public class InspectReportServiceImpl implements InspectReportService { } return inspectResourceVoList; } else { - return inspectMapper.getInspectResourceListByIdList(searchVo.getIdList()); + return inspectService.getInspectResourceListByIdList(searchVo.getIdList()); } } @@ -413,7 +416,7 @@ public class InspectReportServiceImpl implements InspectReportService { IResourceCenterResourceCrossoverService resourceCenterResourceCrossoverService = CrossoverServiceFactory.getApi(IResourceCenterResourceCrossoverService.class); List typeIdList = resourceCenterResourceCrossoverService.getDownwardCiIdListByCiIdList(Arrays.asList(searchVo.getTypeId())); searchVo.setTypeIdList(typeIdList); - int resourceCount = inspectMapper.getInspectResourceCount(searchVo); + int resourceCount = inspectService.getInspectResourceCount(searchVo); searchVo.setRowNum(resourceCount); if (resourceCount > 0) { List headerList = new ArrayList<>(); @@ -433,8 +436,8 @@ public class InspectReportServiceImpl implements InspectReportService { Map fieldPathTextMap = new HashMap<>(); for (int i = 1; i <= searchVo.getPageCount(); i++) { searchVo.setCurrentPage(i); - List resourceIdList = inspectMapper.getInspectResourceIdList(searchVo); - List inspectResourceVos = inspectMapper.getInspectResourceListByIdList(resourceIdList); + List resourceIdList = inspectService.getInspectResourceIdList(searchVo); + List inspectResourceVos = inspectService.getInspectResourceListByIdList(resourceIdList); putCommonDataMap(resourceIdList, inspectResourceVos, isNeedAlertDetail, nameList, fieldPathTextMap, sheetBuilder); } return workbook; @@ -478,7 +481,7 @@ public class InspectReportServiceImpl implements InspectReportService { searchVo.setTypeId(typeId); List idList = resourceCenterDataSource.getAppResourceIdList(searchVo, false); if (CollectionUtils.isNotEmpty(idList)) { - List inspectResourceVos = inspectMapper.getInspectResourceListByIdList(idList); + List inspectResourceVos = inspectService.getInspectResourceListByIdList(idList); putCommonDataMap(idList, inspectResourceVos, isNeedAlertDetail, nameList, fieldPathTextMap, sheetBuilder); } } @@ -594,15 +597,15 @@ public class InspectReportServiceImpl implements InspectReportService { calendar.add(Calendar.DAY_OF_MONTH, -1);//获取前一天数据 startDate = calendar.getTime(); } - int resourceCount = inspectMapper.getInspectResourceCount(searchVo); + int resourceCount = inspectService.getInspectResourceCount(searchVo); if (resourceCount > 0) { searchVo.setRowNum(resourceCount); searchVo.setPageSize(20); for (int i = 1; i <= searchVo.getPageCount(); i++) { searchVo.setCurrentPage(i); searchVo.setStartNum(searchVo.getStartNum()); - List resourceIdList = inspectMapper.getInspectResourceIdList(searchVo); - List inspectResourceVoList = inspectMapper.getInspectResourceListByIdList(resourceIdList); + List resourceIdList = inspectService.getInspectResourceIdList(searchVo); + List inspectResourceVoList = inspectService.getInspectResourceListByIdList(resourceIdList); if (CollectionUtils.isNotEmpty(inspectResourceVoList)) { JSONObject inspectDetail = getInspectDetailByResourceIdListAndDate(inspectResourceVoList.stream().map(InspectResourceVo::getId).collect(Collectors.toList()), startDate, endDate); if (MapUtils.isNotEmpty(inspectDetail)) { -- Gitee