From 0a1b51f38e6ddccb1a9664b9d1bd4671b2cac32b Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期四, 14 九月 2023 09:56:41 +0800 Subject: [PATCH] 设备健康信息 --- 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