From 38d3632583355b740c507b3d41fb683f88567b22 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 19 Nov 2020 09:43:34 +0800
Subject: [PATCH] 大屏臭氧预测与实测对比

---
 src/main/resources/mapper/HistoryHourlyMapper.xml |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index b1896e9..3d5ca95 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -100,7 +100,12 @@
     </select>
 
     <select id="getDataByMacAndTime" resultType="java.util.Map">
-        SELECT DATE_FORMAT(`time`,'%Y-%m-%d %H:%i:%s') as `time`,json->'$.${sensor}[0]' as ${sensor} FROM `history_hourly` where `mac`=#{mac} and `time`&gt;=#{startTime} and `time`&lt;#{endTime}
+        SELECT DATE_FORMAT(`time`,'%Y-%m-%d %H:%i:%s') as `time`,
+        json->'$.${sensor}[0]' as ${sensor}
+        FROM `history_hourly`
+        where `mac`=#{mac}
+        and `time`&gt;=#{startTime}
+        and `time`&lt;#{endTime}
     </select>
     <select id="getDataByMacAndTime1" resultType="java.util.Map">
         SELECT DATE_FORMAT(`time`,'%Y-%m-%d %H:%i:%s') as `time`,json->'$.${sensor}[0]' as ${sensor} FROM `history_hourly` where `mac`=#{mac} and `time`&gt;=#{startTime} and `time`<![CDATA[<]]>#{endTime}

--
Gitblit v1.8.0