From 9009798abd7abfd726bcda80267c7d53dd3b8da3 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 12 Jun 2019 14:33:25 +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 | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
index fd61ddd..ceffa68 100644
--- a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
@@ -111,7 +111,7 @@
}
}
- @Override
+ /*@Override
public Map<String, Object> getSensorsByMonitPointId(String id) {
System.out.println("SensorUnitServiceImpl-----getSensorsByMonitPointId-----id:"+id);
List<Map<String, Object>> list = sensorUnitMapper.getSensorsByMonitPointId(id);
@@ -131,5 +131,31 @@
Map<String, Object> sensorUnitMap = null;
return sensorUnitMap;
}
+ }*/
+
+ @Override
+ public Map<String, Map<String, Object>> getSensorsByMonitPointId(String id) {
+ System.out.println("SensorUnitServiceImpl-----getSensorsByMonitPointId-----id:"+id);
+ List<Map<String, Object>> list = sensorUnitMapper.getSensorsByMonitPointId(id);
+ System.out.println("SensorUnitServiceImpl----getSensorsByMonitPointId----list:"+list);
+ if (list!=null && !list.isEmpty()) {
+ Map<String, Object> innerMap = new HashMap<>();
+ Map<String, Map<String, Object>> sensorUnitMap = new HashMap<>();
+ for(Map<String, Object> sensorMap : list) {
+ 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");
+ System.out.println("SensorUnitServiceImpl----getSensorsByMonitPointId----sensor_key:"+sensor_key);
+ String name = (String) sensorMap.get("name");
+ System.out.println("SensorUnitServiceImpl----getSensorsByMonitPointId----name:"+name);
+ sensorUnitMap.put(sensor_key, innerMap);
+ }
+ System.out.println(sensorUnitMap);
+ return sensorUnitMap;
+ } else {
+ Map<String, Map<String, Object>> sensorUnitMap = null;
+ return sensorUnitMap;
+ }
}
}
--
Gitblit v1.8.0