From 8d5b8a8c1909be6cdca5228a01bdc017b85a4078 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 21 Jan 2026 15:37:17 +0800
Subject: [PATCH] 处理Vo继承entity问题
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 0eeff63..3e0c91d 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,7 +34,11 @@
<select id="selectFwDroneAlarmRecordPage" resultType="org.sxkj.fw.record.vo.FwDroneAlarmRecordVO">
- select dar.*,d.device_name,d.device_model from
+ select
+ dar.*,
+ d.device_name,
+ d.status deviceStatus
+ from
ja_fw_drone_alarm_record dar
left join ja_fw_device d on dar.device_id = d.id
<where>
@@ -107,4 +111,11 @@
SELECT * FROM ja_fw_drone_alarm_record ${ew.customSqlSegment}
</select>
+ <select id="alarmTypeStatistics" resultType="org.sxkj.fw.cockpit.vo.AlarmStatisticsVO">
+ SELECT
+ COUNT(CASE WHEN alarm_type = 1 THEN 1 END) AS realTimeAlarmCount,
+ COUNT(CASE WHEN alarm_type = 2 THEN 2 END) AS historyAlarmCount
+ FROM ja_fw_drone_alarm_record WHERE is_deleted = 0
+ </select>
+
</mapper>
--
Gitblit v1.9.3