wvp-pro.git - Gitblit

			@@ -164,8 +164,8 @@
			throw new ControllerException(ErrorCode.ERROR100.getCode(), "未找到可用的流媒体");
			}
			JSONObject result = assistRESTfulUtils.queryTaskList(mediaServerItem, app, stream, callId, taskId, isEnd);
			if (result.getInteger("code") != 0) {
			throw new ControllerException(result.getInteger("code"), result.getString("msg"));
			if (result == null \|\| result.getInteger("code") != 0) {
			throw new ControllerException(ErrorCode.ERROR100.getCode(), result.getString("msg"));
			}
			return result.getJSONArray("data");
			}

			@@ -13,6 +13,7 @@
			import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
			import com.genersoft.iot.vmp.service.IMediaServerService;
			import com.genersoft.iot.vmp.service.bean.*;
			import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
			import com.genersoft.iot.vmp.utils.redis.RedisUtil;
			import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
			import org.slf4j.Logger;
			@@ -76,6 +77,9 @@

			@Autowired
			private IMediaServerService mediaServerService;

			@Autowired
			private IRedisCatchStorage redisCatchStorage;


			@Autowired
			@@ -322,6 +326,7 @@
			responseSendItemMsg.setSendRtpItem(sendRtpItem);
			responseSendItemMsg.setMediaServerItem(mediaServerItem);
			result.setData(responseSendItemMsg);
			redisCatchStorage.updateSendRTPSever(sendRtpItem);

			WvpRedisMsg response = WvpRedisMsg.getResponseInstance(
			userSetting.getServerId(), toId, WvpRedisMsgCmd.GET_SEND_ITEM, serial, JSON.toJSONString(result)

			@@ -73,12 +73,20 @@
			MessageForPushChannel pushChannel = JSON.parseObject(message.getBody(), MessageForPushChannel.class);
			StreamPushItem push = streamPushService.getPush(pushChannel.getApp(), pushChannel.getStream());
			if (push != null) {
			if (redisCatchStorage.isChannelSendingRTP(push.getGbId())) {
			List<SendRtpItem> sendRtpItems = redisCatchStorage.querySendRTPServerByChnnelId(
			push.getGbId());
			if (sendRtpItems.size() > 0) {
			for (SendRtpItem sendRtpItem : sendRtpItems) {
			ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(sendRtpItem.getPlatformId());
			List<SendRtpItem> sendRtpItems = redisCatchStorage.querySendRTPServerByChnnelId(
			push.getGbId());
			if (!sendRtpItems.isEmpty()) {
			for (SendRtpItem sendRtpItem : sendRtpItems) {
			ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(sendRtpItem.getPlatformId());
			if (parentPlatform != null) {
			redisCatchStorage.deleteSendRTPServer(sendRtpItem.getPlatformId(), sendRtpItem.getChannelId(), sendRtpItem.getCallId(), sendRtpItem.getStreamId());
			try {
			commanderFroPlatform.streamByeCmd(parentPlatform, sendRtpItem);
			} catch (SipException \| InvalidArgumentException \| ParseException e) {
			logger.error("[命令发送失败] 国标级联发送BYE: {}", e.getMessage());
			}
			}
			if (push.isSelf()) {
			// 停止向上级推流
			String streamId = sendRtpItem.getStreamId();
			Map<String, Object> param = new HashMap<>();
			@@ -90,12 +98,6 @@
			MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
			redisCatchStorage.deleteSendRTPServer(sendRtpItem.getPlatformId(), sendRtpItem.getChannelId(), sendRtpItem.getCallId(), sendRtpItem.getStreamId());
			zlmServerFactory.stopSendRtpStream(mediaInfo, param);

			try {
			commanderFroPlatform.streamByeCmd(parentPlatform, sendRtpItem);
			} catch (SipException \| InvalidArgumentException \| ParseException e) {
			logger.error("[命令发送失败] 国标级联发送BYE: {}", e.getMessage());
			}
			if (InviteStreamType.PUSH == sendRtpItem.getPlayType()) {
			MessageForPushChannel messageForPushChannel = MessageForPushChannel.getInstance(0,
			sendRtpItem.getApp(), sendRtpItem.getStreamId(), sendRtpItem.getChannelId(),

	src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史