fengxiang
2018-02-07 0723049b7785749898fede88452055a66c49770e
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 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,9 +273,10 @@
   @Override
   public List<Map<String,String>> queryDevicesState(List<String> macList,Boolean withData) {
      List<Map<String,String>> list = macList.stream().map(mac->{
         Map<String,String> resultMap = new HashMap<>();
         if(!StringUtils.isBlank(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);
@@ -279,6 +284,7 @@
            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>>(){});
@@ -286,6 +292,7 @@
               resultMap.putAll(dataMap);
            }
         }
         }
         return  resultMap;
      }).collect(Collectors.toList());
      return list;