From f069ce1cc814e57c36b3c8d48d10af215350081b Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 14 六月 2023 09:40:16 +0800
Subject: [PATCH] 修改盗电报警数据从mqtt接收 修改管线泄漏sql错误

---
 ard-work/src/main/resources/mapper/stealAlarm/ArdAlarmStealelecMapper.xml |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/stealAlarm/ArdAlarmStealelecMapper.xml b/ard-work/src/main/resources/mapper/stealAlarm/ArdAlarmStealelecMapper.xml
index 15970a0..1aa3076 100644
--- a/ard-work/src/main/resources/mapper/stealAlarm/ArdAlarmStealelecMapper.xml
+++ b/ard-work/src/main/resources/mapper/stealAlarm/ArdAlarmStealelecMapper.xml
@@ -40,6 +40,25 @@
             </if>
         </where>
     </select>
+    <select id="selectListAllByCommand" resultMap="BaseResultMap">
+        SELECT T.*
+        FROM (
+                 SELECT aas.ID,
+                        aas.DESCRIBE,
+                        aas.start_time,
+                        aas.longitude,
+                        aas.latitude,
+                        aas.altitude,
+                        ROW_NUMBER() OVER ( PARTITION BY aas.DESCRIBE ORDER BY aas.start_time DESC ) AS rn, COUNT(CASE WHEN aas.view_time IS NULL THEN 1 END) OVER ( PARTITION BY aas.DESCRIBE ) AS COUNT,
+		            COUNT ( aas.start_time ) OVER ( PARTITION BY DESCRIBE ) AS total
+                 FROM
+                     ard_alarm_stealelec aas
+                 WHERE
+                     aas.start_time >= ( CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE )
+                 order by aas.start_time desc
+             ) T
+        WHERE T.rn = 1
+    </select>
     <select id="selectRealByCondition" resultMap="BaseResultMap">
         SELECT aas.*, A.COUNT, A.total
         FROM (
@@ -61,10 +80,14 @@
                  LEFT JOIN ard_alarm_stealelec aas ON A.ID = aas.ID
         ORDER BY aas.start_time DESC LIMIT 50
     </select>
-    <update id="updateViewTimeByDescribe" parameterType="java.lang.String">
+    <select id="selectCountByStartTime" resultType="Integer">
+        select count(DISTINCT aas."describe") from ard_alarm_stealelec aas where aas.start_time >= ( CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE )
+    </select>
+    <update id="updateViewTimeByDescribe" parameterType="String">
         update ard_alarm_stealelec
         set view_time=#{viewTime}
         where describe = #{describe}
+          and start_time&lt;=#{alarmTime}
           and view_time is null
     </update>
     <insert id="insert" parameterType="ArdAlarmStealelec">

--
Gitblit v1.9.3