roouzenn/wvp
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化收到目录时的分组信息处理

Browse Source
This commit is contained in:
648540858
2024-08-09 11:08:40 +08:00
parent a1671c3c3e
commit 7f8a15f017
12 changed files with 173 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/genersoft/iot/vmp/gb28181/session/CatalogDataCatch.java
View File

@@ -58,9 +58,26 @@ public class CatalogDataCatch {
catalogData.setTotal(total);
catalogData.setDevice(device);
catalogData.setStatus(CatalogData.CatalogDataStatus.runIng);
catalogData.getChannelList().addAll(deviceChannelList);
catalogData.getRegionListList().addAll(regionList);
catalogData.getGroupListListList().addAll(groupList);
if (deviceChannelList != null && !deviceChannelList.isEmpty()) {
if (catalogData.getChannelList() != null) {
catalogData.getChannelList().addAll(deviceChannelList);
}
}
if (regionList != null && !regionList.isEmpty()) {
if (catalogData.getRegionListList() != null) {
catalogData.getRegionListList().addAll(regionList);
}else {
catalogData.setRegionListList(regionList);
}
}
if (groupList != null && !groupList.isEmpty()) {
if (catalogData.getGroupListListList() != null) {
catalogData.getGroupListListList().addAll(groupList);
}else {
catalogData.setGroupListListList(groupList);
}
}
catalogData.setLastTime(Instant.now());
}
}