修复合并分支造成的bug

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java

@@ -364,8 +364,6 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
 					}
 
 					// 写入redis， 超时时回复
-					redisCatchStorage.updateSendRTPSever(sendRtpItem);
-
 					sendRtpItem.setStatus(1);
 					redisCatchStorage.updateSendRTPSever(sendRtpItem);
 					StringBuffer content = new StringBuffer(200);

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

@@ -117,7 +117,7 @@ public class PlayServiceImpl implements IPlayService {
             // 点播超时回复BYE
             cmder.streamByeCmd(device.getDeviceId(), channelId, streamInfo.getStream());
             // 释放rtpserver
-            mediaServerService.closeRTPServer(playResult.getDevice(), channelId, streamInfo.getStream());
+            mediaServerService.closeRTPServer(playResult.getDevice().getDeviceId(), channelId, streamInfo.getStream());
             // 回复之前所有的点播请求
             resultHolder.invokeAllResult(msg);
             // TODO 释放ssrc