From 9d9681c663e1a5ca09a9ed6f3b8ba9bcbc61279a Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Wed, 31 Jan 2024 10:49:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9=E6=92=AD=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/gb28181/GB28181ResourceServiceImpl.java | 8 ++++---- .../iot/vmp/service/impl/DeviceChannelServiceImpl.java | 1 - .../iot/vmp/vmanager/channel/CommonChannelController.java | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/GB28181ResourceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/GB28181ResourceServiceImpl.java index 1b5d1ad2..84f0519b 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/GB28181ResourceServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/GB28181ResourceServiceImpl.java @@ -78,11 +78,11 @@ public class GB28181ResourceServiceImpl implements IResourceService { CheckCommonGbChannelResult checkResult = checkCommonGbChannel(commonGbChannel); if (checkResult.errorMsg != null) { - callback.call(commonGbChannel, null, ErrorCode.SUCCESS.getCode(), checkResult.errorMsg, null); + callback.call(commonGbChannel, null, ErrorCode.ERROR100.getCode(), checkResult.errorMsg, null); return; } if (checkResult.device == null || checkResult.channel == null) { - callback.call(commonGbChannel, null, ErrorCode.SUCCESS.getCode(), "设备获取失败", null); + callback.call(commonGbChannel, null, ErrorCode.ERROR100.getCode(), "设备获取失败", null); return; } @@ -102,11 +102,11 @@ public class GB28181ResourceServiceImpl implements IResourceService { CheckCommonGbChannelResult checkResult = checkCommonGbChannel(commonGbChannel); if (checkResult.errorMsg != null) { - callback.call(commonGbChannel, null, ErrorCode.SUCCESS.getCode(), checkResult.errorMsg, null); + callback.call(commonGbChannel, null, ErrorCode.ERROR100.getCode(), checkResult.errorMsg, null); return; } if (checkResult.device == null || checkResult.channel == null) { - callback.call(commonGbChannel, null, ErrorCode.SUCCESS.getCode(), "设备获取失败", null); + callback.call(commonGbChannel, null, ErrorCode.ERROR100.getCode(), "设备获取失败", null); return; } try { diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java index 2dbcab91..7bcedcb8 100755 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java @@ -559,7 +559,6 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService { }); } - if(CollectionUtils.isEmpty(channels)){ logger.info("通道重设，数据为空={}" , deviceChannelList); return false; diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/channel/CommonChannelController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/channel/CommonChannelController.java index e94e46b7..33314a6b 100755 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/channel/CommonChannelController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/channel/CommonChannelController.java @@ -206,8 +206,8 @@ public class CommonChannelController { streamInfo.changeStreamIp(host); } wvpResult.setData(new StreamContent(streamInfo)); - result.setResult(wvpResult); } + result.setResult(wvpResult); }else { WVPResult wvpResult = new WVPResult<>(); wvpResult.setCode(code);