From 824762785fb717317550127684efb4f7b792cc8b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 12 Nov 2020 09:47:58 +0800
Subject: [PATCH] 剔除沧州地图页面非本公司设备图标，vue页面城市地理特征更新
---
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