Merge remote-tracking branch 'origin/master'

linwei

2026-01-14 bc1a6bb5bb2803ed6a5669a976bf2b47f3dacfca

 drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml

@@ -107,4 +107,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>