Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-11-18 d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc

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

@@ -7,8 +7,10 @@
import org.apache.ibatis.annotations.Param;



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

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



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



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



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

@@ -21,13 +23,13 @@


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

   

   Map<String, Object> getAVGValueByMacAndTimeslot(@Param("mac")String mac, @Param("starttime")String starttime, @Param("endtime")String endtime);

    Map<String, Object> getAVGValueByMacAndTimeslot(@Param("mac") String mac, @Param("starttime") String starttime, @Param("endtime") String endtime, @Param("timeUnits") String timeUnits);



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

    

    List<Map<String, Object>> getAVGSensorRankByMonitorPointIdList(@Param("sensor")String sensor, @Param("monitorPointIdList") List<Object> monitorPointIdList, @Param("before5Time")String before5Time, @Param("endTime")String endTime);

    List<Map<String, Object>> getAVGSensorRankByMonitorPointIdList(@Param("sensor") String sensor, @Param("monitorPointIdList") List<Object> monitorPointIdList, @Param("before5Time") String before5Time, @Param("endTime") String endTime,@Param("timeUnits") String timeUnits);

    

    Map<String, Object> getMonitorPointAVGValueByMonitorPointIdAndTimeslot(@Param("monitor_point_id")String monitor_point_id, @Param("starttime")String starttime, @Param("endtime")String endtime);

    Map<String, Object> getMonitorPointAVGValueByMonitorPointIdAndTimeslot(@Param("monitor_point_id") String monitor_point_id, @Param("starttime") String starttime, @Param("endtime") String endtime, @Param("timeUnits") String timeUnits);



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



@@ -40,6 +42,7 @@


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

            @Param("timea") String timea);



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

                  @Param("time") String time,

                  @Param("table") String table);