From faec027b63bb19d061098724754895ae801ad493 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Mon, 30 Oct 2017 14:03:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/monitor/listener/TaskListener.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/moral/monitor/listener/TaskListener.java b/src/main/java/com/moral/monitor/listener/TaskListener.java
index 69c101c..e346459 100644
--- a/src/main/java/com/moral/monitor/listener/TaskListener.java
+++ b/src/main/java/com/moral/monitor/listener/TaskListener.java
@@ -59,11 +59,12 @@
         }
 
         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()) {

--
Gitblit v1.8.0