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/FwDroneFlightRecordMapper.xml | 46 ++++++++++++++++------------------------------
1 files changed, 16 insertions(+), 30 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 f4385b5..02162b9 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,53 +23,39 @@
<select id="selectFwDroneFlightRecordPage" resultMap="fwDroneFlightRecordResultMap">
- select * from ja_fw_drone_flight_record
+ select dfr.* from ja_fw_drone_flight_record dfr
+ left join ja_fw_area_divide ad on dfr.area_divide_id = ad.id
<where>
- is_deleted = 0
- <if test="param2.id != null and param2.id != ''">
- and id = #{param2.id}
- </if>
+ dfr.is_deleted = 0
<if test="param2.deviceId != null and param2.deviceId != ''">
- and device_id = #{param2.deviceId}
+ and dfr.device_id = #{param2.deviceId}
</if>
<if test="param2.droneName != null and param2.droneName != ''">
- and drone_name = #{param2.droneName}
+ and dfr.drone_name like CONCAT('%', #{param2.droneName}, '%')
</if>
<if test="param2.serialNo != null and param2.serialNo != ''">
- and serial_no = #{param2.serialNo}
+ and dfr.serial_no = #{param2.serialNo}
</if>
<if test="param2.alarmTime != null and param2.alarmTime != ''">
- and alarm_time = #{param2.alarmTime}
+ and dfr.alarm_time = #{param2.alarmTime}
</if>
<if test="param2.triggerType != null and param2.triggerType != ''">
- and trigger_type = #{param2.triggerType}
+ and dfr.trigger_type = #{param2.triggerType}
</if>
<if test="param2.stayDuration != null and param2.stayDuration != ''">
- and stay_duration = #{param2.stayDuration}
+ and dfr.stay_duration = #{param2.stayDuration}
</if>
<if test="param2.areaCode != null and param2.areaCode != ''">
- and area_code = #{param2.areaCode}
+ and dfr.area_code = #{param2.areaCode}
</if>
- <if test="param2.createUser != null and param2.createUser != ''">
- and create_user = #{param2.createUser}
+ <if test="param2.startTime != null and param2.startTime != '' and param2.endTime != null and param2.endTime != ''">
+ and dfr.alarm_time BETWEEN #{param2.startTime} AND #{param2.endTime}
</if>
- <if test="param2.createDept != null and param2.createDept != ''">
- and create_dept = #{param2.createDept}
+ <if test="param2.deviceType != null and param2.deviceType != ''">
+ and dfr.device_type = #{param2.deviceType}
</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