From 79e1f0e504d593d864cb69a167fa28b6a42bf076 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 14 Nov 2017 21:39:50 +0800
Subject: [PATCH] test
---
src/main/java/com/moral/monitor/listener/TaskListener.java | 169 ++++++++++++++++++++++++++------------------------------
1 files changed, 78 insertions(+), 91 deletions(-)
diff --git a/src/main/java/com/moral/monitor/listener/TaskListener.java b/src/main/java/com/moral/monitor/listener/TaskListener.java
index af8c890..3dfe83a 100644
--- a/src/main/java/com/moral/monitor/listener/TaskListener.java
+++ b/src/main/java/com/moral/monitor/listener/TaskListener.java
@@ -17,7 +17,6 @@
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;
@@ -32,6 +31,7 @@
import com.moral.monitor.dao.TaskDao;
import com.moral.monitor.entity.History;
import com.moral.monitor.entity.Sensor;
+import com.moral.monitor.service.RedisService;
import com.moral.monitor.util.RedisUtil;
public class TaskListener implements MessageListener {
@@ -52,99 +52,79 @@
protected MongoTemplate mongoTemplate;
private Logger logger = LoggerFactory.getLogger(TaskListener.class);
-
+ @Resource
+ RedisService redisService;
@Override
public void onMessage(Message msg) {
+ try {
+ String message = null;
+ try {
+ message = new String(msg.getBody(), "utf-8");
+ } catch (UnsupportedEncodingException e) {
+ logger.warn(e.getMessage());
+ }
- String message = null;
- try {
- message = new String(msg.getBody(), "utf-8");
- } catch (UnsupportedEncodingException e) {
- logger.warn(e.getMessage());
- }
+ Map<String, String> msgData = JSON.parseObject(message, new TypeReference<Map<String, String>>() {});
+ String mac = msgData.get("mac");
+ String ver = msgData.get("ver");
- Map<String, String> msgData = JSON.parseObject(message, new TypeReference<Map<String, String>>() {});
- String mac = msgData.get("mac");
- String ver = msgData.get("ver");
-
- if(StringUtils.isEmpty(ver) || StringUtils.isEmpty(mac)) {
- return;
- }
-
- Map<String, Float> adjustMap;
- String adjust_key = "adjust_" + mac;
- if(RedisUtil.hasKey(redisTemplate, adjust_key)) {
- adjustMap = JSON.parseObject(RedisUtil.get(redisTemplate, adjust_key), new TypeReference<Map<String, Float>>() {});
- } else {
- adjustMap = getAdjustData(mac);
- RedisUtil.set(redisTemplate, adjust_key, JSON.toJSONString(adjustMap));
- }
-
- if(!adjustMap.isEmpty()) {
- for (Map.Entry<String, Float> entry : adjustMap.entrySet()) {
- String key = entry.getKey();
- if(msgData.containsKey(key)) {
- Float value = entry.getValue();
- Float dataValue = Float.valueOf(msgData.get(key)) ;
- msgData.put(key, String.valueOf(dataValue + value));
+ if(StringUtils.isEmpty(ver) || StringUtils.isEmpty(mac)) {
+ return;
+ }
+ //���������������������������map
+ Map<String, Float> adjustMap = redisService.getAdjustsByMac(mac);
+ if(adjustMap!=null&&!adjustMap.isEmpty()) {
+ for (Map.Entry<String, Float> entry : adjustMap.entrySet()) {
+ String key = entry.getKey();
+ if(msgData.containsKey(key)) {
+ Float value = entry.getValue();
+ Float dataValue = Float.valueOf(msgData.get(key)) ;
+ msgData.put(key, String.valueOf(dataValue + value));
+ }
}
}
- }
+// System.out.println(message);
+// System.out.println(JSON.toJSONString(msgData));
-// System.out.println(message);
-// System.out.println(JSON.toJSONString(msgData));
+ 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()));
- 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);
+// rabbitTemplate.convertAndSend("monitors_alarm", "", "{\"mac\": \"" + mac + "\", \"state\": " + state + "}");
-// int state = (new Random()).nextInt(4) % 5; //TODO
- int state = detEquState(msgData);
-// rabbitTemplate.convertAndSend("monitors_alarm", "", "{\"mac\": \"" + mac + "\", \"state\": " + state + "}");
+ //������������������
+ jobDao.updateStateByMac(mac, state);
- //������������������
- jobDao.updateStateByMac(mac, state);
+// //������������������
+// taskDao.insertTologger(mac, message, getDate());
+ mongoTemplate.insert(message, "logger");
-// //������������������
-// taskDao.insertTologger(mac, message, getDate());
- 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);
+ //������������������
+ 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);
+ jobDao.batchInsertHistory(histories);
- //mongoTemplate.insert(JSON.toJSONString(histories), "data");
- mongoTemplate.insert(new_message, "data");
- }
-
- private Map<String, Float> getAdjustData(String mac) {
- List<Map<String, String>> adjusts = jobDao.findAdjustByMac(mac);
- Map<String, Float> dataMap = new HashMap<String, Float>();
- for (int i = 0; i < adjusts.size(); i++) {
- Map adjust = adjusts.get(i);
- if(adjust.get("value") != null) {
- String key = String.valueOf(adjust.get("key"));
- String data = String.valueOf(adjust.get("value"));
- BigDecimal value = new BigDecimal(data);
- value.setScale(3, BigDecimal.ROUND_HALF_UP);
- dataMap.put(key, value.floatValue());
- }
- }
- return dataMap;
+ //mongoTemplate.insert(JSON.toJSONString(histories), "data");
+ mongoTemplate.insert(new_message, "data");
+ } catch (Exception e) {
+ //������������
+ logger.error(e.getMessage());
+ }
}
//���������������������
private static Map<String,Double[]> alarmLevles =new HashMap<String, Double[]>();
@@ -175,6 +155,10 @@
//���������������������������������������������
private int detEquState(Map<String,String> data) {
int state = 0;
+ Map<String, Object> equMap = new HashMap<String, Object>();
+ String mac = data.get("mac");
+ data.remove("mac");//���������������mac������
+ equMap.putAll(data);
if(data!=null) {
for(String key:alarmLevles.keySet()) {
String value = data.get(key);
@@ -186,21 +170,24 @@
if(val>=arr[index]) {
//���������������������������������������������������������������������������
state = (index>state)?index:state;
- break;
+ String e_key = "level"+Integer.toString(index);
+ Object e_States = equMap.get(e_key);
+ if(e_States!=null&&e_States instanceof List) {
+ ((List)e_States).add(key);
+ }else {
+ e_States = new ArrayList<String>();
+ equMap.put(e_key, e_States);
+ ((List)e_States).add(key);
+ }
+ equMap.put(e_key, e_States);
+ break;
}
- }
- //���������������������������������������������������������
- if(state == (arr.length-1)) {
- break;
}
}
}
}
+ equMap.put("state", state);//������������
+ redisService.setEquState(mac,equMap);
return state;
- }
- private String getDate() {
- Date d = new Date();
- SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- return formatter.format(d);
}
}
--
Gitblit v1.8.0