Merge remote-tracking branch 'origin/master'

沈斌

2017-11-15 ad42a81e625f1e7a982a94994d7d5f3314c71fbd

 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()) {