From 5799ca158c43e9c74a7a7eeb88a0b03a02513a68 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 02 Nov 2020 14:45:43 +0800
Subject: [PATCH] 修改平均风向SQL语句
---
src/main/resources/mapper/AlarmMapper.xml | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/AlarmMapper.xml b/src/main/resources/mapper/AlarmMapper.xml
index 5ab87ad..f070bda 100644
--- a/src/main/resources/mapper/AlarmMapper.xml
+++ b/src/main/resources/mapper/AlarmMapper.xml
@@ -3,20 +3,27 @@
<mapper namespace="com.moral.mapper.AlarmMapper">
<select id="getAlarmData" resultType="java.util.LinkedHashMap">
SELECT
- mac
- <foreach collection="sensorKeys" open="," separator="," item="sensorKey">
- json->'$.${sensorKey}[0]' AS '${sensorKey}'
- </foreach>
+ json_search ( json, 'all', '1' ) '1',
+ json_search ( json, 'all', '2' ) '2',
+ json_search ( json, 'all', '3' ) '3'
FROM
alarm_${yearAndMonth}
WHERE
time >= #{start}
AND time <![CDATA[<]]> #{end}
- AND mac in
- <foreach collection="macs" open="(" separator="," close=")"
- item="mac">
- #{mac}
- </foreach>
+ AND mac =#{mac}
+ </select>
+
+ <select id="getMacs" resultType="java.lang.String">
+ SELECT
+ mac
+ FROM
+ alarm_${yearAndMonth}
+ where
+ time >= #{start}
+ AND time <![CDATA[<]]> #{end}
+ GROUP BY
+ mac
</select>
<insert id="insertAlarmDaily">
--
Gitblit v1.8.0