From d61a1d81e8dcaf8d0c8e0bd02e8914021aacb468 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 29 七月 2023 09:26:15 +0800
Subject: [PATCH] 3

---
 src/main/resources/mapper/QxshMapper.xml |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/QxshMapper.xml b/src/main/resources/mapper/QxshMapper.xml
index 15e26ab..93e3a28 100644
--- a/src/main/resources/mapper/QxshMapper.xml
+++ b/src/main/resources/mapper/QxshMapper.xml
@@ -10,26 +10,32 @@
 
     <select id="selectMonthTop10" resultType="com.yssh.entity.Qxsh">
         with rs as (
-            select id, name, format(value, 2) "value", time
+            select id, name, lon, lat, format(value, 2) "value", time
             from yssh_qxsh
             where time like #{time} and name like 'AI-%'
         )
-        select id, name, value, time from rs
+        select id, name, lon, lat, value, time from rs
         order by value desc
         limit 10;
     </select>
 
-    <select id="select3Hours" resultType="com.yssh.entity.Qxsh">
+    <select id="count7DayForWarn" resultType="com.yssh.entity.Qxsh">
         select id, name, format(value, 2) "value", time
         from yssh_qxsh
-        where name like 'AI-%' and time in
-            <foreach collection="times" item="time" open="(" separator="," close=")">
-                #{time}
-            </foreach>
-        order by name, time;
+        where time between #{start} and #{end}
+            and value > (select jcyj from alert_config limit 1) and name like 'AI-%'
+        order by time, name;
     </select>
 
     <select id="selectByBeginAndEnd" resultType="com.yssh.entity.Qxsh">
+        select id, name, lon, lat, format(value, 2) "value", time
+        from yssh_qxsh
+        where time between #{start} and #{end}
+            and value > (select jcyj from alert_config limit 1) and name like 'AI-%'
+        order by time, name;
+    </select>
+
+    <select id="selectForReport" resultType="com.yssh.entity.Qxsh">
         select id, name, format(value, 2) "value", time
         from yssh_qxsh
         where time between #{start} and #{end}

--
Gitblit v1.9.3