From 7e25fda3cfb8a7fc785cb6261a888671fb146fbe Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 18 Nov 2020 14:13:13 +0800
Subject: [PATCH] 从history获取数据接口更新为从history日表获取

---
 src/main/resources/mapper/HistoryMapper.xml |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 8a44f87..0fd5fcf 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.moral.mapper.HistoryMapper">
     <select id="selectValueByMacAndTime" resultType="java.lang.String">
-		select `value` from history
+		select `value` from history_${timeUnits}
 		where  time = #{time} and mac = #{mac}
 		limit 0,1
 	</select>
@@ -13,10 +13,10 @@
             d.`name`,
         </if>
         <foreach collection="sensorKeys" separator="," item="sensorKey">
-            AVG(h.`value` ->'$.${sensorKey}[0]') AS '${sensorKey}'
+            AVG(h.`value` ->'$.${sensorKey}') AS '${sensorKey}'
         </foreach>
         FROM
-        history h,
+        history_${timeUnits} h,
         device d,
         monitor_point mp
         WHERE
@@ -132,7 +132,7 @@
 			value,
 			time
 		FROM
-			history 
+			history_${timeUnits}
 		WHERE
 			mac = #{mac} 
 		ORDER BY
@@ -143,10 +143,10 @@
     <select id="getActualDataByRegion" resultType="java.util.Map">
         SELECT
         <foreach collection="sensorKeys" separator="," item="sensorKey">
-            MAX( `value` ->> '$.${sensorKey}' ) * 1 AS '${sensorKey}'
+            MAX( `value` -> '$.${sensorKey}' ) * 1 AS '${sensorKey}'
         </foreach>
         FROM
-        history h ,
+        history_${timeUnits} h ,
         device d,
         monitor_point mp
         <where>
@@ -165,9 +165,10 @@
 
     <select id="getAVGValueByMacAndTimeslot" resultType="java.util.Map">
 		SELECT AVG(JSON_EXTRACT(value,'$.e1[0]')) e1,AVG(JSON_EXTRACT(value,'$.e2[0]')) e2,AVG(JSON_EXTRACT(value,'$.e10[0]')) e10,AVG(JSON_EXTRACT(value,'$.e11[0]')) e11,AVG(JSON_EXTRACT(value,'$.e16[0]')) e16,AVG(JSON_EXTRACT(value,'$.e15[0]')) e15
-		FROM history
+		FROM history_${timeUnits}
 		WHERE mac = #{mac}
-		AND time BETWEEN #{starttime} AND #{endtime}
+		AND time >= #{starttime}
+		AND time <![CDATA[<]]> #{endtime}
 	</select>
 
     <!-- ���������sensor������������ -->
@@ -196,7 +197,7 @@
 
     <select id="getAVGSensorRankByMonitorPointIdList" resultType="java.util.Map">
         SELECT mp.name, AVG(JSON_EXTRACT(h.value,'$.${sensor}[0]')) sensor
-        FROM device d, history h, monitor_point mp
+        FROM device d, history_${timeUnits} h, monitor_point mp
         WHERE d.mac=h.mac
         And mp.id=d.monitor_point_id
         AND d.monitor_point_id IN
@@ -210,10 +211,11 @@
 
     <select id="getMonitorPointAVGValueByMonitorPointIdAndTimeslot" resultType="java.util.Map">
     	SELECT AVG(JSON_EXTRACT(value,'$.e1[0]')) e1,AVG(JSON_EXTRACT(value,'$.e2[0]')) e2,AVG(JSON_EXTRACT(value,'$.e10[0]')) e10,AVG(JSON_EXTRACT(value,'$.e11[0]')) e11,AVG(JSON_EXTRACT(value,'$.e16[0]')) e16,AVG(JSON_EXTRACT(value,'$.e15[0]')) e15
-		FROM device d,history h
+		FROM device d,history_${timeUnits} h
 		WHERE d.monitor_point_id = #{monitor_point_id}
 		AND d.mac = h.mac
-		AND h.time BETWEEN #{starttime} AND #{endtime}
+		AND h.time >= #{starttime}
+		AND h.time <![CDATA[<]]> #{endtime}
     </select>
 
     <!-- ���������sensor������ -->
@@ -292,8 +294,9 @@
         select `json` from ${table}
 		where  time = #{time} and mac = #{mac}
     </select>
+
     <select id="getValueByMacAndTime" resultType="java.lang.String">
-        select `value` from history
+        select `value` from history_${timeUnits}
 		where  mac = #{mac} and time &gt;= #{time1} and time &lt;=#{time}
         limit 0,1
     </select>

--
Gitblit v1.8.0