From dd07cafb1604f528fbb7a04a79fc89b55198e080 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 08 七月 2024 16:24:15 +0800
Subject: [PATCH] 电子围栏挂接bug修改提交

---
 ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
index 1fe49c8..05a77ce 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
@@ -150,7 +150,7 @@
                  aar.create_time >= ( CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE )
              GROUP BY aar.NAME
             ) r
-                INNER JOIN ard_alarm_radar_move aaar ON r.create_time1 = aaar.create_time
+                INNER JOIN ard_alarm_radar_move aaar ON aaar.NAME = r.NAME AND r.create_time1 = aaar.create_time
         ORDER BY aaar.create_time desc
     </select>
     <update id="updateViewTimeByCondition" parameterType="String">
@@ -176,6 +176,6 @@
     </select>
     <select id="ten" resultType="com.ruoyi.statistical.vo.TenVo">
         SELECT name,count(name) as "value" from ard_alarm_radar_move
-        where (current_timestamp - interval '1024 hour') &lt;= alarm_time GROUP BY name ORDER BY "value" desc LIMIT 10
+        where (current_timestamp - interval '1024 hour') &lt;= alarm_time GROUP BY name ORDER BY "value" desc LIMIT 10 offset 0
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3