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 | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/moral/monitor/listener/TaskListener.java b/src/main/java/com/moral/monitor/listener/TaskListener.java
index b874bb0..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;
}
@@ -106,24 +110,23 @@
mongoTemplate.insert(message, "logger");
-//������������������������
-// //������������������
-// List<History> histories = new ArrayList<History>();
-// List<Sensor> sensorList = taskDao.selectFromsensorByver(ver);
-// for (Sensor sensor : sensorList) {
-// String key = sensor.getMac_key();
-// if(msgData.containsKey(key)) {
-// //taskDao.insertTohistory(mac, sensor.getSensor(), key, msgData.get(key));
-// History history = new History();
-// history.setMac(mac);
-// history.setMac_key(key);
-// history.setTime(new Date(Long.parseLong(msgData.get("time").toString())));
-// history.setSensor(sensor.getSensor());
-// history.setMac_value(Double.valueOf(msgData.get(key).toString()));
-// histories.add(history);
-// }
-// }
-// jobDao.batchInsertHistory(histories);
+ //������������������
+ List<History> histories = new ArrayList<History>();
+ List<Sensor> sensorList = taskDao.selectFromsensorByver(ver);
+ for (Sensor sensor : sensorList) {
+ String key = sensor.getMac_key();
+ if(msgData.containsKey(key)) {
+ //taskDao.insertTohistory(mac, sensor.getSensor(), key, msgData.get(key));
+ History history = new History();
+ history.setMac(mac);
+ history.setMac_key(key);
+ history.setTime(new Date(Long.parseLong(msgData.get("time").toString())));
+ history.setSensor(sensor.getSensor());
+ history.setMac_value(Double.valueOf(msgData.get(key).toString()));
+ histories.add(history);
+ }
+ }
+ jobDao.batchInsertHistory(histories);
//mongoTemplate.insert(JSON.toJSONString(histories), "data");
--
Gitblit v1.8.0