From 1babbf1c0b2bc8d27f2874c85369e394b545594a Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 11 May 2020 11:24:00 +0800
Subject: [PATCH] add轨迹信息显示按秒级显示,update轨迹数据先从history表查询,update报表单位问题
---
src/main/java/com/moral/service/HistoryMinutelyService.java | 54 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index ec3f36d..45b8517 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -1,21 +1,33 @@
-package com.moral.service;
-
-import com.moral.entity.charts.LineChartCriteria;
-import com.moral.entity.charts.PairData;
-
-import java.util.List;
-import java.util.Map;
-
-public interface HistoryMinutelyService {
-
- Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters);
-
- Map<String, List<Object>> 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);
-}
+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, Object> getHourAQIByDevice(Map<String, Object> parameters);
+
+ 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, Object> getAverageBySensor(Map<String, Object> parameters);
+
+ Map<String, List<List<Double>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria);
+
+ void convertQueryParam(Map<String, Object> parameters) throws ParseException;
+
+ List<List<Map<String, Object>>> getSensorData(Map<String, Object> parameters) throws Exception;
+
+ List<Map<String, Object>> getDevicesAvgDataToExcel(Map<String, Object> parameters) throws Exception;
+
+ List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters) throws Exception;
+}
--
Gitblit v1.8.0