Lawrence
2020-10-29 56996e2138bc6a50e716e66945c2773db02833f5
修正拼写错误
4个文件已修改
26 ■■■■ 已修改文件
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/storager/jdbc/VideoManagerJdbcStoragerImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
@@ -329,7 +329,7 @@
            streamInfo.setSsrc(ssrc);
            streamInfo.setCahnnelId(channelId);
            streamInfo.setDeviceID(device.getDeviceId());
            boolean b = storager.startPlayBlack(streamInfo);
            boolean b = storager.startPlayback(streamInfo);
            return streamInfo;
        } catch ( SipException | ParseException | InvalidArgumentException e) {
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
@@ -184,11 +184,11 @@
    Map<String, StreamInfo> queryPlayByDeviceId(String deviceId);
    boolean startPlayBlack(StreamInfo streamInfo);
    boolean startPlayback(StreamInfo streamInfo);
    boolean stopPlayBlack(StreamInfo streamInfo);
    boolean stopPlayback(StreamInfo streamInfo);
    StreamInfo queryPlayBlackByDevice(String deviceId, String channelId);
    StreamInfo queryPlaybackByDevice(String deviceId, String channelId);
    StreamInfo queryPlayBlackBySSRC(String ssrc);
    StreamInfo queryPlaybackBySSRC(String ssrc);
}
src/main/java/com/genersoft/iot/vmp/storager/jdbc/VideoManagerJdbcStoragerImpl.java
@@ -195,22 +195,22 @@
    }
    @Override
    public boolean startPlayBlack(StreamInfo streamInfo) {
    public boolean startPlayback(StreamInfo streamInfo) {
        return false;
    }
    @Override
    public boolean stopPlayBlack(StreamInfo streamInfo) {
    public boolean stopPlayback(StreamInfo streamInfo) {
        return false;
    }
    @Override
    public StreamInfo queryPlayBlackByDevice(String deviceId, String channelId) {
    public StreamInfo queryPlaybackByDevice(String deviceId, String channelId) {
        return null;
    }
    @Override
    public StreamInfo queryPlayBlackBySSRC(String ssrc) {
    public StreamInfo queryPlaybackBySSRC(String ssrc) {
        return null;
    }
}
src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
@@ -409,7 +409,7 @@
    }
    @Override
    public StreamInfo queryPlayBlackBySSRC(String ssrc) {
    public StreamInfo queryPlaybackBySSRC(String ssrc) {
//        List<Object> playLeys = redis.keys(String.format("%S_%s_*", VideoManagerConstants.PLAYER_PREFIX, ssrc));
        List<Object> playLeys = redis.scan(String.format("%S_%s_*", VideoManagerConstants.PLAY_BLACK_PREFIX, ssrc));
        if (playLeys == null || playLeys.size() == 0) return null;
@@ -505,14 +505,14 @@
    @Override
    public boolean startPlayBlack(StreamInfo stream) {
    public boolean startPlayback(StreamInfo stream) {
        return redis.set(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX, stream.getSsrc(),stream.getDeviceID(), stream.getCahnnelId()),
                stream);
    }
    @Override
    public boolean stopPlayBlack(StreamInfo streamInfo) {
    public boolean stopPlayback(StreamInfo streamInfo) {
        if (streamInfo == null) return false;
        DeviceChannel deviceChannel = queryChannel(streamInfo.getDeviceID(), streamInfo.getCahnnelId());
        if (deviceChannel != null) {
@@ -527,7 +527,7 @@
    }
    @Override
    public StreamInfo queryPlayBlackByDevice(String deviceId, String code) {
    public StreamInfo queryPlaybackByDevice(String deviceId, String code) {
        String format = String.format("%S_*_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
                deviceId,
                code);