Merge remote-tracking branch 'origin/master'

沈斌

2017-11-11 45be44fb95325305373647231ef74e72d1501f8c

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

@@ -73,7 +73,7 @@
        }

        //获取缓存中的校准值map

        Map<String, Float> adjustMap = redisService.getAdjustsByMac(mac);

        if(!adjustMap.isEmpty()) {

        if(adjustMap!=null&&!adjustMap.isEmpty()) {

            for (Map.Entry<String, Float> entry : adjustMap.entrySet()) {

                String key = entry.getKey();

                if(msgData.containsKey(key)) {

@@ -83,7 +83,6 @@
                }

            }

        }



//        System.out.println(message);

//        System.out.println(JSON.toJSONString(msgData));