From e8ef361dc975aeaedeee6f28dfe679489a22f9d5 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 02 Sep 2019 17:42: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 | 21 ++-------------------
1 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
index 064d1d4..2d8b897 100644
--- a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
@@ -110,15 +110,15 @@
@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, Object> innerMap = new HashMap<>();
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");
- String name = (String) sensorMap.get("name");
sensorUnitMap.put(sensor_key, innerMap);
}
//System.out.println(sensorUnitMap);
@@ -132,23 +132,6 @@
@Override
public List<Map<String, Object>> getSensorsByMonitPointId2(String id) {
List<Map<String, Object>> list = sensorUnitMapper.getSensorsByMonitPointId(id);
- /*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");
- String name = (String) sensorMap.get("name");
- sensorUnitMap.put(sensor_key, innerMap);
- }
- System.out.println(sensorUnitMap);
- return sensorUnitMap;
- } else {
- Map<String, Map<String, Object>> sensorUnitMap = null;
- return sensorUnitMap;
- }*/
return list;
}
}
--
Gitblit v1.8.0