From 3469271ec25c69e4528b085ba3be7d9d85ec519e Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期一, 26 七月 2021 11:40:32 +0800
Subject: [PATCH] 优化集群方案， 每个zlm一套ssrc； 优化集群下的docker接入逻辑； 更正sql脚本； 支持重启不设置设备离线。重启SIP事务不丢失
---
src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
index 475ec6d..16ed401 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
@@ -1,7 +1,5 @@
package com.genersoft.iot.vmp.storager.dao;
-import com.genersoft.iot.vmp.conf.MediaConfig;
-import com.genersoft.iot.vmp.media.zlm.dto.IMediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
@@ -35,6 +33,7 @@
"rtpEnable, " +
"rtpPortRange, " +
"recordAssistPort, " +
+ "defaultServer, " +
"createTime, " +
"updateTime" +
") VALUES " +
@@ -57,9 +56,10 @@
"${rtpEnable}, " +
"'${rtpPortRange}', " +
"${recordAssistPort}, " +
+ "${defaultServer}, " +
"'${createTime}', " +
"'${updateTime}')")
- int add(IMediaServerItem mediaServerItem);
+ int add(MediaServerItem mediaServerItem);
@Update(value = {" <script>" +
"UPDATE media_server " +
@@ -83,7 +83,7 @@
"<if test=\"recordAssistPort != null\">, recordAssistPort=${recordAssistPort}</if>" +
"WHERE id='${id}'"+
" </script>"})
- int update(IMediaServerItem mediaServerItem);
+ int update(MediaServerItem mediaServerItem);
@Select("SELECT * FROM media_server WHERE id='${id}'")
MediaServerItem queryOne(String id);
@@ -92,7 +92,7 @@
List<MediaServerItem> queryAll();
@Select("DELETE FROM media_server WHERE id='${id}'")
- int delOne(String secret);
+ void delOne(String id);
@Select("SELECT * FROM media_server WHERE ip='${host}' and httpPort=${port}")
MediaServerItem queryOneByHostAndPort(String host, int port);
--
Gitblit v1.8.0