From e97c393e23f4c015a44b5fef5fd26ae288bc6c0f Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 10 Jul 2019 11:31:35 +0800
Subject: [PATCH] 天气预报
---
src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java | 55 ++++++++++++++++++++++++-------------------------------
1 files changed, 24 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
index ceffa68..7f72281 100644
--- a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
@@ -91,16 +91,12 @@
@Override
public Map<String, Object> getSensorByMac(String mac) {
- System.out.println("SensorUnitServiceImpl-----getSensorByMac-----mac:"+mac);
List<Map<String, Object>> list = sensorUnitMapper.getSensorsByDeviceMac(mac);
- System.out.println("SensorUnitServiceImpl----getSensorByMac----list:"+list);
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");
- System.out.println("SensorUnitServiceImpl----getSensorByMac----sensor_key:"+sensor_key);
String name = (String) sensorMap.get("name");
- System.out.println("SensorUnitServiceImpl----getSensorByMac----name:"+name);
sensorUnitMap.put(sensor_key, name);
}
System.out.println(sensorUnitMap);
@@ -111,34 +107,32 @@
}
}
- /*@Override
- public 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> sensorUnitMap = new HashMap<>();
- for(Map<String, Object> sensorMap : list) {
- 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, 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) {
- System.out.println("SensorUnitServiceImpl-----getSensorsByMonitPointId-----id:"+id);
List<Map<String, Object>> list = sensorUnitMapper.getSensorsByMonitPointId(id);
- System.out.println("SensorUnitServiceImpl----getSensorsByMonitPointId----list:"+list);
+ 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);
+ /*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) {
@@ -146,9 +140,7 @@
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);
@@ -156,6 +148,7 @@
} else {
Map<String, Map<String, Object>> sensorUnitMap = null;
return sensorUnitMap;
- }
+ }*/
+ return list;
}
}
--
Gitblit v1.8.0