From 58ab95398518445ee6e8fb83a5a95ee534fd0541 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 08 Jan 2026 19:02:28 +0800
Subject: [PATCH] 记录优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml | 74 +++++++++++++++----------------------
1 files changed, 30 insertions(+), 44 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 c26f733..0641dbd 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
@@ -33,87 +33,73 @@
</resultMap>
- <select id="selectFwDroneAlarmRecordPage" resultMap="fwDroneAlarmRecordResultMap">
- select * from ja_fw_drone_alarm_record
+ <select id="selectFwDroneAlarmRecordPage" resultType="org.sxkj.fw.record.vo.FwDroneAlarmRecordVO">
+ select dar.* from
+ ja_fw_drone_alarm_record dar
+ left join ja_fw_area_divide ad on dar.area_divide_id = ad.id
<where>
- is_deleted = 0
- <if test="param2.id != null and param2.id != ''">
- and id = #{param2.id}
- </if>
+ dar.is_deleted = 0
+
<if test="param2.deviceId != null and param2.deviceId != ''">
- and device_id = #{param2.deviceId}
+ and dar.device_id = #{param2.deviceId}
</if>
<if test="param2.droneName != null and param2.droneName != ''">
- and drone_name = #{param2.droneName}
+ and dar.drone_name like CONCAT('%', #{param2.droneName}, '%')
</if>
<if test="param2.droneSerialNo != null and param2.droneSerialNo != ''">
- and drone_serial_no = #{param2.droneSerialNo}
+ and dar.drone_serial_no = #{param2.droneSerialNo}
</if>
<if test="param2.droneType != null and param2.droneType != ''">
- and drone_type = #{param2.droneType}
+ and dar.drone_type = #{param2.droneType}
</if>
<if test="param2.alarmType != null and param2.alarmType != ''">
- and alarm_type = #{param2.alarmType}
+ and dar.alarm_type = #{param2.alarmType}
</if>
<if test="param2.alarmTime != null and param2.alarmTime != ''">
- and alarm_time = #{param2.alarmTime}
+ and dar.alarm_time = #{param2.alarmTime}
</if>
<if test="param2.triggerReason != null and param2.triggerReason != ''">
- and trigger_reason = #{param2.triggerReason}
+ and dar.trigger_reason = #{param2.triggerReason}
</if>
<if test="param2.flightStatus != null and param2.flightStatus != ''">
- and flight_status = #{param2.flightStatus}
+ and dar.flight_status = #{param2.flightStatus}
</if>
<if test="param2.longitude != null and param2.longitude != ''">
- and longitude = #{param2.longitude}
+ and dar.longitude = #{param2.longitude}
</if>
<if test="param2.latitude != null and param2.latitude != ''">
- and latitude = #{param2.latitude}
+ and dar.latitude = #{param2.latitude}
</if>
<if test="param2.signalFreqMhz != null and param2.signalFreqMhz != ''">
- and signal_freq_mhz = #{param2.signalFreqMhz}
+ and dar.signal_freq_mhz = #{param2.signalFreqMhz}
</if>
<if test="param2.flightHeightM != null and param2.flightHeightM != ''">
- and flight_height_m = #{param2.flightHeightM}
+ and dar.flight_height_m = #{param2.flightHeightM}
</if>
<if test="param2.flightSpeedMs != null and param2.flightSpeedMs != ''">
- and flight_speed_ms = #{param2.flightSpeedMs}
+ and dar.flight_speed_ms = #{param2.flightSpeedMs}
</if>
<if test="param2.stayDuration != null and param2.stayDuration != ''">
- and stay_duration = #{param2.stayDuration}
+ and dar.stay_duration = #{param2.stayDuration}
</if>
<if test="param2.counterWay != null and param2.counterWay != ''">
- and counter_way = #{param2.counterWay}
+ and dar.counter_way = #{param2.counterWay}
</if>
<if test="param2.areaDivideId != null and param2.areaDivideId != ''">
- and area_divide_id = #{param2.areaDivideId}
+ and dar.area_divide_id = #{param2.areaDivideId}
</if>
<if test="param2.defenseSceneId != null and param2.defenseSceneId != ''">
- and defense_scene_id = #{param2.defenseSceneId}
+ and dar.defense_scene_id = #{param2.defenseSceneId}
</if>
- <if test="param2.areaCode != null and param2.areaCode != ''">
- and area_code = #{param2.areaCode}
+
+ <if test="param2.startTime != null and param2.startTime != '' and param2.endTime != null and param2.endTime != ''">
+ and dar.alarm_time BETWEEN #{param2.startTime} AND #{param2.endTime}
</if>
- <if test="param2.createUser != null and param2.createUser != ''">
- and create_user = #{param2.createUser}
+ <if test="param2.deviceType != null and param2.deviceType != ''">
+ and dar.device_type = #{param2.deviceType}
</if>
- <if test="param2.createDept != null and param2.createDept != ''">
- and create_dept = #{param2.createDept}
- </if>
- <if test="param2.createTime != null and param2.createTime != ''">
- and create_time = #{param2.createTime}
- </if>
- <if test="param2.updateUser != null and param2.updateUser != ''">
- and update_user = #{param2.updateUser}
- </if>
- <if test="param2.updateTime != null and param2.updateTime != ''">
- and update_time = #{param2.updateTime}
- </if>
- <if test="param2.status != null and param2.status != ''">
- and status = #{param2.status}
- </if>
- <if test="param2.isDeleted != null and param2.isDeleted != ''">
- and is_deleted = #{param2.isDeleted}
+ <if test="param2.areaName != null and param2.areaName != ''">
+ and ad.area_name like CONCAT('%', #{param2.areaName}, '%')
</if>
</where>
</select>
--
Gitblit v1.9.3