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/HistoryMapper.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index 8fecdda..d51634e 100644
--- a/src/main/java/com/moral/mapper/HistoryMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMapper.java
@@ -1,19 +1,32 @@
package com.moral.mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
import java.util.List;
import java.util.Map;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
public interface HistoryMapper{
-
- Map<String, Double> getDayAQIByDevice(Map<String, Object> parameters);
-
- Map<String, Object> getAllSensorAverageByDevice(Map<String, Object> parameters);
-
- List<Map<String, Object>> getSensorsAverageByDevice4Report(Map<String, Object> parameters);
-
+ String selectValueByMacAndTime(@Param("mac")String mac, @Param("time")Date time);
List<Map<String, Object>> getAreaAllDataByAccount(Map<String, Object> parameters);
+ List<Map<String, Object>> getRegionRankingData(Map<String, Object> parameters);
+
+ List<String> selectNextLevelRegion(Map<String, Object> parameters);
+
+ List<Map<String, Object>> getDischargeByRegion(Map<String, Object> parameters);
+
+ List<Map<String, Object>> getValueByMacAndSize(Map<String, Object> parameters);
+
+ Map<String, Object> getActualDataByRegion(Map<String, Object> parameters);
+
+ Map<String, Object> getAVGValueByMacAndTimeslot(@Param("mac")String mac, @Param("starttime")String starttime, @Param("endtime")String endtime);
+
+ List<Map<String, Object>> getSensorDataToday(Map<String, Object> parameters);
+
+ List<Map<String, Object>> getAVGSensorRankByMonitorPointIdList(@Param("sensor")String sensor, @Param("monitorPointIdList") List<Object> monitorPointIdList, @Param("before5Time")String before5Time, @Param("endTime")String endTime);
+
+ Map<String, Object> getMonitorPointAVGValueByMonitorPointIdAndTimeslot(@Param("monitor_point_id")String monitor_point_id, @Param("starttime")String starttime, @Param("endtime")String endtime);
+
+ List<Map<String, Object>> getCarSensorData(Map<String, Object> parameters);
}
\ No newline at end of file
--
Gitblit v1.8.0