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/service/HistoryHourlyService.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryHourlyService.java b/src/main/java/com/moral/service/HistoryHourlyService.java
index e6ca84a..0e99fea 100644
--- a/src/main/java/com/moral/service/HistoryHourlyService.java
+++ b/src/main/java/com/moral/service/HistoryHourlyService.java
@@ -1,5 +1,6 @@
package com.moral.service;
+import java.util.List;
import java.util.Map;
import com.moral.entity.Point;
@@ -12,4 +13,19 @@
Map<String, Object> getPollutionSourceDataAll(Map<String, Object> parameters) throws Exception;
Point getDirPoint(Map<String, Object> parameters) throws Exception;
+
+ //������TVOC������
+ String getTVOCByMac(String mac,String time,String sensor);
+ //������������������
+ String getPressureByMac(String mac,String time);
+
+ //������historyHourly���������������
+
+ Map<String,Object> getDataByMac(String mac,String time);
+
+ List<Map<String, Object>> getDataByTimeSlot(String mac, String startTime, String endTime) throws Exception;
+
+ List<Map> getDataByMacAndTime(Map param);
+
+ List<Map> getDataAvbByMIdAndTime(String mId,String startTime,String endTime);
}
--
Gitblit v1.8.0