From d4f150414533b95324b2a1c8a81c11d92efb71ec Mon Sep 17 00:00:00 2001 From: xufenglei <xufenglei> Date: Tue, 13 Mar 2018 16:25:20 +0800 Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git --- src/main/java/com/moral/service/HistoryMinutelyService.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java index b5a38c3..ec3f36d 100644 --- a/src/main/java/com/moral/service/HistoryMinutelyService.java +++ b/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; @@ -9,7 +12,10 @@ Map<String, List<Object>> getCompareReport(Map<String, Object> parameters) throws Exception; - List<Map<String, Object>> getMonitorPointOrDeviceAvgData4Excel(Map<String, Object> parameters) throws Exception; + 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); } -- Gitblit v1.8.0