From 46a35f95b4caddb52ec886ce0ee7d9f81fbf8bb6 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 13 九月 2023 12:55:18 +0800
Subject: [PATCH] 修改电子围栏历史报警按alarm_time逆序返回数据
---
ard-work/src/main/resources/mapper/alarm/ArdAlarmWallMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmWallMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmWallMapper.xml
index b27f048..fb4859c 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmWallMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmWallMapper.xml
@@ -49,6 +49,7 @@
<if test="latitude != null ">and latitude = #{latitude}</if>
<if test="altitude != null ">and altitude = #{altitude}</if>
</where>
+ order by alarm_time desc
</select>
<select id="selectArdAlarmWallById" parameterType="String" resultMap="ArdAlarmWallResult">
@@ -137,8 +138,7 @@
aaa.longitude,
aaa.latitude,
aaa.altitude,
- ROW_NUMBER() OVER ( PARTITION BY aaa.wall_NAME ORDER BY aaa.alarm_time DESC ) AS rn,
- COUNT(CASE WHEN aaa.view_time IS NULL THEN 1 END) OVER ( PARTITION BY aaa.wall_NAME ) AS COUNT,
+ ROW_NUMBER() OVER ( PARTITION BY aaa.wall_NAME ORDER BY aaa.alarm_time DESC ) AS rn, COUNT(CASE WHEN aaa.view_time IS NULL THEN 1 END) OVER ( PARTITION BY aaa.wall_NAME ) AS COUNT,
COUNT ( aaa.alarm_time ) OVER ( PARTITION BY aaa.wall_NAME ) AS total
FROM
ard_alarm_wall aaa
--
Gitblit v1.9.3