From 43c0f7bd6b605b2c71f58e43055144004e7d42e7 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 16 Nov 2017 17:29:26 +0800
Subject: [PATCH] 降序 排序

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

diff --git a/src/main/resources/mapper/HistoryEntityMapper.xml b/src/main/resources/mapper/HistoryEntityMapper.xml
index 85374e0..3089c66 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">

--
Gitblit v1.8.0