change - 传感器信息增加边设备ID、传感器编号模糊搜索

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>

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="EdgeId != null  and EdgeId != ''">and t1.EdgeId like concat('%', #{EdgeId},'%')</if>
-            <if test="sensorId != null  and sensorId != ''">and t1.Sensor_Id = #{sensorId}</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="EdgeId != null  and EdgeId != ''">and t2.EdgeId like concat('%', #{EdgeId},'%')</if>
-            <if test="sensorId != null  and sensorId != ''">and t2.Sensor_Id = #{sensorId}</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>