From dba54bf8c8f9299d61c05bf3a941708ea399c998 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Sun, 26 Apr 2020 15:20:22 +0800
Subject: [PATCH] update excel多个工作表导出

---
 src/main/java/com/moral/mapper/HistoryMinutelyMapper.java |   39 +++++++++++++++++++++++----------------
 1 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
index ee03fe0..0b09df2 100644
--- a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
@@ -1,25 +1,32 @@
 package com.moral.mapper;
 
-import com.moral.entity.charts.DataCondition;
-import com.moral.entity.charts.PairData;
-import com.moral.entity.charts.TimePeriod;
-import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 import java.util.Map;
 
-public interface HistoryMinutelyMapper{
+import org.apache.ibatis.annotations.Param;
 
-	Map<String, Double> getSersionAvgByDevice(Map<String, Object> parameters);
+import com.moral.entity.charts.DataCondition;
+import com.moral.entity.charts.TimePeriod;
 
-	List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters);
+public interface HistoryMinutelyMapper {
 
-	/**
-	 *
-	 * @param sensorKeys
-	 * @param timePeriod
-	 * @param dataCondition
-	 * @return {format_time:string,e1:double,e2...............}
-	 */
-    List<Map<String, Object>> selectLineChartDateByCrieria(@Param("sensorKeys")List<String> sensorKeys, @Param("timePeriod") TimePeriod timePeriod, @Param("dataCondition") DataCondition dataCondition);
+    Map<String, Double> getSersionAvgByDevice(Map<String, Object> parameters);
+
+    List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters);
+
+    /**
+     * @param sensorKeys
+     * @param timePeriod
+     * @param dataCondition
+     * @return {format_time:string,e1:double,e2...............}
+     */
+    List<Map<String, Object>> selectLineChartDateByCrieria(@Param("sensorKeys") List<String> sensorKeys, @Param("timePeriod") TimePeriod timePeriod, @Param("dataCondition") DataCondition dataCondition);
+
+    List<Map<String, Object>> getSensorData(Map<String, Object> parameters);
+
+    List<Map<String, Object>> getSensorData2020(Map<String, Object> parameters);
+
+    List<Map<String, Object>> getDevicesAvgDataToExcel(Map<String, Object> parameters);
+
+    List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters);
 }
\ No newline at end of file

--
Gitblit v1.8.0