guzijian / wvp-GB28181-pro · Commits

Commit 2f108a46d05e34981d52b447d73f0cfd8e8c30fd

Authored by 648540858
Committed by GitHub
2 parents 9561e952 d5739409

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

fix bug
Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
  View file @2f108a4
@@ -108,10 +108,10 @@ public class DeviceControl { @@ -108,10 +108,10 @@ public class DeviceControl {
108 msg.setData("Timeout. Device did not response to this command."); 108 msg.setData("Timeout. Device did not response to this command.");
109 resultHolder.invokeAllResult(msg); 109 resultHolder.invokeAllResult(msg);
110 }); 110 });
111 - resultHolder.put(key, uuid, result);  
112 if (resultHolder.exist(key, null)){ 111 if (resultHolder.exist(key, null)){
113 return result; 112 return result;
114 } 113 }
  114 + resultHolder.put(key, uuid, result);
115 cmder.recordCmd(device, channelId, recordCmdStr, event -> { 115 cmder.recordCmd(device, channelId, recordCmdStr, event -> {
116 RequestMessage msg = new RequestMessage(); 116 RequestMessage msg = new RequestMessage();
117 msg.setId(uuid); 117 msg.setId(uuid);
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java
  View file @2f108a4
@@ -88,10 +88,10 @@ public class DownloadController { @@ -88,10 +88,10 @@ public class DownloadController {
88 msg.setData("Timeout"); 88 msg.setData("Timeout");
89 resultHolder.invokeAllResult(msg); 89 resultHolder.invokeAllResult(msg);
90 }); 90 });
91 - resultHolder.put(key, uuid, result);  
92 if(resultHolder.exist(key, null)) { 91 if(resultHolder.exist(key, null)) {
93 return result; 92 return result;
94 } 93 }
  94 + resultHolder.put(key, uuid, result);
95 Device device = storager.queryVideoDevice(deviceId); 95 Device device = storager.queryVideoDevice(deviceId);
96 StreamInfo streamInfo = redisCatchStorage.queryPlaybackByDevice(deviceId, channelId); 96 StreamInfo streamInfo = redisCatchStorage.queryPlaybackByDevice(deviceId, channelId);
97 if (streamInfo != null) { 97 if (streamInfo != null) {