From b8e86e2b44b796ced6f8fa557dfee532749dcc6c Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Wed, 15 Nov 2017 17:25:02 +0800
Subject: [PATCH] Merge branch 'master' of http://fengxiang@blit.7drlb.com:8888/r/task.git
---
src/main/resources/mapper/HistoryEntityMapper.xml | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/HistoryEntityMapper.xml b/src/main/resources/mapper/HistoryEntityMapper.xml
index 85374e0..e5b64e7 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 > #{start}
- AND time < #{end}
+ mac = #{mac,jdbcType=VARCHAR}
+ AND mac_key = #{macKey,jdbcType=VARCHAR}
+ AND time > #{start,jdbcType=TIMESTAMP}
+ AND time < #{end,jdbcType=TIMESTAMP}
</select>
<select id="getAverageByAll" resultType="map">
@@ -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