From a13506f193f38720ae2729f9c2ceb35bf9fdb898 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 28 Sep 2020 11:50:05 +0800
Subject: [PATCH] 更新获取风向和设备信息，添加经纬度，修改rabbit MQ代码。
---
src/main/java/com/moral/mapper/HistoryMapper.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index 5f81619..3b6d2ea 100644
--- a/src/main/java/com/moral/mapper/HistoryMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMapper.java
@@ -1,10 +1,10 @@
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.Param;
public interface HistoryMapper{
String selectValueByMacAndTime(@Param("mac")String mac, @Param("time")Date time);
@@ -15,5 +15,31 @@
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);
+
+ 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);
}
\ No newline at end of file
--
Gitblit v1.8.0