From 4e48664942bbefe70699ca43d25cbbd56ecc8daa Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Mon, 19 Jan 2026 15:17:12 +0800
Subject: [PATCH] update-维修计划状态更新、新增定时器修改状态
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 efdafb0..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,9 +34,12 @@
<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_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
@@ -98,7 +101,7 @@
and dar.device_type = #{param2.deviceType}
</if>
<if test="param2.areaName != null and param2.areaName != ''">
- and ad.area_name like CONCAT('%', #{param2.areaName}, '%')
+ and dar.area_name like CONCAT('%', #{param2.areaName}, '%')
</if>
</where>
</select>
@@ -108,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