From 33ab5566da759239cdde4e80464ee293e4154fc3 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 09 Jan 2026 10:44:01 +0800
Subject: [PATCH] 数据驾驶舱
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml
index 02162b9..298b579 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml
@@ -24,7 +24,6 @@
<select id="selectFwDroneFlightRecordPage" resultMap="fwDroneFlightRecordResultMap">
select dfr.* from ja_fw_drone_flight_record dfr
- left join ja_fw_area_divide ad on dfr.area_divide_id = ad.id
<where>
dfr.is_deleted = 0
<if test="param2.deviceId != null and param2.deviceId != ''">
@@ -55,14 +54,25 @@
and dfr.device_type = #{param2.deviceType}
</if>
<if test="param2.areaName != null and param2.areaName != ''">
- and ad.area_name like CONCAT('%', #{param2.areaName}, '%')
+ and dfr.area_name like CONCAT('%', #{param2.areaName}, '%')
</if>
</where>
</select>
<select id="exportFwDroneFlightRecord" resultType="org.sxkj.fw.record.excel.FwDroneFlightRecordExcel">
- SELECT * FROM ja_fw_drone_flight_record ${ew.customSqlSegment}
+ SELECT dfr.drone_name,
+ dfr.serial_no,
+ dfr.alarm_time,
+ dfr.area_name,
+ dfr.trigger_type,
+ dfr.stay_duration,
+ dfrd.longitude,
+ dfrd.latitude,
+ dfrd.point_time
+ FROM ja_fw_drone_flight_record dfr
+ left join ja_fw_drone_flight_record_detail dfrd on dfr.id = dfrd.flight_record_id
+ where dfr.is_deleted = 0
</select>
</mapper>
--
Gitblit v1.9.3