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

mrjackwang

2022-03-04 bb50a243145dba2b3bf5f3bf225c63a092697a16

 src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java

@@ -248,7 +248,7 @@
        StreamProxyItem streamProxyDto = videoManagerStorager.queryStreamProxy(app, stream);
        if (streamProxyDto != null && streamProxyDto.isEnable()) {
            JSONObject jsonObject = removeStreamProxyFromZlm(streamProxyDto);
            if (jsonObject.getInteger("code") == 0) {
            if (null==jsonObject.getInteger("code") || jsonObject.getInteger("code") == 0) {
                streamProxyDto.setEnable(false);
                result = videoManagerStorager.updateStreamProxy(streamProxyDto);
            }