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

gushouzheng

2022-08-06 d21d281b2c4020bcbfc72bd95a458084a109933a

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

@@ -277,7 +277,11 @@
            return null;
        }
        String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerId;
        return (MediaServerItem)redisUtil.get(key);
        MediaServerItem serverItem=(MediaServerItem)redisUtil.get(key);
        if(null==serverItem){
            serverItem=mediaServerMapper.queryOne(mediaServerId);
        }
        return serverItem;
    }

    @Override