From b55fb044a0ecf58a57677b66c64b749e8084d079 Mon Sep 17 00:00:00 2001
From: Wen JY <wenjy@mesnac.com>
Date: Tue, 4 Jul 2023 17:22:00 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=BC=A0=E6=84=9F=E5=99=A8?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E8=BE=B9=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?ID=E3=80=81=E4=BC=A0=E6=84=9F=E5=99=A8=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/base/sensorInfo/sensorInfo.html          | 10 +++++++++-
 .../resources/mapper/system/BaseSensorInfoMapper.xml   |  8 ++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/base/sensorInfo/sensorInfo.html b/ruoyi-admin/src/main/resources/templates/base/sensorInfo/sensorInfo.html
index 405a577..ba8f489 100644
--- a/ruoyi-admin/src/main/resources/templates/base/sensorInfo/sensorInfo.html
+++ b/ruoyi-admin/src/main/resources/templates/base/sensorInfo/sensorInfo.html
@@ -38,7 +38,15 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <label>名称：</label>
+                                <label>Edge ID：</label>
+                                <input type="text" name="edgeId"/>
+                            </li>
+                            <li>
+                                <label>设备编号：</label>
+                                <input type="text" name="sensorId"/>
+                            </li>
+                            <li>
+                                <label>设备名称：</label>
                                 <input type="text" name="sensorName"/>
                             </li>
                             <li>
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseSensorInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseSensorInfoMapper.xml
index 48a93ff..df4b738 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseSensorInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseSensorInfoMapper.xml
@@ -89,8 +89,8 @@
         from base_sensor_info t1
         left join base_monitorunit_info t2 on t1.MonitorUnit_Id = t2.MonitorUnit_Id
         <where>
-            <if test="EdgeId != null  and EdgeId != ''">and t1.EdgeId = #{EdgeId}</if>
-            <if test="sensorId != null  and sensorId != ''">and t1.Sensor_Id = #{sensorId}</if>
+            <if test="EdgeId != null  and EdgeId != ''">and t1.EdgeId like concat('%', #{EdgeId},'%')</if>
+            <if test="sensorId != null  and sensorId != ''">and t1.Sensor_Id like concat('%', #{sensorId},'%')</if>
             <if test="sensorName != null  and sensorName != ''">and t1.Sensor_Name like concat('%', #{sensorName},
                 '%')
             </if>
@@ -126,8 +126,8 @@
         left join base_monitorunit_info t3 on t2.MonitorUnit_Id = t3.MonitorUnit_Id
         <where>
             <if test="roleId != null ">and t1.role_id = #{roleId}</if>
-            <if test="EdgeId != null  and EdgeId != ''">and t2.EdgeId = #{EdgeId}</if>
-            <if test="sensorId != null  and sensorId != ''">and t2.Sensor_Id = #{sensorId}</if>
+            <if test="EdgeId != null  and EdgeId != ''">and t2.EdgeId like concat('%', #{EdgeId},'%')</if>
+            <if test="sensorId != null  and sensorId != ''">and t2.Sensor_Id like concat('%', #{sensorId},'%')</if>
             <if test="sensorName != null  and sensorName != ''">and t2.Sensor_Name like concat('%', #{sensorName},
                 '%')
             </if>