于紫祥_1901
2020-06-30 d903f312cf6a1d0fc4c5745832a9d6fa681e5141
src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -216,13 +216,22 @@
            deviceList = deviceMapper.selectByMap(params);
            // loadDeviceState(deviceList);
        }
      for(Device d:deviceList){
            if(dv.contains(d.getDeviceVersionId())){
        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{
            } else {
                d.setHasWindInfo(false);
            }
      }
            for (Device temp : devicesInfo) {
                if (d.getId().equals(temp.getId())) {
                    d.setState(temp.getState());
                }
            }
        }
        return deviceList;
    }