Merge remote-tracking branch 'origin/master'

沈斌

2017-11-15 ad42a81e625f1e7a982a94994d7d5f3314c71fbd

Merge remote-tracking branch 'origin/master'

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

@@ -196,7 +196,6 @@
        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()) {


 src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java

@@ -98,7 +98,7 @@
    public void setEquState(String mac,Map<String,Object> equWithStateMap) {

        String key = getEquStateKey(mac);

        String equWithStateJsonStr = JSON.toJSONString(equWithStateMap);

        RedisUtil.set(redis,key,equWithStateJsonStr,10,TimeUnit.SECONDS);

        RedisUtil.set(redis,key,equWithStateJsonStr,1200,TimeUnit.SECONDS);

    }

    //从redis获取含有状态的设备监控功能数据

    public Map<String,Object> getEquState(String mac) {