From a29a0a0785f966294ba01982fba62c1ff0f23bea Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期四, 22 四月 2021 17:33:07 +0800
Subject: [PATCH] 增加对设备的兼容性
---
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 85 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 76 insertions(+), 9 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 b2756e2..8354b56 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
@@ -2,11 +2,14 @@
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.StreamProxyItem;
+import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.*;
-import com.genersoft.iot.vmp.vmanager.platform.bean.ChannelReduce;
+import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -54,7 +57,13 @@
private StreamProxyMapper streamProxyMapper;
@Autowired
+ private StreamPushMapper streamPushMapper;
+
+ @Autowired
private GbStreamMapper gbStreamMapper;
+
+ @Autowired
+ private VideoStreamSessionManager streamSession;
/**
@@ -102,6 +111,7 @@
public synchronized void updateChannel(String deviceId, DeviceChannel channel) {
String channelId = channel.getChannelId();
channel.setDeviceId(deviceId);
+ channel.setStreamId(streamSession.getStreamId(deviceId, channel.getChannelId()));
DeviceChannel deviceChannel = deviceChannelMapper.queryChannel(deviceId, channelId);
if (deviceChannel == null) {
deviceChannelMapper.add(channel);
@@ -191,9 +201,22 @@
*/
@Override
public boolean delete(String deviceId) {
- int result = deviceMapper.del(deviceId);
-
- return result > 0;
+ TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
+ boolean result = false;
+ try {
+ if (platformChannelMapper.delChannelForDeviceId(deviceId) <0 // 鍒犻櫎涓庡浗鏍囧钩鍙扮殑鍏宠仈
+ || deviceChannelMapper.cleanChannelsByDeviceId(deviceId) < 0 // 鍒犻櫎浠栫殑閫氶亾
+ || deviceMapper.del(deviceId) < 0 // 绉婚櫎璁惧淇℃伅
+ ) {
+ //浜嬪姟鍥炴粴
+ dataSourceTransactionManager.rollback(transactionStatus);
+ }
+ result = true;
+ dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
+ }catch (Exception e) {
+ dataSourceTransactionManager.rollback(transactionStatus);
+ }
+ return result;
}
/**
@@ -221,9 +244,10 @@
*/
@Override
public synchronized boolean outline(String deviceId) {
+ System.out.println("鏇存柊璁惧绂荤嚎: " + deviceId);
Device device = deviceMapper.getDeviceByDeviceId(deviceId);
+ if (device == null) return false;
device.setOnline(0);
- System.out.println("鏇存柊璁惧绂荤嚎");
return deviceMapper.update(device) > 0;
}
@@ -266,15 +290,21 @@
public boolean updateParentPlatform(ParentPlatform parentPlatform) {
int result = 0;
ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(parentPlatform.getServerGBId()); // .getDeviceGBId());
- if ( platformMapper.getParentPlatById(parentPlatform.getServerGBId()) == null) {
+ if (parentPlatform.getId() == null ) {
result = platformMapper.addParentPlatform(parentPlatform);
-
if (parentPlatformCatch == null) {
parentPlatformCatch = new ParentPlatformCatch();
parentPlatformCatch.setParentPlatform(parentPlatform);
parentPlatformCatch.setId(parentPlatform.getServerGBId());
}
}else {
+ if (parentPlatformCatch == null) { // serverGBId 宸插彉鍖�
+ ParentPlatform parentPlatById = platformMapper.getParentPlatById(parentPlatform.getId());
+ // 浣跨敤鏃х殑鏌ュ嚭缂撳瓨ID
+ parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(parentPlatById.getServerGBId());
+ parentPlatformCatch.setId(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformCatchInfo(parentPlatById.getServerGBId());
+ }
result = platformMapper.updateParentPlatform(parentPlatform);
}
// 鏇存柊缂撳瓨
@@ -300,8 +330,8 @@
}
@Override
- public ParentPlatform queryParentPlatById(String platformGbId) {
- return platformMapper.getParentPlatById(platformGbId);
+ public ParentPlatform queryParentPlatByServerGBId(String platformGbId) {
+ return platformMapper.getParentPlatByServerGBId(platformGbId);
}
@Override
@@ -403,6 +433,7 @@
TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
boolean result = false;
streamProxyItem.setStreamType("proxy");
+ streamProxyItem.setStatus(true);
try {
if (gbStreamMapper.add(streamProxyItem)<0 || streamProxyMapper.add(streamProxyItem) < 0) {
//浜嬪姟鍥炴粴
@@ -434,6 +465,7 @@
dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
result = true;
}catch (Exception e) {
+ e.printStackTrace();
dataSourceTransactionManager.rollback(transactionStatus);
}
return result;
@@ -504,4 +536,39 @@
public StreamProxyItem queryStreamProxy(String app, String stream){
return streamProxyMapper.selectOne(app, stream);
}
+
+ @Override
+ public void updateMediaList(List<StreamPushItem> streamPushItems) {
+ if (streamPushItems == null || streamPushItems.size() == 0) return;
+ System.out.printf("updateMediaList: " + streamPushItems.size());
+ streamPushMapper.addAll(streamPushItems);
+ // TODO 寰呬紭鍖�
+ for (int i = 0; i < streamPushItems.size(); i++) {
+ gbStreamMapper.setStatus(streamPushItems.get(i).getApp(), streamPushItems.get(i).getStream(), true);
+ }
+ }
+
+ @Override
+ public void updateMedia(StreamPushItem streamPushItem) {
+ streamPushMapper.del(streamPushItem.getApp(), streamPushItem.getStream());
+ streamPushMapper.add(streamPushItem);
+ gbStreamMapper.setStatus(streamPushItem.getApp(), streamPushItem.getStream(), true);
+ }
+
+ @Override
+ public void removeMedia(String app, String stream) {
+ streamPushMapper.del(app, stream);
+ }
+
+ @Override
+ public void clearMediaList() {
+ streamPushMapper.clear();
+ }
+
+ @Override
+ public void mediaOutline(String app, String streamId) {
+ gbStreamMapper.setStatus(app, streamId, false);
+ }
+
+
}
--
Gitblit v1.8.0