From d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 18 Nov 2020 14:39:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/mapper/HistoryMapper.java | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index 8fecdda..eae009e 100644
--- a/src/main/java/com/moral/mapper/HistoryMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMapper.java
@@ -1,19 +1,51 @@
package com.moral.mapper;
+import java.util.Date;
import java.util.List;
import java.util.Map;
-import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
-@Mapper
-public interface HistoryMapper{
+public interface HistoryMapper {
+ String selectValueByMacAndTime(@Param("mac") String mac, @Param("time") Date time, @Param("timeUnits") String timeUnits);
- Map<String, Double> getDayAQIByDevice(Map<String, Object> parameters);
+ String getValueByMacAndTime(@Param("mac") String mac, @Param("time") String time, @Param("time1") String time1, @Param("timeUnits") String timeUnits);
- Map<String, Object> getAllSensorAverageByDevice(Map<String, Object> parameters);
+ List<Map<String, Object>> getAreaAllDataByAccount(Map<String, Object> parameters);
- List<Map<String, Object>> getSensorsAverageByDevice4Report(Map<String, Object> parameters);
+ List<Map<String, Object>> getRegionRankingData(Map<String, Object> parameters);
- List<Map<String, Object>> getAreaAllDataByAccount(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, @Param("timeUnits") String timeUnits);
+
+ 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,@Param("timeUnits") String timeUnits);
+
+ Map<String, Object> getMonitorPointAVGValueByMonitorPointIdAndTimeslot(@Param("monitor_point_id") String monitor_point_id, @Param("starttime") String starttime, @Param("endtime") String endtime, @Param("timeUnits") String timeUnits);
+
+ List<Map<String, Object>> getCarSensorData(Map<String, Object> parameters);
+
+ List<Map<String, Object>> getUavSensorData(Map<String, Object> parameters);
+
+ List<Map<String, Object>> listGetSensorData(Map<String, Object> parameters);
+
+ //���������������������������
+ List<Map<String, Object>> getO3AVG(Map<String, Object> parameters);
+
+ int getNum(@Param("timef") String timef,
+ @Param("timea") String timea);
+
+ String getJsonData(@Param("mac") String mac,
+ @Param("time") String time,
+ @Param("table") String table);
+
+ Map<String,Object> getDailyAvgData(@Param("mId")String mId,@Param("time")String time);
}
\ No newline at end of file
--
Gitblit v1.8.0