From f0aa8adb5cafc5829138bc0b096be7fd1e94b6f6 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 22 Jan 2026 17:07:29 +0800
Subject: [PATCH] 告警记录导出
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml
index 3e0c91d..ee38f68 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml
@@ -47,10 +47,12 @@
and dar.device_id = #{param2.deviceId}
</if>
<if test="param2.droneName != null and param2.droneName != ''">
- and dar.drone_name like CONCAT('%', #{param2.droneName}, '%')
+ and (
+ dar.drone_name like CONCAT('%', #{param2.droneName}, '%')
</if>
<if test="param2.droneSerialNo != null and param2.droneSerialNo != ''">
- and dar.drone_serial_no = #{param2.droneSerialNo}
+ or dar.drone_serial_no like CONCAT('%', #{param2.droneSerialNo}, '%')
+ )
</if>
<if test="param2.droneType != null and param2.droneType != ''">
and dar.drone_type = #{param2.droneType}
@@ -108,7 +110,22 @@
<select id="exportFwDroneAlarmRecord" resultType="org.sxkj.fw.record.excel.FwDroneAlarmRecordExcel">
- SELECT * FROM ja_fw_drone_alarm_record ${ew.customSqlSegment}
+ select
+ dar.*,
+ d.device_name,
+ d.status deviceStatus
+ from
+ ja_fw_drone_alarm_record dar
+ left join ja_fw_device d on dar.device_id = d.id
+ <where>
+ dar.is_deleted = 0
+ <if test="ids != null and ids.size() > 0">
+ and dar.id in
+ <foreach item="item" collection="ids" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ </where>
</select>
<select id="alarmTypeStatistics" resultType="org.sxkj.fw.cockpit.vo.AlarmStatisticsVO">
--
Gitblit v1.9.3