Browse Source

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

pull/250/head
邓泽宇 3 years ago
parent
commit
8db82c8e69
  1. 10
      src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java
  2. 10
      src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java

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

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

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

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

Loading…
Cancel
Save