guzijian / wvp-GB28181-pro · Commits

Commit 250a059ca0c754b6b56de9c4b677ffd2d0f20b9f

Authored by 648540858
1 parent 243edbd1

优化目录发送

Inline Side-by-side
Showing 2 changed files with 10 additions and 9 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
  View file @250a059
@@ -1620,13 +1620,11 @@ public class SIPCommander implements ISIPCommander { @@ -1620,13 +1620,11 @@ public class SIPCommander implements ISIPCommander {
1620 clientTransaction = udpSipProvider.getNewClientTransaction(request); 1620 clientTransaction = udpSipProvider.getNewClientTransaction(request);
1621 } 1621 }
1622 if (request.getHeader(UserAgentHeader.NAME) == null) { 1622 if (request.getHeader(UserAgentHeader.NAME) == null) {
1623 - UserAgentHeader userAgentHeader = null;  
1624 try { 1623 try {
1625 - userAgentHeader = SipUtils.createUserAgentHeader(sipFactory, gitUtil); 1624 + request.addHeader(SipUtils.createUserAgentHeader(sipFactory, gitUtil));
1626 } catch (ParseException e) { 1625 } catch (ParseException e) {
1627 logger.error("添加UserAgentHeader失败", e); 1626 logger.error("添加UserAgentHeader失败", e);
1628 } 1627 }
1629 - request.addHeader(userAgentHeader);  
1630 } 1628 }
1631 CallIdHeader callIdHeader = (CallIdHeader)request.getHeader(CallIdHeader.NAME); 1629 CallIdHeader callIdHeader = (CallIdHeader)request.getHeader(CallIdHeader.NAME);
1632 // 添加错误订阅 1630 // 添加错误订阅
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
  View file @250a059
@@ -258,6 +258,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform { @@ -258,6 +258,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
258 if (channel.getParentId() != null) { 258 if (channel.getParentId() != null) {
259 // 业务分组加上这一项即可，提高兼容性， 259 // 业务分组加上这一项即可，提高兼容性，
260 catalogXml.append("<ParentID>" + channel.getParentId() + "</ParentID>\r\n"); 260 catalogXml.append("<ParentID>" + channel.getParentId() + "</ParentID>\r\n");
  261 +// catalogXml.append("<ParentID>" + parentPlatform.getDeviceGBId() + "/" + channel.getParentId() + "</ParentID>\r\n");
261 } 262 }
262 if (channel.getChannelId().length() == 20 && Integer.parseInt(channel.getChannelId().substring(10, 13)) == 216) { 263 if (channel.getChannelId().length() == 20 && Integer.parseInt(channel.getChannelId().substring(10, 13)) == 216) {
263 // 虚拟组织增加BusinessGroupID字段 264 // 虚拟组织增加BusinessGroupID字段
@@ -268,21 +269,23 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform { @@ -268,21 +269,23 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
268 if (channel.getParental() == 0) { 269 if (channel.getParental() == 0) {
269 catalogXml.append("<Status>" + (channel.getStatus() == 0 ? "OFF" : "ON") + "</Status>\r\n"); 270 catalogXml.append("<Status>" + (channel.getStatus() == 0 ? "OFF" : "ON") + "</Status>\r\n");
270 } 271 }
271 -  
272 } 272 }
273 if (channel.getParental() == 0) { 273 if (channel.getParental() == 0) {
274 // 通道项 274 // 通道项
275 catalogXml.append("<Manufacturer>" + channel.getManufacture() + "</Manufacturer>\r\n"); 275 catalogXml.append("<Manufacturer>" + channel.getManufacture() + "</Manufacturer>\r\n");
276 catalogXml.append("<Secrecy>" + channel.getSecrecy() + "</Secrecy>\r\n"); 276 catalogXml.append("<Secrecy>" + channel.getSecrecy() + "</Secrecy>\r\n");
277 catalogXml.append("<RegisterWay>" + channel.getRegisterWay() + "</RegisterWay>\r\n"); 277 catalogXml.append("<RegisterWay>" + channel.getRegisterWay() + "</RegisterWay>\r\n");
278 - 278 + String civilCode = channel.getCivilCode() == null?parentPlatform.getAdministrativeDivision() : channel.getCivilCode();
279 if (channel.getChannelType() != 2) { // 业务分组/虚拟组织/行政区划 不设置以下属性 279 if (channel.getChannelType() != 2) { // 业务分组/虚拟组织/行政区划 不设置以下属性
280 catalogXml.append("<Model>" + channel.getModel() + "</Model>\r\n"); 280 catalogXml.append("<Model>" + channel.getModel() + "</Model>\r\n");
281 - catalogXml.append("<Owner> " + channel.getOwner()+ "</Owner>\r\n");  
282 - catalogXml.append("<CivilCode>" + channel.getCivilCode() + "</CivilCode>\r\n");  
283 - catalogXml.append("<Address>" + channel.getAddress() + "</Address>\r\n"); 281 + catalogXml.append("<Owner>" + parentPlatform.getDeviceGBId()+ "</Owner>\r\n");
  282 + catalogXml.append("<CivilCode>" + civilCode + "</CivilCode>\r\n");
  283 + if (channel.getAddress() == null) {
  284 + catalogXml.append("<Address></Address>\r\n");
  285 + }else {
  286 + catalogXml.append("<Address>" + channel.getAddress() + "</Address>\r\n");
  287 + }
284 } 288 }
285 -  
286 } 289 }
287 catalogXml.append("</Item>\r\n"); 290 catalogXml.append("</Item>\r\n");
288 } 291 }