From d41d6b34af2485198ed01e1888db1571e4da1a6a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 23 四月 2024 20:59:20 +0800
Subject: [PATCH] Merge branch 'refs/heads/2.7.0'
---
src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 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 131b8a5..d34657f 100755
--- 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,6 +1,6 @@
package com.genersoft.iot.vmp.storager.dao;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.bean.MediaServer;
import org.apache.ibatis.annotations.*;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -24,6 +24,10 @@
"rtmp_ssl_port,"+
"rtp_proxy_port,"+
"rtsp_port,"+
+ "flv_port," +
+ "flv_ssl_port," +
+ "ws_flv_port," +
+ "ws_flv_ssl_port," +
"rtsp_ssl_port,"+
"auto_config,"+
"secret,"+
@@ -51,6 +55,10 @@
"#{rtmpSSlPort}, " +
"#{rtpProxyPort}, " +
"#{rtspPort}, " +
+ "#{flvPort}, " +
+ "#{flvSSLPort}, " +
+ "#{wsFlvPort}, " +
+ "#{wsFlvSSLPort}, " +
"#{rtspSSLPort}, " +
"#{autoConfig}, " +
"#{secret}, " +
@@ -65,7 +73,7 @@
"#{createTime}, " +
"#{updateTime}, " +
"#{hookAliveInterval})")
- int add(MediaServerItem mediaServerItem);
+ int add(MediaServer mediaServerItem);
@Update(value = {" <script>" +
"UPDATE wvp_media_server " +
@@ -81,6 +89,10 @@
"<if test=\"rtpProxyPort != null\">, rtp_proxy_port=#{rtpProxyPort}</if>" +
"<if test=\"rtspPort != null\">, rtsp_port=#{rtspPort}</if>" +
"<if test=\"rtspSSLPort != null\">, rtsp_ssl_port=#{rtspSSLPort}</if>" +
+ "<if test=\"flvPort != null\">, flv_port=#{flvPort}</if>" +
+ "<if test=\"flvSSLPort != null\">, flv_ssl_port=#{flvSSLPort}</if>" +
+ "<if test=\"wsFlvPort != null\">, ws_flv_port=#{wsFlvPort}</if>" +
+ "<if test=\"wsFlvSSLPort != null\">, ws_flv_ssl_port=#{wsFlvSSLPort}</if>" +
"<if test=\"autoConfig != null\">, auto_config=#{autoConfig}</if>" +
"<if test=\"rtpEnable != null\">, rtp_enable=#{rtpEnable}</if>" +
"<if test=\"rtpPortRange != null\">, rtp_port_range=#{rtpPortRange}</if>" +
@@ -93,7 +105,7 @@
"<if test=\"type != null\">, type=#{type}</if>" +
"WHERE id=#{id}"+
" </script>"})
- int update(MediaServerItem mediaServerItem);
+ int update(MediaServer mediaServerItem);
@Update(value = {" <script>" +
"UPDATE wvp_media_server " +
@@ -108,6 +120,10 @@
"<if test=\"rtpProxyPort != null\">, rtp_proxy_port=#{rtpProxyPort}</if>" +
"<if test=\"rtspPort != null\">, rtsp_port=#{rtspPort}</if>" +
"<if test=\"rtspSSLPort != null\">, rtsp_ssl_port=#{rtspSSLPort}</if>" +
+ "<if test=\"flvPort != null\">, flv_port=#{flvPort}</if>" +
+ "<if test=\"flvSSLPort != null\">, flv_ssl_port=#{flvSSLPort}</if>" +
+ "<if test=\"wsFlvPort != null\">, ws_flv_port=#{wsFlvPort}</if>" +
+ "<if test=\"wsFlvSSLPort != null\">, ws_flv_ssl_port=#{wsFlvSSLPort}</if>" +
"<if test=\"autoConfig != null\">, auto_config=#{autoConfig}</if>" +
"<if test=\"rtpEnable != null\">, rtp_enable=#{rtpEnable}</if>" +
"<if test=\"rtpPortRange != null\">, rtp_port_range=#{rtpPortRange}</if>" +
@@ -120,13 +136,13 @@
"<if test=\"hookAliveInterval != null\">, hook_alive_interval=#{hookAliveInterval}</if>" +
"WHERE ip=#{ip} and http_port=#{httpPort}"+
" </script>"})
- int updateByHostAndPort(MediaServerItem mediaServerItem);
+ int updateByHostAndPort(MediaServer mediaServerItem);
@Select("SELECT * FROM wvp_media_server WHERE id=#{id}")
- MediaServerItem queryOne(String id);
+ MediaServer queryOne(String id);
@Select("SELECT * FROM wvp_media_server")
- List<MediaServerItem> queryAll();
+ List<MediaServer> queryAll();
@Delete("DELETE FROM wvp_media_server WHERE id=#{id}")
void delOne(String id);
@@ -138,12 +154,12 @@
int delDefault();
@Select("SELECT * FROM wvp_media_server WHERE ip=#{host} and http_port=#{port}")
- MediaServerItem queryOneByHostAndPort(@Param("host") String host, @Param("port") int port);
+ MediaServer queryOneByHostAndPort(@Param("host") String host, @Param("port") int port);
@Select("SELECT * FROM wvp_media_server WHERE default_server=true")
- MediaServerItem queryDefault();
+ MediaServer queryDefault();
@Select("SELECT * FROM wvp_media_server WHERE record_assist_port > 0")
- List<MediaServerItem> queryAllWithAssistPort();
+ List<MediaServer> queryAllWithAssistPort();
}
--
Gitblit v1.8.0