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

临时提交

Browse Source
This commit is contained in:
panlinlin
2024-08-08 23:44:03 +08:00
parent 8ab88c0f02
commit a1671c3c3e
11 changed files with 172 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,6 @@
package com.genersoft.iot.vmp.gb28181.session;
import com.genersoft.iot.vmp.gb28181.bean.CatalogData;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.bean.SyncStatus;
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.service.IDeviceChannelService;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +36,8 @@ public class CatalogDataCatch {
}
}
public void put(String deviceId, int sn, int total, Device device, List<DeviceChannel> deviceChannelList) {
public void put(String deviceId, int sn, int total, Device device, List<DeviceChannel> deviceChannelList,
List<Region> regionList, List<Group> groupList) {
CatalogData catalogData = data.get(deviceId);
if (catalogData == null) {
catalogData = new CatalogData();
@@ -47,6 +45,8 @@ public class CatalogDataCatch {
catalogData.setTotal(total);
catalogData.setDevice(device);
catalogData.setChannelList(deviceChannelList);
catalogData.setRegionListList(regionList);
catalogData.setGroupListListList(groupList);
catalogData.setStatus(CatalogData.CatalogDataStatus.runIng);
catalogData.setLastTime(Instant.now());
data.put(deviceId, catalogData);
@@ -59,11 +59,13 @@ public class CatalogDataCatch {
catalogData.setDevice(device);
catalogData.setStatus(CatalogData.CatalogDataStatus.runIng);
catalogData.getChannelList().addAll(deviceChannelList);
catalogData.getRegionListList().addAll(regionList);
catalogData.getGroupListListList().addAll(groupList);
catalogData.setLastTime(Instant.now());
}
}
public List<DeviceChannel> get(String deviceId) {
public List<DeviceChannel> getDeviceChannelList(String deviceId) {
CatalogData catalogData = data.get(deviceId);
if (catalogData == null) {
return null;
@@ -71,6 +73,22 @@ public class CatalogDataCatch {
return catalogData.getChannelList();
}
public List<Region> getRegionList(String deviceId) {
CatalogData catalogData = data.get(deviceId);
if (catalogData == null) {
return null;
}
return catalogData.getRegionListList();
}
public List<Group> getGroupList(String deviceId) {
CatalogData catalogData = data.get(deviceId);
if (catalogData == null) {
return null;
}
return catalogData.getGroupListListList();
}
public int getTotal(String deviceId) {
CatalogData catalogData = data.get(deviceId);
if (catalogData == null) {