From fdc17984ef81801f1b1bfeecb8571030e2ede71a Mon Sep 17 00:00:00 2001
From: "wangshaopeng@sunnybs.com" <wangshaopeng@sunnybs.com>
Date: Wed, 31 Mar 2021 16:46:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=91=E4=B8=8A=E7=BA=A7=E8=81=94=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E8=8B=A5=E4=B8=8B=E7=BA=A7=E6=9C=AA=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=90=91=E4=B8=8A=E6=8E=A8=E9=80=81=E7=9A=84=E9=80=9A=E9=81=93?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=B8=8A=E7=BA=A7=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E4=B8=8B=E7=BA=A7=E5=B9=B3=E5=8F=B0=EF=BC=8C?=
 =?UTF-8?q?=E6=8A=A5=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmd/impl/SIPCommanderFroPlatform.java     | 32 ++++-----
 .../request/impl/MessageRequestProcessor.java |  7 +-
 .../response/impl/OtherResponseProcessor.java | 67 ++++++++++---------
 3 files changed, 54 insertions(+), 52 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 08925261..4f33bdd1 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
@@ -197,7 +197,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
     @Override
     public boolean catalogQuery(DeviceChannel channel, ParentPlatform parentPlatform, String sn, String fromTag, int size) {
 
-        if (channel == null  || parentPlatform ==null) {
+        if (parentPlatform ==null) {
             return false;
         }
         try {
@@ -210,21 +210,21 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
             catalogXml.append("<SumNum>" + size + "</SumNum>\r\n");
             catalogXml.append("<DeviceList Num=\"1\">\r\n");
             catalogXml.append("<Item>\r\n");
-
-            catalogXml.append("<DeviceID>" + channel.getChannelId() + "</DeviceID>\r\n");
-            catalogXml.append("<Name>" + channel.getName() + "</Name>\r\n");
-            catalogXml.append("<Manufacturer>" + channel.getManufacture() + "</Manufacturer>\r\n");
-            catalogXml.append("<Model>" + channel.getModel() + "</Model>\r\n");
-            catalogXml.append("<Owner>" + channel.getOwner() + "</Owner>\r\n");
-            catalogXml.append("<CivilCode>" + channel.getCivilCode() + "</CivilCode>\r\n");
-            catalogXml.append("<Address>" + channel.getAddress() + "</Address>\r\n");
-            catalogXml.append("<Parental>" + channel.getParental() + "</Parental>\r\n");// TODO 当前不能添加分组， 所以暂时没有父节点
-            catalogXml.append("<ParentID>" + channel.getParentId() + "</ParentID>\r\n"); // TODO 当前不能添加分组， 所以暂时没有父节点
-            catalogXml.append("<Secrecy>" + channel.getSecrecy() + "</Secrecy>\r\n");
-            catalogXml.append("<RegisterWay>" + channel.getRegisterWay() + "</RegisterWay>\r\n");
-            catalogXml.append("<Status>" + (channel.getStatus() == 0?"OFF":"ON") + "</Status>\r\n");
-            catalogXml.append("<Info></Info>\r\n");
-
+            if(null != channel){
+                catalogXml.append("<DeviceID>" + channel.getChannelId() + "</DeviceID>\r\n");
+                catalogXml.append("<Name>" + channel.getName() + "</Name>\r\n");
+                catalogXml.append("<Manufacturer>" + channel.getManufacture() + "</Manufacturer>\r\n");
+                catalogXml.append("<Model>" + channel.getModel() + "</Model>\r\n");
+                catalogXml.append("<Owner>" + channel.getOwner() + "</Owner>\r\n");
+                catalogXml.append("<CivilCode>" + channel.getCivilCode() + "</CivilCode>\r\n");
+                catalogXml.append("<Address>" + channel.getAddress() + "</Address>\r\n");
+                catalogXml.append("<Parental>" + channel.getParental() + "</Parental>\r\n");// TODO 当前不能添加分组， 所以暂时没有父节点
+                catalogXml.append("<ParentID>" + channel.getParentId() + "</ParentID>\r\n"); // TODO 当前不能添加分组， 所以暂时没有父节点
+                catalogXml.append("<Secrecy>" + channel.getSecrecy() + "</Secrecy>\r\n");
+                catalogXml.append("<RegisterWay>" + channel.getRegisterWay() + "</RegisterWay>\r\n");
+                catalogXml.append("<Status>" + (channel.getStatus() == 0?"OFF":"ON") + "</Status>\r\n");
+                catalogXml.append("<Info></Info>\r\n");
+            }
             catalogXml.append("</Item>\r\n");
             catalogXml.append("</DeviceList>\r\n");
             catalogXml.append("</Response>\r\n");
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
index f05c7939..dc74b9b7 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
@@ -515,16 +515,15 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
                     String sn = snElement.getText();
                     // 准备回复通道信息
                     List<ChannelReduce> channelReduces = storager.queryChannelListInParentPlatform(parentPlatform.getServerGBId());
-                    if (channelReduces.size() > 0) {
+                    if (null == channelReduces || channelReduces.isEmpty()) {
+                        cmderFroPlatform.catalogQuery(null, parentPlatform, sn, fromHeader.getTag(), channelReduces.size());
+                    }else{
                         for (ChannelReduce channelReduce : channelReduces) {
                             DeviceChannel deviceChannel = storager.queryChannel(channelReduce.getDeviceId(), channelReduce.getChannelId());
                             cmderFroPlatform.catalogQuery(deviceChannel, parentPlatform, sn, fromHeader.getTag(), channelReduces.size());
                         }
                     }
-
                 }
-
-
             } else {
                 Iterator<Element> deviceListIterator = deviceListElement.elementIterator();
                 if (deviceListIterator != null) {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/OtherResponseProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/OtherResponseProcessor.java
index 16314409..b73129f0 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/OtherResponseProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/OtherResponseProcessor.java
@@ -1,32 +1,35 @@
-package com.genersoft.iot.vmp.gb28181.transmit.response.impl;
-
-import javax.sip.ResponseEvent;
-
-import org.springframework.stereotype.Component;
-
-import com.genersoft.iot.vmp.conf.SipConfig;
-import com.genersoft.iot.vmp.gb28181.SipLayer;
-import com.genersoft.iot.vmp.gb28181.transmit.response.ISIPResponseProcessor;
-
-/**    
- * @Description:暂不支持的消息响应处理器
- * @author: swwheihei
- * @date:   2020年5月3日 下午5:32:59     
- */
-@Component
-public class OtherResponseProcessor implements ISIPResponseProcessor {
-
-	/**   
-	 * <p>Title: process</p>   
-	 * <p>Description: </p>   
-	 * @param evt
-	 * @param layer
-	 * @param config    
-	 */  
-	@Override
-	public void process(ResponseEvent evt, SipLayer layer, SipConfig config) {
-		// TODO Auto-generated method stub
-		
-	}
-
-}
+package com.genersoft.iot.vmp.gb28181.transmit.response.impl;
+
+import com.genersoft.iot.vmp.conf.SipConfig;
+import com.genersoft.iot.vmp.gb28181.SipLayer;
+import com.genersoft.iot.vmp.gb28181.transmit.response.ISIPResponseProcessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import javax.sip.ResponseEvent;
+
+/**
+ * @Description:暂不支持的消息响应处理器
+ * @author: swwheihei
+ * @date: 2020年5月3日 下午5:32:59
+ */
+@Component
+public class OtherResponseProcessor implements ISIPResponseProcessor {
+    Logger logger = LoggerFactory.getLogger(OtherResponseProcessor.class);
+
+    /**
+     * <p>Title: process</p>
+     * <p>Description: </p>
+     *
+     * @param evt
+     * @param layer
+     * @param config
+     */
+    @Override
+    public void process(ResponseEvent evt, SipLayer layer, SipConfig config) {
+        // TODO Auto-generated method stub
+        logger.info("OtherResponseProcessor: {}", evt.getResponse());
+    }
+
+}