From d7ee12cb208473741f79b64505adccd0653e4654 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 27 Oct 2020 13:44:28 +0800
Subject: [PATCH] vue页面增加误差率参数，沧州剔除非本公司设备显示，报表接口更新
---
src/main/java/com/moral/mapper/HistoryMapper.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index 6fd31b0..5ab081a 100644
--- a/src/main/java/com/moral/mapper/HistoryMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMapper.java
@@ -1,13 +1,14 @@
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);
+ String getValueByMacAndTime(@Param("mac")String mac, @Param("time")String time,@Param("time1")String time1);
List<Map<String, Object>> getAreaAllDataByAccount(Map<String, Object> parameters);
List<Map<String, Object>> getRegionRankingData(Map<String, Object> parameters);
@@ -22,4 +23,24 @@
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