From 8bb914874ef1ebcda2a9c606224bf3e3db2f46f8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 23 Nov 2020 09:51:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 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..e3dfd63 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -3,6 +3,7 @@
import java.util.List;
import java.util.Map;
+import com.moral.entity.Device;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -28,6 +29,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();
}
@@ -41,4 +57,15 @@
public List<Map<String, Object>> macAndOrganizationIdMap(List<String> macs) {
return deviceMapper.macAndOrganizationIdMap(macs);
}
+
+ @Override
+ public List<Map<String, Object>> getAllByMacList(List<String> macList) {
+ return deviceMapper.getAllByMacList(macList);
+ }
+
+ @Override
+ public Device getDeviceByID(int id) {
+ Device result = deviceMapper.selectByPrimaryKey(id);
+ return result;
+ }
}
--
Gitblit v1.8.0