From f28149d8183a62f87fa9c8df9ae589070d83f612 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 24 Dec 2020 13:47:50 +0800
Subject: [PATCH] 波动补偿
---
src/main/java/com/moral/mapper/HistoryMapper.java | 55 +++++++++++++++++++++++++++++++------------------------
1 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index 5ab081a..1d19f87 100644
--- a/src/main/java/com/moral/mapper/HistoryMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMapper.java
@@ -6,41 +6,48 @@
import org.apache.ibatis.annotations.Param;
-public interface HistoryMapper{
- String selectValueByMacAndTime(@Param("mac")String mac, @Param("time")Date time);
- String getValueByMacAndTime(@Param("mac")String mac, @Param("time")String time,@Param("time1")String time1);
- List<Map<String, Object>> getAreaAllDataByAccount(Map<String, Object> parameters);
+public interface HistoryMapper {
+ String selectValueByMacAndTime(@Param("mac") String mac, @Param("time") Date time, @Param("timeUnits") String timeUnits);
- List<Map<String, Object>> getRegionRankingData(Map<String, Object> parameters);
+ String getValueByMacAndTime(@Param("mac") String mac, @Param("time") String time, @Param("time1") String time1, @Param("timeUnits") String timeUnits);
- List<String> selectNextLevelRegion(Map<String, Object> parameters);
+ List<Map<String, Object>> getAreaAllDataByAccount(Map<String, Object> parameters);
- List<Map<String, Object>> getDischargeByRegion(Map<String, Object> parameters);
-
- List<Map<String, Object>> getValueByMacAndSize(Map<String, Object> parameters);
+ List<Map<String, Object>> getRegionRankingData(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<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);
-
- Map<String, Object> getMonitorPointAVGValueByMonitorPointIdAndTimeslot(@Param("monitor_point_id")String monitor_point_id, @Param("starttime")String starttime, @Param("endtime")String endtime);
+
+ 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>> getUavSensorData(Map<String, Object> parameters);
List<Map<String, Object>> listGetSensorData(Map<String, Object> parameters);
- //���������������������������
- List<Map<String, Object>> getO3AVG(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);
+ 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);
+ Map<String,Object> getDailyAvgDataByMIds(@Param("mIds")String[] mIds,@Param("time")String time);
+
}
\ No newline at end of file
--
Gitblit v1.8.0