XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev/数据库统合'

Browse Source 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceQuery.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
This commit is contained in:
lin
2025-03-12 14:20:28 +08:00
parent cb5a09214a 33abdb1db6
commit b904e594a1
136 changed files with 4446 additions and 1908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/genersoft/iot/vmp/vmanager/bean/ErrorCode.java
View File

@@ -9,6 +9,7 @@ public enum ErrorCode {
ERROR400(400, "参数或方法错误"),
ERROR404(404, "资源未找到"),
ERROR403(403, "无权限操作"),
ERROR486(486, "超时或无响应"),
ERROR401(401, "请登录后重新请求"),
ERROR500(500, "系统异常");

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

@@ -110,10 +110,7 @@ public class CloudRecordController {
}
mediaServers.add(mediaServer);
} else {
mediaServers = mediaServerService.getAllOnlineList();
}
if (mediaServers.isEmpty()) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "当前无流媒体");
mediaServers = null;
}
if (query != null && ObjectUtils.isEmpty(query.trim())) {
query = null;
@@ -342,10 +339,7 @@ public class CloudRecordController {
}
mediaServers.add(mediaServer);
} else {
mediaServers = mediaServerService.getAll();
}
if (mediaServers.isEmpty()) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "当前无流媒体");
mediaServers = null;
}
if (query != null && ObjectUtils.isEmpty(query.trim())) {
query = null;