From 3be7bd55ff0a4ab2ed25b46cdfd1dede92300ea3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 26 Aug 2021 11:15:29 +0800
Subject: [PATCH] kafa数据从redis获取型号，当前组织下走航车设备列表
---
screen-api/src/main/resources/mapper/DeviceMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/DeviceMapper.xml b/screen-api/src/main/resources/mapper/DeviceMapper.xml
index 94cde21..5c54941 100644
--- a/screen-api/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-api/src/main/resources/mapper/DeviceMapper.xml
@@ -28,11 +28,14 @@
<!--���������������������������-->
<select id="getTrendChartData" resultType="java.util.Map">
- SELECT
+ SELECT mac,
DATE_FORMAT(`time`,#{dateFormat}) AS `time`,
`value`->'$.${sensorCode}' AS '${sensorCode}'
FROM history_${timeUnits}
- WHERE mac = #{mac}
+ WHERE mac IN
+ <foreach collection="macs" item="mac" index="index" open="(" close=")" separator=",">
+ #{mac}
+ </foreach>
AND `time` <![CDATA[>=]]> #{start}
AND `time` <![CDATA[<]]> #{end}
ORDER BY `time`
--
Gitblit v1.8.0