XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.6.8' into wvp-28181-2.0

Browse Source 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
#	src/main/resources/all-application.yml
#	web_src/package-lock.json
This commit is contained in:
648540858
2023-06-19 20:19:31 +08:00
parent 319cdd2151 8cf5b65e38
commit 6b3732b8c4
28 changed files with 4126 additions and 603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
View File

@@ -403,8 +403,12 @@ public class PlatformController {
if (platform == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "平台未找到");
}
if (platformId.equals(parentId)) {
parentId = platform.getDeviceGBId();
// if (platformId.equals(parentId)) {
// parentId = platform.getDeviceGBId();
// }
if (platformId.equals(platform.getDeviceGBId())) {
parentId = null;
}
return storager.getChildrenCatalogByPlatform(platformId, parentId);