From 3aa2f5aa4c7963e7bcfbc0d710c286c826338df9 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 02 Dec 2020 14:39:08 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/HistoryService.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryService.java b/src/main/java/com/moral/service/HistoryService.java
index 2ab5e0e..3ed919d 100644
--- a/src/main/java/com/moral/service/HistoryService.java
+++ b/src/main/java/com/moral/service/HistoryService.java
@@ -13,6 +13,8 @@
String queryValueByMacAndTime(String mac, Date time);
+ String getValueByMacAndTime(String mac, String time,String time1);
+
List<Map<String, Object>> getRegionRankingData(Map<String, Object> parameters);
List<Map<String, Object>> getSensorsDataByDevice(Map<String, Object> parameters);
@@ -36,5 +38,7 @@
//������������������������������
List<Map<String, Object>> getO3AVG(Map<String, Object> parameters);
+ String getJsonData(String mac,String time,String table);
+
}
--
Gitblit v1.8.0