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

添加兼容目录同步兼容性

pull/939/head
648540858 2023-07-05 17:20:20 +08:00
parent 457c5e3821
commit deeff5533b
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
View File

@ -380,13 +380,18 @@ public class XmlUtil {
} }
} }
// 父设备/区域/系统ID // 父设备/区域/系统ID
String realParentId = parentID;
if (!ObjectUtils.isEmpty(parentID)) { if (!ObjectUtils.isEmpty(parentID) ) {
if (parentID.contains("/")) { if (parentID.contains("/")) {
String[] parentIdArray = parentID.split("/"); String[] parentIdArray = parentID.split("/");
realParentId = parentIdArray[parentIdArray.length - 1]; deviceChannel.setParentId(parentIdArray[parentIdArray.length - 1]);
}else {
if (parentID.length()%2 == 0) {
deviceChannel.setParentId(parentID);
}else {
logger.warn("[xml解析] 不规范的parentID：{}, 已舍弃", parentID);
}
} }
deviceChannel.setParentId(realParentId);
}else { }else {
if (!ObjectUtils.isEmpty(businessGroupID)) { if (!ObjectUtils.isEmpty(businessGroupID)) {
deviceChannel.setParentId(businessGroupID); deviceChannel.setParentId(businessGroupID);

2
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
View File

@ -447,8 +447,6 @@ public class ZLMHttpHookListener {
if ("rtp".equals(param.getApp())) { if ("rtp".equals(param.getApp())) {
ret.put("close", userSetting.getStreamOnDemand()); ret.put("close", userSetting.getStreamOnDemand());
// 国标流， 点播/录像回放/录像下载 // 国标流， 点播/录像回放/录像下载
// StreamInfo streamInfoForPlayCatch = redisCatchStorage.queryPlayByStreamId(param.getStream());
InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(null, param.getStream()); InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(null, param.getStream());
// 点播 // 点播
if (inviteInfo != null) { if (inviteInfo != null) {