From 54596f54e147492009daa112ab89a6bcd7bf33a5 Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Thu, 28 Sep 2023 11:10:09 +0800 Subject: [PATCH] ci:添加单号筛选项 --- screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml b/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml index 45ce8b7..0de8ee6 100644 --- a/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml +++ b/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml @@ -12,15 +12,13 @@ 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}) - AND d.is_delete = '0' </select> </mapper> \ No newline at end of file -- Gitblit v1.8.0