From 4253b8ce52930d3cca21fe76fd433170058788d0 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 25 Oct 2017 16:33:49 +0800
Subject: [PATCH] updates
---
src/main/java/com/moral/monitor/listener/Listener.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/monitor/listener/Listener.java b/src/main/java/com/moral/monitor/listener/Listener.java
index 70dcf96..a8a7de0 100644
--- a/src/main/java/com/moral/monitor/listener/Listener.java
+++ b/src/main/java/com/moral/monitor/listener/Listener.java
@@ -18,11 +18,15 @@
/*���������������*/
public class Listener implements MessageListener {
+
@Resource
RabbitTemplate rabbitTemplate;
+
@Resource
TaskDao taskDao;
+
private Logger logger = LoggerFactory.getLogger(Listener.class);
+
public void onMessage(Message message) {
logger.warn("���������������������������=" + Thread.currentThread().getName());
@@ -63,7 +67,6 @@
removeNotBind(receiveMsgMap,exsensorMap,bindsensor);
}
-
//���������������������������������������������
List<State> states = taskDao.findstateBymac(mac);
updateOrinsertstate(receiveMsgMap, mac, exsensorMap);
@@ -72,7 +75,6 @@
} else {
insertTohistoryDistinct(receiveMsgMap,mac,exsensorMap,states);
}
-
//������������������
List<Critical> criticals = taskDao.findcritical();
@@ -226,7 +228,7 @@
List<Sensor> sensors = taskDao.selectFromsensorByver(ver);
Map<String, String> ex_sensorMap = new LinkedHashMap<String, String>();
for (Sensor sensor : sensors) {
- ex_sensorMap.put(sensor.getMac_key(), sensor.getSensor());
+ ex_sensorMap.put(sensor.getMacKey(), sensor.getSensor());
}
return ex_sensorMap;
}
--
Gitblit v1.8.0