From a30cc74a46477c1820c6114cbda7f4e11b3aaf0d Mon Sep 17 00:00:00 2001 From: jpy <812110275@qq.com> Date: Sun, 28 May 2023 16:10:24 +0800 Subject: [PATCH] 风场sql --- 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