From 676d6a5f64af0d083a2049a08ddaceaffc996f73 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 8 Aug 2025 18:55:17 +0800 Subject: [PATCH 1/4] =?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 --- .../module/inspect/dao/mapper/InspectConfigFileMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 1fe6d20..0042a50 100644 --- a/src/main/java/neatlogic/module/inspect/dao/mapper/InspectConfigFileMapper.xml +++ b/src/main/java/neatlogic/module/inspect/dao/mapper/InspectConfigFileMapper.xml @@ -45,14 +45,14 @@ - + FROM @{DATA_SCHEMA}.`scence_ipobject_detail` a -- Gitee From 6e75051b62a08f38a7b18f5f84c27ff551e46127 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 11 Aug 2025 18:25:37 +0800 Subject: [PATCH 2/4] =?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 --- .../api/configfile/ListInspectConfigFileResourceApi.java | 3 +++ 1 file changed, 3 insertions(+) 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 c9be836..af4be9c 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)); -- Gitee From 44ae557f6a41b0313ba3689ef13ff0c0cf3fd939 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 12 Aug 2025 19:21:57 +0800 Subject: [PATCH 3/4] =?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 --- .../module/inspect/dao/mapper/InspectConfigFileMapper.java | 2 ++ .../module/inspect/dao/mapper/InspectConfigFileMapper.xml | 4 ++++ 2 files changed, 6 insertions(+) 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 4905ae0..c7c2d83 100644 --- a/src/main/java/neatlogic/module/inspect/dao/mapper/InspectConfigFileMapper.java +++ b/src/main/java/neatlogic/module/inspect/dao/mapper/InspectConfigFileMapper.java @@ -64,6 +64,8 @@ public interface InspectConfigFileMapper { List getInspectConfigFilePathListByJobId(Long jobId); + List getInspectConfigFilePathListBySql(String sql); + Long getPreviousVersionIdByPathIdAndVersionId(@Param("pathId") Long pathId, @Param("versionId") Long versionId); int insertInspectConfigFilePath(InspectConfigFilePathVo pathVo); 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 0042a50..ccd8eb8 100644 --- a/src/main/java/neatlogic/module/inspect/dao/mapper/InspectConfigFileMapper.xml +++ b/src/main/java/neatlogic/module/inspect/dao/mapper/InspectConfigFileMapper.xml @@ -516,6 +516,10 @@ WHERE c.`job_id` = #{value} + + + ${sql} + + @@ -516,10 +520,6 @@ WHERE c.`job_id` = #{value} - -