From 70c4207810e4348ad9c125c44cbb6842ecd8b4b7 Mon Sep 17 00:00:00 2001 From: 沈斌 <bluelazysb@hotmail.com> Date: Tue, 28 Nov 2017 06:31:53 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/moral/monitor/service/ScreenService.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/moral/monitor/service/ScreenService.java b/src/main/java/com/moral/monitor/service/ScreenService.java index 7265a13..5b7f81c 100644 --- a/src/main/java/com/moral/monitor/service/ScreenService.java +++ b/src/main/java/com/moral/monitor/service/ScreenService.java @@ -9,8 +9,16 @@ List<AccountEntity> getAccountLists(String account, String password); - Map<String, Object> getDataByEquipmentMac(Map<String, Object> parameters); + Map<String, Object> getMonthDataByEquipment(Map<String, Object> parameters) throws Exception; Map<String, Object> getAverageByAll(Map<String, Object> parameters); + Map<String, Object> getEquipmentStates(Map<String, Object> parameters); + + Map<String, Object> getAverageBySensor(Map<String, Object> parameters); + + Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters); + + Map<String, Object> getDayAQIBySensor(Map<String, Object> parameters) throws Exception; + } -- Gitblit v1.8.0