From 875ade2caa81f3c42554d554ebe1f649c21a3447 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 28 Feb 2018 16:41:25 +0800
Subject: [PATCH] test

---
 src/main/resources/mapper/HistoryEntityMapper.xml |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/mapper/HistoryEntityMapper.xml b/src/main/resources/mapper/HistoryEntityMapper.xml
index 85374e0..2d1c61d 100644
--- a/src/main/resources/mapper/HistoryEntityMapper.xml
+++ b/src/main/resources/mapper/HistoryEntityMapper.xml
@@ -231,10 +231,10 @@
 		FROM
 			history
 		WHERE
-			mac = #{mac}
-		AND mac_key = #{macKey}
-		AND time &gt; #{start}
-		AND time &lt; #{end}
+			mac = #{mac,jdbcType=VARCHAR}
+		AND mac_key = #{macKey,jdbcType=VARCHAR}
+		AND time &gt; #{start,jdbcType=TIMESTAMP}
+		AND time &lt; #{end,jdbcType=TIMESTAMP}
   </select>
 
 	<select id="getAverageByAll" resultType="map">
@@ -266,7 +266,7 @@
 		<if test="macKey != null and macKey != 'all'">
 			AND	h.mac_key = #{macKey}
 			GROUP BY e.id
-			ORDER BY avg
+			ORDER BY avg desc
 		</if>	
 		<if test="macKey == 'all'">
 			GROUP BY h.mac_key
@@ -287,10 +287,6 @@
 			</foreach>
 		</if>
 		GROUP BY state
-	</select>
-
-	<select id="getMacLogByLast" resultType="string">
-		SELECT mac_log FROM logger ORDER BY time DESC LIMIT 1
 	</select>
 
 	<select id="getSensorsAverageByEquipment" resultType="map">
@@ -336,4 +332,21 @@
 		GROUP BY
 			time
 	</select>
+	
+	<select id="getDayAQIByDevice" resultType="map">
+		SELECT
+			AVG(json -> '$.e1[0]') e1,
+			AVG(json -> '$.e2[0]') e2,
+			AVG(json -> '$.e10[0]') e10,
+			AVG(json -> '$.e11[0]') e11,
+			AVG(json -> '$.e15[0]') e15,
+			AVG(json -> '$.e16[0]') e16
+		FROM
+			data
+		WHERE
+			mac = #{mac}
+		AND time >= #{start}
+		AND time &lt; #{end}
+	</select>
+	
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0