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

修复兼通api错误

pull/627/head
648540858 2022-09-26 10:40:20 +08:00
parent 0cc5917d8a
commit 3fb9694c2d
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,10 +83,12 @@ public class ApiStreamController {
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
result.put("error","device[ " + serial + " ]未找到"); result.put("error","device[ " + serial + " ]未找到");
resultDeferredResult.setResult(result); resultDeferredResult.setResult(result);
return resultDeferredResult;
}else if (device.getOnline() == 0) { }else if (device.getOnline() == 0) {
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
result.put("error","device[ " + code + " ]offline"); result.put("error","device[ " + code + " ]offline");
resultDeferredResult.setResult(result); resultDeferredResult.setResult(result);
return resultDeferredResult;
} }
resultDeferredResult.onTimeout(()->{ resultDeferredResult.onTimeout(()->{
logger.info("播放等待超时"); logger.info("播放等待超时");
@ -102,10 +104,12 @@ public class ApiStreamController {
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
result.put("error","channel[ " + code + " ]未找到"); result.put("error","channel[ " + code + " ]未找到");
resultDeferredResult.setResult(result); resultDeferredResult.setResult(result);
return resultDeferredResult;
}else if (deviceChannel.getStatus() == 0) { }else if (deviceChannel.getStatus() == 0) {
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
result.put("error","channel[ " + code + " ]offline"); result.put("error","channel[ " + code + " ]offline");
resultDeferredResult.setResult(result); resultDeferredResult.setResult(result);
return resultDeferredResult;
} }
MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device); MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
PlayResult play = playService.play(newMediaServerItem, serial, code, (mediaServerItem, response)->{ PlayResult play = playService.play(newMediaServerItem, serial, code, (mediaServerItem, response)->{
@ -143,18 +147,6 @@ public class ApiStreamController {
result.put("RelaySize", ""); result.put("RelaySize", "");
result.put("ChannelPTZType", "0"); result.put("ChannelPTZType", "0");
resultDeferredResult.setResult(result); resultDeferredResult.setResult(result);
// Class<?> aClass = responseEntity.getClass().getSuperclass();
// Field body = null;
// try {
// // 使用反射动态修改返回的body
// body = aClass.getDeclaredField("body");
// body.setAccessible(true);
// body.set(responseEntity, result);
// } catch (NoSuchFieldException e) {
// e.printStackTrace();
// } catch (IllegalAccessException e) {
// e.printStackTrace();
// }
}, (eventResult) -> { }, (eventResult) -> {
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
result.put("error", "channel[ " + code + " ] " + eventResult.msg); result.put("error", "channel[ " + code + " ] " + eventResult.msg);