更新

fengxiang

2017-11-13 1169873a81a827452533be1d50cf1f1cf97b2853

更新

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

@@ -151,7 +151,9 @@
    //根据三级警报阀值，确定设备状态

    private int detEquState(Map<String,String> data) {

        int state = 0;

        data.remove("mac");//不需要存储mac地址

        Map<String, Object> equMap = new HashMap<String, Object>();

        equMap.putAll(data);

        if(data!=null) {

                for(String key:alarmLevles.keySet()) {

                      String value = data.get(key);

@@ -171,7 +173,6 @@
                                        e_States = new ArrayList<String>();

                                        equMap.put(e_key, e_States);

                                        ((List)e_States).add(key);

    						        	
                                    }

                                    equMap.put(e_key, e_States);

                                    break;


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

@@ -32,7 +32,7 @@
    private static final String ADJUSTS = "adjusts";

    private static final String ORG_ID = "orgId";

    private static final String AREA_CODE = "areaCode";

    private static final String MONITORPOINT_ID= "monitorpoint";

    private static final String MONITORPOINT_ID= "monitorpointId";

    //设备静态数据，不常改动。

    private static String getStaticEquKey(String mac) {

        return "static_equ_"+mac;