Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

648540858

2023-06-10 52f9c295f90188d3346b9c129a00e817ab7f14e4

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

@@ -92,7 +92,7 @@
            result.put("error","device[ " + serial + " ]未找到");
            resultDeferredResult.setResult(result);
            return resultDeferredResult;
        }else if (!device.isOnline()) {
        }else if (!device.isOnLine()) {
            JSONObject result = new JSONObject();
            result.put("error","device[ " + code + " ]offline");
            resultDeferredResult.setResult(result);
@@ -113,7 +113,7 @@
            result.put("error","channel[ " + code + " ]未找到");
            resultDeferredResult.setResult(result);
            return resultDeferredResult;
        }else if (deviceChannel.getStatus() == 0) {
        }else if (!deviceChannel.isStatus()) {
            JSONObject result = new JSONObject();
            result.put("error","channel[ " + code + " ]offline");
            resultDeferredResult.setResult(result);