ZhuDongming
2020-06-28 df80448fbd1bccdba131d797c0c7e93274ed6ba1
src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -216,12 +216,21 @@
            deviceList = deviceMapper.selectByMap(params);
            // loadDeviceState(deviceList);
        }
        Example deviceExample = new Example(Device.class);//实例化
        Example.Criteria deviceCriteria = deviceExample.createCriteria();
        deviceCriteria.orEqualTo("isDelete", Constants.IS_DELETE_FALSE);
        List<Device> devicesInfo = deviceMapper.selectByExample(deviceExample);
      for(Device d:deviceList){
            if(dv.contains(d.getDeviceVersionId())){
                d.setHasWindInfo(true);
            }else{
                d.setHasWindInfo(false);
            }
            for (Device temp : devicesInfo) {
                if (d.getId().equals(temp.getId())) {
                    d.setState(temp.getState());
                }
            }
      }
        return deviceList;
    }