From 912e70e4ce93c38c8b99408a3cc4a323abb668c9 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 8 Aug 2025 18:52:52 +0800
Subject: [PATCH 1/3] =?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
---
 .../framework/inspect/dao/mapper/InspectMapper.java         | 6 ++++--
 .../framework/inspect/dao/mapper/InspectMapper.xml          | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/neatlogic/framework/inspect/dao/mapper/InspectMapper.java b/src/main/java/neatlogic/framework/inspect/dao/mapper/InspectMapper.java
index 7be479d..44e3f7c 100644
--- a/src/main/java/neatlogic/framework/inspect/dao/mapper/InspectMapper.java
+++ b/src/main/java/neatlogic/framework/inspect/dao/mapper/InspectMapper.java
@@ -1,10 +1,10 @@
 package neatlogic.framework.inspect.dao.mapper;
 
 import neatlogic.framework.cmdb.dto.cientity.CiEntityInspectVo;
-import neatlogic.framework.inspect.dto.InspectAlertEverydayVo;
-import neatlogic.framework.inspect.dto.InspectResourceScriptVo;
 import neatlogic.framework.cmdb.dto.resourcecenter.ResourceSearchVo;
+import neatlogic.framework.inspect.dto.InspectAlertEverydayVo;
 import neatlogic.framework.inspect.dto.InspectCiCombopVo;
+import neatlogic.framework.inspect.dto.InspectResourceScriptVo;
 import neatlogic.framework.inspect.dto.InspectResourceVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,6 +21,8 @@ public interface InspectMapper {
 
     List<InspectResourceVo> getInspectResourceListByIdList(List<Long> idList);
 
+    List<InspectResourceVo> getInspectResourceListByIdListSql(String newSql);
+
     List<InspectResourceVo> getInspectResourceListByIdListAndJobId(@Param("idList") List<Long> idList, @Param("jobId") Long jobId);
 
     List<InspectResourceScriptVo> getResourceScriptListByResourceIdList(@Param("resourceIdList") List<Long> resourceIdList);
diff --git a/src/main/java/neatlogic/framework/inspect/dao/mapper/InspectMapper.xml b/src/main/java/neatlogic/framework/inspect/dao/mapper/InspectMapper.xml
index 626c5a7..5344134 100644
--- a/src/main/java/neatlogic/framework/inspect/dao/mapper/InspectMapper.xml
+++ b/src/main/java/neatlogic/framework/inspect/dao/mapper/InspectMapper.xml
@@ -371,6 +371,10 @@
         </foreach>
     </select>
 
+    <select id="getInspectResourceListByIdListSql" parameterType="java.lang.Long" resultMap="inspectResourceMap">
+        ${sql}
+    </select>
+
     <select id="getInspectResourceCount" resultType="int">
         SELECT COUNT(DISTINCT (a.`id`))
         <include refid="resource_inspect_autoexec_job_from_join_with_auth"/>
-- 
Gitee


From e921e4e5592d9cab3a710d684ef98959a534317b Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Mon, 11 Aug 2025 17:16:23 +0800
Subject: [PATCH 2/3] =?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/dao/mapper/InspectMapper.xml      | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/main/java/neatlogic/framework/inspect/dao/mapper/InspectMapper.xml b/src/main/java/neatlogic/framework/inspect/dao/mapper/InspectMapper.xml
index 5344134..8972185 100644
--- a/src/main/java/neatlogic/framework/inspect/dao/mapper/InspectMapper.xml
+++ b/src/main/java/neatlogic/framework/inspect/dao/mapper/InspectMapper.xml
@@ -410,7 +410,13 @@
 
     <select id="getInspectResourceIdList" resultType="java.lang.Long">
         SELECT m.`id` FROM (
-        SELECT distinct a.`id`, a.`name`, a.`ip`
+        SELECT distinct a.`id`
+        <if test="isNameFieldSort != null and isNameFieldSort == 1">
+            ,a.`name`
+        </if>
+        <if test="isIpFieldSort != null and isIpFieldSort == 1">
+            ,a.`ip`
+        </if>
         <include refid="resource_inspect_autoexec_job_from_join_with_auth"/>
         <where>
             <if test="keyword != null and keyword != ''">
@@ -420,10 +426,10 @@
         </where>
         <choose>
             <when test="isNameFieldSort != null and isNameFieldSort == 1">
-                ORDER BY LENGTH(a.`name`)
+                ORDER BY LENGTH(a.`name`), a.`id`
             </when>
             <when test="isIpFieldSort != null and isIpFieldSort == 1">
-                ORDER BY LENGTH(a.`ip`)
+                ORDER BY LENGTH(a.`ip`), a.`id`
             </when>
             <otherwise>
                 ORDER BY a.`id`
@@ -451,8 +457,7 @@
         <include refid="resource_inspect_autoexec_job_node_from_join"/>
         <where>
             <if test="searchVo.keyword != null and searchVo.keyword != ''">
-                AND (a.`name` LIKE CONCAT('%', #{searchVo.keyword}, '%') OR a.`ip` LIKE CONCAT('%', #{searchVo.keyword},
-                '%'))
+                AND a.`ip` LIKE CONCAT('%', #{searchVo.keyword}, '%')
             </if>
             <include refid="resource_inspect_autoexec_job_node_where"/>
         </where>
@@ -464,8 +469,7 @@
         <include refid="resource_inspect_autoexec_job_node_from_join"/>
         <where>
             <if test="searchVo.keyword != null and searchVo.keyword != ''">
-                AND (a.`name` LIKE CONCAT('%', #{searchVo.keyword}, '%') OR a.`ip` LIKE CONCAT('%', #{searchVo.keyword},
-                '%'))
+                AND a.`name` LIKE CONCAT('%', #{searchVo.keyword}, '%')
             </if>
             <include refid="resource_inspect_autoexec_job_node_where"/>
         </where>
@@ -474,7 +478,13 @@
 
     <select id="getInspectAutoexecJobNodeResourceIdList" resultType="java.lang.Long">
         SELECT m.`id` FROM (
-        SELECT distinct a.`id`, a.`name`, a.`ip`
+        SELECT distinct a.`id`
+        <if test="searchVo.isNameFieldSort != null and searchVo.isNameFieldSort == 1">
+            , a.`name`
+        </if>
+        <if test="searchVo.isIpFieldSort != null and searchVo.isIpFieldSort == 1">
+            , a.`ip`
+        </if>
         <include refid="resource_inspect_autoexec_job_node_from_join"/>
         <where>
             <if test="searchVo.keyword != null and searchVo.keyword != ''">
-- 
Gitee


From 40fa5d21f45592101c1bd87382e9393d84a503a1 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 13 Aug 2025 17:00:26 +0800
Subject: [PATCH 3/3] =?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
---
 .../framework/inspect/dao/mapper/InspectMapper.java        | 5 +++--
 .../framework/inspect/dao/mapper/InspectMapper.xml         | 7 +++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/neatlogic/framework/inspect/dao/mapper/InspectMapper.java b/src/main/java/neatlogic/framework/inspect/dao/mapper/InspectMapper.java
index 44e3f7c..b41fefb 100644
--- a/src/main/java/neatlogic/framework/inspect/dao/mapper/InspectMapper.java
+++ b/src/main/java/neatlogic/framework/inspect/dao/mapper/InspectMapper.java
@@ -11,6 +11,9 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 public interface InspectMapper {
+
+    List<InspectResourceVo> getInspectResourceListByIdListSql(String sql);
+
     List<InspectCiCombopVo> searchInspectCiCombopList();
 
     List<InspectCiCombopVo> searchInspectCiCombopListByCiIdList(List<Long> ciIdList);
@@ -21,8 +24,6 @@ public interface InspectMapper {
 
     List<InspectResourceVo> getInspectResourceListByIdList(List<Long> idList);
 
-    List<InspectResourceVo> getInspectResourceListByIdListSql(String newSql);
-
     List<InspectResourceVo> getInspectResourceListByIdListAndJobId(@Param("idList") List<Long> idList, @Param("jobId") Long jobId);
 
     List<InspectResourceScriptVo> getResourceScriptListByResourceIdList(@Param("resourceIdList") List<Long> resourceIdList);
diff --git a/src/main/java/neatlogic/framework/inspect/dao/mapper/InspectMapper.xml b/src/main/java/neatlogic/framework/inspect/dao/mapper/InspectMapper.xml
index 8972185..a6a4d54 100644
--- a/src/main/java/neatlogic/framework/inspect/dao/mapper/InspectMapper.xml
+++ b/src/main/java/neatlogic/framework/inspect/dao/mapper/InspectMapper.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="neatlogic.framework.inspect.dao.mapper.InspectMapper">
 
+    <select id="getInspectResourceListByIdListSql" parameterType="java.lang.Long" resultMap="inspectResourceMap">
+        ${sql}
+    </select>
 
     <select id="searchInspectCiCombopList" resultType="neatlogic.framework.inspect.dto.InspectCiCombopVo">
         select icc.ci_id     as id,
@@ -371,10 +374,6 @@
         </foreach>
     </select>
 
-    <select id="getInspectResourceListByIdListSql" parameterType="java.lang.Long" resultMap="inspectResourceMap">
-        ${sql}
-    </select>
-
     <select id="getInspectResourceCount" resultType="int">
         SELECT COUNT(DISTINCT (a.`id`))
         <include refid="resource_inspect_autoexec_job_from_join_with_auth"/>
-- 
Gitee