From c25a99d60bef3d3bbd59fee895bd658928fd00db Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 10 一月 2024 16:17:29 +0800
Subject: [PATCH] 修复空指针异常
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java | 215 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 154 insertions(+), 61 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
old mode 100644
new mode 100755
index b1e2196..ecbdcca
--- 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
@@ -9,7 +9,7 @@
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.SIPRequestHeaderPlarformProvider;
import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
-import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
+import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
@@ -56,7 +56,7 @@
private SipSubscribe sipSubscribe;
@Autowired
- private ZLMRTPServerFactory zlmrtpServerFactory;
+ private ZLMServerFactory zlmServerFactory;
@Autowired
private SipLayer sipLayer;
@@ -148,13 +148,13 @@
CallIdHeader callIdHeader = sipSender.getNewCallIdHeader(parentPlatform.getDeviceIp(),parentPlatform.getTransport());
- Request request = headerProviderPlatformProvider.createMessageRequest(
- parentPlatform,
- keepaliveXml.toString(),
- SipUtils.getNewFromTag(),
- SipUtils.getNewViaTag(),
- callIdHeader);
- sipSender.transmitRequest(parentPlatform.getDeviceIp(), request, errorEvent, okEvent);
+ Request request = headerProviderPlatformProvider.createMessageRequest(
+ parentPlatform,
+ keepaliveXml.toString(),
+ SipUtils.getNewFromTag(),
+ SipUtils.getNewViaTag(),
+ callIdHeader);
+ sipSender.transmitRequest(parentPlatform.getDeviceIp(), request, errorEvent, okEvent);
return callIdHeader.getCallId();
}
@@ -209,59 +209,152 @@
// 琛屾斂鍖哄垝鍒嗙粍鍙渶瑕佽繖涓ら」灏卞彲浠�
catalogXml.append("<DeviceID>" + channel.getChannelId() + "</DeviceID>\r\n");
catalogXml.append("<Name>" + channel.getName() + "</Name>\r\n");
- if (channel.getParentId() != null) {
- // 涓氬姟鍒嗙粍鍔犱笂杩欎竴椤瑰嵆鍙紝鎻愰珮鍏煎鎬э紝
- catalogXml.append("<ParentID>" + channel.getParentId() + "</ParentID>\r\n");
-// catalogXml.append("<ParentID>" + parentPlatform.getDeviceGBId() + "/" + channel.getParentId() + "</ParentID>\r\n");
- }
- if (channel.getChannelId().length() == 20 && Integer.parseInt(channel.getChannelId().substring(10, 13)) == 216) {
- // 铏氭嫙缁勭粐澧炲姞BusinessGroupID瀛楁
- catalogXml.append("<BusinessGroupID>" + channel.getParentId() + "</BusinessGroupID>\r\n");
- }
- if (!channel.getChannelId().equals(parentPlatform.getDeviceGBId())) {
- catalogXml.append("<Parental>" + channel.getParental() + "</Parental>\r\n");
- if (channel.getParental() == 0) {
- catalogXml.append("<Status>" + (channel.isStatus() ? "ON" : "OFF") + "</Status>\r\n");
+ if (channel.getChannelId().length() <= 8) {
+ catalogXml.append("</Item>\r\n");
+ continue;
+ }else {
+ if (channel.getChannelId().length() != 20) {
+ catalogXml.append("</Item>\r\n");
+ logger.warn("[缂栧彿闀垮害寮傚父] {} 闀垮害閿欒锛岃浣跨敤20浣嶉暱搴︾殑鍥芥爣缂栧彿,褰撳墠闀垮害锛歿}", channel.getChannelId(), channel.getChannelId().length());
+ catalogXml.append("</Item>\r\n");
+ continue;
}
- }
- if (channel.getParental() == 0) {
- // 閫氶亾椤�
- catalogXml.append("<Manufacturer>" + channel.getManufacture() + "</Manufacturer>\r\n");
- catalogXml.append("<Secrecy>" + channel.getSecrecy() + "</Secrecy>\r\n");
- catalogXml.append("<RegisterWay>" + channel.getRegisterWay() + "</RegisterWay>\r\n");
- String civilCode = channel.getCivilCode() == null?parentPlatform.getAdministrativeDivision() : channel.getCivilCode();
- if (channel.getChannelType() != 2) { // 涓氬姟鍒嗙粍/铏氭嫙缁勭粐/琛屾斂鍖哄垝 涓嶈缃互涓嬪睘鎬�
- catalogXml.append("<Model>" + channel.getModel() + "</Model>\r\n");
- catalogXml.append("<Owner>" + parentPlatform.getDeviceGBId()+ "</Owner>\r\n");
- catalogXml.append("<CivilCode>" + civilCode + "</CivilCode>\r\n");
- if (channel.getAddress() == null) {
- catalogXml.append("<Address></Address>\r\n");
- }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("<PTZType>" + channel.getPTZType() + "</PTZType>\r\n");
- catalogXml.append("<Status>" + (channel.isStatus() ? "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");
+ switch (Integer.parseInt(channel.getChannelId().substring(10, 13))){
+ case 200:
+// catalogXml.append("<Manufacturer>涓夋案鍗庨��</Manufacturer>\r\n");
+// GitUtil gitUtil = SpringBeanFactory.getBean("gitUtil");
+// String model = (gitUtil == null || gitUtil.getBuildVersion() == null)?"1.0": gitUtil.getBuildVersion();
+// catalogXml.append("<Model>" + model + "</Manufacturer>\r\n");
+// catalogXml.append("<Owner>涓夋案鍗庨��</Owner>\r\n");
+ if (channel.getCivilCode() != null) {
+ catalogXml.append("<CivilCode>"+channel.getCivilCode()+"</CivilCode>\r\n");
+ }else {
+ catalogXml.append("<CivilCode></CivilCode>\r\n");
+ }
+ catalogXml.append("<RegisterWay>1</RegisterWay>\r\n");
+ catalogXml.append("<Secrecy>0</Secrecy>\r\n");
+ break;
+ case 215:
+ if (!ObjectUtils.isEmpty(channel.getParentId())) {
+ catalogXml.append("<ParentID>" + channel.getParentId() + "</ParentID>\r\n");
+ }
+
+ break;
+ case 216:
+ if (!ObjectUtils.isEmpty(channel.getParentId())) {
+ catalogXml.append("<ParentID>" + channel.getParentId() + "</ParentID>\r\n");
+ }else {
+ catalogXml.append("<ParentID></ParentID>\r\n");
+ }
+ if (!ObjectUtils.isEmpty(channel.getBusinessGroupId())) {
+ catalogXml.append("<BusinessGroupID>" + channel.getBusinessGroupId() + "</BusinessGroupID>\r\n");
+ }else {
+ catalogXml.append("<BusinessGroupID></BusinessGroupID>\r\n");
+ }
+ break;
+ default:
+ // 閫氶亾椤�
+ if (channel.getManufacture() != null) {
+ catalogXml.append("<Manufacturer>" + channel.getManufacture() + "</Manufacturer>\r\n");
+ }else {
+ catalogXml.append("<Manufacturer></Manufacturer>\r\n");
+ }
+ if (channel.getSecrecy() != null) {
+ catalogXml.append("<Secrecy>" + channel.getSecrecy() + "</Secrecy>\r\n");
+ }else {
+ catalogXml.append("<Secrecy></Secrecy>\r\n");
+ }
+ catalogXml.append("<RegisterWay>" + channel.getRegisterWay() + "</RegisterWay>\r\n");
+ if (channel.getModel() != null) {
+ catalogXml.append("<Model>" + channel.getModel() + "</Model>\r\n");
+ }else {
+ catalogXml.append("<Model></Model>\r\n");
+ }
+ if (channel.getOwner() != null) {
+ catalogXml.append("<Owner>" + channel.getOwner()+ "</Owner>\r\n");
+ }else {
+ catalogXml.append("<Owner></Owner>\r\n");
+ }
+ if (channel.getCivilCode() != null) {
+ catalogXml.append("<CivilCode>" + channel.getCivilCode() + "</CivilCode>\r\n");
+ }else {
+ catalogXml.append("<CivilCode></CivilCode>\r\n");
+ }
+ if (channel.getAddress() == null) {
+ catalogXml.append("<Address></Address>\r\n");
+ }else {
+ catalogXml.append("<Address>" + channel.getAddress() + "</Address>\r\n");
+ }
+ if (!ObjectUtils.isEmpty(channel.getParentId())) {
+ catalogXml.append("<ParentID>" + channel.getParentId() + "</ParentID>\r\n");
+ }else {
+ catalogXml.append("<ParentID></ParentID>\r\n");
+ }
+ if (!ObjectUtils.isEmpty(channel.getBlock())) {
+ catalogXml.append("<Block>" + channel.getBlock() + "</Block>\r\n");
+ }else {
+ catalogXml.append("<Block></Block>\r\n");
+ }
+ if (!ObjectUtils.isEmpty(channel.getSafetyWay())) {
+ catalogXml.append("<SafetyWay>" + channel.getSafetyWay() + "</SafetyWay>\r\n");
+ }else {
+ catalogXml.append("<SafetyWay></SafetyWay>\r\n");
+ }
+ if (!ObjectUtils.isEmpty(channel.getCertNum())) {
+ catalogXml.append("<CertNum>" + channel.getCertNum() + "</CertNum>\r\n");
+ }else {
+ catalogXml.append("<CertNum></CertNum>\r\n");
+ }
+ if (!ObjectUtils.isEmpty(channel.getCertifiable())) {
+ catalogXml.append("<Certifiable>" + channel.getCertifiable() + "</Certifiable>\r\n");
+ }else {
+ catalogXml.append("<Certifiable></Certifiable>\r\n");
+ }
+ if (!ObjectUtils.isEmpty(channel.getErrCode())) {
+ catalogXml.append("<ErrCode>" + channel.getErrCode() + "</ErrCode>\r\n");
+ }else {
+ catalogXml.append("<ErrCode></ErrCode>\r\n");
+ }
+ if (!ObjectUtils.isEmpty(channel.getEndTime())) {
+ catalogXml.append("<EndTime>" + channel.getEndTime() + "</EndTime>\r\n");
+ }else {
+ catalogXml.append("<EndTime></EndTime>\r\n");
+ }
+ if (!ObjectUtils.isEmpty(channel.getSecrecy())) {
+ catalogXml.append("<Secrecy>" + channel.getSecrecy() + "</Secrecy>\r\n");
+ }else {
+ catalogXml.append("<Secrecy></Secrecy>\r\n");
+ }
+ if (!ObjectUtils.isEmpty(channel.getIpAddress())) {
+ catalogXml.append("<IPAddress>" + channel.getIpAddress() + "</IPAddress>\r\n");
+ }else {
+ catalogXml.append("<IPAddress></IPAddress>\r\n");
+ }
+ catalogXml.append("<Port>" + channel.getPort() + "</Port>\r\n");
+ if (!ObjectUtils.isEmpty(channel.getPassword())) {
+ catalogXml.append("<Password>" + channel.getPassword() + "</Password>\r\n");
+ }else {
+ catalogXml.append("<Password></Password>\r\n");
+ }
+ if (!ObjectUtils.isEmpty(channel.getPTZType())) {
+ catalogXml.append("<PTZType>" + channel.getPTZType() + "</PTZType>\r\n");
+ }else {
+ catalogXml.append("<PTZType></PTZType>\r\n");
+ }
+ catalogXml.append("<Status>" + (channel.isStatus() ?"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");
+ break;
}
+ catalogXml.append("</Item>\r\n");
}
- catalogXml.append("</Item>\r\n");
}
}
@@ -505,7 +598,7 @@
SIPRequest notifyRequest = headerProviderPlatformProvider.createNotifyRequest(parentPlatform, catalogXmlContent, subscribeInfo);
- sipSender.transmitRequest(parentPlatform.getDeviceIp(), notifyRequest);
+ sipSender.transmitRequest(parentPlatform.getDeviceIp(), notifyRequest, errorEvent, okEvent);
}
private String getCatalogXmlContentForCatalogAddOrUpdate(ParentPlatform parentPlatform, List<DeviceChannel> channels, int sumNum, String type, SubscribeInfo subscribeInfo) {
@@ -517,7 +610,7 @@
.append("<CmdType>Catalog</CmdType>\r\n")
.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n")
.append("<DeviceID>" + parentPlatform.getDeviceGBId() + "</DeviceID>\r\n")
- .append("<SumNum>1</SumNum>\r\n")
+ .append("<SumNum>"+ channels.size() +"</SumNum>\r\n")
.append("<DeviceList Num=\"" + channels.size() + "\">\r\n");
if (channels.size() > 0) {
for (DeviceChannel channel : channels) {
@@ -638,7 +731,7 @@
.append("<Response>\r\n")
.append("<CmdType>RecordInfo</CmdType>\r\n")
.append("<SN>" +recordInfo.getSn() + "</SN>\r\n")
- .append("<DeviceID>" + recordInfo.getDeviceId() + "</DeviceID>\r\n")
+ .append("<DeviceID>" + recordInfo.getChannelId() + "</DeviceID>\r\n")
.append("<SumNum>" + recordInfo.getSumNum() + "</SumNum>\r\n");
if (recordInfo.getRecordList() == null ) {
recordXml.append("<RecordList Num=\"0\">\r\n");
@@ -727,7 +820,7 @@
MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
if (mediaServerItem != null) {
mediaServerService.releaseSsrc(mediaServerItem.getId(), sendRtpItem.getSsrc());
- zlmrtpServerFactory.closeRtpServer(mediaServerItem, sendRtpItem.getStreamId());
+ zlmServerFactory.closeRtpServer(mediaServerItem, sendRtpItem.getStreamId());
}
SIPRequest byeRequest = headerProviderPlatformProvider.createByeRequest(parentPlatform, sendRtpItem);
if (byeRequest == null) {
--
Gitblit v1.8.0