diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java index d3aceb10..b3447f95 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java @@ -290,12 +290,8 @@ public class SIPCommander implements ISIPCommander { @Override public void playStreamCmd(Device device, String channelId, ZLMHttpHookSubscribe.Event event, SipSubscribe.Event errorEvent) { try { - String ssrc = ""; - if (rtpEnable) { - ssrc = String.format("gb_play_%s_%s", device.getDeviceId(), channelId); - }else { - ssrc = streamSession.createPlaySsrc(); - } + + String ssrc = streamSession.createPlaySsrc(); String streamId = null; if (rtpEnable) { streamId = String.format("gb_play_%s_%s", device.getDeviceId(), channelId); @@ -412,16 +408,13 @@ public class SIPCommander implements ISIPCommander { , SipSubscribe.Event errorEvent) { try { MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo(); - String ssrc = null; + String ssrc = streamSession.createPlayBackSsrc(); String streamId = null; if (rtpEnable) { - ssrc = String.format("gb_playback_%s_%s", device.getDeviceId(), channelId); - streamId = ssrc; + streamId = String.format("gb_playback_%s_%s", device.getDeviceId(), channelId); }else { - ssrc = streamSession.createPlayBackSsrc(); streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase(); } - // 添加订阅 JSONObject subscribeKey = new JSONObject(); subscribeKey.put("app", "rtp"); diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java index 3ed22b28..c5ae4f5d 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java @@ -342,6 +342,7 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor { 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 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor { 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 previousList = (List) 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 cacheKeys = redis.scan(cacheKey + "_*"); + List totalRecordList = new ArrayList(); + for (int i = 0; i < cacheKeys.size(); i++) { + totalRecordList.addAll((List) 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()); @@ -460,7 +451,6 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor { cmder.streamByeCmd(streamInfo.getStreamId()); } } - } catch (ParseException | SipException | InvalidArgumentException | DocumentException e) { e.printStackTrace(); } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java index 4faab0ef..26764697 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java @@ -144,10 +144,10 @@ public class RegisterRequestProcessor extends SIPRequestAbstractProcessor { 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); diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java index ce3d6584..e6a6066f 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java @@ -66,5 +66,4 @@ public interface DeviceMapper { @Delete("DELETE FROM device WHERE deviceId=#{deviceId}") int del(String deviceId); - } diff --git a/web_src/src/components/platformEdit.vue b/web_src/src/components/platformEdit.vue index 76697d29..2eafb332 100644 --- a/web_src/src/components/platformEdit.vue +++ b/web_src/src/components/platformEdit.vue @@ -74,7 +74,7 @@ - + @@ -245,6 +245,11 @@ export default { }); return result; }, + checkExpires: function() { + if (this.platform.enable && this.platform.expires == "0") { + this.platform.expires = "300"; + } + } }, };