wvp-pro.git - Gitblit

			@@ -339,7 +339,7 @@
			}else {
			catalogXml.append("<PTZType></PTZType>\r\n");
			}
			catalogXml.append("<Status>" + (channel.getStatus() == 1?"ON":"OFF") + "</Status>\r\n");
			catalogXml.append("<Status>" + (channel.isStatus() ?"ON":"OFF") + "</Status>\r\n");

			catalogXml.append("<Longitude>" +
			(channel.getLongitudeWgs84() != 0? channel.getLongitudeWgs84():channel.getLongitude())

			@@ -225,7 +225,7 @@
			}else {
			logger.warn("[xml解析] 无法确定行政区划{}的上级行政区划", channelId);
			}
			deviceChannel.setStatus(1);
			deviceChannel.setStatus(true);
			return deviceChannel;
			}else {
			if(channelId.length() != 20) {
			@@ -284,7 +284,7 @@
			if (!ObjectUtils.isEmpty(address)) {
			deviceChannel.setAddress(address);
			}
			deviceChannel.setStatus(1);
			deviceChannel.setStatus(true);
			if (!ObjectUtils.isEmpty(registerWay)) {
			try {
			deviceChannel.setRegisterWay(Integer.parseInt(registerWay));
			@@ -298,7 +298,7 @@
			return deviceChannel;
			case 215:
			// 业务分组
			deviceChannel.setStatus(1);
			deviceChannel.setStatus(true);
			if (!ObjectUtils.isEmpty(parentID)) {
			if (!parentID.trim().equalsIgnoreCase(device.getDeviceId())) {
			deviceChannel.setParentId(parentID);
			@@ -312,7 +312,7 @@
			break;
			case 216:
			// 虚拟组织
			deviceChannel.setStatus(1);
			deviceChannel.setStatus(true);
			if (!ObjectUtils.isEmpty(businessGroupID)) {
			deviceChannel.setBusinessGroupId(businessGroupID);
			}
			@@ -476,13 +476,13 @@
			if (status != null) {
			// ONLINE OFFLINE HIKVISION DS-7716N-E4 NVR的兼容性处理
			if (status.equals("ON") \|\| status.equals("On") \|\| status.equals("ONLINE") \|\| status.equals("OK")) {
			deviceChannel.setStatus(1);
			deviceChannel.setStatus(true);
			}
			if (status.equals("OFF") \|\| status.equals("Off") \|\| status.equals("OFFLINE")) {
			deviceChannel.setStatus(0);
			deviceChannel.setStatus(false);
			}
			}else {
			deviceChannel.setStatus(1);
			deviceChannel.setStatus(true);
			}

			// 经度

			@@ -140,11 +140,11 @@
			if (allChannelMap.containsKey(deviceChannel.getChannelId())) {
			deviceChannel.setStreamId(allChannelMap.get(deviceChannel.getChannelId()).getStreamId());
			deviceChannel.setHasAudio(allChannelMap.get(deviceChannel.getChannelId()).isHasAudio());
			if (allChannelMap.get(deviceChannel.getChannelId()).getStatus() !=deviceChannel.getStatus()){
			if (allChannelMap.get(deviceChannel.getChannelId()).isStatus() !=deviceChannel.isStatus()){
			List<String> strings = platformChannelMapper.queryParentPlatformByChannelId(deviceChannel.getChannelId());
			if (!CollectionUtils.isEmpty(strings)){
			strings.forEach(platformId->{
			eventPublisher.catalogEventPublish(platformId, deviceChannel, deviceChannel.getStatus()==1?CatalogEvent.ON:CatalogEvent.OFF);
			eventPublisher.catalogEventPublish(platformId, deviceChannel, deviceChannel.isStatus()?CatalogEvent.ON:CatalogEvent.OFF);
			});
			}

	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史