From 943f95ba8ce02f8088f2dfcfd83a60391a8a65a6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 14 三月 2023 14:02:33 +0800
Subject: [PATCH] 增加消息通道配置，可以通道redis在wvp上下级之间发送消息
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
index da5c11f..b9d2c4c 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
@@ -215,6 +215,25 @@
}else {
catalogXml.append("<Address>" + channel.getAddress() + "</Address>\r\n");
}
+ catalogXml.append("<Block>" + channel.getBlock() + "</Block>\r\n");
+ catalogXml.append("<SafetyWay>" + channel.getSafetyWay() + "</SafetyWay>\r\n");
+ catalogXml.append("<CertNum>" + channel.getCertNum() + "</CertNum>\r\n");
+ catalogXml.append("<Certifiable>" + channel.getCertifiable() + "</Certifiable>\r\n");
+ catalogXml.append("<ErrCode>" + channel.getErrCode() + "</ErrCode>\r\n");
+ catalogXml.append("<EndTime>" + channel.getEndTime() + "</EndTime>\r\n");
+ catalogXml.append("<Secrecy>" + channel.getSecrecy() + "</Secrecy>\r\n");
+ 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("<Status>" + (channel.getStatus() == 1?"ON":"OFF") + "</Status>\r\n");
+ catalogXml.append("<Longitude>" +
+ (channel.getLongitudeWgs84() != 0? channel.getLongitudeWgs84():channel.getLongitude())
+ + "</Longitude>\r\n");
+ catalogXml.append("<Latitude>" +
+ (channel.getLatitudeWgs84() != 0? channel.getLatitudeWgs84():channel.getLatitude())
+ + "</Latitude>\r\n");
+
+
}
}
catalogXml.append("</Item>\r\n");
@@ -293,23 +312,23 @@
* @return
*/
@Override
- public void deviceInfoResponse(ParentPlatform parentPlatform, String sn, String fromTag) throws SipException, InvalidArgumentException, ParseException {
+ public void deviceInfoResponse(ParentPlatform parentPlatform,Device device, String sn, String fromTag) throws SipException, InvalidArgumentException, ParseException {
if (parentPlatform == null) {
return;
}
String characterSet = parentPlatform.getCharacterSet();
StringBuffer deviceInfoXml = new StringBuffer(600);
- deviceInfoXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n")
- .append("<Response>\r\n")
- .append("<CmdType>DeviceInfo</CmdType>\r\n")
- .append("<SN>" +sn + "</SN>\r\n")
- .append("<DeviceID>" + parentPlatform.getDeviceGBId() + "</DeviceID>\r\n")
- .append("<DeviceName>" + parentPlatform.getName() + "</DeviceName>\r\n")
- .append("<Manufacturer>wvp</Manufacturer>\r\n")
- .append("<Model>wvp-28181-2.0</Model>\r\n")
- .append("<Firmware>2.0.202107</Firmware>\r\n")
- .append("<Result>OK</Result>\r\n")
- .append("</Response>\r\n");
+ deviceInfoXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n");
+ deviceInfoXml.append("<Response>\r\n");
+ deviceInfoXml.append("<CmdType>DeviceInfo</CmdType>\r\n");
+ deviceInfoXml.append("<SN>" +sn + "</SN>\r\n");
+ deviceInfoXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
+ deviceInfoXml.append("<DeviceName>" + device.getName() + "</DeviceName>\r\n");
+ deviceInfoXml.append("<Manufacturer>" + device.getManufacturer() + "</Manufacturer>\r\n");
+ deviceInfoXml.append("<Model>" + device.getModel() + "</Model>\r\n");
+ deviceInfoXml.append("<Firmware>" + device.getFirmware() + "</Firmware>\r\n");
+ deviceInfoXml.append("<Result>OK</Result>\r\n");
+ deviceInfoXml.append("</Response>\r\n");
CallIdHeader callIdHeader = sipSender.getNewCallIdHeader(parentPlatform.getDeviceIp(),parentPlatform.getTransport());
@@ -383,7 +402,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);
@@ -394,7 +413,7 @@
.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("<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")
--
Gitblit v1.8.0