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/HistoryMinutelyMapper.xml | 10 +++++-----
src/main/resources/mapper/HistoryHourlyMapper.xml | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index 4f5766c..f64a1fc 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -25,13 +25,13 @@
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}',
- ROUND(MIN(json->'$.${sensorKey}[1]'),3) AS 'MIN${sensorKey}',
- ROUND(MAX(json->'$.${sensorKey}[2]'),3) AS 'MAX${sensorKey}'
+ MIN(json->'$.${sensorKey}[1]') AS 'MIN${sensorKey}',
+ MAX(json->'$.${sensorKey}[2]') AS 'MAX${sensorKey}'
</when>
<otherwise>
- ROUND(AVG(json->'$.${sensorKey}[0]'),3) AS 'AVG${sensorKey}',
- ROUND(MIN(json->'$.${sensorKey}[1]'),3) AS 'MIN${sensorKey}',
- ROUND(MAX(json->'$.${sensorKey}[2]'),3) AS '${sensorKey}'
+ AVG(json->'$.${sensorKey}[0]') AS 'AVG${sensorKey}',
+ MIN(json->'$.${sensorKey}[1]') AS 'MIN${sensorKey}',
+ MAX(json->'$.${sensorKey}[2]') AS '${sensorKey}'
</otherwise>
</choose>
</foreach>
diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index d5caab6..8512a8c 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -35,13 +35,13 @@
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}',
- ROUND(MIN(json->'$.${sensorKey}[1]'),3) AS 'MIN${sensorKey}',
- ROUND(MAX(json->'$.${sensorKey}[2]'),3) AS 'MAX${sensorKey}'
+ MIN(json->'$.${sensorKey}[1]') AS 'MIN${sensorKey}',
+ MAX(json->'$.${sensorKey}[2]') AS 'MAX${sensorKey}'
</when>
<otherwise>
- ROUND(AVG(json->'$.${sensorKey}[0]'),3) AS '${sensorKey}',
- ROUND(MIN(json->'$.${sensorKey}[1]'),3) AS 'MIN${sensorKey}',
- ROUND(MAX(json->'$.${sensorKey}[2]'),3) AS 'MAX${sensorKey}'
+ AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}',
+ MIN(json->'$.${sensorKey}[1]') AS 'MIN${sensorKey}',
+ MAX(json->'$.${sensorKey}[2]') AS 'MAX${sensorKey}'
</otherwise>
</choose>
</foreach>
--
Gitblit v1.8.0