From dbed3099ea0dd2a517b739f29943d4ee529760e6 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 17 Jun 2019 15:23:45 +0800
Subject: [PATCH] Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/screen_api_v2.git
---
src/main/resources/mapper/HistoryDailyMapper.xml | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/HistoryDailyMapper.xml b/src/main/resources/mapper/HistoryDailyMapper.xml
index 6fa840a..7628af6 100644
--- a/src/main/resources/mapper/HistoryDailyMapper.xml
+++ b/src/main/resources/mapper/HistoryDailyMapper.xml
@@ -94,4 +94,20 @@
vdd.monitor_point_id,
vdd.device_tech
</select>
+
+ <!-- ������������mac������������������������������������������������������ -->
+ <select id="getTraceabilityData" resultType="java.util.Map">
+ SELECT
+ json ->'$.${sensorKey}[0]' AS '${sensorKey}'
+ FROM
+ history_daily
+ <where>
+ <if test="mac!=null and mac!=''">
+ AND mac=#{mac}
+ </if>
+ <if test="time!=null and time!=''">
+ AND time=#{time}
+ </if>
+ </where>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0