From 3152a4e4dadcd6ebfb8e882aa356d063416d49cc Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 24 Nov 2020 09:58:26 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_job
---
src/main/resources/mapper/HistoryHourlyMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index 4f5766c..f9a4473 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 '${sensorKey}',
+ MIN(json->'$.${sensorKey}[1]') AS 'MIN${sensorKey}',
+ MAX(json->'$.${sensorKey}[2]') AS 'MAX${sensorKey}'
</otherwise>
</choose>
</foreach>
--
Gitblit v1.8.0