From 72747f407004aadc8dbfe2148b3e26ab8bbaf2d4 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 08 Apr 2026 13:36:06 +0800
Subject: [PATCH] opt: 人大金仓数据库改造
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 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 9710c6f..50e9510 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
@@ -52,7 +52,6 @@
<where>
dar.is_deleted = 0
AND d.is_enabled = 1
-
<if test="param2.regionCode != null and param2.regionCode != ''">
AND (
d.final_outbound_area_code LIKE CONCAT(#{param2.regionCode}, '%')
@@ -69,6 +68,7 @@
<if test="param2.deviceId != null and param2.deviceId != ''">
AND dar.device_id::text = #{param2.deviceId}::text
</if>
+
<if test="param2.droneName != null and param2.droneName != ''">
AND (
dar.drone_name::text LIKE CONCAT('%', #{param2.droneName}::text, '%')
@@ -94,8 +94,8 @@
<if test="param2.areaName != null and 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, dar.alarm_time DESC
</select>
--
Gitblit v1.9.3