From ba9a621c55f520be8e26cdb0d3ad61b5246b2fc1 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 07 Nov 2017 22:05:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/monitor/listener/TaskListener.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/monitor/listener/TaskListener.java b/src/main/java/com/moral/monitor/listener/TaskListener.java
index c0e8dee..af8c890 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,9 @@
// 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()));
+ String new_message = JSON.toJSONString(msgData);
+ rabbitTemplate.convertAndSend("monitors_data2", "", new_message.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);
@@ -124,6 +126,9 @@
}
}
jobDao.batchInsertHistory(histories);
+
+ //mongoTemplate.insert(JSON.toJSONString(histories), "data");
+ mongoTemplate.insert(new_message, "data");
}
private Map<String, Float> getAdjustData(String mac) {
@@ -146,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());
@@ -160,7 +165,7 @@
double level2 = levels.get("level2");
double level3 = levels.get("level3");
//������������������������������������������
- if(level1!=0&&level2!=0&&level3!=0) {
+ if(levels.get("enable")!=null&&levels.get("enable")==1) {
//������������������
Double arr[] = {0.0,level1,level2,level3};
alarmLevles.put(key, arr);
--
Gitblit v1.8.0