From a13506f193f38720ae2729f9c2ceb35bf9fdb898 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 28 Sep 2020 11:50:05 +0800
Subject: [PATCH] 更新获取风向和设备信息，添加经纬度，修改rabbit MQ代码。
---
src/main/resources/mapper/HistoryDailyMapper.xml | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/HistoryDailyMapper.xml b/src/main/resources/mapper/HistoryDailyMapper.xml
index 78e7f3f..4d4fe67 100644
--- a/src/main/resources/mapper/HistoryDailyMapper.xml
+++ b/src/main/resources/mapper/HistoryDailyMapper.xml
@@ -14,10 +14,10 @@
hd.mac = vdi.mac
AND vdi.monitor_point_id = mp.id
AND vdi.device_tech = 1
- <if test="monitorPointId != null and monitorPointId!=''">
+ <if test="monitorPointId != null">
AND mp.id = #{monitorPointId}
</if>
- <if test="mac != null and mac!=''">
+ <if test="mac != null">
AND hd.mac = #{mac}
</if>
<if test="start != null">
@@ -111,12 +111,20 @@
FROM
history_daily
<where>
- <if test="mac!=null and mac!=''">
+ <if test="mac!=null">
AND mac=#{mac}
</if>
- <if test="time!=null and time!=''">
+ <if test="time!=null">
AND time=#{time}
</if>
</where>
</select>
+
+ <!-- ������������mac������������������������������������������������������ -->
+ <select id="getDataByTimeSlot" resultType="java.util.Map">
+ SELECT *
+ FROM history_daily
+ where mac=#{mac}
+ AND time between #{startTime} and #{endTime}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0