From b8e86e2b44b796ced6f8fa557dfee532749dcc6c Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Wed, 15 Nov 2017 17:25:02 +0800
Subject: [PATCH] Merge branch 'master' of http://fengxiang@blit.7drlb.com:8888/r/task.git

---
 src/main/java/com/moral/monitor/service/ScreenService.java |    4 +++-
 1 files changed, 3 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 1e9a0cc..c6c5bce 100644
--- a/src/main/java/com/moral/monitor/service/ScreenService.java
+++ b/src/main/java/com/moral/monitor/service/ScreenService.java
@@ -9,10 +9,12 @@
 
 	List<AccountEntity> getAccountLists(String account, String password);
 
-	Map<String, Object> getMonthDataByEquipment(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);
+
 }

--
Gitblit v1.8.0