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 | 38 ++++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 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 b31ba9e..a969435 100644
--- a/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java
+++ b/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java
@@ -13,6 +13,7 @@
import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.moral.monitor.dao.JobDao;
import com.moral.monitor.service.RedisService;
@@ -35,9 +36,13 @@
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) {
+ if(mac==null) {
+ throw new RuntimeException("Value for mac cannot be null");
+ }
RedisUtil.set(redis, getStaticEquKey(mac),JSON.toJSONString(equMap));
}
public Map<String,Object> getStaticEqu(String mac) {
@@ -47,18 +52,18 @@
if(StringUtils.isEmpty(staticEquJson)) {
equMap = jobDao.findEquWithAdjustsByMac(mac);
if(equMap!=null) {
- //���������������adjust������������
+ //list���map���������������adjust������������,
List<Map<String,Object>> adjustList = (List<Map<String, Object>>) equMap.get(ADJUSTS);
- List<Object> adjustListWithData = new ArrayList<Object>();
+ Map<String,String> adjustMap = new HashMap();
//list to map
for(Map<String,Object> adjust:adjustList) {
- if(adjust.get("value")!=null) {
+ if(adjust.get("value")!=null&&Float.parseFloat(adjust.get("value").toString())!=0.0) {
//������������������
- adjustListWithData.add(adjust);
+ adjustMap.put(adjust.get("key").toString(), adjust.get("value").toString());
}
}
- equMap.put(ADJUSTS,adjustListWithData);
- setStaticEqu(mac,equMap);
+ equMap.put(ADJUSTS,adjustMap);
+ setStaticEqu(mac,equMap);
}
}else {
equMap = JSON.parseObject(staticEquJson,new TypeReference<Map<String,Object>>(){});
@@ -70,20 +75,12 @@
*/
public Map<String,Float> getAdjustsByMac(String mac){
Map<String,Object> equMap = getStaticEqu(mac);
+ Object adjusts = equMap.get(ADJUSTS);
Map<String,Float> adjustMap = null;
- if(equMap!=null) {
- List<Map<String,Object>> adjustList = (List<Map<String, Object>>) equMap.get(ADJUSTS);
- if(adjustList!=null) {
- adjustMap = new HashMap<String, Float>();
- //list to map
- for(Map<String,Object> adjust:adjustList) {
- if(adjust.get("value")!=null) {
- adjustMap.put(adjust.get("key").toString(), Float.valueOf(adjust.get("value").toString()));
- }
- }
- }
- }
- return adjustMap;
+ if(adjusts!=null&&adjusts instanceof JSONObject) {
+ adjustMap = ((JSONObject)adjusts).toJavaObject(new TypeReference<Map<String,Float>>(){});
+ }
+ return adjustMap;
}
//���������state_������ID_������ID_���������ID_mac
private String getEquStateKey(String mac) {
@@ -92,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 {
@@ -102,7 +100,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