From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001 From: JinPengYong <812110275@qq.com> Date: Sun, 26 Apr 2020 16:18:30 +0800 Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts. --- src/main/java/com/moral/service/HistoryService.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/moral/service/HistoryService.java b/src/main/java/com/moral/service/HistoryService.java index b619064..aad4b39 100644 --- a/src/main/java/com/moral/service/HistoryService.java +++ b/src/main/java/com/moral/service/HistoryService.java @@ -25,6 +25,9 @@ Map<String, Object> gitHourlyAQIByMacAndTimeslot(Map<String, Object> parameters); - Map<String, Object> getMointorPointRankByOrganizationId(Map<String, Object> parameters); + List<Map<String, Object>> getMointorPointRankByOrganizationId(Map<String, Object> parameters); + + Map<String, Object> gitHourlyAQIByMonitorPointIdAndTimeslot(Map<String, Object> parameters); + List<List<Map<String, Object>>> getCarSensorData(Map<String, Object> parameters) throws Exception; } -- Gitblit v1.8.0