From ca66f2f175e6b66eda193ce58439515a9484e6b7 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 03 Sep 2019 13:44:06 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/impl/SensorServiceImpl.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/SensorServiceImpl.java b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
index fc9b469..e26a7f7 100644
--- a/src/main/java/com/moral/service/impl/SensorServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
@@ -10,6 +10,7 @@
import javax.annotation.Resource;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -89,4 +90,24 @@
Map<String, Object> map = sensorMapper.getSensorBySensorKey(sensorKey);
return map;
}
+ @Override
+ public List<Map<String, Object>> getSensorByDeviceId(String id) {
+ List<Map<String,Object>> list = sensorMapper.getSensorByDeviceId(id);
+ return list;
+ }
+ @Override
+ public List<Map<String, Object>> getSensorByMonitorPointId(String monitor_point_id) {
+ List<Map<String,Object>> list = sensorMapper.getSensorByMonitorPointId(monitor_point_id);
+ return list;
+ }
+
+ @Override
+ public Map<String, String> getSensorsMap(Map<String, Object> parameters) {
+ List<Sensor> sensors = sensorMapper.getSensorsByMac(parameters);
+ Map<String, String> sensorMap = new HashMap<>();
+ for (Sensor sensor : sensors) {
+ sensorMap.put(sensor.getSensorKey(), sensor.getDescription());
+ }
+ return sensorMap;
+ }
}
--
Gitblit v1.8.0