wvp-pro.git - Gitblit

			@@ -225,6 +225,7 @@
			catalogXml.append("<IPAddress>" + channel.getIpAddress() + "</IPAddress>\r\n");
			catalogXml.append("<Port>" + channel.getPort() + "</Port>\r\n");
			catalogXml.append("<Password>" + channel.getPort() + "</Password>\r\n");
			catalogXml.append("<PTZType>" + channel.getPTZType() + "</PTZType>\r\n");
			catalogXml.append("<Status>" + (channel.getStatus() == 1?"ON":"OFF") + "</Status>\r\n");
			catalogXml.append("<Longitude>" +
			(channel.getLongitudeWgs84() != 0? channel.getLongitudeWgs84():channel.getLongitude())
			@@ -402,7 +403,7 @@
			if (parentPlatform == null) {
			return;
			}
			logger.info("[发送报警通知] {}/{}->{},{}: {}", parentPlatform.getServerGBId(), deviceAlarm.getChannelId(),
			logger.info("[发送报警通知]平台： {}/{}->{},{}: {}", parentPlatform.getServerGBId(), deviceAlarm.getChannelId(),
			deviceAlarm.getLongitude(), deviceAlarm.getLatitude(), JSON.toJSONString(deviceAlarm));
			String characterSet = parentPlatform.getCharacterSet();
			StringBuffer deviceStatusXml = new StringBuffer(600);
			@@ -413,8 +414,8 @@
			.append("<DeviceID>" + deviceAlarm.getChannelId() + "</DeviceID>\r\n")
			.append("<AlarmPriority>" + deviceAlarm.getAlarmPriority() + "</AlarmPriority>\r\n")
			.append("<AlarmMethod>" + deviceAlarm.getAlarmMethod() + "</AlarmMethod>\r\n")
			.append("<AlarmTime>" + deviceAlarm.getAlarmTime() + "</AlarmTime>\r\n")
			.append("<AlarmDescription>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(deviceAlarm.getAlarmDescription()) + "</AlarmDescription>\r\n")
			.append("<AlarmTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(deviceAlarm.getAlarmTime()) + "</AlarmTime>\r\n")
			.append("<AlarmDescription>" + deviceAlarm.getAlarmDescription() + "</AlarmDescription>\r\n")
			.append("<Longitude>" + deviceAlarm.getLongitude() + "</Longitude>\r\n")
			.append("<Latitude>" + deviceAlarm.getLatitude() + "</Latitude>\r\n")
			.append("<info>\r\n")