old mode 100644
new mode 100755
| | |
| | | deviceChannel.setLatitude(gbStream.getLatitude()); |
| | | deviceChannel.setDeviceId(platform.getDeviceGBId()); |
| | | deviceChannel.setManufacture("wvp-pro"); |
| | | deviceChannel.setStatus(gbStream.isStatus()?1:0); |
| | | deviceChannel.setStatus(gbStream.isStatus()); |
| | | |
| | | deviceChannel.setRegisterWay(1); |
| | | |
| | | PlatformCatalog catalog = catalogMapper.select(catalogId); |
| | | PlatformCatalog catalog = catalogMapper.selectByPlatFormAndCatalogId(platform.getServerGBId(), catalogId); |
| | | if (catalog != null) { |
| | | deviceChannel.setCivilCode(catalog.getCivilCode()); |
| | | deviceChannel.setParentId(catalog.getParentId()); |
| | |
| | | }else { |
| | | status = gbStreamMapper.selectStatusForPush(gbStream.getApp(), gbStream.getStream()); |
| | | } |
| | | deviceChannel.setStatus((status != null && status )?1:0); |
| | | deviceChannel.setStatus(status != null && status); |
| | | |
| | | deviceChannel.setRegisterWay(1); |
| | | PlatformCatalog catalog = catalogMapper.select(catalogId); |
| | | PlatformCatalog catalog = catalogMapper.selectByPlatFormAndCatalogId(platform.getServerGBId(), catalogId); |
| | | if (catalog != null) { |
| | | deviceChannel.setCivilCode(catalog.getCivilCode()); |
| | | deviceChannel.setParentId(catalog.getParentId()); |