From 875ade2caa81f3c42554d554ebe1f649c21a3447 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 28 Feb 2018 16:41:25 +0800
Subject: [PATCH] test
---
src/main/java/com/moral/monitor/listener/TaskListener.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/monitor/listener/TaskListener.java b/src/main/java/com/moral/monitor/listener/TaskListener.java
index 973e01a..11612fb 100644
--- a/src/main/java/com/moral/monitor/listener/TaskListener.java
+++ b/src/main/java/com/moral/monitor/listener/TaskListener.java
@@ -69,9 +69,13 @@
}
Map<String, Object> msgData = JSON.parseObject(message, new TypeReference<Map<String, Object>>() {});
- String mac = msgData.get("mac").toString();
- String ver = msgData.get("ver").toString();
-
+ Object obj_mac = msgData.get("mac");
+ Object obj_ver = msgData.get("ver");
+ if(obj_ver == null || obj_mac == null) {
+ return;
+ }
+ String mac = obj_mac.toString();
+ String ver = obj_ver.toString();
if(StringUtils.isEmpty(ver) || StringUtils.isEmpty(mac)) {
return;
}
@@ -105,6 +109,7 @@
// taskDao.insertTologger(mac, message, getDate());
mongoTemplate.insert(message, "logger");
+
//������������������
List<History> histories = new ArrayList<History>();
List<Sensor> sensorList = taskDao.selectFromsensorByver(ver);
@@ -123,6 +128,7 @@
}
jobDao.batchInsertHistory(histories);
+
//mongoTemplate.insert(JSON.toJSONString(histories), "data");
mongoTemplate.insert(new_message, "data");
} catch (Exception e) {
--
Gitblit v1.8.0