Merge remote-tracking branch 'origin/master'

沈斌

2017-10-30 faec027b63bb19d061098724754895ae801ad493

 src/main/java/com/moral/monitor/listener/TaskListener.java

@@ -16,6 +16,7 @@
import org.springframework.amqp.rabbit.connection.Connection;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.util.StringUtils;

import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
@@ -53,12 +54,17 @@
        String mac = msgData.get("mac");
        String ver = msgData.get("ver");

        if(StringUtils.isEmpty(ver) || StringUtils.isEmpty(mac)) {
            return;
        }

        Map<String, Float> adjustMap;
        if(RedisUtil.hasKey(redisTemplate, mac)) {
            adjustMap = JSON.parseObject(RedisUtil.get(redisTemplate, mac), new TypeReference<Map<String, Float>>() {});
        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, mac, JSON.toJSONString(adjustMap));
            RedisUtil.set(redisTemplate, adjust_key, JSON.toJSONString(adjustMap));
        }

        if(!adjustMap.isEmpty()) {
@@ -75,7 +81,7 @@
//        System.out.println(message);
//        System.out.println(JSON.toJSONString(msgData));

//        rabbitTemplate.convertAndSend("monitors_data", "", JSON.toJSONString(msgData).getBytes());
        rabbitTemplate.convertAndSend("monitors_data2", "", JSON.toJSONString(msgData).getBytes());
//        rabbitTemplate.send("monitors_data_3", "", new Message(JSON.toJSONString(msgData).getBytes(), new MessageProperties()));

        int state = (new Random()).nextInt(4) % 5; //TODO