From 51c2a670b6b7d031f2cd6ef6c5e8a77bf25df413 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 08 Jan 2026 19:24:00 +0800
Subject: [PATCH] 记录优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml | 7 +++----
1 files changed, 3 insertions(+), 4 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 0641dbd..efdafb0 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
@@ -34,12 +34,12 @@
<select id="selectFwDroneAlarmRecordPage" resultType="org.sxkj.fw.record.vo.FwDroneAlarmRecordVO">
- select dar.* from
+ select dar.*,d.device_name,d.device_model from
ja_fw_drone_alarm_record dar
- left join ja_fw_area_divide ad on dar.area_divide_id = ad.id
+ left join ja_fw_area_divide ad on dar.area_divide_id = ad.id
+ left join ja_fw_device d on dar.device_id = d.id
<where>
dar.is_deleted = 0
-
<if test="param2.deviceId != null and param2.deviceId != ''">
and dar.device_id = #{param2.deviceId}
</if>
@@ -91,7 +91,6 @@
<if test="param2.defenseSceneId != null and param2.defenseSceneId != ''">
and dar.defense_scene_id = #{param2.defenseSceneId}
</if>
-
<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>
--
Gitblit v1.9.3