From 5d686103fbb4361bebc305c731c9358d038e2836 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 02 Nov 2017 13:41:24 +0800
Subject: [PATCH] Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/task.git

---
 src/main/java/com/moral/monitor/service/ScreenService.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/monitor/service/ScreenService.java b/src/main/java/com/moral/monitor/service/ScreenService.java
index 7e217b7..1e9a0cc 100644
--- a/src/main/java/com/moral/monitor/service/ScreenService.java
+++ b/src/main/java/com/moral/monitor/service/ScreenService.java
@@ -1,6 +1,7 @@
 package com.moral.monitor.service;
 
 import java.util.List;
+import java.util.Map;
 
 import com.moral.monitor.entity.AccountEntity;
 
@@ -8,4 +9,10 @@
 
 	List<AccountEntity> getAccountLists(String account, String password);
 
+	Map<String, Object> getMonthDataByEquipment(Map<String, Object> parameters);
+
+	Map<String, Object> getAverageByAll(Map<String, Object> parameters);
+
+	Map<String, Object> getEquipmentStates(Map<String, Object> parameters);
+
 }

--
Gitblit v1.8.0