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("" + size + "\r\n");
catalogXml.append("\r\n");
catalogXml.append("- \r\n");
-
- catalogXml.append("" + channel.getChannelId() + "\r\n");
- catalogXml.append("" + channel.getName() + "\r\n");
- catalogXml.append("" + channel.getManufacture() + "\r\n");
- catalogXml.append("" + channel.getModel() + "\r\n");
- catalogXml.append("" + channel.getOwner() + "\r\n");
- catalogXml.append("" + channel.getCivilCode() + "\r\n");
- catalogXml.append("" + channel.getAddress() + "\r\n");
- catalogXml.append("" + channel.getParental() + "\r\n");// TODO 当前不能添加分组, 所以暂时没有父节点
- catalogXml.append("" + channel.getParentId() + "\r\n"); // TODO 当前不能添加分组, 所以暂时没有父节点
- catalogXml.append("" + channel.getSecrecy() + "\r\n");
- catalogXml.append("" + channel.getRegisterWay() + "\r\n");
- catalogXml.append("" + (channel.getStatus() == 0?"OFF":"ON") + "\r\n");
- catalogXml.append("\r\n");
-
+ if(null != channel){
+ catalogXml.append("" + channel.getChannelId() + "\r\n");
+ catalogXml.append("" + channel.getName() + "\r\n");
+ catalogXml.append("" + channel.getManufacture() + "\r\n");
+ catalogXml.append("" + channel.getModel() + "\r\n");
+ catalogXml.append("" + channel.getOwner() + "\r\n");
+ catalogXml.append("" + channel.getCivilCode() + "\r\n");
+ catalogXml.append("" + channel.getAddress() + "\r\n");
+ catalogXml.append("" + channel.getParental() + "\r\n");// TODO 当前不能添加分组, 所以暂时没有父节点
+ catalogXml.append("" + channel.getParentId() + "\r\n"); // TODO 当前不能添加分组, 所以暂时没有父节点
+ catalogXml.append("" + channel.getSecrecy() + "\r\n");
+ catalogXml.append("" + channel.getRegisterWay() + "\r\n");
+ catalogXml.append("" + (channel.getStatus() == 0?"OFF":"ON") + "\r\n");
+ catalogXml.append("\r\n");
+ }
catalogXml.append("
\r\n");
catalogXml.append("\r\n");
catalogXml.append("\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 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 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 {
-
- /**
- * Title: process
- * Description:
- * @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);
+
+ /**
+ * Title: process
+ * Description:
+ *
+ * @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());
+ }
+
+}