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/SensorUnitServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
index 0ab1c6f..2d8b897 100644
--- a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
@@ -80,6 +80,7 @@
Map<Integer,List<SensorUnit>> resultListMap = new HashMap<>();
for(Integer sensorId: sensorIds) {
sensorUnitQuery.setSensorId(sensorId);
+ sensorUnitQuery.setIsDelete(false);
List<SensorUnit> sensorUnitList = sensorUnitMapper.select(sensorUnitQuery);
if(sensorUnitList!=null&&sensorUnitList.size()>0){
resultListMap.put(sensorId,sensorUnitList);
@@ -87,4 +88,50 @@
}
return resultListMap;
}
+
+ @Override
+ public Map<String, Object> getSensorByMac(String mac) {
+ List<Map<String, Object>> list = sensorUnitMapper.getSensorsByDeviceMac(mac);
+ if (list!=null && !list.isEmpty()) {
+ Map<String, Object> sensorUnitMap = new HashMap<>();
+ for(Map<String, Object> sensorMap : list) {
+ String sensor_key = (String) sensorMap.get("sensor_key");
+ String name = (String) sensorMap.get("name");
+ sensorUnitMap.put(sensor_key, name);
+ }
+ System.out.println(sensorUnitMap);
+ return sensorUnitMap;
+ } else {
+ Map<String, Object> sensorUnitMap = null;
+ return sensorUnitMap;
+ }
+ }
+
+ @Override
+ public Map<String, Map<String, Object>> getSensorsByMonitPointId(String id) {
+ List<Map<String, Object>> list = sensorUnitMapper.getSensorsByMonitPointId(id);
+ System.out.println(list);
+ if (list!=null && !list.isEmpty()) {
+ Map<String, Map<String, Object>> sensorUnitMap = new HashMap<>();
+ for(Map<String, Object> sensorMap : list) {
+ Map<String, Object> innerMap = new HashMap<>();
+ innerMap.put("unit", sensorMap.get("unit"));
+ innerMap.put("name", sensorMap.get("name"));
+ innerMap.put("rules", sensorMap.get("rules"));
+ String sensor_key = (String) sensorMap.get("sensor_key");
+ sensorUnitMap.put(sensor_key, innerMap);
+ }
+ //System.out.println(sensorUnitMap);
+ return sensorUnitMap;
+ } else {
+ Map<String, Map<String, Object>> sensorUnitMap = null;
+ return sensorUnitMap;
+ }
+ }
+
+ @Override
+ public List<Map<String, Object>> getSensorsByMonitPointId2(String id) {
+ List<Map<String, Object>> list = sensorUnitMapper.getSensorsByMonitPointId(id);
+ return list;
+ }
}
--
Gitblit v1.8.0