Browse Source

Merge pull request #232 from chenparty/wvp-28181-2.0

fix bug
pull/243/head
648540858 3 years ago
committed by GitHub
parent
commit
2f108a46d0
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
  2. 2
      src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java

2
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java

@ -108,10 +108,10 @@ public class DeviceControl {
msg.setData("Timeout. Device did not response to this command."); msg.setData("Timeout. Device did not response to this command.");
resultHolder.invokeAllResult(msg); resultHolder.invokeAllResult(msg);
}); });
resultHolder.put(key, uuid, result);
if (resultHolder.exist(key, null)){ if (resultHolder.exist(key, null)){
return result; return result;
} }
resultHolder.put(key, uuid, result);
cmder.recordCmd(device, channelId, recordCmdStr, event -> { cmder.recordCmd(device, channelId, recordCmdStr, event -> {
RequestMessage msg = new RequestMessage(); RequestMessage msg = new RequestMessage();
msg.setId(uuid); msg.setId(uuid);

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

@ -88,10 +88,10 @@ public class DownloadController {
msg.setData("Timeout"); msg.setData("Timeout");
resultHolder.invokeAllResult(msg); resultHolder.invokeAllResult(msg);
}); });
resultHolder.put(key, uuid, result);
if(resultHolder.exist(key, null)) { if(resultHolder.exist(key, null)) {
return result; return result;
} }
resultHolder.put(key, uuid, result);
Device device = storager.queryVideoDevice(deviceId); Device device = storager.queryVideoDevice(deviceId);
StreamInfo streamInfo = redisCatchStorage.queryPlaybackByDevice(deviceId, channelId); StreamInfo streamInfo = redisCatchStorage.queryPlaybackByDevice(deviceId, channelId);
if (streamInfo != null) { if (streamInfo != null) {

Loading…
Cancel
Save