From e5e45930821b186093deedd7974f4328f5f90cbd Mon Sep 17 00:00:00 2001
From: jpy <812110275@qq.com>
Date: Sat, 27 May 2023 18:01:45 +0800
Subject: [PATCH] test
---
screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml | 1 +
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java b/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java
index 7103577..ca63bcd 100644
--- a/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java
@@ -98,8 +98,8 @@
}
String[] monitorPointIds = params.remove("monitorPointIds").toString().split(",");
params.put("monitorPointIds", monitorPointIds);
- //List<Object> response = historyFiveMinutelyService.getAreaWindData(params);
- return ResultMessage.ok(new ArrayList<>());
+ List<Object> response = historyFiveMinutelyService.getAreaWindData(params);
+ return ResultMessage.ok(response);
}
/**
diff --git a/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml b/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
index 4e0901b..45ce8b7 100644
--- a/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
@@ -20,6 +20,7 @@
</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