From 8b62edac1e2ce364ebd665569c2ab58a83efb110 Mon Sep 17 00:00:00 2001
From: jpy <812110275@qq.com>
Date: Sat, 27 May 2023 18:12:02 +0800
Subject: [PATCH] test
---
screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml b/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
index 45ce8b7..1acd877 100644
--- a/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
@@ -14,13 +14,12 @@
`device` AS d
WHERE d.mac = h.mac
AND d.mac IN
- (SELECT mac FROM device WHERE monitor_point_id 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>
)
AND h.time = (SELECT max(time) FROM history_five_minutely_${timeUnits})
- AND d.is_delete = '0'
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0