Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

临时提交

dev/数据库统合
648540858 2024-12-31 15:58:53 +08:00
parent adfd28d9d7
commit a8ad586204
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
View File

@ -103,14 +103,14 @@ public class CloudRecordController {
List<MediaServer> mediaServers; List<MediaServer> mediaServers;
if (!ObjectUtils.isEmpty(mediaServerId)) { if (!ObjectUtils.isEmpty(mediaServerId)) {
mediaServers = null; mediaServers = new ArrayList<>();
// MediaServer mediaServer = mediaServerService.getOne(mediaServerId); MediaServer mediaServer = mediaServerService.getOne(mediaServerId);
// if (mediaServer == null) { if (mediaServer == null) {
// throw new ControllerException(ErrorCode.ERROR100.getCode(), "未找到流媒体: " + mediaServerId); throw new ControllerException(ErrorCode.ERROR100.getCode(), "未找到流媒体: " + mediaServerId);
// } }
// mediaServers.add(mediaServer); mediaServers.add(mediaServer);
} else { } else {
mediaServers = mediaServerService.getAllOnlineList(); mediaServers = null;
} }
if (query != null && ObjectUtils.isEmpty(query.trim())) { if (query != null && ObjectUtils.isEmpty(query.trim())) {
query = null; query = null;
@ -339,10 +339,7 @@ public class CloudRecordController {
} }
mediaServers.add(mediaServer); mediaServers.add(mediaServer);
} else { } else {
mediaServers = mediaServerService.getAll(); mediaServers = null;
}
if (mediaServers.isEmpty()) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "当前无流媒体");
} }
if (query != null && ObjectUtils.isEmpty(query.trim())) { if (query != null && ObjectUtils.isEmpty(query.trim())) {
query = null; query = null;