传感器平均数据 报表接口

xufenglei

2017-11-14 91e5d3d85c737b96b2c4a1994e2b861cc083453c

 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));



@@ -152,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);

@@ -172,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;