From 1169873a81a827452533be1d50cf1f1cf97b2853 Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Mon, 13 Nov 2017 16:47:52 +0800
Subject: [PATCH] 更新
---
src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java | 2 +-
src/main/java/com/moral/monitor/listener/TaskListener.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/monitor/listener/TaskListener.java b/src/main/java/com/moral/monitor/listener/TaskListener.java
index 93462e8..a769e17 100644
--- a/src/main/java/com/moral/monitor/listener/TaskListener.java
+++ b/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;
diff --git a/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java b/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java
index fdb06af..b31ba9e 100644
--- a/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java
+++ b/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;
--
Gitblit v1.8.0