Merge remote-tracking branch 'origin/master'

fengxiang

2018-04-20 6688e50ba02988d742baadaca156a303a90b6191

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

@@ -1,16 +1,17 @@
package com.moral.service;



import com.moral.entity.charts.LineChartCriteria;

import com.moral.entity.charts.PairData;



import java.text.ParseException;

import java.util.List;

import java.util.Map;



import com.moral.entity.charts.LineChartCriteria;



@SuppressWarnings("rawtypes")

public interface HistoryMinutelyService {



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

   

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

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



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



@@ -18,4 +19,6 @@




    Map<String, List<List<Double>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria);



   void convertQueryParam(Map<String, Object> parameters) throws ParseException;

}