From a4f11cd94cb83dc59f4b9fe1871ec1f9a1b19b46 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Mon, 26 Feb 2018 09:29:58 +0800
Subject: [PATCH] test

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

diff --git a/src/main/java/com/moral/monitor/listener/TaskListener.java b/src/main/java/com/moral/monitor/listener/TaskListener.java
index aca1f91..e691eca 100644
--- a/src/main/java/com/moral/monitor/listener/TaskListener.java
+++ b/src/main/java/com/moral/monitor/listener/TaskListener.java
@@ -110,23 +110,26 @@
 //            taskDao.insertTologger(mac, message, getDate());
             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");
             mongoTemplate.insert(new_message, "data");

--
Gitblit v1.8.0