From 74756c657109a4e48dd6c0b4d8959cdab89b33a9 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 28 Jan 2026 20:10:29 +0800
Subject: [PATCH] update-区域划分表结构调整
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml | 70 +++++++++++++++++++++++++++++++----
1 files changed, 62 insertions(+), 8 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..747d131 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,20 +34,37 @@
<select id="selectFwDroneAlarmRecordPage" resultType="org.sxkj.fw.record.vo.FwDroneAlarmRecordVO">
- 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_device d on dar.device_id = d.id
+ select
+ dar.*,
+ d.device_name,
+ d.status deviceStatus,
+ /* 1=已关注，0=未关注 */
+ EXISTS (
+ SELECT
+ 1
+ FROM
+ ja_fw_alarm_favorite f
+ WHERE
+ f.alarm_record_id = dar.id
+ AND f.user_id = #{param2.currentUserId} -- MyBatis 参数
+ AND f.is_deleted = 0
+ ) AS favorited
+ from
+ ja_fw_drone_alarm_record dar
+ 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>
<if test="param2.droneName != null and param2.droneName != ''">
- and dar.drone_name like CONCAT('%', #{param2.droneName}, '%')
+ and (
+ dar.drone_name like CONCAT('%', #{param2.droneName}, '%')
</if>
<if test="param2.droneSerialNo != null and param2.droneSerialNo != ''">
- and dar.drone_serial_no = #{param2.droneSerialNo}
+ or dar.drone_serial_no like CONCAT('%', #{param2.droneSerialNo}, '%')
+ )
</if>
<if test="param2.droneType != null and param2.droneType != ''">
and dar.drone_type = #{param2.droneType}
@@ -98,14 +115,51 @@
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>
+ <if test="param2.deptList != null and param2.deptList.size > 0">
+ and dar.create_dept in
+ <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
</if>
</where>
+ order by favorited desc
</select>
<select id="exportFwDroneAlarmRecord" resultType="org.sxkj.fw.record.excel.FwDroneAlarmRecordExcel">
- SELECT * FROM ja_fw_drone_alarm_record ${ew.customSqlSegment}
+ 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>
+ dar.is_deleted = 0
+ <if test="ids != null and ids.size() > 0">
+ and dar.id in
+ <foreach item="item" collection="ids" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ </where>
+ </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
+ <if test="deptList != null and deptList.size > 0">
+ and create_dept in
+ <foreach collection="deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3