Merge remote-tracking branch 'origin/master'

fengxiang

2018-06-22 0fd34e51dadbf9598188b0e061b658139e6d6257

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

@@ -1,6 +1,7 @@
package com.moral.service;



import java.util.Date;

import java.util.List;

import java.util.Map;





@@ -11,4 +12,6 @@
   Map<String, Object> getDeviceRankingBySensorAverage(Map<String, Object> parameters);



    String queryValueByMacAndTime(String mac, Date time);



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

}