From 70c4207810e4348ad9c125c44cbb6842ecd8b4b7 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 28 Nov 2017 06:31:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
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 9a70187..a969435 100644
--- a/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java
+++ b/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java
@@ -36,6 +36,7 @@
private static final String MONITORPOINT_ID= "monitorpointId";
//������������������������������������
private static String getStaticEquKey(String mac) {
+ mac = mac==null?"":mac.toLowerCase();
return "static_equ_"+mac;
}
public void setStaticEqu(String mac,Map<String,Object> equMap) {
@@ -88,6 +89,7 @@
String orgId = equMap.get(ORG_ID)==null?"$":equMap.get(ORG_ID).toString();
String areaCode = equMap.get(AREA_CODE)==null?"$":equMap.get(AREA_CODE).toString();
String mpointId = equMap.get(MONITORPOINT_ID)==null?"$":equMap.get(MONITORPOINT_ID).toString();
+ mac = mac==null?"":mac.toLowerCase();
return "state_"+orgId+"_"+areaCode+"_"+mpointId+"_"+mac;
}
else {
--
Gitblit v1.8.0