From c534d4ac66958e9f2e9be2d9d7587c55fb3bb42f Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Fri, 17 Apr 2020 11:12:27 +0800
Subject: [PATCH] add 走航车等设备的history表数据重新存一份
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 31 +++++++++++--------------------
1 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 0a0fd29..280914b 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -18,28 +18,9 @@
@Autowired
DeviceMapper deviceMapper;
-
+
@Autowired
HistoryMapper historyMapper;
-
- @Override
- public Map<String, Object> getAvgData(Map<String, Object> parameters) {
- // TODO Auto-generated method stub
-
- return historyMapper.getAvgData(parameters);
- }
-
- @Override
- public List<Map<String, Object>> getMacAndSensorkeyByOrganizationid(List<Object> organizationIdList) {
- // TODO Auto-generated method stub
- return deviceMapper.getMacAndSensorkeyByOrganizationid(organizationIdList);
- }
-
- @Override
- public Map<String, Object> getMaxAndMinData(Map<String, Object> parameters) {
- // TODO Auto-generated method stub
- return historyMapper.getMaxAndMinData(parameters);
- }
@Override
public List<Map<String, Object>> getSensorData(Map<String, Object> parameters) {
@@ -52,6 +33,16 @@
}
@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