From 0723049b7785749898fede88452055a66c49770e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 07 Feb 2018 11:50:51 +0800
Subject: [PATCH] 地图相关资源
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index bf3ad03..bb9406d 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -165,9 +165,13 @@
private void loadDeviceState(List<Device> list){
//���redis������������
list.stream().map( device -> {
- String mac = Optional.of(device.getMac()).get();
- String state = getSateFromRedis(device.getMonitorPointId(),mac.toLowerCase());
- device.setState(state);
+ String mac = device.getMac();
+ if(!StringUtils.isBlank(mac)){
+ String state = getSateFromRedis(device.getMonitorPointId(),mac.toLowerCase());
+ device.setState(state);
+ }else{
+ device.setState(Constants.DEVICE_STATE_OFFLINE);
+ }
return device;
}).count();
}
@@ -269,21 +273,24 @@
@Override
public List<Map<String,String>> queryDevicesState(List<String> macList,Boolean withData) {
List<Map<String,String>> list = macList.stream().map(mac->{
- mac = mac.toLowerCase();
- Device device = getDeviceWithOrgIdsByMac(mac);
Map<String,String> resultMap = new HashMap<>();
- Map<String,String> stateMap = getStateMapFromRedis(device.getMonitorPointId(),mac);
- if(!MapUtils.isEmpty(stateMap)){
- resultMap.putAll(stateMap);
- }else{
- resultMap.put("state",Constants.DEVICE_STATE_OFFLINE);
- resultMap.put("mac",mac);
- }
- if(BooleanUtils.isTrue(withData)){
- String dataKey = "data_"+mac;
- Map<String,String> dataMap = redisUtils.get(dataKey,new TypeReference<Map<String,String>>(){});
- if(!MapUtils.isEmpty(dataMap)){
- resultMap.putAll(dataMap);
+ if(!StringUtils.isBlank(mac)){
+ mac = mac.toLowerCase();
+ Device device = getDeviceWithOrgIdsByMac(mac);
+ Map<String,String> stateMap = getStateMapFromRedis(device.getMonitorPointId(),mac);
+ if(!MapUtils.isEmpty(stateMap)){
+ resultMap.putAll(stateMap);
+ }else{
+ resultMap.put("state",Constants.DEVICE_STATE_OFFLINE);
+ resultMap.put("mac",mac);
+ }
+ //������data
+ if(BooleanUtils.isTrue(withData)){
+ String dataKey = "data_"+mac;
+ Map<String,String> dataMap = redisUtils.get(dataKey,new TypeReference<Map<String,String>>(){});
+ if(!MapUtils.isEmpty(dataMap)){
+ resultMap.putAll(dataMap);
+ }
}
}
return resultMap;
--
Gitblit v1.8.0