From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 08 Aug 2019 17:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/HistoryMinutelyService.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index ec3f36d..9e10982 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -1,21 +1,28 @@
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, Object> getDayAQIByDevice(Map<String, Object> parameters);
+
+ Map<String, Object> getHourAQIByDevice(Map<String, Object> parameters);
- List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters) throws Exception;
+ Map<String, List> getCompareReport(Map<String, Object> parameters) throws Exception;
- Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);
+ 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;
+
+ List<Map<String, Object>> getSensorData(Map<String, Object> parameters) throws Exception;
}
--
Gitblit v1.8.0