Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

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

@@ -14,4 +14,20 @@
    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);



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

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

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

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



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

}