From 2c8b914f70a8b2425d3ede5941bce1cabe9c2931 Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Tue, 04 Jul 2023 20:50:32 +0800
Subject: [PATCH] 日期排序提交
---
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 4e0901b..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 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