From 019827fd35f84465ee503fcc248b12a045da44d2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 29 十一月 2021 18:09:49 +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 | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 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 990f4e5..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.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,11 +16,15 @@
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瀹炵幇
@@ -138,6 +140,16 @@
}
@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
public void startPlay(String deviceId, String channelId, String streamId) {
deviceChannelMapper.startPlay(deviceId, channelId, streamId);
}
@@ -183,6 +195,11 @@
return deviceChannelMapper.queryChannel(deviceId, channelId);
}
+
+ @Override
+ public int delChannel(String deviceId, String channelId) {
+ return deviceChannelMapper.del(deviceId, channelId);
+ }
/**
* 鑾峰彇澶氫釜璁惧
@@ -588,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
@@ -598,8 +615,8 @@
}
@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
@@ -624,8 +641,9 @@
return streamProxyMapper.selectForEnableInMediaServer(id, enable);
}
+
@Override
- public Device queryVideoDeviceByChannelId(String channelId) {
+ public Device queryVideoDeviceByChannelId( String channelId) {
Device result = null;
List<DeviceChannel> channelList = deviceChannelMapper.queryChannelByChannelId(channelId);
if (channelList.size() == 1) {
@@ -633,4 +651,9 @@
}
return result;
}
+
+ @Override
+ public StreamProxyItem getStreamProxyByAppAndStream(String app, String streamId) {
+ return streamProxyMapper.selectOne(app, streamId);
+ }
}
--
Gitblit v1.8.0