From 381b3d15caa30e99c75f58a366b3b75cbbf01450 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 07 十二月 2021 11:40:17 +0800
Subject: [PATCH] 修复未结束的推流无法下载
---
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 141 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 130 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
index 7e206bf..a5a4be7 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
@@ -1,13 +1,13 @@
package com.genersoft.iot.vmp.storager.impl;
-import java.util.*;
-
-import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
+import com.genersoft.iot.vmp.service.IGbStreamService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.storager.dao.*;
import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
import com.github.pagehelper.PageHelper;
@@ -17,14 +17,19 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.stereotype.Component;
-
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
- * @Description:瑙嗛璁惧鏁版嵁瀛樺偍-jdbc瀹炵幇
+ * @description:瑙嗛璁惧鏁版嵁瀛樺偍-jdbc瀹炵幇
* @author: swwheihei
* @date: 2020骞�5鏈�6鏃� 涓嬪崍2:31:42
*/
@@ -66,9 +71,24 @@
@Autowired
private GbStreamMapper gbStreamMapper;
+;
+
+ @Autowired
+ private PlatformGbStreamMapper platformGbStreamMapper;
+
+ @Autowired
+ private IGbStreamService gbStreamService;
+
+ @Autowired
+ private ParentPlatformMapper parentPlatformMapper;
@Autowired
private VideoStreamSessionManager streamSession;
+
+ @Autowired
+ private MediaServerMapper mediaServerMapper;
+
+ private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
/**
@@ -103,8 +123,11 @@
*/
@Override
public synchronized boolean updateDevice(Device device) {
+ String now = this.format.format(System.currentTimeMillis());
+ device.setUpdateTime(now);
Device deviceByDeviceId = deviceMapper.getDeviceByDeviceId(device.getDeviceId());
if (deviceByDeviceId == null) {
+ device.setCreateTime(now);
return deviceMapper.add(device) > 0;
}else {
return deviceMapper.update(device) > 0;
@@ -117,12 +140,25 @@
String channelId = channel.getChannelId();
channel.setDeviceId(deviceId);
channel.setStreamId(streamSession.getStreamId(deviceId, channel.getChannelId()));
+ String now = this.format.format(System.currentTimeMillis());
+ channel.setUpdateTime(now);
DeviceChannel deviceChannel = deviceChannelMapper.queryChannel(deviceId, channelId);
if (deviceChannel == null) {
+ channel.setCreateTime(now);
deviceChannelMapper.add(channel);
}else {
deviceChannelMapper.update(channel);
}
+ }
+
+ @Override
+ public void deviceChannelOnline(String deviceId, String channelId) {
+ deviceChannelMapper.online(deviceId, channelId);
+ }
+
+ @Override
+ public void deviceChannelOffline(String deviceId, String channelId) {
+ deviceChannelMapper.offline(deviceId, channelId);
}
@Override
@@ -171,6 +207,11 @@
return deviceChannelMapper.queryChannel(deviceId, channelId);
}
+
+ @Override
+ public int delChannel(String deviceId, String channelId) {
+ return deviceChannelMapper.del(deviceId, channelId);
+ }
/**
* 鑾峰彇澶氫釜璁惧
@@ -257,6 +298,18 @@
}
/**
+ * 鏇存柊鎵�鏈夎澶囩绾�
+ *
+ * @return true锛氭洿鏂版垚鍔� false锛氭洿鏂板け璐�
+ */
+ @Override
+ public synchronized boolean outlineForAll() {
+ logger.info("鏇存柊鎵�鏈夎澶囩绾�");
+ int result = deviceMapper.outlineForAll();
+ return result > 0;
+ }
+
+ /**
* 娓呯┖閫氶亾
* @param deviceId
*/
@@ -315,6 +368,15 @@
// 鏇存柊缂撳瓨
parentPlatformCatch.setParentPlatform(parentPlatform);
redisCatchStorage.updatePlatformCatchInfo(parentPlatformCatch);
+ // 鍏变韩鎵�鏈夎棰戞祦锛岄渶瑕佸皢鐜版湁瑙嗛娴佹坊鍔犲埌姝ゅ钩鍙�
+ List<GbStream> gbStreams = gbStreamMapper.selectAll();
+ if (gbStreams.size() > 0) {
+ if (parentPlatform.isShareAllLiveStream()) {
+ gbStreamService.addPlatformInfo(gbStreams, parentPlatform.getServerGBId());
+ }else {
+ gbStreamService.delPlatformInfo(gbStreams);
+ }
+ }
return result > 0;
}
@@ -439,6 +501,8 @@
boolean result = false;
streamProxyItem.setStreamType("proxy");
streamProxyItem.setStatus(true);
+ String now = this.format.format(System.currentTimeMillis());
+ streamProxyItem.setCreateTime(now);
try {
if (gbStreamMapper.add(streamProxyItem)<0 || streamProxyMapper.add(streamProxyItem) < 0) {
//浜嬪姟鍥炴粴
@@ -447,8 +511,11 @@
result = true;
dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
}catch (Exception e) {
+ logger.error("鍚戞暟鎹簱娣诲姞娴佷唬鐞嗗け璐ワ細", e);
dataSourceTransactionManager.rollback(transactionStatus);
}
+
+
return result;
}
@@ -517,7 +584,7 @@
* @return
*/
@Override
- public GbStream queryStreamInParentPlatform(String platformId, String gbId) {
+ public List<GbStream> queryStreamInParentPlatform(String platformId, String gbId) {
return gbStreamMapper.queryStreamInPlatform(platformId, gbId);
}
@@ -558,11 +625,27 @@
streamPushMapper.del(streamPushItem.getApp(), streamPushItem.getStream());
streamPushMapper.add(streamPushItem);
gbStreamMapper.setStatus(streamPushItem.getApp(), streamPushItem.getStream(), true);
+ if(!StringUtils.isEmpty(streamPushItem.getGbId() )){
+ // 鏌ユ壘寮�鍚簡鍏ㄩ儴鐩存挱娴佸叡浜殑涓婄骇骞冲彴
+ List<ParentPlatform> parentPlatforms = parentPlatformMapper.selectAllAhareAllLiveStream();
+ if (parentPlatforms.size() > 0) {
+ for (ParentPlatform parentPlatform : parentPlatforms) {
+ streamPushItem.setPlatformId(parentPlatform.getServerGBId());
+ String stream = streamPushItem.getStream();
+ StreamProxyItem streamProxyItems = platformGbStreamMapper.selectOne(streamPushItem.getApp(), stream, parentPlatform.getServerGBId());
+ if (streamProxyItems == null) {
+ platformGbStreamMapper.add(streamPushItem);
+ }
+
+ }
+ }
+ }
+
}
@Override
- public void removeMedia(String app, String stream) {
- streamPushMapper.del(app, stream);
+ public int removeMedia(String app, String stream) {
+ return streamPushMapper.del(app, stream);
}
@Override
@@ -571,9 +654,45 @@
}
@Override
- public void mediaOutline(String app, String streamId) {
- gbStreamMapper.setStatus(app, streamId, false);
+ public int mediaOutline(String app, String streamId) {
+ return gbStreamMapper.setStatus(app, streamId, false);
+ }
+
+ @Override
+ public void updateParentPlatformStatus(String platformGbID, boolean online) {
+ platformMapper.updateParentPlatformStatus(platformGbID, online);
+ }
+
+ @Override
+ public void updateMediaServer(MediaServerItem mediaServerItem) {
+ String now = this.format.format(System.currentTimeMillis());
+ mediaServerItem.setUpdateTime(now);
+ if (mediaServerMapper.queryOne(mediaServerItem.getId()) != null) {
+ mediaServerMapper.update(mediaServerItem);
+ }else {
+ mediaServerItem.setCreateTime(now);
+ mediaServerMapper.add(mediaServerItem);
+ }
+ }
+
+ @Override
+ public List<StreamProxyItem> getStreamProxyListForEnableInMediaServer(String id, boolean enable) {
+ return streamProxyMapper.selectForEnableInMediaServer(id, enable);
}
+ @Override
+ public Device queryVideoDeviceByChannelId( String channelId) {
+ Device result = null;
+ List<DeviceChannel> channelList = deviceChannelMapper.queryChannelByChannelId(channelId);
+ if (channelList.size() == 1) {
+ result = deviceMapper.getDeviceByDeviceId(channelList.get(0).getDeviceId());
+ }
+ return result;
+ }
+
+ @Override
+ public StreamProxyItem getStreamProxyByAppAndStream(String app, String streamId) {
+ return streamProxyMapper.selectOne(app, streamId);
+ }
}
--
Gitblit v1.8.0