From a042a6a95626ee4bad9c7c8740fcdec19102a2be Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 01 Nov 2017 14:22:28 +0800
Subject: [PATCH] 恢复历史数据

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

diff --git a/src/main/java/com/moral/monitor/listener/TaskListener.java b/src/main/java/com/moral/monitor/listener/TaskListener.java
index 0ac8634..1bd0a48 100644
--- a/src/main/java/com/moral/monitor/listener/TaskListener.java
+++ b/src/main/java/com/moral/monitor/listener/TaskListener.java
@@ -101,24 +101,24 @@
 
 //        //������������������
 //        taskDao.insertTologger(mac, message, getDate());
-//
-//        //������������������
-//        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"))));
-//                history.setSensor(sensor.getSensor());
-//                history.setMac_value(Double.valueOf(msgData.get(key)));
-//                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"))));
+                history.setSensor(sensor.getSensor());
+                history.setMac_value(Double.valueOf(msgData.get(key)));
+                histories.add(history);
+            }
+        }
+        jobDao.batchInsertHistory(histories);
     }
 
     private Map<String, Float> getAdjustData(String mac) {

--
Gitblit v1.8.0