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

临时提交

Browse Source
This commit is contained in:
panlinlin
2024-08-11 23:20:42 +08:00
parent 76a0d248ef
commit 0177831e86
36 changed files with 334 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiControlController.java
View File

@@ -51,7 +51,7 @@ public class ApiControlController {
}
if (channel == null) {channel = 0;}
if (speed == null) {speed = 0;}
Device device = deviceService.getDevice(serial);
Device device = deviceService.getDeviceByDeviceId(serial);
if (device == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "device[ " + serial + " ]未找到");
}
@@ -125,7 +125,7 @@ public class ApiControlController {
}
if (channel == null) {channel = 0;}
Device device = deviceService.getDevice(serial);
Device device = deviceService.getDeviceByDeviceId(serial);
if (device == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "device[ " + serial + " ]未找到");
}

2
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
View File

@@ -200,7 +200,7 @@ public class ApiDeviceController {
serial, channel, code, fill, timeout);
}
Device device = deviceService.getDevice(serial);
Device device = deviceService.getDeviceByDeviceId(serial);
String uuid = UUID.randomUUID().toString();
String key = DeferredResultHolder.CALLBACK_CMD_PRESETQUERY + (ObjectUtils.isEmpty(code) ? serial : code);
DeferredResult<Object> result = new DeferredResult<> (timeout * 1000L);

4
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
View File

@@ -82,7 +82,7 @@ public class ApiStreamController {
){
DeferredResult<JSONObject> result = new DeferredResult<>(userSetting.getPlayTimeout().longValue() + 10);
Device device = deviceService.getDevice(serial);
Device device = deviceService.getDeviceByDeviceId(serial);
if (device == null ) {
JSONObject resultJSON = new JSONObject();
resultJSON.put("error","device[ " + serial + " ]未找到");
@@ -230,7 +230,7 @@ public class ApiStreamController {
result.put("error","未找到流信息");
return result;
}
Device device = deviceService.getDevice(serial);
Device device = deviceService.getDeviceByDeviceId(serial);
if (device == null) {
JSONObject result = new JSONObject();
result.put("error","未找到设备");