From 03cdc1111aa07041d635840eb30433cbb980accf Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 28 Feb 2018 16:44:48 +0800
Subject: [PATCH] test
---
src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 0859574..2c06a66 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) {
@@ -74,11 +75,13 @@
*/
public Map<String,Float> getAdjustsByMac(String mac){
Map<String,Object> equMap = getStaticEqu(mac);
- Object adjusts = equMap.get(ADJUSTS);
Map<String,Float> adjustMap = null;
- if(adjusts!=null&&adjusts instanceof JSONObject) {
- adjustMap = ((JSONObject)adjusts).toJavaObject(new TypeReference<Map<String,Float>>(){});
- }
+ if(equMap != null) {
+ Object adjusts = equMap.get(ADJUSTS);
+ if(adjusts!=null&&adjusts instanceof JSONObject) {
+ adjustMap = ((JSONObject)adjusts).toJavaObject(new TypeReference<Map<String,Float>>(){});
+ }
+ }
return adjustMap;
}
//���������state_������ID_������ID_���������ID_mac
@@ -88,6 +91,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 {
@@ -98,7 +102,7 @@
public void setEquState(String mac,Map<String,Object> equWithStateMap) {
String key = getEquStateKey(mac);
String equWithStateJsonStr = JSON.toJSONString(equWithStateMap);
- RedisUtil.set(redis,key,equWithStateJsonStr,10,TimeUnit.SECONDS);
+ RedisUtil.set(redis,key,equWithStateJsonStr,1200,TimeUnit.SECONDS);
}
//���redis���������������������������������������������
public Map<String,Object> getEquState(String mac) {
--
Gitblit v1.8.0