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

kaiyu

2020-11-24 1d7e1b771160dd8b7f25765e402ce25cac676641

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

@@ -3,6 +3,7 @@
import org.apache.ibatis.annotations.Param;
import org.springframework.security.access.method.P;

import java.lang.reflect.Array;
import java.util.List;
import java.util.Map;

@@ -38,4 +39,17 @@
    List<Map<String,Object>> getDataAvbByMIdAndTime( @Param("mId")String mId,
                                                     @Param("startTime")String startTime,
                                                     @Param("endTime")String endTime);

    List<Map<String,Object>> getDataByMonitorPoints(@Param("mIds") String[] mIds,
                                                    @Param("startTime")String startTime,
                                                    @Param("endTime")String endTime);


    Map<String,Object> getAvgDataByMId(@Param("mId")String mId,
                                              @Param("startTime")String startTime,
                                              @Param("endTime")String endTime);

    Map<String,Object> getAvgDataByMIds(@Param("mIds")String[] mIds,
                                       @Param("startTime")String startTime,
                                       @Param("endTime")String endTime);
}