From b4aa377b5e7898cd2ef018cc385a19af67a56839 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 26 Mar 2018 14:05:58 +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 |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index bfb8590..f1dacc2 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;
 
@@ -11,5 +14,8 @@
 
 	List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters) throws Exception;
 
+	Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);
 
+
+    Map<String, List<List<Double>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria);
 }

--
Gitblit v1.8.0