From c8aa05fd65cc788abc0f44494338b04993e3b4be Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Sep 2021 15:08:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-api/src/main/resources/mapper/HistorySecondSpecialMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/HistorySecondSpecialMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondSpecialMapper.xml
index 207f6a3..989922f 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondSpecialMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondSpecialMapper.xml
@@ -12,13 +12,13 @@
</resultMap>
<select id="getSpecialDeviceData" resultType="java.util.Map">
- SELECT JSON_UNQUOTE(`value`->'$.${sensorCode}') AS '${sensorCode}',
- JSON_UNQUOTE(`value`->'$.flylon') AS 'flylon',
- JSON_UNQUOTE(`value`->'$.flylat') AS 'flylat',
- DATE_FORMAT(`time`, #{dateFormat}) AS 'time'
+ SELECT
+ DATE_FORMAT(`time`, #{dateFormat}) AS `time`,
+ `value`
FROM `history_second_special`
WHERE mac = #{mac}
AND `time` LIKE #{time}"%"
+ AND organization_id = #{orgId}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0