From d7ee12cb208473741f79b64505adccd0653e4654 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 27 Oct 2020 13:44:28 +0800
Subject: [PATCH] vue页面增加误差率参数,沧州剔除非本公司设备显示,报表接口更新

---
 src/main/java/com/moral/service/HistoryMinutelyService.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index 2408384..35be96b 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -17,9 +17,12 @@
 
     List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters) throws Exception;
 
+    List<Map<String, Object>> get(Map<String, Object> parameters) throws Exception;
+
+
     Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);
 
-    List<Map<String, Object>> getAreaAvgDataByAreaCode(Map<String, Object> parameters) throws Exception;
+    Map<String, Object> getAverageBySensor(Map<String, Object> parameters);
 
     Map<String, List<List<Double>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria);
 
@@ -30,4 +33,11 @@
     List<Map<String, Object>> getDevicesAvgDataToExcel(Map<String, Object> parameters) throws Exception;
 
     List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters) throws Exception;
+
+    List<Map<String, Object>> get5MinutesOrHalfHour(Map<String, Object> parameters) throws ParseException;
+
+    List<Map<String, Object>> getMultiDeviceSensorData(Map<String, Object> parameters) throws Exception;
+
+    List<Map<String, Object>> getAllDeviceDataToExcel(Map<String, Object> parameters) throws Exception;
+
 }

--
Gitblit v1.8.0