From 269fd088f1c308b7e11d531a4485d163261ea2df Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Fri, 03 Nov 2017 13:52:16 +0800
Subject: [PATCH] json位置修改
---
src/main/java/com/moral/monitor/listener/TaskListener.java | 52 ++++++++++++++++++++++++++++++----------------------
1 files changed, 30 insertions(+), 22 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..558a789 100644
--- a/src/main/java/com/moral/monitor/listener/TaskListener.java
+++ b/src/main/java/com/moral/monitor/listener/TaskListener.java
@@ -20,6 +20,7 @@
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 +46,9 @@
@Resource
RedisTemplate<String, String> redisTemplate;
+
+ @Resource
+ protected MongoTemplate mongoTemplate;
private Logger logger = LoggerFactory.getLogger(TaskListener.class);
@@ -101,24 +105,25 @@
// //������������������
// 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);
+ }
+ }
+ jobDao.batchInsertHistory(histories);
}
private Map<String, Float> getAdjustData(String mac) {
@@ -141,7 +146,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 +159,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(level1!=0&&level2!=0&&level3!=0) {
+ //������������������
+ Double arr[] = {0.0,level1,level2,level3};
+ alarmLevles.put(key, arr);
+ }
}
}
//���������������������������������������������
--
Gitblit v1.8.0