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

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) {
+			String ssrc = streamSession.createPlaySsrc();
-				ssrc = String.format("gb_play_%s_%s", device.getDeviceId(), channelId);
-			}else {
-				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 = String.format("gb_playback_%s_%s", device.getDeviceId(), channelId);
-				streamId = ssrc;
 			}else {
-				ssrc = streamSession.createPlayBackSsrc();
 				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 @@ 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<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());
@@ -460,7 +451,6 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
 					cmder.streamByeCmd(streamInfo.getStreamId());
 				}
 			}
-
 		} catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
 			e.printStackTrace();
 		}

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);

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);
-
 }

web_src/src/components/platformEdit.vue

@@ -74,7 +74,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="其他选项">
-                <el-checkbox label="启用" v-model="platform.enable"></el-checkbox>
+                <el-checkbox label="启用" v-model="platform.enable" @change="checkExpires"></el-checkbox>
                 <el-checkbox label="云台控制" v-model="platform.PTZEnable"></el-checkbox>
                 <el-checkbox label="RTCP保活" v-model="platform.rtcp"></el-checkbox>
               </el-form-item>
@@ -245,6 +245,11 @@ export default {
         });
       return result;
     },
+    checkExpires: function() {
+      if (this.platform.enable && this.platform.expires == "0") {
+        this.platform.expires = "300";
+      }
+    }
   },
 };
 </script>