From 10e5f7af88374a352211eabb32348ba8302c07c4 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 09 Apr 2026 14:41:19 +0800
Subject: [PATCH] opt:优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 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 437cf78..0e6fbba 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
@@ -84,14 +84,43 @@
<if test="param2.startTime != null and param2.startTime != '' and param2.endTime != null and param2.endTime != ''">
AND dar.alarm_time BETWEEN #{param2.startTime}::timestamp AND #{param2.endTime}::timestamp
</if>
-
<if test="param2.deviceType != null and param2.deviceType != ''">
AND dar.device_type = #{param2.deviceType}
</if>
-
<if test="param2.droneType != null and param2.droneType != ''">
AND dar.drone_type = #{param2.droneType}
</if>
+ <if test="param2.alarmType != null and param2.alarmType != ''">
+ and dar.alarm_type = #{param2.alarmType}
+ </if>
+
+ <if test="param2.triggerReason != null and param2.triggerReason != ''">
+ and dar.trigger_reason = #{param2.triggerReason}
+ </if>
+ <if test="param2.flightStatus != null and param2.flightStatus != ''">
+ and dar.flight_status = #{param2.flightStatus}
+ </if>
+ <if test="param2.longitude != null and param2.longitude != ''">
+ and dar.longitude = #{param2.longitude}
+ </if>
+ <if test="param2.latitude != null and param2.latitude != ''">
+ and dar.latitude = #{param2.latitude}
+ </if>
+ <if test="param2.signalFreqMhz != null and param2.signalFreqMhz != ''">
+ and dar.signal_freq_mhz = #{param2.signalFreqMhz}
+ </if>
+ <if test="param2.flightHeightM != null and param2.flightHeightM != ''">
+ and dar.flight_height_m = #{param2.flightHeightM}
+ </if>
+ <if test="param2.flightSpeedMs != null and param2.flightSpeedMs != ''">
+ and dar.flight_speed_ms = #{param2.flightSpeedMs}
+ </if>
+ <if test="param2.stayDuration != null and param2.stayDuration != ''">
+ and dar.stay_duration = #{param2.stayDuration}
+ </if>
+ <if test="param2.counterWay != null and param2.counterWay != ''">
+ and dar.counter_way = #{param2.counterWay}
+ </if>
<if test="param2.areaName != null and param2.areaName != ''">
AND dar.area_name::text LIKE CONCAT('%', #{param2.areaName}::text, '%')
--
Gitblit v1.9.3