Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

mk1990

2022-05-07 88db57697ae4644d6b25b7e7c4af8d15ca76b025

 src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java

@@ -68,7 +68,7 @@
                                             @RequestParam(required = false)String timeout

    ){
        DeferredResult<JSONObject> resultDeferredResult = new DeferredResult<>(userSetting.getPlayTimeout() + 10);
        DeferredResult<JSONObject> resultDeferredResult = new DeferredResult<>(userSetting.getPlayTimeout().longValue() + 10);
        Device device = storager.queryVideoDevice(serial);
        if (device == null ) {
            JSONObject result = new JSONObject();