From 1a73abc088caa0f5873d8143a6bd71937263a413 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 27 Dec 2017 15:43:46 +0800
Subject: [PATCH] 更新 安装用户

---
 src/main/resources/mapper/HistoryMapper.xml |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 580a1f2..0f1a427 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -1,8 +1,7 @@
 <?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.HistoryMapper">
-
-  <select id="getDayAQIByDevice" resultType="map">
+	<select id="getDayAQIByDevice" resultType="map">
 		SELECT
 			AVG(value -> '$.e1') e1,
 			AVG(value -> '$.e2') e2,
@@ -14,9 +13,9 @@
 			history
 		WHERE
 			mac = #{mac}
-		AND time &gt; #{start}
+		AND time >= #{start}
 		AND time &lt; #{end}
-  </select>
+	</select>
 
 	<select id="getAllSensorAverageByDevice" resultType="java.util.LinkedHashMap">
 		SELECT
@@ -28,13 +27,13 @@
 		<if test="orgIds != null and orgIds.size &gt; 0">
 			LEFT JOIN monitor_point_organization mpo ON mpo.monitor_point_id = mp.id 
 			AND mpo.organization_id IN
-			<foreach close=")" collection="orgIds" item="listItem" open="(" separator=",">
+			<foreach collection="orgIds" open="(" separator="," close=")" item="listItem">
 				#{listItem}
 			</foreach>
 		</if>
 		WHERE
 			mp.area_code = #{areaCode} 
-			AND h.time > #{start} 
+			AND h.time >= #{start} 
 			AND h.time &lt; #{end}
 			AND h.mac = d.mac 
 			AND d.monitor_point_id = mp.id 
@@ -55,11 +54,11 @@
 			monitor_point mp
 		WHERE
 			mp.area_code = #{areaCode} 
-			AND h.time > #{start} 
+			AND h.time >= #{start} 
 			AND h.time &lt; #{end}
 		<if test="orgIds != null and orgIds.size &gt; 0">
 			AND mp.organization_id IN
-			<foreach  collection="orgIds" open="(" separator="," close=")" item="listItem" >
+			<foreach  collection="orgIds" open="(" separator="," close=")" item="listItem">
 				#{listItem}
 			</foreach>
 		</if>
@@ -86,5 +85,4 @@
 		ORDER BY
 			time
 	</select>
-	
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0