From 8ac34cbae4ea8cc47194f51389a4e2dddebcc7d5 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 13:55:20 +0800
Subject: [PATCH] opt: sql改造其他模块改造7
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml | 73 +++++++++++++++++++++++++++++-------
1 files changed, 59 insertions(+), 14 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 298b579..bb6fecd 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
@@ -23,9 +23,28 @@
<select id="selectFwDroneFlightRecordPage" resultMap="fwDroneFlightRecordResultMap">
- select dfr.* from ja_fw_drone_flight_record dfr
+ select
+ dfr.*
+ from
+ ja_fw_drone_flight_record dfr
+ left join
+ ja_fw_device d on dfr.device_id = d.id::VARCHAR
<where>
- dfr.is_deleted = 0
+ dfr.is_deleted = 0
+ and d.track_status = 1
+ and d.is_enabled = 1
+ <if test="param2.regionCode != null and param2.regionCode != ''">
+ and (d.final_outbound_area_code like CONCAT(#{param2.regionCode}, '%')
+ <!-- 或者设备是共享给当前部门的 -->
+ <if test="param2.currentDeptId != null and param2.currentDeptId != '' ">
+ or dfr.device_id in (
+ SELECT device_id FROM ja_fw_device_per_share
+ WHERE loan_to_dept_id = #{param2.currentDeptId}
+ AND is_deleted = 0
+ )
+ </if>
+ )
+ </if>
<if test="param2.deviceId != null and param2.deviceId != ''">
and dfr.device_id = #{param2.deviceId}
</if>
@@ -61,18 +80,44 @@
<select id="exportFwDroneFlightRecord" resultType="org.sxkj.fw.record.excel.FwDroneFlightRecordExcel">
- 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
+ dfr.id,
+ 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_device d on dfr.device_id = d.id::VARCHAR
+ left join
+ ja_fw_drone_flight_record_detail dfrd on dfr.id = dfrd.flight_record_id::VARCHAR
+ <where>
+ dfr.is_deleted = 0
+ <if test="ids != null and ids.size() > 0">
+ and dfr.id in
+ <foreach item="item" collection="ids" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="regionCode != null and regionCode != ''">
+ and (d.final_outbound_area_code like CONCAT(#{regionCode}, '%')
+ <!-- 或者设备是共享给当前部门的 -->
+ <if test="currentDeptId != null and currentDeptId != '' ">
+ or dfr.device_id in (
+ SELECT device_id FROM ja_fw_device_per_share
+ WHERE loan_to_dept_id = #{currentDeptId}
+ AND is_deleted = 0
+ )
+ </if>
+ )
+ </if>
+ </where>
</select>
</mapper>
--
Gitblit v1.9.3