From d4a2ee43f5d6c7a8209d7356002ce5a3191d9b3e Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Thu, 09 Nov 2017 11:22:27 +0800
Subject: [PATCH] task数据库没有的设备造成异常处理
---
src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java | 46 ++++++++++++++++++++++++++--------------------
src/main/java/com/moral/monitor/listener/TaskListener.java | 3 +--
2 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/moral/monitor/listener/TaskListener.java b/src/main/java/com/moral/monitor/listener/TaskListener.java
index f325e1c..93462e8 100644
--- a/src/main/java/com/moral/monitor/listener/TaskListener.java
+++ b/src/main/java/com/moral/monitor/listener/TaskListener.java
@@ -73,7 +73,7 @@
}
//���������������������������map
Map<String, Float> adjustMap = redisService.getAdjustsByMac(mac);
- if(!adjustMap.isEmpty()) {
+ if(adjustMap!=null&&!adjustMap.isEmpty()) {
for (Map.Entry<String, Float> entry : adjustMap.entrySet()) {
String key = entry.getKey();
if(msgData.containsKey(key)) {
@@ -83,7 +83,6 @@
}
}
}
-
// System.out.println(message);
// System.out.println(JSON.toJSONString(msgData));
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..87c4cfa 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,13 +70,18 @@
*/
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;
}
--
Gitblit v1.8.0