648540858
GitHub
commit
9d37b411ec
|
|
@ -717,7 +717,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
|
|||
try {
|
||||
if (streamProxyMapper.add(streamProxyItem) > 0) {
|
||||
if (!StringUtils.isEmpty(streamProxyItem.getGbId())) {
|
||||
if (gbStreamMapper.add(streamProxyItem) > 0) {
|
||||
if (gbStreamMapper.add(streamProxyItem) < 0) {
|
||||
//事务回滚
|
||||
dataSourceTransactionManager.rollback(transactionStatus);
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@ public class PlatformController {
|
|||
|
||||
/**
|
||||
* 获取国标服务的配置
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation("获取国标服务的配置")
|
||||
|
|
@ -65,8 +66,10 @@ public class PlatformController {
|
|||
result.put("password", sipConfig.getPassword());
|
||||
return new ResponseEntity<>(result, HttpStatus.OK);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取级联服务器信息
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation("获取国标服务的配置")
|
||||
|
|
@ -87,6 +90,7 @@ public class PlatformController {
|
|||
|
||||
/**
|
||||
* 分页查询级联平台
|
||||
*
|
||||
* @param page 当前页
|
||||
* @param count 每页条数
|
||||
* @return
|
||||
|
|
@ -107,6 +111,7 @@ public class PlatformController {
|
|||
|
||||
/**
|
||||
* 添加上级平台信息
|
||||
*
|
||||
* @param parentPlatform
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -154,7 +159,7 @@ public class PlatformController {
|
|||
if (updateResult) {
|
||||
// 保存时启用就发送注册
|
||||
if (parentPlatform.isEnable()) {
|
||||
if (parentPlatformOld.isStatus()) {
|
||||
if (parentPlatformOld != null && parentPlatformOld.isStatus()) {
|
||||
commanderForPlatform.unregister(parentPlatformOld, null, eventResult -> {
|
||||
// 只要保存就发送注册
|
||||
commanderForPlatform.register(parentPlatform, null, null);
|
||||
|
|
@ -179,6 +184,7 @@ public class PlatformController {
|
|||
|
||||
/**
|
||||
* 保存上级平台信息
|
||||
*
|
||||
* @param parentPlatform
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -244,6 +250,7 @@ public class PlatformController {
|
|||
|
||||
/**
|
||||
* 删除上级平台
|
||||
*
|
||||
* @param serverGBId 上级平台国标ID
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -291,6 +298,7 @@ public class PlatformController {
|
|||
|
||||
/**
|
||||
* 查询上级平台是否存在
|
||||
*
|
||||
* @param serverGBId 上级平台国标ID
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -311,6 +319,7 @@ public class PlatformController {
|
|||
|
||||
/**
|
||||
* 分页查询级联平台的所有所有通道
|
||||
*
|
||||
* @param page 当前页
|
||||
* @param count 每页条数
|
||||
* @param platformId 上级平台ID
|
||||
|
|
@ -358,6 +367,7 @@ public class PlatformController {
|
|||
|
||||
/**
|
||||
* 向上级平台添加国标通道
|
||||
*
|
||||
* @param param 通道关联参数
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -379,6 +389,7 @@ public class PlatformController {
|
|||
|
||||
/**
|
||||
* 从上级平台移除国标通道
|
||||
*
|
||||
* @param param 通道关联参数
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -400,6 +411,7 @@ public class PlatformController {
|
|||
|
||||
/**
|
||||
* 获取目录
|
||||
*
|
||||
* @param platformId 平台ID
|
||||
* @param parentId 目录父ID
|
||||
* @return
|
||||
|
|
@ -432,6 +444,7 @@ public class PlatformController {
|
|||
|
||||
/**
|
||||
* 添加目录
|
||||
*
|
||||
* @param platformCatalog 目录
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -469,6 +482,7 @@ public class PlatformController {
|
|||
|
||||
/**
|
||||
* 编辑目录
|
||||
*
|
||||
* @param platformCatalog 目录
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -503,6 +517,7 @@ public class PlatformController {
|
|||
|
||||
/**
|
||||
* 删除目录
|
||||
*
|
||||
* @param id 目录Id
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -548,6 +563,7 @@ public class PlatformController {
|
|||
|
||||
/**
|
||||
* 删除关联
|
||||
*
|
||||
* @param platformCatalog 关联的信息
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -578,6 +594,7 @@ public class PlatformController {
|
|||
|
||||
/**
|
||||
* 修改默认目录
|
||||
*
|
||||
* @param platformId 平台Id
|
||||
* @param catalogId 目录Id
|
||||
* @return
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ spring:
|
|||
# [可选] 数据库 DB
|
||||
database: 6
|
||||
# [可选] 访问密码,若你的redis服务器没有设置密码，就不需要用密码去连接
|
||||
password:
|
||||
password: face2020
|
||||
# [可选] 超时时间
|
||||
timeout: 10000
|
||||
# [可选] jdbc数据库配置, 项目使用sqlite作为数据库，一般不需要配置
|
||||
|
|
@ -23,7 +23,7 @@ spring:
|
|||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
url: jdbc:mysql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false
|
||||
username: root
|
||||
password: root123
|
||||
password: 123456
|
||||
druid:
|
||||
initialSize: 10 # 连接池初始化连接数
|
||||
maxActive: 200 # 连接池最大连接数
|
||||
|
|
@ -50,7 +50,7 @@ server:
|
|||
# 作为28181服务器的配置
|
||||
sip:
|
||||
# [必须修改] 本机的IP
|
||||
ip: 192.168.118.70
|
||||
ip: 192.168.41.16
|
||||
# [可选] 28181服务监听的端口
|
||||
port: 5060
|
||||
# 根据国标6.1.2中规定，domain宜采用ID统一编码的前十位编码。国标附录D中定义前8位为中心编码（由省级、市级、区级、基层编号组成，参照GB/T 2260-2007）
|
||||
|
|
@ -67,9 +67,9 @@ sip:
|
|||
media:
|
||||
id: FQ3TF8yT83wh5Wvz
|
||||
# [必须修改] zlm服务器的内网IP
|
||||
ip: 192.168.118.70
|
||||
ip: 192.168.41.16
|
||||
# [必须修改] zlm服务器的http.port
|
||||
http-port: 80
|
||||
http-port: 8091
|
||||
# [可选] zlm服务器的hook.admin_params=secret
|
||||
secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc
|
||||
# 启用多端口模式, 多端口模式使用端口区分每路流，兼容性更好。 单端口使用流的ssrc区分， 点播超时建议使用多端口测试
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -198,7 +198,7 @@ export default {
|
|||
let that = this;
|
||||
this.$axios({
|
||||
method: 'get',
|
||||
url:`/api/platform/query/10000/0`
|
||||
url:`/api/platform/query/10000/1`
|
||||
}).then(function (res) {
|
||||
that.platformList = res.data.list;
|
||||
}).catch(function (error) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue