From 69d9692f6194d1e03ec81cf87ea8f0e7a62f7173 Mon Sep 17 00:00:00 2001
From: wangyimeng <421132955@qq.com>
Date: 星期三, 16 三月 2022 15:27:12 +0800
Subject: [PATCH] 删除重复字段
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java | 143 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 118 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
index 0541124..c1c7e24 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
@@ -2,9 +2,15 @@
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.conf.SipConfig;
+import com.genersoft.iot.vmp.conf.UserSetup;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
+import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
+import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
@@ -27,8 +33,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
/**
* 瑙嗛浠ｇ悊涓氬姟
@@ -51,10 +56,25 @@
private StreamProxyMapper streamProxyMapper;
@Autowired
+ private IRedisCatchStorage redisCatchStorage;
+
+ @Autowired
+ private IVideoManagerStorager storager;
+
+ @Autowired
+ private UserSetup userSetup;
+
+ @Autowired
+ private SipConfig sipConfig;
+
+ @Autowired
private GbStreamMapper gbStreamMapper;
@Autowired
private PlatformGbStreamMapper platformGbStreamMapper;
+
+ @Autowired
+ private EventPublisher eventPublisher;
@Autowired
private ParentPlatformMapper parentPlatformMapper;
@@ -98,23 +118,22 @@
result.append("淇濆瓨鎴愬姛");
if (param.isEnable()) {
JSONObject jsonObject = addStreamProxyToZlm(param);
- if (jsonObject == null) {
+ if (jsonObject == null || jsonObject.getInteger("code") != 0) {
streamLive = false;
result.append(", 浣嗘槸鍚敤澶辫触锛岃妫�鏌ユ祦鍦板潃鏄惁鍙敤");
param.setEnable(false);
- videoManagerStorager.updateStreamProxy(param);
- }else {
- Integer code = jsonObject.getInteger("code");
- if (code == 0) {
- streamLive = true;
- StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(
- mediaInfo, param.getApp(), param.getStream(), null);
- wvpResult.setData(streamInfo);
+ // 鐩存帴绉婚櫎
+ if (param.isEnable_remove_none_reader()) {
+ del(param.getApp(), param.getStream());
}else {
- result.append(", 浣嗘槸鍚敤澶辫触锛岃妫�鏌ユ祦鍦板潃鏄惁鍙敤");
- param.setEnable(false);
videoManagerStorager.updateStreamProxy(param);
}
+
+ }else {
+ streamLive = true;
+ StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(
+ mediaInfo, param.getApp(), param.getStream(), null, null);
+ wvpResult.setData(streamInfo);
}
}
@@ -124,24 +143,29 @@
if ( !StringUtils.isEmpty(param.getPlatformGbId()) && streamLive) {
List<GbStream> gbStreams = new ArrayList<>();
gbStreams.add(param);
- if (gbStreamService.addPlatformInfo(gbStreams, param.getPlatformGbId())){
+ if (gbStreamService.addPlatformInfo(gbStreams, param.getPlatformGbId(), param.getCatalogId())){
result.append(", 鍏宠仈鍥芥爣骞冲彴[ " + param.getPlatformGbId() + " ]鎴愬姛");
}else {
result.append(", 鍏宠仈鍥芥爣骞冲彴[ " + param.getPlatformGbId() + " ]澶辫触");
}
}
- // 鏌ユ壘寮�鍚簡鍏ㄩ儴鐩存挱娴佸叡浜殑涓婄骇骞冲彴
- List<ParentPlatform> parentPlatforms = parentPlatformMapper.selectAllAhareAllLiveStream();
- if (parentPlatforms.size() > 0) {
- for (ParentPlatform parentPlatform : parentPlatforms) {
- param.setPlatformId(parentPlatform.getServerGBId());
- String stream = param.getStream();
- StreamProxyItem streamProxyItems = platformGbStreamMapper.selectOne(param.getApp(), stream, parentPlatform.getServerGBId());
- if (streamProxyItems == null) {
- platformGbStreamMapper.add(param);
+ if (!StringUtils.isEmpty(param.getGbId())) {
+ // 鏌ユ壘寮�鍚簡鍏ㄩ儴鐩存挱娴佸叡浜殑涓婄骇骞冲彴
+ List<ParentPlatform> parentPlatforms = parentPlatformMapper.selectAllAhareAllLiveStream();
+ if (parentPlatforms.size() > 0) {
+ for (ParentPlatform parentPlatform : parentPlatforms) {
+ param.setPlatformId(parentPlatform.getServerGBId());
+ param.setCatalogId(parentPlatform.getCatalogId());
+ String stream = param.getStream();
+ StreamProxyItem streamProxyItems = platformGbStreamMapper.selectOne(param.getApp(), stream, parentPlatform.getServerGBId());
+ if (streamProxyItems == null) {
+ platformGbStreamMapper.add(param);
+ eventPublisher.catalogEventPublishForStream(parentPlatform.getServerGBId(), param, CatalogEvent.ADD);
+ }
}
}
}
+
wvpResult.setMsg(result.toString());
return wvpResult;
}
@@ -155,6 +179,9 @@
return null;
}else {
mediaServerItem = mediaServerService.getOne(param.getMediaServerId());
+ }
+ if (mediaServerItem == null) {
+ return null;
}
if ("default".equals(param.getType())){
result = zlmresTfulUtils.addStreamProxy(mediaServerItem, param.getApp(), param.getStream(), param.getUrl(),
@@ -184,6 +211,7 @@
public void del(String app, String stream) {
StreamProxyItem streamProxyItem = videoManagerStorager.queryStreamProxy(app, stream);
if (streamProxyItem != null) {
+ gbStreamService.sendCatalogMsg(streamProxyItem, CatalogEvent.DEL);
videoManagerStorager.deleteStreamProxy(app, stream);
JSONObject jsonObject = removeStreamProxyFromZlm(streamProxyItem);
if (jsonObject != null && jsonObject.getInteger("code") == 0) {
@@ -192,7 +220,9 @@
platformGbStreamMapper.delByAppAndStream(app, stream);
// TODO 濡傛灉鍏宠仈鐨勬帹娴侊紝 閭ｄ箞鐘舵�佽缃负绂荤嚎
}
+ redisCatchStorage.removeStream(streamProxyItem.getMediaServerId(), "PULL", app, stream);
}
+
}
@@ -218,7 +248,7 @@
StreamProxyItem streamProxyDto = videoManagerStorager.queryStreamProxy(app, stream);
if (streamProxyDto != null && streamProxyDto.isEnable()) {
JSONObject jsonObject = removeStreamProxyFromZlm(streamProxyDto);
- if (jsonObject.getInteger("code") == 0) {
+ if (null==jsonObject.getInteger("code") || jsonObject.getInteger("code") == 0) {
streamProxyDto.setEnable(false);
result = videoManagerStorager.updateStreamProxy(streamProxyDto);
}
@@ -240,7 +270,6 @@
}
}
}
-
return result;
}
@@ -249,4 +278,68 @@
public StreamProxyItem getStreamProxyByAppAndStream(String app, String streamId) {
return videoManagerStorager.getStreamProxyByAppAndStream(app, streamId);
}
+
+ @Override
+ public void zlmServerOnline(String mediaServerId) {
+ // 绉婚櫎寮�鍚簡鏃犱汉瑙傜湅鑷姩绉婚櫎鐨勬祦
+ List<StreamProxyItem> streamProxyItemList = streamProxyMapper.selecAutoRemoveItemByMediaServerId(mediaServerId);
+ if (streamProxyItemList.size() > 0) {
+ gbStreamMapper.batchDel(streamProxyItemList);
+ }
+ streamProxyMapper.deleteAutoRemoveItemByMediaServerId(mediaServerId);
+
+ // 鎭㈠娴佷唬鐞�, 鍙煡鎵捐繖涓繖涓祦濯掍綋
+ List<StreamProxyItem> streamProxyListForEnable = storager.getStreamProxyListForEnableInMediaServer(
+ mediaServerId, true, false);
+ for (StreamProxyItem streamProxyDto : streamProxyListForEnable) {
+ logger.info("鎭㈠娴佷唬鐞嗭紝" + streamProxyDto.getApp() + "/" + streamProxyDto.getStream());
+ JSONObject jsonObject = addStreamProxyToZlm(streamProxyDto);
+ if (jsonObject == null) {
+ // 璁剧疆涓虹绾�
+ logger.info("鎭㈠娴佷唬鐞嗗け璐�" + streamProxyDto.getApp() + "/" + streamProxyDto.getStream());
+ updateStatus(false, streamProxyDto.getApp(), streamProxyDto.getStream());
+ }else {
+ updateStatus(true, streamProxyDto.getApp(), streamProxyDto.getStream());
+ }
+ }
+ }
+
+ @Override
+ public void zlmServerOffline(String mediaServerId) {
+ // 绉婚櫎寮�鍚簡鏃犱汉瑙傜湅鑷姩绉婚櫎鐨勬祦
+ List<StreamProxyItem> streamProxyItemList = streamProxyMapper.selecAutoRemoveItemByMediaServerId(mediaServerId);
+ if (streamProxyItemList.size() > 0) {
+ gbStreamMapper.batchDel(streamProxyItemList);
+ }
+ streamProxyMapper.deleteAutoRemoveItemByMediaServerId(mediaServerId);
+ // 鍏朵粬鐨勬祦璁剧疆绂荤嚎
+ streamProxyMapper.updateStatusByMediaServerId(false, mediaServerId);
+ String type = "PULL";
+
+ // 鍙戦�乺edis娑堟伅
+ List<MediaItem> mediaItems = redisCatchStorage.getStreams(mediaServerId, type);
+ if (mediaItems.size() > 0) {
+ for (MediaItem mediaItem : mediaItems) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("serverId", userSetup.getServerId());
+ jsonObject.put("app", mediaItem.getApp());
+ jsonObject.put("stream", mediaItem.getStream());
+ jsonObject.put("register", false);
+ jsonObject.put("mediaServerId", mediaServerId);
+ redisCatchStorage.sendStreamChangeMsg(type, jsonObject);
+ // 绉婚櫎redis鍐呮祦鐨勪俊鎭�
+ redisCatchStorage.removeStream(mediaServerId, type, mediaItem.getApp(), mediaItem.getStream());
+ }
+ }
+ }
+
+ @Override
+ public void clean() {
+
+ }
+
+ @Override
+ public int updateStatus(boolean status, String app, String stream) {
+ return streamProxyMapper.updateStatus(status, app, stream);
+ }
}
--
Gitblit v1.8.0