Merge remote-tracking branch 'origin/master'

fengxiang

2018-09-20 a31c81dada74c63ff96c7adf7f21451f1e3ad989

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

@@ -14,4 +14,11 @@
    String queryValueByMacAndTime(String mac, Date time);



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



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



}