From 99773108758898c032f67a125439fb811f5b992b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 20 Nov 2020 13:33:18 +0800
Subject: [PATCH] 天气预测，实测优化
---
src/main/resources/mapper/HistoryHourlyMapper.xml | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index ef5edec..f9a4473 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -15,9 +15,25 @@
SELECT
h.mac,
<foreach collection="sensorKeys" separator="," item="sensorKey">
- AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}',
- MIN(json->'$.${sensorKey}[1]') AS 'MIN${sensorKey}',
- MAX(json->'$.${sensorKey}[2]') AS 'MAX${sensorKey}'
+ <choose >
+ <when test="sensorKey=='e23'">
+ ROUND((CASE WHEN AVG(json->'$.e18[0]'*SIN((json->'$.e23[0]'/180)*PI()))<![CDATA[>]]>0 AND AVG(json->'$.e18[0]'*COS((json->'$.e23[0]'/180)*PI()))<![CDATA[>]]>0
+ THEN ATAN(AVG(json->'$.e18[0]'*SIN((json->'$.e23[0]'/180)*PI()))/AVG(json->'$.e18[0]'*COS((json->'$.e23[0]'/180)*PI())))*180/PI()
+ WHEN AVG(json->'$.e18[0]'*SIN((json->'$.e23[0]'/180)*PI()))>0 AND AVG(json->'$.e18[0]'*COS((json->'$.e23[0]'/180)*PI()))<![CDATA[<]]>0
+ THEN (ATAN(AVG(json->'$.e18[0]'*SIN((json->'$.e23[0]'/180)*PI()))/AVG(json->'$.e18[0]'*COS((json->'$.e23[0]'/180)*PI())))*180/PI())+180
+ WHEN AVG(json->'$.e18[0]'*SIN((json->'$.e23[0]'/180)*PI()))<![CDATA[<]]>0 AND AVG(json->'$.e18[0]'*COS((json->'$.e23[0]'/180)*PI()))<![CDATA[<]]>0
+ THEN (ATAN(AVG(json->'$.e18[0]'*SIN((json->'$.e23[0]'/180)*PI()))/AVG(json->'$.e18[0]'*COS((json->'$.e23[0]'/180)*PI())))*180/PI())+180
+ ELSE (ATAN(AVG(json->'$.e18[0]'*SIN((json->'$.e23[0]'/180)*PI()))/AVG(json->'$.e18[0]'*COS((json->'$.e23[0]'/180)*PI())))*180/PI())+360
+ END),3) AS '${sensorKey}',
+ MIN(json->'$.${sensorKey}[1]') AS 'MIN${sensorKey}',
+ MAX(json->'$.${sensorKey}[2]') AS 'MAX${sensorKey}'
+ </when>
+ <otherwise>
+ AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}',
+ MIN(json->'$.${sensorKey}[1]') AS 'MIN${sensorKey}',
+ MAX(json->'$.${sensorKey}[2]') AS 'MAX${sensorKey}'
+ </otherwise>
+ </choose>
</foreach>
FROM
history_hourly h
--
Gitblit v1.8.0