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);