From 4b4a150626f7943ee0811d7c3c718be0abe68b23 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 29 七月 2023 10:41:41 +0800
Subject: [PATCH] 6

---
 src/main/resources/mapper/QxshMapper.xml |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/QxshMapper.xml b/src/main/resources/mapper/QxshMapper.xml
index d785b67..8d73f5b 100644
--- a/src/main/resources/mapper/QxshMapper.xml
+++ b/src/main/resources/mapper/QxshMapper.xml
@@ -19,6 +19,22 @@
         limit 10;
     </select>
 
+    <select id="selectWarnByBeginAndEnd" 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 name like 'AI-%'
+            and value > (select jcyj from alert_config limit 1) and value &lt;= (select jcbj from alert_config limit 1)
+        order by time desc, name;
+    </select>
+
+    <select id="selectAlarmByBeginAndEnd" 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 name like 'AI-%'
+            and value > (select jcbj from alert_config limit 1)
+        order by time desc, name;
+    </select>
+
     <select id="countMonthForWarn" resultType="java.lang.Integer">
         select count(*)
         from yssh_qxsh
@@ -29,7 +45,8 @@
     <select id="countMonthForAlarm" resultType="java.lang.Integer">
         select count(*)
         from yssh_qxsh
-        where time between #{start} and #{end} and name like 'AI-%' and value > (select jcbj from alert_config limit 1);
+        where time between #{start} and #{end} and name like 'AI-%'
+            and value > (select jcbj from alert_config limit 1);
     </select>
 
     <select id="count7DayForWarn" resultType="java.util.Map">
@@ -46,12 +63,13 @@
         with rs as (
             select left(time, 8) "createTime"
             from yssh_qxsh
-            where time between #{start} and #{end} and name like 'AI-%' and value > (select jcbj from alert_config limit 1)
+            where time between #{start} and #{end} and name like 'AI-%'
+                and value > (select jcbj from alert_config limit 1)
         )
         select createTime, count(*) "num" from rs group by createTime order by createTime;
     </select>
 
-    <select id="selectByBeginAndEnd" resultType="com.yssh.entity.Qxsh">
+    <select id="select3Hours" resultType="com.yssh.entity.Qxsh">
         select id, name, lon, lat, format(value, 2) "value", time
         from yssh_qxsh
         where time between #{start} and #{end}

--
Gitblit v1.9.3