From 8585b431e9257333413358eb37c30ae58f74db76 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 13 Aug 2026 15:46:10 +0800
Subject: [PATCH] refactor(database): 优化数据库查询中的字段映射
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml | 135 ++++++++++++++++++++++++++++-----------------
1 files changed, 84 insertions(+), 51 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 260efd0..c9b43ca 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,73 +34,102 @@
<select id="selectFwDroneAlarmRecordPage" resultType="org.sxkj.fw.record.vo.FwDroneAlarmRecordVO">
- select
+ SELECT
dar.*,
d.device_name,
- d.status deviceStatus,
+ d.status AS deviceStatus,
d.final_outbound_area,
- /* 1=已关注，0=未关注 */
EXISTS (
- SELECT
- 1
- FROM
- ja_fw_alarm_favorite f
- WHERE
- /* 修改点1：确保 ID 比对类型一致 */
- f.alarm_record_id::VARCHAR = dar.id::VARCHAR
- AND f.user_id = #{param2.currentUserId}::bigint
- AND f.is_deleted = 0
+ SELECT 1 FROM ja_fw_alarm_favorite f
+ WHERE f.alarm_record_id::text = dar.id::text
+ AND f.user_id = #{param2.currentUserId}::bigint
+ AND f.is_deleted = 0
) AS favorited
- from
+ FROM
ja_fw_drone_alarm_record dar
- left join
- /* 修改点2：JOIN 两端全部转 VARCHAR 避坑 */
- ja_fw_device d on dar.device_id::VARCHAR = d.id::VARCHAR
+ LEFT JOIN
+ ja_fw_device d ON dar.device_id::text = d.id::text
<where>
dar.is_deleted = 0
- and d.is_enabled = 1
+ AND d.is_enabled = 1
<if test="param2.regionCode != null and param2.regionCode != ''">
- and (d.final_outbound_area_code like CONCAT(#{param2.regionCode}, '%')
+ AND (
+ d.final_outbound_area_code LIKE CONCAT(#{param2.regionCode}, '%')
<if test="param2.currentDeptId != null and param2.currentDeptId != '' ">
- /* 修改点3：IN 两端必须类型对等 */
- or dar.device_id::VARCHAR in (
- SELECT device_id::VARCHAR FROM ja_fw_device_per_share
+ OR dar.device_id::text IN (
+ SELECT device_id::text FROM ja_fw_device_per_share
WHERE loan_to_dept_id = #{param2.currentDeptId}::bigint
AND is_deleted = 0
)
</if>
)
</if>
+
<if test="param2.deviceId != null and param2.deviceId != ''">
- and dar.device_id::VARCHAR = #{param2.deviceId}::VARCHAR
+ AND dar.device_id::text = #{param2.deviceId}::text
</if>
- /* ... 其余 if 条件保持不变 ... */
+
<if test="param2.droneName != null and param2.droneName != ''">
- and (
- dar.drone_name like CONCAT('%', #{param2.droneName}, '%')
- </if>
- <if test="param2.droneSerialNo != null and param2.droneSerialNo != ''">
- or dar.drone_serial_no like CONCAT('%', #{param2.droneSerialNo}, '%')
+ AND ( dar.drone_name::text LIKE CONCAT('%', #{param2.droneName}::text, '%')
+ or dar.drone_serial_no::text LIKE CONCAT('%', #{param2.droneName}::text, '%')
)
</if>
- /* ... 注意：如果下面的字段如 area_divide_id 是 bigint，也要像下面这样处理 ... */
+
<if test="param2.areaDivideId != null and param2.areaDivideId != ''">
- and dar.area_divide_id::VARCHAR = #{param2.areaDivideId}::VARCHAR
+ AND dar.area_divide_id::text = #{param2.areaDivideId}::text
</if>
+
<if test="param2.defenseSceneId != null and param2.defenseSceneId != ''">
- and dar.defense_scene_id::VARCHAR = #{param2.defenseSceneId}::VARCHAR
+ AND dar.defense_scene_id::text = #{param2.defenseSceneId}::text
</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}
+ AND dar.alarm_time BETWEEN #{param2.startTime}::timestamp AND #{param2.endTime}::timestamp
</if>
<if test="param2.deviceType != null and param2.deviceType != ''">
- and dar.device_type = #{param2.deviceType}
+ AND dar.device_type = #{param2.deviceType}
</if>
+ <if test="param2.droneType != null and param2.droneType != ''">
+ AND dar.drone_type = #{param2.droneType}
+ </if>
+ <if test="param2.alarmType != null and param2.alarmType != ''">
+ and dar.alarm_type = #{param2.alarmType}
+ </if>
+
+ <if test="param2.triggerReason != null and param2.triggerReason != ''">
+ and dar.trigger_reason = #{param2.triggerReason}
+ </if>
+ <if test="param2.flightStatus != null and param2.flightStatus != ''">
+ and dar.flight_status = #{param2.flightStatus}
+ </if>
+ <if test="param2.longitude != null and param2.longitude != ''">
+ and dar.longitude = #{param2.longitude}
+ </if>
+ <if test="param2.latitude != null and param2.latitude != ''">
+ and dar.latitude = #{param2.latitude}
+ </if>
+ <if test="param2.signalFreqMhz != null and param2.signalFreqMhz != ''">
+ and dar.signal_freq_mhz = #{param2.signalFreqMhz}
+ </if>
+ <if test="param2.flightHeightM != null and param2.flightHeightM != ''">
+ and dar.flight_height_m = #{param2.flightHeightM}
+ </if>
+ <if test="param2.flightSpeedMs != null and param2.flightSpeedMs != ''">
+ and dar.flight_speed_ms = #{param2.flightSpeedMs}
+ </if>
+ <if test="param2.stayDuration != null and param2.stayDuration != ''">
+ and dar.stay_duration = #{param2.stayDuration}
+ </if>
+ <if test="param2.counterWay != null and param2.counterWay != ''">
+ and dar.counter_way = #{param2.counterWay}
+ </if>
+
<if test="param2.areaName != null and param2.areaName != ''">
- and dar.area_name like CONCAT('%', #{param2.areaName}, '%')
+ AND dar.area_name::text LIKE CONCAT('%', #{param2.areaName}::text, '%')
</if>
+ ORDER BY favorited DESC, dar.alarm_time DESC
</where>
- order by favorited desc
+
</select>
@@ -111,22 +140,22 @@
d.status deviceStatus
from
ja_fw_drone_alarm_record dar
- left join ja_fw_device d on dar.device_id = d.id::VARCHAR
+ left join ja_fw_device d on dar.device_id::text = d.id::text
<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}
+ #{item}::bigint
</foreach>
</if>
<if test="regionCode != null and regionCode != ''">
- and (d.final_outbound_area_code like CONCAT(#{regionCode}, '%')
- <!-- 或者设备是共享给当前部门的 -->
+ and (d.final_outbound_area_code::text like CONCAT(#{regionCode}::text, '%')
<if test="currentDeptId != null and currentDeptId != '' ">
or dar.device_id in (
SELECT device_id FROM ja_fw_device_per_share
- WHERE loan_to_dept_id = #{currentDeptId}
+ WHERE
+ loan_to_dept_id = #{currentDeptId}::bigint
AND is_deleted = 0
)
</if>
@@ -137,22 +166,26 @@
<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
+ /* 1 和 2 如果是字符类型请加单引号 '1'，如果是数字则保持现状 */
+ COUNT(CASE WHEN alarm_type::text = '1' THEN 1 END) AS realTimeAlarmCount,
+ COUNT(CASE WHEN alarm_type::text = '2' THEN 2 END) AS historyAlarmCount
FROM
- ja_fw_drone_alarm_record dar
+ ja_fw_drone_alarm_record dar
left join
- ja_fw_device d on dar.device_id = d.id::VARCHAR
+ /* 修改点1：JOIN 两端对齐转为 text */
+ ja_fw_device d on dar.device_id::text = d.id::text
WHERE dar.is_deleted = 0
- AND d.is_deleted = 0
- and d.is_enabled = 1
+ AND d.is_deleted = 0
+ and d.is_enabled = 1
<if test="regionCode != null and regionCode != ''">
- and (d.final_outbound_area_code like CONCAT(#{regionCode}, '%')
- <!-- 或者设备是共享给当前部门的 -->
+ and (d.final_outbound_area_code::text like CONCAT(#{regionCode}, '%')
<if test="currentDeptId != null and currentDeptId != '' ">
- or dar.device_id in (
- SELECT device_id FROM ja_fw_device_per_share
- WHERE loan_to_dept_id = #{currentDeptId}
+ /* 修改点2：dar.device_id 转 text 以匹配子查询返回的文本数组 */
+ or dar.device_id::text in (
+ SELECT device_id::text
+ FROM ja_fw_device_per_share
+ /* 修改点3：参数强转为 bigint 匹配数据库字段类型 */
+ WHERE loan_to_dept_id = #{currentDeptId}::bigint
AND is_deleted = 0
)
</if>
--
Gitblit v1.9.3