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

修正了如果设备不存在以及不在线的时候没有 释放请求的问题

pull/250/head
邓泽宇 2021-11-27 20:25:39 +08:00
parent 7fc38ad9b3
commit 8db82c8e69
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java
View File

@ -95,12 +95,22 @@ public class DownloadController {
Device device = storager.queryVideoDevice(deviceId); Device device = storager.queryVideoDevice(deviceId);
if (device == null) { if (device == null) {
result.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST)); result.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
RequestMessage msg = new RequestMessage();
msg.setId(uuid);
msg.setKey(key);
msg.setData("设备不存在");
resultHolder.invokeAllResult(msg);
return result; return result;
} }
//判断设备是否在线，不在线直接返回 //判断设备是否在线，不在线直接返回
if(device.getOnline()==0) if(device.getOnline()==0)
{ {
result.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST)); result.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
RequestMessage msg = new RequestMessage();
msg.setId(uuid);
msg.setKey(key);
msg.setData("设备不在线");
resultHolder.invokeAllResult(msg);
return result; return result;
} }
StreamInfo streamInfo = redisCatchStorage.queryPlaybackByDevice(deviceId, channelId); StreamInfo streamInfo = redisCatchStorage.queryPlaybackByDevice(deviceId, channelId);

10
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
View File

@ -83,12 +83,22 @@ public class PlaybackController {
Device device = storager.queryVideoDevice(deviceId); Device device = storager.queryVideoDevice(deviceId);
if (device == null) { if (device == null) {
result.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST)); result.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
RequestMessage msg = new RequestMessage();
msg.setId(uuid);
msg.setKey(key);
msg.setData("设备不存在");
resultHolder.invokeAllResult(msg);
return result; return result;
} }
//判断设备是否在线，不在线直接返回 //判断设备是否在线，不在线直接返回
if(device.getOnline()==0) if(device.getOnline()==0)
{ {
result.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST)); result.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
RequestMessage msg = new RequestMessage();
msg.setId(uuid);
msg.setKey(key);
msg.setData("设备不在线");
resultHolder.invokeAllResult(msg);
return result; return result;
} }
MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device); MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);