From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/mapper/HistoryMinutelyMapper.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
index 8d78140..0b09df2 100644
--- a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
@@ -1,12 +1,12 @@
package com.moral.mapper;
-import com.moral.entity.charts.DataCondition;
-import com.moral.entity.charts.TimePeriod;
+import java.util.List;
+import java.util.Map;
import org.apache.ibatis.annotations.Param;
-import java.util.List;
-import java.util.Map;
+import com.moral.entity.charts.DataCondition;
+import com.moral.entity.charts.TimePeriod;
public interface HistoryMinutelyMapper {
@@ -24,4 +24,9 @@
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