From d07ca3c2c178bccf9816a0a4d46f5492ffc78d52 Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Fri, 10 Nov 2017 14:22:21 +0800
Subject: [PATCH] 更新校正值
---
src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 35 insertions(+), 24 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 dde096b..fdb06af 100644
--- a/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java
+++ b/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java
@@ -46,19 +46,20 @@
Map<String,Object> equMap = null;
if(StringUtils.isEmpty(staticEquJson)) {
equMap = jobDao.findEquWithAdjustsByMac(mac);
- //���������������adjust������������
- List<Map<String,Object>> adjustList = (List<Map<String, Object>>) equMap.get(ADJUSTS);
- List<Object> adjustListWithData = new ArrayList<Object>();
- //list to map
- for(Map<String,Object> adjust:adjustList) {
- if(adjust.get("value")!=null) {
- //������������������
- adjustListWithData.add(adjust);
- }
- }
- equMap.put(ADJUSTS,adjustListWithData);
- setStaticEqu(mac,equMap);
-
+ if(equMap!=null) {
+ //���������������adjust������������
+ List<Map<String,Object>> adjustList = (List<Map<String, Object>>) equMap.get(ADJUSTS);
+ List<Object> adjustListWithData = new ArrayList<Object>();
+ //list to map
+ for(Map<String,Object> adjust:adjustList) {
+ if(adjust.get("value")!=null) {
+ //������������������
+ adjustListWithData.add(adjust);
+ }
+ }
+ equMap.put(ADJUSTS,adjustListWithData);
+ setStaticEqu(mac,equMap);
+ }
}else {
equMap = JSON.parseObject(staticEquJson,new TypeReference<Map<String,Object>>(){});
}
@@ -69,23 +70,33 @@
*/
public Map<String,Float> getAdjustsByMac(String mac){
Map<String,Object> equMap = getStaticEqu(mac);
- List<Map<String,Object>> adjustList = (List<Map<String, Object>>) equMap.get(ADJUSTS);
- //list to map
- Map<String,Float> adjustMap = new HashMap<String, Float>();
- for(Map<String,Object> adjust:adjustList) {
- if(adjust.get("value")!=null) {
- adjustMap.put(adjust.get("key").toString(), Float.valueOf(adjust.get("value").toString()));
- }
+ 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;
}
//���������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