From 5f36c255501c738470a83a76efa049987689dc2c Mon Sep 17 00:00:00 2001
From: daiyongfei <974332738@qq.com>
Date: Sat, 20 Sep 2025 14:35:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E5=AE=B9=EF=BC=88=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/domain/bo/DeviceAlarmBo.java           |  4 ++--
 .../resources/mapper/equipment/DeviceAlarmMapper.xml | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceAlarmBo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceAlarmBo.java
index ab50363..2c298dc 100644
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceAlarmBo.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceAlarmBo.java
@@ -36,7 +36,7 @@ public class DeviceAlarmBo extends TenantEntity {
     /**
      * 报警事项
      * device_action
-     *  0-强制报警，1-撞击闯入，2-自动报警，3-电子围栏告警
+     * 0-强制报警，1-撞击闯入，2-自动报警，3-电子围栏告警
      */
     private Integer deviceAction;
 
@@ -63,7 +63,7 @@ public class DeviceAlarmBo extends TenantEntity {
     private String dataSource;
 
     /**
-     * 内容
+     * 内容（报警信息）
      */
     private String content;
 
diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml
index 39e312d..4e79b65 100644
--- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml
+++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml
@@ -6,17 +6,21 @@
 
     <!-- 查询设备告警列表 -->
     <select id="selectVoPage" resultType="com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo">
-        select da.*, d.device_mac as deviceMac, d.device_imei as deviceImei,
+        select da.*, d.device_mac as deviceMac, d.device_imei as deviceImei,d.device_name as deviceName,
+        d.device_type as deviceType,
         d.type_name as deviceTypeName, d.device_pic as devicePic
         from device_alarm da
         left join device d on da.device_id = d.id
-        left join device_type dt on dt.id = da.device_type
+        left join device_type dt on dt.id = d.device_type
         <where>
+            <if test="bo.content != null">
+                and d.device_name like concat('%', #{bo.content}, '%') or dt.type_name like concat('%', #{bo.content}, '%')
+            </if>
             <if test="bo.deviceName != null">
-                and da.device_name = #{bo.deviceName}
+                and d.device_name like concat('%', #{bo.deviceName}, '%')
             </if>
             <if test="bo.deviceType != null">
-                and da.device_type = #{bo.deviceType}
+                and dt.id = #{bo.deviceType}
             </if>
             <if test="bo.deviceAction != null">
                 and da.device_action = #{bo.deviceAction}