From 45be44fb95325305373647231ef74e72d1501f8c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Sat, 11 Nov 2017 08:08:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 87c4cfa..fdb06af 100644
--- a/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java
+++ b/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java
@@ -88,10 +88,15 @@
//���������state_������ID_������ID_���������ID_mac
private String getEquStateKey(String mac) {
Map<String,Object> equMap = getStaticEqu(mac);
- 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();
- return "state_"+orgId+"_"+areaCode+"_"+mpointId+"_"+mac;
+ if(equMap!=null) {
+ 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();
+ return "state_"+orgId+"_"+areaCode+"_"+mpointId+"_"+mac;
+ }
+ else {
+ return "state_$_$_$_"+mac;
+ }
}
//������������������������������������������ ���������redis
public void setEquState(String mac,Map<String,Object> equWithStateMap) {
--
Gitblit v1.8.0