From 09c3a7d258c7bde571f74050156437d2eb86c6c6 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 12 Jun 2019 17:02:40 +0800
Subject: [PATCH] sensor
---
src/main/java/com/moral/controller/ScreenController.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 2d75e1e..99a7cea 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -983,19 +983,18 @@
if(sensorMap!=null && !sensorMap.isEmpty()) {
for (Map<String, Object> map : list) {
+ System.out.println("ScreenController-----AIForecast-----map:"+map);
String time = map.get("time").toString();
time = time.substring(time.length() - 2);
map.put("time", Integer.valueOf(time));
map.put("value", map.remove(sensorKey));
- String sensor = map.get("sensorKey").toString();
- if(sensorMap.get(sensor)!=null) {
- map.put("unit", sensorMap.get("unit"));
- map.put("name", sensorMap.get("name"));
- map.put("rules", sensorMap.get("rules"));
+ System.out.println("ScreenController-----AIForecast-----map:"+map);
+ System.out.println(sensorMap.get("unit"));
+ //String sensor = map.get("sensorKey").toString();
+ if(sensorMap.get(sensorKey)!=null) {
+ map.put("unit", sensorMap.get(sensorKey).get("name"));
}else {
- map.put("unit", null);
- map.put("name", null);
- map.put("rules", null);
+ map.put("unit", "mg/m��");
}
}
}else {
@@ -1004,9 +1003,7 @@
time = time.substring(time.length() - 2);
map.put("time", Integer.valueOf(time));
map.put("value", map.remove(sensorKey));
- map.put("unit", null);
- map.put("name", null);
- map.put("rules", null);
+ map.put("unit", "mg/m��");
}
}
//return null;
--
Gitblit v1.8.0