Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-06-12 9009798abd7abfd726bcda80267c7d53dd3b8da3

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



}