向上级联时，若下级未设置向上推送的通道信息，上级平台刷新下级平台，报异常的问题修复

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");
-
+            if(null != channel){
-            catalogXml.append("<DeviceID>" + channel.getChannelId() + "</DeviceID>\r\n");
+                catalogXml.append("<DeviceID>" + channel.getChannelId() + "</DeviceID>\r\n");
-            catalogXml.append("<Name>" + channel.getName() + "</Name>\r\n");
+                catalogXml.append("<Name>" + channel.getName() + "</Name>\r\n");
-            catalogXml.append("<Manufacturer>" + channel.getManufacture() + "</Manufacturer>\r\n");
+                catalogXml.append("<Manufacturer>" + channel.getManufacture() + "</Manufacturer>\r\n");
-            catalogXml.append("<Model>" + channel.getModel() + "</Model>\r\n");
+                catalogXml.append("<Model>" + channel.getModel() + "</Model>\r\n");
-            catalogXml.append("<Owner>" + channel.getOwner() + "</Owner>\r\n");
+                catalogXml.append("<Owner>" + channel.getOwner() + "</Owner>\r\n");
-            catalogXml.append("<CivilCode>" + channel.getCivilCode() + "</CivilCode>\r\n");
+                catalogXml.append("<CivilCode>" + channel.getCivilCode() + "</CivilCode>\r\n");
-            catalogXml.append("<Address>" + channel.getAddress() + "</Address>\r\n");
+                catalogXml.append("<Address>" + channel.getAddress() + "</Address>\r\n");
-            catalogXml.append("<Parental>" + channel.getParental() + "</Parental>\r\n");// TODO 当前不能添加分组， 所以暂时没有父节点
+                catalogXml.append("<Parental>" + channel.getParental() + "</Parental>\r\n");// TODO 当前不能添加分组， 所以暂时没有父节点
-            catalogXml.append("<ParentID>" + channel.getParentId() + "</ParentID>\r\n"); // TODO 当前不能添加分组， 所以暂时没有父节点
+                catalogXml.append("<ParentID>" + channel.getParentId() + "</ParentID>\r\n"); // TODO 当前不能添加分组， 所以暂时没有父节点
-            catalogXml.append("<Secrecy>" + channel.getSecrecy() + "</Secrecy>\r\n");
+                catalogXml.append("<Secrecy>" + channel.getSecrecy() + "</Secrecy>\r\n");
-            catalogXml.append("<RegisterWay>" + channel.getRegisterWay() + "</RegisterWay>\r\n");
+                catalogXml.append("<RegisterWay>" + channel.getRegisterWay() + "</RegisterWay>\r\n");
-            catalogXml.append("<Status>" + (channel.getStatus() == 0?"OFF":"ON") + "</Status>\r\n");
+                catalogXml.append("<Status>" + (channel.getStatus() == 0?"OFF":"ON") + "</Status>\r\n");
-            catalogXml.append("<Info></Info>\r\n");
+                catalogXml.append("<Info></Info>\r\n");
-
+            }
             catalogXml.append("</Item>\r\n");
             catalogXml.append("</DeviceList>\r\n");
             catalogXml.append("</Response>\r\n");

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) {

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;
+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     
+ * @date: 2020年5月3日 下午5:32:59
  */
 @Component
 public class OtherResponseProcessor implements ISIPResponseProcessor {
+    Logger logger = LoggerFactory.getLogger(OtherResponseProcessor.class);
 
-	/**   
+    /**
-	 * <p>Title: process</p>   
+     * <p>Title: process</p>
-	 * <p>Description: </p>   
+     * <p>Description: </p>
-	 * @param evt
+     *
-	 * @param layer
+     * @param evt
-	 * @param config    
+     * @param layer
-	 */  
+     * @param config
-	@Override
+     */
-	public void process(ResponseEvent evt, SipLayer layer, SipConfig config) {
+    @Override
-		// TODO Auto-generated method stub
+    public void process(ResponseEvent evt, SipLayer layer, SipConfig config) {
-		
+        // TODO Auto-generated method stub
-	}
+        logger.info("OtherResponseProcessor: {}", evt.getResponse());
+    }
 
 }