From 92e4be80be068c47d1cdcc059d31d192c6989a39 Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Wed, 27 Apr 2022 16:02:43 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=A8=A1=E7=B3=8A=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/base/monitorUnitInfo/monitorUnitInfo.html     | 4 ++--
 .../main/resources/mapper/system/BaseAlarmInfoMapper.xml    | 2 +-
 .../main/resources/mapper/system/BaseAlarmModuleMapper.xml  | 2 +-
 .../main/resources/mapper/system/BaseAlarmTypeMapper.xml    | 2 +-
 .../main/resources/mapper/system/BaseDeviceParamMapper.xml  | 2 +-
 .../main/resources/mapper/system/BaseStationInfoMapper.xml  | 2 +-
 .../main/resources/mapper/system/SysParamConfigMapper.xml   | 6 +++---
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/base/monitorUnitInfo/monitorUnitInfo.html b/ruoyi-admin/src/main/resources/templates/base/monitorUnitInfo/monitorUnitInfo.html
index 53c50aa..5063521 100644
--- a/ruoyi-admin/src/main/resources/templates/base/monitorUnitInfo/monitorUnitInfo.html
+++ b/ruoyi-admin/src/main/resources/templates/base/monitorUnitInfo/monitorUnitInfo.html
@@ -10,10 +10,10 @@
             <form id="formId">
                 <div class="select-list">
                     <ul>
-                        <li>
+                        <!--<li>
                             <label style="width: 95px">监控单元编号：</label>
                             <input type="text" name="monitorunitId"/>
-                        </li>
+                        </li>-->
                         <li>
                             <label style="width: 95px">监控单元名称：</label>
                             <input type="text" name="monitorunitName"/>
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseAlarmInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseAlarmInfoMapper.xml
index 349e09b..dd6c532 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseAlarmInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseAlarmInfoMapper.xml
@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join base_alarm_type t2 on t1.AlarmType_Id = t2.alarmType_Id
         left join base_sensor_info t3 on t1.Sensor_Id = t3.Sensor_Id
         <where>  
-            <if test="sensorId != null  and sensorId != ''"> and t1.Sensor_Id = #{sensorId}</if>
+            <if test="sensorId != null  and sensorId != ''"> and t3.Sensor_Name like concat('%', #{sensorId}, '%')</if>
             <if test="alarmtypeId != null  and alarmtypeId != ''"> and t1.AlarmType_Id = #{alarmtypeId}</if>
         </where>
     </select>
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseAlarmModuleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseAlarmModuleMapper.xml
index 3e4292d..4d4d8b5 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseAlarmModuleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseAlarmModuleMapper.xml
@@ -60,7 +60,7 @@
         <include refid="selectBaseAlarmModuleVo"/>
         <where>
             <if test="alarmmoduleId != null  and alarmmoduleId != ''">and t1.AlarmModule_Id = #{alarmmoduleId}</if>
-            <if test="alarmmoduleText != null  and alarmmoduleText != ''">and t1.AlarmModule_Text = #{alarmmoduleText}</if>
+            <if test="alarmmoduleText != null  and alarmmoduleText != ''">and t1.AlarmModule_Text like concat('%', #{alarmmoduleText}, '%')</if>
             <if test="monitorunitId != null  and monitorunitId != ''">and t1.MonitorUnit_Id = #{monitorunitId}</if>
             <if test="alarmTypeId != null  and alarmTypeId != ''">and t1.AlarmType_Id = #{alarmTypeId}</if>
             <if test="enableFlag != null ">and t1.Enable_Flag = #{enableFlag}</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseAlarmTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseAlarmTypeMapper.xml
index 3c89301..3549f70 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseAlarmTypeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseAlarmTypeMapper.xml
@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBaseAlarmTypeList" parameterType="BaseAlarmType" resultMap="BaseAlarmTypeResult">
         <include refid="selectBaseAlarmTypeVo"/>
         <where>  
-            <if test="alarmtypeId != null  and alarmtypeId != ''"> and alarmType_Id = #{alarmtypeId}</if>
+            <if test="alarmtypeId != null  and alarmtypeId != ''"> and alarmType_Id like concat('%', #{alarmtypeId}, '%')</if>
             <if test="alarmtypeName != null  and alarmtypeName != ''"> and alarmType_Name like concat('%', #{alarmtypeName}, '%')</if>
             <if test="parentId != null  and parentId != ''"> and parent_Id = #{parentId}</if>
             <if test="enableFlag != null "> and Enable_Flag = #{enableFlag}</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseDeviceParamMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseDeviceParamMapper.xml
index 78a99a1..9547df9 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseDeviceParamMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseDeviceParamMapper.xml
@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join base_monitorunit_info t2 on t1.Device_Id = t2.MonitorUnit_Id
         <where>  
             <if test="deviceId != null  and deviceId != ''"> and t1.Device_Id = #{deviceId}</if>
-            <if test="paramTitle != null  and paramTitle != ''"> and t1.Param_Title = #{paramTitle}</if>
+            <if test="paramTitle != null  and paramTitle != ''"> and t1.Param_Title like concat('%', #{paramTitle}, '%')</if>
             <if test="enableFlag != null "> and t1.Enable_Flag = #{enableFlag}</if>
         </where>
     </select>
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseStationInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseStationInfoMapper.xml
index 54ca90c..e96af18 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseStationInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseStationInfoMapper.xml
@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBaseStationInfoList" parameterType="BaseStationInfo" resultMap="BaseStationInfoResult">
         <include refid="selectBaseStationInfoVo"/>
         <where>  
-            <if test="stationId != null  and stationId != ''"> and Station_Id = #{stationId}</if>
+            <if test="stationId != null  and stationId != ''"> and Station_Id like concat('%', #{stationId}, '%')</if>
             <if test="stationName != null  and stationName != ''"> and Station_Name like concat('%', #{stationName}, '%')</if>
             <if test="stationStatus != null "> and Station_Status = #{stationStatus}</if>
             <if test="stationLocation != null  and stationLocation != ''"> and Station_Location like concat('%', #{stationLocation}, '%')</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysParamConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysParamConfigMapper.xml
index afcb167..1d95f1f 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysParamConfigMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysParamConfigMapper.xml
@@ -26,9 +26,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSysParamConfigList" parameterType="SysParamConfig" resultMap="SysParamConfigResult">
         <include refid="selectSysParamConfigVo"/>
         <where>  
-            <if test="paramType != null  and paramType != ''"> and Param_Type = #{paramType}</if>
-            <if test="paramTitle != null  and paramTitle != ''"> and Param_Title = #{paramTitle}</if>
-            <if test="paramText != null  and paramText != ''"> and Param_Text = #{paramText}</if>
+            <if test="paramType != null  and paramType != ''"> and Param_Type like concat('%', #{paramType}, '%')</if>
+            <if test="paramTitle != null  and paramTitle != ''"> and Param_Title like concat('%', #{paramTitle}, '%')</if>
+            <if test="paramText != null  and paramText != ''"> and Param_Text like concat('%', #{paramText}, '%')</if>
             <if test="enableFlag != null "> and Enable_Flag = #{enableFlag}</if>
             <if test="visibleFlag != null "> and Visible_Flag = #{visibleFlag}</if>
         </where>