From 72b62513dbb8621658628a07001c5a159c130738 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 24 Jul 2023 09:42:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml b/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
index 1acd877..0de8ee6 100644
--- a/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
@@ -12,13 +12,12 @@
h.value->'$.a01008' AS windDir
FROM history_five_minutely_${timeUnits} h ,
`device` AS d
- WHERE d.mac = h.mac
- AND d.mac IN
- (SELECT mac FROM device WHERE is_delete = '0' and monitor_point_id IN
- <foreach item="monitorPointId" collection="monitorPointIds" index="index" open="(" separator="," close=")">
- #{monitorPointId}
- </foreach>
- )
+ WHERE d.is_delete = '0'
+ AND d.mac = h.mac
+ AND d.monitor_point_id IN
+ <foreach item="monitorPointId" collection="monitorPointIds" index="index" open="(" separator="," close=")">
+ #{monitorPointId}
+ </foreach>
AND h.time = (SELECT max(time) FROM history_five_minutely_${timeUnits})
</select>
--
Gitblit v1.8.0