From ff4d251eac2fe3f5c1d98b0c46e763f8aaec8809 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Mon, 21 Oct 2024 15:18:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BD=E6=A0=87=E7=BA=A7?= =?UTF-8?q?=E8=81=94=E5=8F=91=E9=80=81CivilCode=E5=8F=AF=E8=83=BD=E4=B8=BA?= =?UTF-8?q?NULL=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../transmit/cmd/impl/SIPCommanderFroPlatform.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 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 3a6bf99a..25c11c44 100755 --- 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 @@ -660,9 +660,14 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform { if (channel.getChannelType() != 2) { // 业务分组/虚拟组织/行政区划 不设置以下属性 catalogXml.append("" + channel.getModel() + "\r\n") - .append(" " + channel.getOwner()+ "\r\n") - .append("" + channel.getCivilCode() + "\r\n") - .append("
" + channel.getAddress() + "
\r\n"); + .append(" " + channel.getOwner()+ "\r\n"); + if (channel.getCivilCode() != null) { + catalogXml.append("" + channel.getCivilCode() + "\r\n"); + }else { + catalogXml.append("" + parentPlatform.getAdministrativeDivision() + "\r\n"); + } + + catalogXml.append("
" + channel.getAddress() + "
\r\n"); catalogXml.append("" + channel.getLongitude() + "\r\n"); catalogXml.append("" + channel.getLatitude() + "\r\n"); }