Commit 7a41f66e8bde008d373c079ac22f811ba14b6297

Authored by 648540858
Committed by GitHub
2 parents f3454caa c56258ba

Merge pull request #655 from L120820/wvp-28181-2.0

【同步设备通道】第一次收到同步通道数据应该将通道数据放入 不然会造成通道数量不一致 同步时也会漏掉第一个通道
src/main/java/com/genersoft/iot/vmp/gb28181/session/CatalogDataCatch.java
@@ -42,7 +42,7 @@ public class CatalogDataCatch { @@ -42,7 +42,7 @@ public class CatalogDataCatch {
42 catalogData.setSn(sn); 42 catalogData.setSn(sn);
43 catalogData.setTotal(total); 43 catalogData.setTotal(total);
44 catalogData.setDevice(device); 44 catalogData.setDevice(device);
45 - catalogData.setChannelList(Collections.synchronizedList(new ArrayList<>())); 45 + catalogData.setChannelList(deviceChannelList);
46 catalogData.setStatus(CatalogData.CatalogDataStatus.runIng); 46 catalogData.setStatus(CatalogData.CatalogDataStatus.runIng);
47 catalogData.setLastTime(Instant.now()); 47 catalogData.setLastTime(Instant.now());
48 data.put(deviceId, catalogData); 48 data.put(deviceId, catalogData);