Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-12 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41

 src/main/java/com/moral/service/HistoryService.java

@@ -1,15 +1,22 @@
package com.moral.service;



import java.util.Date;

import java.util.List;

import java.util.Map;





public interface HistoryService {



   Map<String, Object> getAverageByAll(Map<String, Object> parameters);

   Map<String, Object> getAllSensorAverageByDevice(Map<String, Object> parameters) throws Exception;



   Map<String, Object> getAverageBySensor(Map<String, Object> parameters);

   Map<String, Object> getDeviceRankingBySensorAverage(Map<String, Object> parameters);



   Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters);

    String queryValueByMacAndTime(String mac, Date time);



   Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);

   List<Map<String, Object>> getRegionRankingData(Map<String, Object> parameters);

	
   List<Map<String, Object>> getSensorsDataByDevice(Map<String, Object> parameters);



   List<Map<String, Object>> getSensorDataBySensorKey(Map<String, Object> parameters);



}