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 | 61 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 24 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..4f7c552 100644
--- a/src/main/java/com/moral/monitor/listener/TaskListener.java
+++ b/src/main/java/com/moral/monitor/listener/TaskListener.java
@@ -17,9 +17,11 @@
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;
+import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.util.StringUtils;
@@ -45,6 +47,9 @@
@Resource
RedisTemplate<String, String> redisTemplate;
+
+ @Resource
+ protected MongoTemplate mongoTemplate;
private Logger logger = LoggerFactory.getLogger(TaskListener.class);
@@ -89,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);
@@ -101,24 +106,29 @@
// //������������������
// 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);
+ 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"))));
+ 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");
}
private Map<String, Float> getAdjustData(String mac) {
@@ -141,7 +151,7 @@
/*
* ������������������������,���map���������������������������������
*/
- @Value(value="alarmLevles.json")
+ @Value(value= "system/alarmLevels.json")
public void setAlarmLevles(String path) throws IOException {
org.springframework.core.io.Resource resource = new ClassPathResource(path);
InputStreamReader reader=new InputStreamReader(resource.getInputStream());
@@ -154,9 +164,12 @@
double level1 = levels.get("level1");
double level2 = levels.get("level2");
double level3 = levels.get("level3");
- //������������������
- Double arr[] = {0.0,level1,level2,level3};
- alarmLevles.put(key, arr);
+ //������������������������������������������
+ if(levels.get("enable")!=null&&levels.get("enable")==1) {
+ //������������������
+ Double arr[] = {0.0,level1,level2,level3};
+ alarmLevles.put(key, arr);
+ }
}
}
//���������������������������������������������
--
Gitblit v1.8.0