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

xufenglei

2018-03-13 d4f150414533b95324b2a1c8a81c11d92efb71ec

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

@@ -1,5 +1,8 @@
package com.moral.service;



import com.moral.entity.charts.LineChartCriteria;

import com.moral.entity.charts.PairData;



import java.util.List;

import java.util.Map;



@@ -11,5 +14,8 @@


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



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





    List<List<PairData>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria);

}