From a2182b5a7ba0ffbba960e774e019a707b5bf26bb Mon Sep 17 00:00:00 2001
From: mk1990 <37614016+mk1990@users.noreply.github.com>
Date: 星期五, 06 五月 2022 17:46:01 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/session/CatalogDataCatch.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/session/CatalogDataCatch.java b/src/main/java/com/genersoft/iot/vmp/gb28181/session/CatalogDataCatch.java
index 97360d2..62393d5 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/session/CatalogDataCatch.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/session/CatalogDataCatch.java
@@ -65,19 +65,25 @@
public List<DeviceChannel> get(String deviceId) {
CatalogData catalogData = data.get(deviceId);
- if (catalogData == null) return null;
+ if (catalogData == null) {
+ return null;
+ }
return catalogData.getChannelList();
}
public int getTotal(String deviceId) {
CatalogData catalogData = data.get(deviceId);
- if (catalogData == null) return 0;
+ if (catalogData == null) {
+ return 0;
+ }
return catalogData.getTotal();
}
public SyncStatus getSyncStatus(String deviceId) {
CatalogData catalogData = data.get(deviceId);
- if (catalogData == null) return null;
+ if (catalogData == null) {
+ return null;
+ }
SyncStatus syncStatus = new SyncStatus();
syncStatus.setCurrent(catalogData.getChannelList().size());
syncStatus.setTotal(catalogData.getTotal());
@@ -87,7 +93,9 @@
public boolean isSyncRunning(String deviceId) {
CatalogData catalogData = data.get(deviceId);
- if (catalogData == null) return false;
+ if (catalogData == null) {
+ return false;
+ }
return !catalogData.getStatus().equals(CatalogData.CatalogDataStatus.end);
}
@@ -125,7 +133,9 @@
public void setChannelSyncEnd(String deviceId, String errorMsg) {
CatalogData catalogData = data.get(deviceId);
- if (catalogData == null)return;
+ if (catalogData == null) {
+ return;
+ }
catalogData.setStatus(CatalogData.CatalogDataStatus.end);
catalogData.setErrorMsg(errorMsg);
}
--
Gitblit v1.8.0