From 0666ef28e17d3f49371b248d39a2d395ef9f7451 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 30 Oct 2017 16:40:38 +0800
Subject: [PATCH] 空值临时处理

---
 src/main/java/com/moral/monitor/listener/TaskListener.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/monitor/listener/TaskListener.java b/src/main/java/com/moral/monitor/listener/TaskListener.java
index 4c259e9..be5c8cb 100644
--- a/src/main/java/com/moral/monitor/listener/TaskListener.java
+++ b/src/main/java/com/moral/monitor/listener/TaskListener.java
@@ -112,6 +112,7 @@
                 History history = new History();
                 history.setMac(mac);
                 history.setMac_key(key);
+                history.setTime(new Date(Long.parseLong(msgData.get("time"))));
                 history.setSensor(sensor.getSensor());
                 history.setMac_value(Double.valueOf(msgData.get(key)));
                 histories.add(history);
@@ -137,6 +138,9 @@
     }
     //���������������������
     private static Map<String,Double[]> alarmLevles =new HashMap<String, Double[]>();
+    /*
+     * ������������������������,���map���������������������������������
+     */
 	@Value(value="alarmLevles.json")
     public void setAlarmLevles(String path) throws IOException {
     	org.springframework.core.io.Resource resource  = new ClassPathResource(path);

--
Gitblit v1.8.0