Merge branch 'master' of http://fengxiang@blit.7drlb.com:8888/r/task.git

fengxiang

2017-11-15 b8e86e2b44b796ced6f8fa557dfee532749dcc6c

 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);



}