updated

沈斌

2018-02-08 3120cdd01c8e6a2a1edefb6ff251c026f44dee5c

 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;