From dbed3099ea0dd2a517b739f29943d4ee529760e6 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 17 Jun 2019 15:23:45 +0800
Subject: [PATCH] Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/screen_api_v2.git
---
src/main/java/com/moral/service/HistoryMinutelyService.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index 7a1ca38..0c106f6 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -1,17 +1,24 @@
package com.moral.service;
+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;
Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);
+ Map<String, List<List<Double>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria);
+
+ void convertQueryParam(Map<String, Object> parameters) throws ParseException;
}
--
Gitblit v1.8.0