wvp-pro.git - Gitblit

old mode 100644 new mode 100755

			@@ -18,6 +18,7 @@
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.TransactionDefinition;
			import org.springframework.transaction.TransactionStatus;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.util.ObjectUtils;

			import java.util.ArrayList;
			@@ -110,11 +111,11 @@
			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());
			@@ -213,10 +214,10 @@
			}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());
			@@ -263,4 +264,9 @@
			eventPublisher.catalogEventPublish(platformId, deviceChannelList, CatalogEvent.DEL);
			}
			}

			@Override
			public List<GbStream> getGbChannelWithGbid(String gbId) {
			return gbStreamMapper.selectByGBId(gbId);
			}
			}