From a46f5f1db19dc1af644a4ed013bb12555621e135 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 21 May 2020 14:23:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index fd27551..280914b 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -28,6 +28,21 @@
}
@Override
+ public List<Map<String, Object>> getSensorDataOnce(Map<String, Object> parameters) {
+ return historyMapper.getSensorDataOnce(parameters);
+ }
+
+ @Override
+ public List<Map<String, Object>> getSensorDataByMac(Map<String, Object> parameters) {
+ return historyMapper.getSensorDataByMac(parameters);
+ }
+
+ @Override
+ public List<Map<String, Object>> getSensorDataByMacOnce(Map<String, Object> parameters) {
+ return historyMapper.getSensorDataByMacOnce(parameters);
+ }
+
+ @Override
public List<String> getMacs() {
return deviceMapper.getMacs();
}
--
Gitblit v1.8.0