From 2c42977a1a38e4f079c5c44fe51a46c27b865f80 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 23 Oct 2020 10:29:27 +0800
Subject: [PATCH] 增加天气城市配置表，优化相关接口
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 36 ++++++++++++++++--------------------
1 files changed, 16 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..2d97264 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) {
@@ -49,6 +30,16 @@
@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
@@ -65,4 +56,9 @@
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);
+ }
}
--
Gitblit v1.8.0