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

648540858

2021-11-17 2f108a46d05e34981d52b447d73f0cfd8e8c30fd

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

fix bug

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

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

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

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