From d679e6f58bca0e03434109bd240268e90aa15e2b Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 07 Nov 2017 09:44:04 +0800
Subject: [PATCH] test

---
 src/main/java/com/moral/monitor/listener/TaskListener.java |    9 ++++++---
 1 files changed, 6 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 37d1d02..4f7c552 100644
--- a/src/main/java/com/moral/monitor/listener/TaskListener.java
+++ b/src/main/java/com/moral/monitor/listener/TaskListener.java
@@ -17,6 +17,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageListener;
+import org.springframework.amqp.core.MessageProperties;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.ClassPathResource;
@@ -93,8 +94,8 @@
 //        System.out.println(message);
 //        System.out.println(JSON.toJSONString(msgData));
 
-        rabbitTemplate.convertAndSend("monitors_data2", "", JSON.toJSONString(msgData).getBytes());
-//        rabbitTemplate.send("monitors_data_3", "", new Message(JSON.toJSONString(msgData).getBytes(), new MessageProperties()));
+//        rabbitTemplate.convertAndSend("monitors_data2", "", JSON.toJSONString(msgData).getBytes());
+        rabbitTemplate.send("monitors_data2", "", new Message(JSON.toJSONString(msgData).getBytes(), new MessageProperties()));
 
 //        int state = (new Random()).nextInt(4) % 5; //TODO
           int state = detEquState(msgData);
@@ -121,11 +122,13 @@
                 history.setSensor(sensor.getSensor());
                 history.setMac_value(Double.valueOf(msgData.get(key)));
                 histories.add(history);
+
+                mongoTemplate.insert(JSON.toJSONString(history), "data");
             }
         }
         jobDao.batchInsertHistory(histories);
 
-        mongoTemplate.insert(JSON.toJSONString(histories), "data");
+        //mongoTemplate.insert(JSON.toJSONString(histories), "data");
     }
 
     private Map<String, Float> getAdjustData(String mac) {

--
Gitblit v1.8.0