From cdcc163408a45578880c91ca79d865e0e5e86b65 Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Thu, 09 Nov 2017 10:04:36 +0800
Subject: [PATCH] redis缓存开发
---
src/main/java/com/moral/monitor/listener/TaskListener.java | 58 ++++++++++++++++++++--------------------------------------
1 files changed, 20 insertions(+), 38 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..f325e1c 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,7 +52,8 @@
protected MongoTemplate mongoTemplate;
private Logger logger = LoggerFactory.getLogger(TaskListener.class);
-
+ @Resource
+ RedisService redisService;
@Override
public void onMessage(Message msg) {
@@ -70,16 +71,8 @@
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));
- }
-
+ //���������������������������map
+ Map<String, Float> adjustMap = redisService.getAdjustsByMac(mac);
if(!adjustMap.isEmpty()) {
for (Map.Entry<String, Float> entry : adjustMap.entrySet()) {
String key = entry.getKey();
@@ -130,22 +123,6 @@
//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;
- }
//���������������������
private static Map<String,Double[]> alarmLevles =new HashMap<String, Double[]>();
/*
@@ -175,6 +152,7 @@
//���������������������������������������������
private int detEquState(Map<String,String> data) {
int state = 0;
+ Map<String, Object> equMap = new HashMap<String, Object>();
if(data!=null) {
for(String key:alarmLevles.keySet()) {
String value = data.get(key);
@@ -186,21 +164,25 @@
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(data.get("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