From a1398a56cc3587f08c28032a5c00f4c71b48e4f7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 02 十二月 2021 09:33:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 82 ++++++++++++++++++++++++++++++++++------
1 files changed, 69 insertions(+), 13 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 6600a75..9ad44d4 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,14 +1,12 @@
package com.genersoft.iot.vmp.storager.impl;
-import java.text.SimpleDateFormat;
-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.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;
@@ -18,14 +16,18 @@
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 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
*/
@@ -71,6 +73,9 @@
@Autowired
private VideoStreamSessionManager streamSession;
+ @Autowired
+ private MediaServerMapper mediaServerMapper;
+
private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -106,7 +111,7 @@
*/
@Override
public synchronized boolean updateDevice(Device device) {
- String now = this.format.format(new Date(System.currentTimeMillis()));
+ String now = this.format.format(System.currentTimeMillis());
device.setUpdateTime(now);
Device deviceByDeviceId = deviceMapper.getDeviceByDeviceId(device.getDeviceId());
if (deviceByDeviceId == null) {
@@ -123,7 +128,7 @@
String channelId = channel.getChannelId();
channel.setDeviceId(deviceId);
channel.setStreamId(streamSession.getStreamId(deviceId, channel.getChannelId()));
- String now = this.format.format(new Date(System.currentTimeMillis()));
+ String now = this.format.format(System.currentTimeMillis());
channel.setUpdateTime(now);
DeviceChannel deviceChannel = deviceChannelMapper.queryChannel(deviceId, channelId);
if (deviceChannel == null) {
@@ -132,6 +137,16 @@
}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
@@ -180,6 +195,11 @@
return deviceChannelMapper.queryChannel(deviceId, channelId);
}
+
+ @Override
+ public int delChannel(String deviceId, String channelId) {
+ return deviceChannelMapper.del(deviceId, channelId);
+ }
/**
* 鑾峰彇澶氫釜璁惧
@@ -460,6 +480,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) {
//浜嬪姟鍥炴粴
@@ -468,6 +490,7 @@
result = true;
dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
}catch (Exception e) {
+ logger.error("鍚戞暟鎹簱娣诲姞娴佷唬鐞嗗け璐ワ細", e);
dataSourceTransactionManager.rollback(transactionStatus);
}
return result;
@@ -582,8 +605,8 @@
}
@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
@@ -592,12 +615,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