From 8585b431e9257333413358eb37c30ae58f74db76 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 13 Aug 2026 15:46:10 +0800
Subject: [PATCH] refactor(database): 优化数据库查询中的字段映射
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml | 52 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 40 insertions(+), 12 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 4f7e913..c9b43ca 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
@@ -52,7 +52,6 @@
<where>
dar.is_deleted = 0
AND d.is_enabled = 1
-
<if test="param2.regionCode != null and param2.regionCode != ''">
AND (
d.final_outbound_area_code LIKE CONCAT(#{param2.regionCode}, '%')
@@ -70,14 +69,9 @@
AND dar.device_id::text = #{param2.deviceId}::text
</if>
- <if test="(param2.droneName != null and param2.droneName != '') or (param2.droneSerialNo != null and param2.droneSerialNo != '')">
- AND ( 1=2
- <if test="param2.droneName != null and param2.droneName != ''">
- OR dar.drone_name::text LIKE CONCAT('%', #{param2.droneName}::text, '%')
- </if>
- <if test="param2.droneSerialNo != null and param2.droneSerialNo != ''">
- OR dar.drone_serial_no::text LIKE CONCAT('%', #{param2.droneSerialNo}::text, '%')
- </if>
+ <if test="param2.droneName != null and param2.droneName != ''">
+ AND ( dar.drone_name::text LIKE CONCAT('%', #{param2.droneName}::text, '%')
+ or dar.drone_serial_no::text LIKE CONCAT('%', #{param2.droneName}::text, '%')
)
</if>
@@ -92,16 +86,50 @@
<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::text = #{param2.deviceType}::text
+ 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, '%')
</if>
+ ORDER BY favorited DESC, dar.alarm_time DESC
</where>
- ORDER BY favorited DESC, dar.alarm_time DESC
+
</select>
--
Gitblit v1.9.3