From 6688e50ba02988d742baadaca156a303a90b6191 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 20 Apr 2018 14:03:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/HistoryMinutelyService.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index ec3f36d..0c106f6 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -1,21 +1,24 @@
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;
Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);
- List<List<PairData>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria);
+ Map<String, List<List<Double>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria);
+
+ void convertQueryParam(Map<String, Object> parameters) throws ParseException;
}
--
Gitblit v1.8.0