From 85885cf527da6817e809e199c8171c09b1bb4697 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 13 Nov 2025 18:45:52 +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 --- .../inspect/service/InspectServiceImpl.java | 71 ++++++++++++++----- 1 file changed, 54 insertions(+), 17 deletions(-) diff --git a/src/main/java/neatlogic/module/inspect/service/InspectServiceImpl.java b/src/main/java/neatlogic/module/inspect/service/InspectServiceImpl.java index 835e1be..1f1302d 100644 --- a/src/main/java/neatlogic/module/inspect/service/InspectServiceImpl.java +++ b/src/main/java/neatlogic/module/inspect/service/InspectServiceImpl.java @@ -24,6 +24,7 @@ import neatlogic.framework.inspect.dto.InspectConfigFilePathSearchVo; import neatlogic.framework.inspect.dto.InspectConfigFilePathVo; import neatlogic.framework.inspect.dto.InspectResourceVo; import neatlogic.module.inspect.dao.mapper.InspectConfigFileMapper; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -60,7 +61,9 @@ public class InspectServiceImpl implements InspectService { if (Objects.equals(mode, JSQLPARSER_MODE) || Objects.equals(enable, COMPARISON_ENABLED)) { IResourceBuildSqlCrossoverService resourceBuildSqlCrossoverService = CrossoverServiceFactory.getApi(IResourceBuildSqlCrossoverService.class); String sql = resourceBuildSqlCrossoverService.buildGetInspectResourceListByIdListSql(idList); - newResourceList = inspectMapper.getInspectResourceListByIdListSql(sql); + if (StringUtils.isNotBlank(sql)) { + newResourceList = inspectMapper.getInspectResourceListByIdListSql(sql); + } } if (Objects.equals(mode, MYBATIS_MODE) || Objects.equals(enable, COMPARISON_ENABLED)) { oldResourceList = inspectMapper.getInspectResourceListByIdList(idList); @@ -80,7 +83,10 @@ public class InspectServiceImpl implements InspectService { public List getInspectResourceListByIdList(List idList, List selectFieldNameList) { IResourceBuildSqlCrossoverService resourceBuildSqlCrossoverService = CrossoverServiceFactory.getApi(IResourceBuildSqlCrossoverService.class); String sql = resourceBuildSqlCrossoverService.buildGetInspectResourceListByIdListSql(idList, selectFieldNameList); - return inspectMapper.getInspectResourceListByIdListSql(sql); + if (StringUtils.isNotBlank(sql)) { + return inspectMapper.getInspectResourceListByIdListSql(sql); + } + return new ArrayList<>(); } @Override @@ -92,7 +98,9 @@ public class InspectServiceImpl implements InspectService { if (Objects.equals(mode, JSQLPARSER_MODE) || Objects.equals(enable, COMPARISON_ENABLED)) { IResourceBuildSqlCrossoverService resourceBuildSqlCrossoverService = CrossoverServiceFactory.getApi(IResourceBuildSqlCrossoverService.class); String sql = resourceBuildSqlCrossoverService.buildGetInspectResourceListByIdListAndJobIdSql(idList, jobId); - newResourceList = inspectMapper.getInspectResourceListByIdListSql(sql); + if (StringUtils.isNotBlank(sql)) { + newResourceList = inspectMapper.getInspectResourceListByIdListSql(sql); + } } if (Objects.equals(mode, MYBATIS_MODE) || Objects.equals(enable, COMPARISON_ENABLED)) { oldResourceList = inspectMapper.getInspectResourceListByIdListAndJobId(idList, jobId); @@ -112,7 +120,10 @@ public class InspectServiceImpl implements InspectService { public List getInspectResourceListByIdListAndJobId(List idList, Long jobId, List selectFieldNameList) { IResourceBuildSqlCrossoverService resourceBuildSqlCrossoverService = CrossoverServiceFactory.getApi(IResourceBuildSqlCrossoverService.class); String sql = resourceBuildSqlCrossoverService.buildGetInspectResourceListByIdListAndJobIdSql(idList, jobId, selectFieldNameList); - return inspectMapper.getInspectResourceListByIdListSql(sql); + if (StringUtils.isNotBlank(sql)) { + return inspectMapper.getInspectResourceListByIdListSql(sql); + } + return new ArrayList<>(); } @Override @@ -125,7 +136,9 @@ public class InspectServiceImpl implements InspectService { IResourceCrossoverMapper resourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); IResourceBuildSqlCrossoverService resourceBuildSqlCrossoverService = CrossoverServiceFactory.getApi(IResourceBuildSqlCrossoverService.class); String sql = resourceBuildSqlCrossoverService.buildGetInspectResourceCountSql(searchVo); - newCount = resourceCrossoverMapper.getCountBySql(sql); + if (StringUtils.isNotBlank(sql)) { + newCount = resourceCrossoverMapper.getCountBySql(sql); + } } if (Objects.equals(mode, MYBATIS_MODE) || Objects.equals(enable, COMPARISON_ENABLED)) { oldCount = inspectMapper.getInspectResourceCount(searchVo); @@ -151,7 +164,9 @@ public class InspectServiceImpl implements InspectService { IResourceCrossoverMapper resourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); IResourceBuildSqlCrossoverService resourceBuildSqlCrossoverService = CrossoverServiceFactory.getApi(IResourceBuildSqlCrossoverService.class); String sql = resourceBuildSqlCrossoverService.buildGetInspectResourceCountByIpKeywordSql(searchVo); - newCount = resourceCrossoverMapper.getCountBySql(sql); + if (StringUtils.isNotBlank(sql)) { + newCount = resourceCrossoverMapper.getCountBySql(sql); + } } if (Objects.equals(mode, MYBATIS_MODE) || Objects.equals(enable, COMPARISON_ENABLED)) { oldCount = inspectMapper.getInspectResourceCountByIpKeyword(searchVo); @@ -177,7 +192,9 @@ public class InspectServiceImpl implements InspectService { IResourceCrossoverMapper resourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); IResourceBuildSqlCrossoverService resourceBuildSqlCrossoverService = CrossoverServiceFactory.getApi(IResourceBuildSqlCrossoverService.class); String sql = resourceBuildSqlCrossoverService.buildGetInspectResourceCountByNameKeywordSql(searchVo); - newCount = resourceCrossoverMapper.getCountBySql(sql); + if (StringUtils.isNotBlank(sql)) { + newCount = resourceCrossoverMapper.getCountBySql(sql); + } } if (Objects.equals(mode, MYBATIS_MODE) || Objects.equals(enable, COMPARISON_ENABLED)) { oldCount = inspectMapper.getInspectResourceCountByNameKeyword(searchVo); @@ -203,7 +220,9 @@ public class InspectServiceImpl implements InspectService { IResourceCrossoverMapper resourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); IResourceBuildSqlCrossoverService resourceBuildSqlCrossoverService = CrossoverServiceFactory.getApi(IResourceBuildSqlCrossoverService.class); String sql = resourceBuildSqlCrossoverService.buildGetInspectResourceIdListSql(searchVo); - newIdList = resourceCrossoverMapper.getIdListBySql(sql); + if (StringUtils.isNotBlank(sql)) { + newIdList = resourceCrossoverMapper.getIdListBySql(sql); + } } if (Objects.equals(mode, MYBATIS_MODE) || Objects.equals(enable, COMPARISON_ENABLED)) { oldIdList = inspectMapper.getInspectResourceIdList(searchVo); @@ -229,7 +248,9 @@ public class InspectServiceImpl implements InspectService { IResourceCrossoverMapper resourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); IResourceBuildSqlCrossoverService resourceBuildSqlCrossoverService = CrossoverServiceFactory.getApi(IResourceBuildSqlCrossoverService.class); String sql = resourceBuildSqlCrossoverService.buildGetInspectAutoexecJobNodeResourceCountSql(searchVo, jobId); - newCount = resourceCrossoverMapper.getCountBySql(sql); + if (StringUtils.isNotBlank(sql)) { + newCount = resourceCrossoverMapper.getCountBySql(sql); + } } if (Objects.equals(mode, MYBATIS_MODE) || Objects.equals(enable, COMPARISON_ENABLED)) { oldCount = inspectMapper.getInspectAutoexecJobNodeResourceCount(searchVo, jobId); @@ -255,7 +276,9 @@ public class InspectServiceImpl implements InspectService { IResourceCrossoverMapper resourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); IResourceBuildSqlCrossoverService resourceBuildSqlCrossoverService = CrossoverServiceFactory.getApi(IResourceBuildSqlCrossoverService.class); String sql = resourceBuildSqlCrossoverService.buildGetInspectAutoexecJobNodeResourceCountByIpKeywordSql(searchVo, jobId); - newCount = resourceCrossoverMapper.getCountBySql(sql); + if (StringUtils.isNotBlank(sql)) { + newCount = resourceCrossoverMapper.getCountBySql(sql); + } } if (Objects.equals(mode, MYBATIS_MODE) || Objects.equals(enable, COMPARISON_ENABLED)) { oldCount = inspectMapper.getInspectAutoexecJobNodeResourceCountByIpKeyword(searchVo, jobId); @@ -281,7 +304,9 @@ public class InspectServiceImpl implements InspectService { IResourceCrossoverMapper resourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); IResourceBuildSqlCrossoverService resourceBuildSqlCrossoverService = CrossoverServiceFactory.getApi(IResourceBuildSqlCrossoverService.class); String sql = resourceBuildSqlCrossoverService.buildGetInspectAutoexecJobNodeResourceCountByNameKeywordSql(searchVo, jobId); - newCount = resourceCrossoverMapper.getCountBySql(sql); + if (StringUtils.isNotBlank(sql)) { + newCount = resourceCrossoverMapper.getCountBySql(sql); + } } if (Objects.equals(mode, MYBATIS_MODE) || Objects.equals(enable, COMPARISON_ENABLED)) { oldCount = inspectMapper.getInspectAutoexecJobNodeResourceCountByNameKeyword(searchVo, jobId); @@ -307,7 +332,9 @@ public class InspectServiceImpl implements InspectService { IResourceCrossoverMapper resourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); IResourceBuildSqlCrossoverService resourceBuildSqlCrossoverService = CrossoverServiceFactory.getApi(IResourceBuildSqlCrossoverService.class); String sql = resourceBuildSqlCrossoverService.buildGetInspectAutoexecJobNodeResourceIdListSql(searchVo, jobId); - newIdList = resourceCrossoverMapper.getIdListBySql(sql); + if (StringUtils.isNotBlank(sql)) { + newIdList = resourceCrossoverMapper.getIdListBySql(sql); + } } if (Objects.equals(mode, MYBATIS_MODE) || Objects.equals(enable, COMPARISON_ENABLED)) { oldIdList = inspectMapper.getInspectAutoexecJobNodeResourceIdList(searchVo, jobId); @@ -333,7 +360,9 @@ public class InspectServiceImpl implements InspectService { IResourceCrossoverMapper resourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); IResourceBuildSqlCrossoverService resourceBuildSqlCrossoverService = CrossoverServiceFactory.getApi(IResourceBuildSqlCrossoverService.class); String sql = resourceBuildSqlCrossoverService.buildGetInspectConfigFileResourceIdListSql(searchVo); - newIdList = resourceCrossoverMapper.getIdListBySql(sql); + if (StringUtils.isNotBlank(sql)) { + newIdList = resourceCrossoverMapper.getIdListBySql(sql); + } } if (Objects.equals(mode, MYBATIS_MODE) || Objects.equals(enable, COMPARISON_ENABLED)) { oldIdList = inspectConfigFileMapper.getInspectResourceIdList(searchVo); @@ -360,7 +389,9 @@ public class InspectServiceImpl implements InspectService { IResourceBuildSqlCrossoverService resourceBuildSqlCrossoverService = CrossoverServiceFactory.getApi(IResourceBuildSqlCrossoverService.class); ResourceSearchVo searchVo = JSONObject.parseObject(JSONObject.toJSONString(inspectConfigFilePathSearchVo), ResourceSearchVo.class); String sql = resourceBuildSqlCrossoverService.buildGetInspectConfigFilePathCountSql(searchVo); - newCount = resourceCrossoverMapper.getCountBySql(sql); + if (StringUtils.isNotBlank(sql)) { + newCount = resourceCrossoverMapper.getCountBySql(sql); + } } if (Objects.equals(mode, MYBATIS_MODE) || Objects.equals(enable, COMPARISON_ENABLED)) { oldCount = inspectConfigFileMapper.getInspectConfigFilePathCount(inspectConfigFilePathSearchVo); @@ -387,7 +418,9 @@ public class InspectServiceImpl implements InspectService { IResourceBuildSqlCrossoverService resourceBuildSqlCrossoverService = CrossoverServiceFactory.getApi(IResourceBuildSqlCrossoverService.class); ResourceSearchVo searchVo = JSONObject.parseObject(JSONObject.toJSONString(inspectConfigFilePathSearchVo), ResourceSearchVo.class); String sql = resourceBuildSqlCrossoverService.buildGetInspectConfigFilePathIdListSql(searchVo); - newIdList = resourceCrossoverMapper.getIdListBySql(sql); + if (StringUtils.isNotBlank(sql)) { + newIdList = resourceCrossoverMapper.getIdListBySql(sql); + } } if (Objects.equals(mode, MYBATIS_MODE) || Objects.equals(enable, COMPARISON_ENABLED)) { oldIdList = inspectConfigFileMapper.getInspectConfigFilePathIdList(inspectConfigFilePathSearchVo); @@ -412,7 +445,9 @@ public class InspectServiceImpl implements InspectService { if (Objects.equals(mode, JSQLPARSER_MODE) || Objects.equals(enable, COMPARISON_ENABLED)) { IResourceBuildSqlCrossoverService resourceBuildSqlCrossoverService = CrossoverServiceFactory.getApi(IResourceBuildSqlCrossoverService.class); String sql = resourceBuildSqlCrossoverService.buildGetInspectConfigFilePathListSql(idList); - newResourceList = inspectConfigFileMapper.getInspectConfigFilePathListBySql(sql); + if (StringUtils.isNotBlank(sql)) { + newResourceList = inspectConfigFileMapper.getInspectConfigFilePathListBySql(sql); + } } if (Objects.equals(mode, MYBATIS_MODE) || Objects.equals(enable, COMPARISON_ENABLED)) { oldResourceList = inspectConfigFileMapper.getInspectConfigFilePathList(idList); @@ -437,7 +472,9 @@ public class InspectServiceImpl implements InspectService { if (Objects.equals(mode, JSQLPARSER_MODE) || Objects.equals(enable, COMPARISON_ENABLED)) { IResourceBuildSqlCrossoverService resourceBuildSqlCrossoverService = CrossoverServiceFactory.getApi(IResourceBuildSqlCrossoverService.class); String sql = resourceBuildSqlCrossoverService.buildGetInspectConfigFilePathListByJobIdSql(jobId); - newResourceList = inspectConfigFileMapper.getInspectConfigFilePathListBySql(sql); + if (StringUtils.isNotBlank(sql)) { + newResourceList = inspectConfigFileMapper.getInspectConfigFilePathListBySql(sql); + } } if (Objects.equals(mode, MYBATIS_MODE) || Objects.equals(enable, COMPARISON_ENABLED)) { oldResourceList = inspectConfigFileMapper.getInspectConfigFilePathListByJobId(jobId); -- Gitee