From 54fafb90bd8051ba04920a45516a2899965367fb Mon Sep 17 00:00:00 2001
From: gaoyutao <duguprogromer@163.com>
Date: Wed, 19 Nov 2025 11:31:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=90=9C=E7=B4=A2=E3=80=81=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/RmResourceRegistrationController.java   | 2 +-
 .../service/impl/RmMonitorConfigDetailsServiceImpl.java       | 4 +++-
 .../service/impl/RmResourceRegistrationServiceImpl.java       | 4 ++--
 .../resources/mapper/system/EpsInitialTrafficDataMapper.xml   | 2 +-
 .../mapper/system/InitialSwitchInfoDetailsMapper.xml          | 2 +-
 .../main/resources/mapper/system/RmSwitchManagementMapper.xml | 2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmResourceRegistrationController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmResourceRegistrationController.java
index 546bbbf..92089e5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmResourceRegistrationController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmResourceRegistrationController.java
@@ -41,7 +41,7 @@ public class RmResourceRegistrationController extends BaseController
     public TableDataInfo list(@RequestBody RmResourceRegistration rmResourceRegistration)
     {
         Map<String, Object> resultMap = rmResourceRegistrationService.getRegistrationTableInfoList(rmResourceRegistration);
-        if(rmResourceRegistration.getQueryParam() != null){
+        if(rmResourceRegistration.getQueryParam() != null && rmResourceRegistration.getQueryParam() != ""){
             return getDataTable((List<RmResourceRegistration>) resultMap.get("list"), (int) resultMap.get("total"));
         }
         return getDataTable((List<RmResourceRegistration>) resultMap.get("list"));
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmMonitorConfigDetailsServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmMonitorConfigDetailsServiceImpl.java
index dc3de48..fac65db 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmMonitorConfigDetailsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmMonitorConfigDetailsServiceImpl.java
@@ -142,7 +142,9 @@ public class RmMonitorConfigDetailsServiceImpl implements IRmMonitorConfigDetail
         if(rmMonitorConfig != null){
             // 拿到开始时间
             String startTime = rmMonitorConfig.getMonitorStartTime();
-            queryParam.setStartTime(startTime);
+            if(queryParam.getStartTime() == null){
+                queryParam.setStartTime(startTime);
+            }
             if(queryParam.getEndTime() == null){
                 queryParam.setEndTime(DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"));
             }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmResourceRegistrationServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmResourceRegistrationServiceImpl.java
index 1a1f501..2de6815 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmResourceRegistrationServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmResourceRegistrationServiceImpl.java
@@ -82,7 +82,7 @@ public class RmResourceRegistrationServiceImpl implements IRmResourceRegistratio
     public Map<String, Object> getRegistrationTableInfoList(RmResourceRegistration rmResourceRegistration)
     {
         Map<String, Object> resultMap = new HashMap();
-        if(rmResourceRegistration.getQueryParam() == null){
+        if(rmResourceRegistration.getQueryParam() == null || rmResourceRegistration.getQueryParam() == ""){
             PageDomain pageDomain = new PageDomain();
             pageDomain.setPageNum(rmResourceRegistration.getPageNum());
             pageDomain.setPageSize(rmResourceRegistration.getPageSize());
@@ -95,7 +95,7 @@ public class RmResourceRegistrationServiceImpl implements IRmResourceRegistratio
                 setNetWorkMsg(resourceRegistration);
             }
         }
-        if(rmResourceRegistration.getQueryParam() != null){
+        if(rmResourceRegistration.getQueryParam() != null && rmResourceRegistration.getQueryParam() != ""){
             String queryValue = rmResourceRegistration.getQueryParam().trim();
             // 筛选公网IP私网IP设备SN相等的数据
             // 从rmResourceRegistrationList列表中筛选符合条件的数据
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml
index 12e77c8..59c74b7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml
@@ -287,7 +287,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTime != null">
                 and create_time &lt;= #{endTime}
             </if>
-            <if test="clientIds != '' and clientIds != null">
+            <if test="clientIds != null">
                 and client_id in
                 <foreach collection="clientIds.split(',')" item="clientId" open="(" separator="," close=")">
                     #{clientId}
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/InitialSwitchInfoDetailsMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/InitialSwitchInfoDetailsMapper.xml
index bda75b4..28b75ad 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/InitialSwitchInfoDetailsMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/InitialSwitchInfoDetailsMapper.xml
@@ -370,7 +370,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY max_speed desc
     </select>
     <select id="geSwitchListByMonitorView" parameterType="InitialSwitchInfoDetails" resultType="InitialSwitchInfoDetails">
-        select client_id clientId, name, in_speed inSpeed, out_speed outSpeed, create_time createTime from initial_switch_info_details
+        select switch_name switchName,client_id clientId, name, in_speed inSpeed, out_speed outSpeed, create_time createTime from initial_switch_info_details
         <where>
             <if test="startTime != null">
                 and create_time &gt;= #{startTime}
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmSwitchManagementMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmSwitchManagementMapper.xml
index a860e84..f7dd8c3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmSwitchManagementMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmSwitchManagementMapper.xml
@@ -56,7 +56,7 @@
             <if test="switchPassword != null  and switchPassword != ''"> and switch_password = #{switchPassword}</if>
             <if test="clientId != null  and clientId != ''"> and client_id = #{clientId}</if>
             <if test="queryName != null  and queryName != ''">
-                and (snmp_address = #{snmpAddress} or switch_name like concat('%', #{switchName}, '%'))
+                and (snmp_address = #{queryName} or switch_name like concat('%', #{queryName}, '%'))
              </if>
         </where>
         order by create_time desc