Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复收到Message Resquest后不回复200 OK的错误

pull/1/head
Lawrence 2020-10-29 10:18:29 +08:00
parent 56996e2138
commit edc16ec434
1 changed files with 135 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
View File

@ -106,6 +106,7 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
/** /**
* 收到deviceInfo设备信息请求 处理 * 收到deviceInfo设备信息请求 处理
*
* @param evt * @param evt
*/ */
private void processMessageDeviceInfo(RequestEvent evt) { private void processMessageDeviceInfo(RequestEvent evt) {
@ -132,13 +133,19 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
msg.setType(DeferredResultHolder.CALLBACK_CMD_DEVICEINFO); msg.setType(DeferredResultHolder.CALLBACK_CMD_DEVICEINFO);
msg.setData(device); msg.setData(device);
deferredResultHolder.invokeResult(msg); deferredResultHolder.invokeResult(msg);
} catch (DocumentException e) { // 回复200 OK
responseAck(evt);
if (offLineDetector.isOnline(deviceId)) {
publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
}
} catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
/*** /***
* 收到catalog设备目录列表请求 处理 * 收到catalog设备目录列表请求 处理
*
* @param evt * @param evt
*/ */
private void processMessageCatalogList(RequestEvent evt) { private void processMessageCatalogList(RequestEvent evt) {
@ -184,21 +191,30 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
deviceChannel.setCivilCode(XmlUtil.getText(itemDevice, "CivilCode")); deviceChannel.setCivilCode(XmlUtil.getText(itemDevice, "CivilCode"));
deviceChannel.setBlock(XmlUtil.getText(itemDevice, "Block")); deviceChannel.setBlock(XmlUtil.getText(itemDevice, "Block"));
deviceChannel.setAddress(XmlUtil.getText(itemDevice, "Address")); deviceChannel.setAddress(XmlUtil.getText(itemDevice, "Address"));
deviceChannel.setParental(itemDevice.element("Parental") == null? 0:Integer.parseInt(XmlUtil.getText(itemDevice,"Parental"))); deviceChannel.setParental(itemDevice.element("Parental") == null ? 0
: Integer.parseInt(XmlUtil.getText(itemDevice, "Parental")));
deviceChannel.setParentId(XmlUtil.getText(itemDevice, "ParentID")); deviceChannel.setParentId(XmlUtil.getText(itemDevice, "ParentID"));
deviceChannel.setSafetyWay(itemDevice.element("SafetyWay") == null? 0:Integer.parseInt(XmlUtil.getText(itemDevice,"SafetyWay"))); deviceChannel.setSafetyWay(itemDevice.element("SafetyWay") == null ? 0
deviceChannel.setRegisterWay(itemDevice.element("RegisterWay") == null? 1:Integer.parseInt(XmlUtil.getText(itemDevice,"RegisterWay"))); : Integer.parseInt(XmlUtil.getText(itemDevice, "SafetyWay")));
deviceChannel.setRegisterWay(itemDevice.element("RegisterWay") == null ? 1
: Integer.parseInt(XmlUtil.getText(itemDevice, "RegisterWay")));
deviceChannel.setCertNum(XmlUtil.getText(itemDevice, "CertNum")); deviceChannel.setCertNum(XmlUtil.getText(itemDevice, "CertNum"));
deviceChannel.setCertifiable(itemDevice.element("Certifiable") == null? 0:Integer.parseInt(XmlUtil.getText(itemDevice,"Certifiable"))); deviceChannel.setCertifiable(itemDevice.element("Certifiable") == null ? 0
deviceChannel.setErrCode(itemDevice.element("ErrCode") == null? 0:Integer.parseInt(XmlUtil.getText(itemDevice,"ErrCode"))); : Integer.parseInt(XmlUtil.getText(itemDevice, "Certifiable")));
deviceChannel.setErrCode(itemDevice.element("ErrCode") == null ? 0
: Integer.parseInt(XmlUtil.getText(itemDevice, "ErrCode")));
deviceChannel.setEndTime(XmlUtil.getText(itemDevice, "EndTime")); deviceChannel.setEndTime(XmlUtil.getText(itemDevice, "EndTime"));
deviceChannel.setSecrecy(XmlUtil.getText(itemDevice, "Secrecy")); deviceChannel.setSecrecy(XmlUtil.getText(itemDevice, "Secrecy"));
deviceChannel.setIpAddress(XmlUtil.getText(itemDevice, "IPAddress")); deviceChannel.setIpAddress(XmlUtil.getText(itemDevice, "IPAddress"));
deviceChannel.setPort(itemDevice.element("Port") == null? 0:Integer.parseInt(XmlUtil.getText(itemDevice,"Port"))); deviceChannel.setPort(itemDevice.element("Port") == null ? 0
: Integer.parseInt(XmlUtil.getText(itemDevice, "Port")));
deviceChannel.setPassword(XmlUtil.getText(itemDevice, "Password")); deviceChannel.setPassword(XmlUtil.getText(itemDevice, "Password"));
deviceChannel.setLongitude(itemDevice.element("Longitude") == null? 0.00:Double.parseDouble(XmlUtil.getText(itemDevice,"Longitude"))); deviceChannel.setLongitude(itemDevice.element("Longitude") == null ? 0.00
deviceChannel.setLatitude(itemDevice.element("Latitude") == null? 0.00:Double.parseDouble(XmlUtil.getText(itemDevice,"Latitude"))); : Double.parseDouble(XmlUtil.getText(itemDevice, "Longitude")));
deviceChannel.setPTZType(itemDevice.element("PTZType") == null? 0:Integer.parseInt(XmlUtil.getText(itemDevice,"PTZType"))); deviceChannel.setLatitude(itemDevice.element("Latitude") == null ? 0.00
: Double.parseDouble(XmlUtil.getText(itemDevice, "Latitude")));
deviceChannel.setPTZType(itemDevice.element("PTZType") == null ? 0
: Integer.parseInt(XmlUtil.getText(itemDevice, "PTZType")));
deviceChannel.setHasAudio(true); // 默认含有音频，播放时再检查是否有音频及是否AAC deviceChannel.setHasAudio(true); // 默认含有音频，播放时再检查是否有音频及是否AAC
storager.updateChannel(device.getDeviceId(), deviceChannel); storager.updateChannel(device.getDeviceId(), deviceChannel);
} }
@ -208,13 +224,11 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
msg.setType(DeferredResultHolder.CALLBACK_CMD_CATALOG); msg.setType(DeferredResultHolder.CALLBACK_CMD_CATALOG);
msg.setData(device); msg.setData(device);
deferredResultHolder.invokeResult(msg); deferredResultHolder.invokeResult(msg);
// 回复200 OK
// 回复200
if (offLineDetector.isOnline(deviceId)) {
responseAck(evt); responseAck(evt);
if (offLineDetector.isOnline(deviceId)) {
publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE); publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
} }
} }
} catch (DocumentException | SipException | InvalidArgumentException | ParseException e) { } catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
e.printStackTrace(); e.printStackTrace();
@ -223,6 +237,7 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
/*** /***
* 收到alarm设备报警信息 处理 * 收到alarm设备报警信息 处理
*
* @param evt * @param evt
*/ */
private void processMessageAlarm(RequestEvent evt) { private void processMessageAlarm(RequestEvent evt) {
@ -246,21 +261,29 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
} }
storager.updateDevice(device); storager.updateDevice(device);
cmder.catalogQuery(device); cmder.catalogQuery(device);
} catch (DocumentException e) { // 回复200 OK
responseAck(evt);
if (offLineDetector.isOnline(deviceId)) {
publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
}
} catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
// } catch (DocumentException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
/*** /***
* 收到keepalive请求 处理 * 收到keepalive请求 处理
*
* @param evt * @param evt
*/ */
private void processMessageKeepAlive(RequestEvent evt) { private void processMessageKeepAlive(RequestEvent evt) {
try { try {
Element rootElement = getRootElement(evt); Element rootElement = getRootElement(evt);
String deviceId = XmlUtil.getText(rootElement, "DeviceID"); String deviceId = XmlUtil.getText(rootElement, "DeviceID");
if (offLineDetector.isOnline(deviceId)) { // 回复200 OK
responseAck(evt); responseAck(evt);
if (offLineDetector.isOnline(deviceId)) {
publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE); publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
} else { } else {
} }
@ -270,12 +293,14 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
} }
/*** /***
* 收到catalog设备目录列表请求 处理 * 收到catalog设备目录列表请求 处理 TODO 过期时间暂时写死180秒，后续与DeferredResult超时时间保持一致
* TODO 过期时间暂时写死180秒，后续与DeferredResult超时时间保持一致 *
* @param evt * @param evt
*/ */
private void processMessageRecordInfo(RequestEvent evt) { private void processMessageRecordInfo(RequestEvent evt) {
try { try {
// 回复200 OK
responseAck(evt);
RecordInfo recordInfo = new RecordInfo(); RecordInfo recordInfo = new RecordInfo();
Element rootElement = getRootElement(evt); Element rootElement = getRootElement(evt);
Element deviceIdElement = rootElement.element("DeviceID"); Element deviceIdElement = rootElement.element("DeviceID");
@ -286,6 +311,8 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
String sn = XmlUtil.getText(rootElement, "SN"); String sn = XmlUtil.getText(rootElement, "SN");
Element recordListElement = rootElement.element("RecordList"); Element recordListElement = rootElement.element("RecordList");
if (recordListElement == null) { if (recordListElement == null) {
logger.info("无录像数据");
// responseAck(evt);
return; return;
} }
@ -293,11 +320,13 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
List<RecordItem> recordList = new ArrayList<RecordItem>(); List<RecordItem> recordList = new ArrayList<RecordItem>();
if (recordListIterator != null) { if (recordListIterator != null) {
RecordItem record = new RecordItem(); RecordItem record = new RecordItem();
logger.info("处理录像列表数据...");
// 遍历DeviceList // 遍历DeviceList
while (recordListIterator.hasNext()) { while (recordListIterator.hasNext()) {
Element itemRecord = recordListIterator.next(); Element itemRecord = recordListIterator.next();
Element recordElement = itemRecord.element("DeviceID"); Element recordElement = itemRecord.element("DeviceID");
if (recordElement == null) { if (recordElement == null) {
logger.info("记录为空，下一个...");
continue; continue;
} }
record = new RecordItem(); record = new RecordItem();
@ -305,9 +334,11 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
record.setName(XmlUtil.getText(itemRecord, "Name")); record.setName(XmlUtil.getText(itemRecord, "Name"));
record.setFilePath(XmlUtil.getText(itemRecord, "FilePath")); record.setFilePath(XmlUtil.getText(itemRecord, "FilePath"));
record.setAddress(XmlUtil.getText(itemRecord, "Address")); record.setAddress(XmlUtil.getText(itemRecord, "Address"));
record.setStartTime(DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(XmlUtil.getText(itemRecord,"StartTime"))); record.setStartTime(
DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(XmlUtil.getText(itemRecord, "StartTime")));
record.setEndTime(DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(XmlUtil.getText(itemRecord, "EndTime"))); record.setEndTime(DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(XmlUtil.getText(itemRecord, "EndTime")));
record.setSecrecy(itemRecord.element("Secrecy") == null? 0:Integer.parseInt(XmlUtil.getText(itemRecord,"Secrecy"))); record.setSecrecy(itemRecord.element("Secrecy") == null ? 0
: Integer.parseInt(XmlUtil.getText(itemRecord, "Secrecy")));
record.setType(XmlUtil.getText(itemRecord, "Type")); record.setType(XmlUtil.getText(itemRecord, "Type"));
record.setRecorderId(XmlUtil.getText(itemRecord, "RecorderID")); record.setRecorderId(XmlUtil.getText(itemRecord, "RecorderID"));
recordList.add(record); recordList.add(record);
@ -328,17 +359,21 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
} }
// 本分支表示录像列表被拆包，且加上之前的数据还是不够,保存缓存返回，等待下个包再处理 // 本分支表示录像列表被拆包，且加上之前的数据还是不够,保存缓存返回，等待下个包再处理
if (recordList.size() < recordInfo.getSumNum()) { if (recordList.size() < recordInfo.getSumNum()) {
redis.set(cacheKey, recordList, 180); logger.info("已获取" + recordList.size() + "项录像数据，共" + recordInfo.getSumNum() + "项");
redis.set(cacheKey, recordList, 90);
return; return;
} else { } else {
// 本分支表示录像被拆包，但加上之前的数据够足够，返回响应 // 本分支表示录像被拆包，但加上之前的数据够足够，返回响应
// 因设备心跳有监听redis过期机制，为提高性能，此处手动删除 // 因设备心跳有监听redis过期机制，为提高性能，此处手动删除
logger.info("录像数据已全部获取");
redis.del(cacheKey); redis.del(cacheKey);
} }
} else { } else {
// 本分支有两种可能：1、录像列表被拆包，且是第一个包,直接保存缓存返回，等待下个包再处理 // 本分支有两种可能：1、录像列表被拆包，且是第一个包,直接保存缓存返回，等待下个包再处理
// 2、之前有包，但超时清空了，那么这次sn批次的响应数据已经不完整，等待过期时间后redis自动清空数据 // 2、之前有包，但超时清空了，那么这次sn批次的响应数据已经不完整，等待过期时间后redis自动清空数据
redis.set(cacheKey, recordList, 180); logger.info("等待后续的包...");
redis.set(cacheKey, recordList, 90);
return; return;
} }
@ -355,7 +390,8 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
recordInfo.getRecordList().sort(Comparator.naturalOrder()); recordInfo.getRecordList().sort(Comparator.naturalOrder());
msg.setData(recordInfo); msg.setData(recordInfo);
deferredResultHolder.invokeResult(msg); deferredResultHolder.invokeResult(msg);
} catch (DocumentException e) { logger.info("处理完成，返回结果");
} catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }