From 81dc94a70de69f45f42b8ca4b702a3a372cf81ac Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 24 May 2022 09:59:07 +0800
Subject: [PATCH] 去除打印
---
src/main/resources/mapper/HistoryFiveMinutelyMapper.xml | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml b/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
index 840c753..695c213 100644
--- a/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
@@ -1,13 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.moral.mapper.HistoryFiveMinutelyMapper">
+
<select id="getFiveMinutesSensorData" resultType="java.util.LinkedHashMap">
select
h.mac
<foreach collection="sensorKeys" open="," separator="," item="sensorKey">
- 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 '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 'AVG${sensorKey}',
+ ROUND(MIN(json->'$.${sensorKey}[1]'),3) AS 'MIN${sensorKey}',
+ ROUND(MAX(json->'$.${sensorKey}[2]'),3) 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 'MAX${sensorKey}'
+ </otherwise>
+ </choose>
</foreach>
FROM
history_minutely_${yearAndMonth} h
@@ -26,9 +43,11 @@
<update id="createHistoryFiveMinutely" parameterType="String">
CREATE TABLE IF NOT EXISTS `history_five_minutely_${yearAndMonth}` (
- `mac` varchar(20) CHARACTER SET latin1 DEFAULT NULL,
+ `mac` varchar(30) CHARACTER SET latin1 DEFAULT NULL,
`time` datetime DEFAULT NULL,
- `json` json DEFAULT NULL
+ `json` json DEFAULT NULL,
+ KEY `idx_time` (`time`),
+ KEY `idx_mac` (`mac`)
) ENGINE=INNODB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
</update>
--
Gitblit v1.8.0