Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-16 cd264145f9b4107f1430da46269dd306d26f3116

 src/main/java/com/moral/mapper/HistoryMapper.java

@@ -8,6 +8,7 @@


public interface HistoryMapper{

   String selectValueByMacAndTime(@Param("mac")String mac, @Param("time")Date time);

   String getValueByMacAndTime(@Param("mac")String mac, @Param("time")String time,@Param("time1")String time1);

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



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

@@ -30,5 +31,18 @@


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



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



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



   //获取臭氧平缓平均值

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



   int getNum(@Param("timef") String timef,

            @Param("timea") String timea);

   String getJsonData(@Param("mac") String mac,

                  @Param("time") String time,

                  @Param("table") String table);



   Map<String,Object> getDailyAvgData(@Param("mId")String mId,@Param("time")String time);

}