648540858
2021-01-11 2d8054be18bf6ad6591703c6ab957777d137ecfe
Merge pull request #32 from lawrencehj/master

优化录像列表获取算法等
8个文件已修改
53 ■■■■ 已修改文件
src/main/java/com/genersoft/iot/vmp/gb28181/auth/DigestServerAuthenticationHelper.java 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-dev.yml 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web_src/src/components/gb28181/devicePlayer.vue 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/auth/DigestServerAuthenticationHelper.java
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
@@ -409,7 +409,12 @@
        try {
            MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
            String ssrc = streamSession.createPlayBackSsrc();
            String streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
            String streamId = null;
            if (rtpEnable) {
                streamId = String.format("gb_playback_%s_%s", device.getDeviceId(), channelId);
            }else {
                streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
            }
            // 添加订阅
            JSONObject subscribeKey = new JSONObject();
            subscribeKey.put("app", "rtp");
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
@@ -342,6 +342,7 @@
        try {
            // 回复200 OK
            responseAck(evt);
            String seqNo = String.valueOf(System.currentTimeMillis());
            RecordInfo recordInfo = new RecordInfo();
            Element rootElement = getRootElement(evt);
            Element deviceIdElement = rootElement.element("DeviceID");
@@ -396,32 +397,22 @@
                if (recordInfo.getSumNum() > 0 && recordList.size() > 0 && recordList.size() < recordInfo.getSumNum()) {
                    // 为防止连续请求该设备的录像数据,返回数据错乱,特增加sn进行区分
                    String cacheKey = CACHE_RECORDINFO_KEY + deviceId + sn;
                    // TODO 暂时直接操作redis存储,后续封装专用缓存接口,改为本地内存缓存
                    if (redis.hasKey(cacheKey)) {
                        List<RecordItem> previousList = (List<RecordItem>) redis.get(cacheKey);
                        if (previousList != null && previousList.size() > 0) {
                            recordList.addAll(previousList);
                        }
                        // 本分支表示录像列表被拆包,且加上之前的数据还是不够,保存缓存返回,等待下个包再处理
                        if (recordList.size() < recordInfo.getSumNum()) {
                            logger.info("已获取" + recordList.size() + "项录像数据,共" + recordInfo.getSumNum() + "项");
                            redis.set(cacheKey, recordList, 90);
                            return;
                        } else {
                            // 本分支表示录像被拆包,但加上之前的数据够足够,返回响应
                            // 因设备心跳有监听redis过期机制,为提高性能,此处手动删除
                            logger.info("录像数据已全部获取");
                            redis.del(cacheKey);
                        }
                    } else {
                        // 本分支有两种可能:1、录像列表被拆包,且是第一个包,直接保存缓存返回,等待下个包再处理
                        // 2、之前有包,但超时清空了,那么这次sn批次的响应数据已经不完整,等待过期时间后redis自动清空数据
                        logger.info("已获取" + recordList.size() + "项录像数据,共" + recordInfo.getSumNum() + "项");
                        logger.info("等待后续的包...");
                        redis.set(cacheKey, recordList, 90);
                    redis.set(cacheKey + "_" + seqNo, recordList, 90);
                    List<Object> cacheKeys = redis.scan(cacheKey + "_*");
                    List<RecordItem> totalRecordList = new ArrayList<RecordItem>();
                    for (int i = 0; i < cacheKeys.size(); i++) {
                        totalRecordList.addAll((List<RecordItem>) redis.get(cacheKeys.get(i).toString()));
                    }
                    if (totalRecordList.size() < recordInfo.getSumNum()) {
                        logger.info("已获取" + totalRecordList.size() + "项录像数据,共" + recordInfo.getSumNum() + "项");
                        return;
                    }
                    logger.info("录像数据已全部获取,共" + recordInfo.getSumNum() + "项");
                    recordInfo.setRecordList(totalRecordList);
                    for (int i = 0; i < cacheKeys.size(); i++) {
                        redis.del(cacheKeys.get(i).toString());
                    }
                }
                // 自然顺序排序, 元素进行升序排列
                recordInfo.getRecordList().sort(Comparator.naturalOrder());
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java
@@ -144,10 +144,10 @@
                storager.updateDevice(device);
                publisher.onlineEventPublish(device.getDeviceId(), VideoManagerConstants.EVENT_ONLINE_REGISTER);
                // 只有第一次注册才更新通道
                if (!exists) {
                // 重新注册更新设备和通道,以免设备替换或更新后信息无法更新
                //if (!exists) {
                    handler.onRegister(device);
                }
                //}
            } else if (registerFlag == 2) {
                logger.info("注销成功! deviceId:" + device.getDeviceId());
                publisher.outlineEventPublish(device.getDeviceId(), VideoManagerConstants.EVENT_OUTLINE_UNREGISTER);
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
@@ -43,7 +43,6 @@
            ")")
    int add(Device device);
    @Update(value = {" <script>" +
                "UPDATE device " +
                "SET deviceId='${deviceId}'" +
src/main/resources/application-dev.yml
src/main/resources/application.yml
@@ -1,3 +1,3 @@
spring:
  profiles:
    active: local
    active: dev
web_src/src/components/gb28181/devicePlayer.vue