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

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

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

@@ -3,10 +3,30 @@
import java.util.List;

import java.util.Map;



public interface HistoryMinutelyMapper{

import org.apache.ibatis.annotations.Param;



   Map<String, Double> getDayAQIByDevice(Map<String, Object> parameters);

import com.moral.entity.charts.DataCondition;

import com.moral.entity.charts.TimePeriod;



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

public interface HistoryMinutelyMapper {



    Map<String, Double> getSersionAvgByDevice(Map<String, Object> parameters);



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



    /**

     * @param sensorKeys

     * @param timePeriod

     * @param dataCondition

     * @return {format_time:string,e1:double,e2...............}

     */

    List<Map<String, Object>> selectLineChartDateByCrieria(@Param("sensorKeys") List<String> sensorKeys, @Param("timePeriod") TimePeriod timePeriod, @Param("dataCondition") DataCondition dataCondition);



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



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



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



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

}