From 5639719879759c287a0c020818104b9e72ffc292 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 29 五月 2023 09:25:45 +0800
Subject: [PATCH] Merge branch 'postgresql' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java | 126 +++++++++++++++++++++---------------------
1 files changed, 63 insertions(+), 63 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 97e74ae..ca0d98d 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
@@ -11,28 +11,28 @@
@Repository
public interface MediaServerMapper {
- @Insert("INSERT INTO media_server (" +
- "id, " +
- "ip, " +
- "hookIp, " +
- "sdpIp, " +
- "streamIp, " +
- "httpPort, " +
- "httpSSlPort, " +
- "rtmpPort, " +
- "rtmpSSlPort, " +
- "rtpProxyPort, " +
- "rtspPort, " +
- "rtspSSLPort, " +
- "autoConfig, " +
- "secret, " +
- "rtpEnable, " +
- "rtpPortRange, " +
- "recordAssistPort, " +
- "defaultServer, " +
- "createTime, " +
- "updateTime, " +
- "hookAliveInterval" +
+ @Insert("INSERT INTO wvp_media_server (" +
+ "id,"+
+ "ip,"+
+ "hook_ip,"+
+ "sdp_ip,"+
+ "stream_ip,"+
+ "http_port,"+
+ "http_ssl_port,"+
+ "rtmp_port,"+
+ "rtmp_ssl_port,"+
+ "rtp_proxy_port,"+
+ "rtsp_port,"+
+ "rtsp_ssl_port,"+
+ "auto_config,"+
+ "secret,"+
+ "rtp_enable,"+
+ "rtp_port_range,"+
+ "record_assist_port,"+
+ "default_server,"+
+ "create_time,"+
+ "update_time,"+
+ "hook_alive_interval"+
") VALUES " +
"(" +
"#{id}, " +
@@ -59,70 +59,70 @@
int add(MediaServerItem mediaServerItem);
@Update(value = {" <script>" +
- "UPDATE media_server " +
- "SET updateTime=#{updateTime}" +
+ "UPDATE wvp_media_server " +
+ "SET update_time=#{updateTime}" +
"<if test=\"ip != null\">, ip=#{ip}</if>" +
- "<if test=\"hookIp != null\">, hookIp=#{hookIp}</if>" +
- "<if test=\"sdpIp != null\">, sdpIp=#{sdpIp}</if>" +
- "<if test=\"streamIp != null\">, streamIp=#{streamIp}</if>" +
- "<if test=\"httpPort != null\">, httpPort=#{httpPort}</if>" +
- "<if test=\"httpSSlPort != null\">, httpSSlPort=#{httpSSlPort}</if>" +
- "<if test=\"rtmpPort != null\">, rtmpPort=#{rtmpPort}</if>" +
- "<if test=\"rtmpSSlPort != null\">, rtmpSSlPort=#{rtmpSSlPort}</if>" +
- "<if test=\"rtpProxyPort != null\">, rtpProxyPort=#{rtpProxyPort}</if>" +
- "<if test=\"rtspPort != null\">, rtspPort=#{rtspPort}</if>" +
- "<if test=\"rtspSSLPort != null\">, rtspSSLPort=#{rtspSSLPort}</if>" +
- "<if test=\"autoConfig != null\">, autoConfig=#{autoConfig}</if>" +
- "<if test=\"rtpEnable != null\">, rtpEnable=#{rtpEnable}</if>" +
- "<if test=\"rtpPortRange != null\">, rtpPortRange=#{rtpPortRange}</if>" +
+ "<if test=\"hookIp != null\">, hook_ip=#{hookIp}</if>" +
+ "<if test=\"sdpIp != null\">, sdp_ip=#{sdpIp}</if>" +
+ "<if test=\"streamIp != null\">, stream_ip=#{streamIp}</if>" +
+ "<if test=\"httpPort != null\">, http_port=#{httpPort}</if>" +
+ "<if test=\"httpSSlPort != null\">, http_ssl_port=#{httpSSlPort}</if>" +
+ "<if test=\"rtmpPort != null\">, rtmp_port=#{rtmpPort}</if>" +
+ "<if test=\"rtmpSSlPort != null\">, rtmp_ssl_port=#{rtmpSSlPort}</if>" +
+ "<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=\"autoConfig != null\">, auto_config=#{autoConfig}</if>" +
+ "<if test=\"rtpEnable != null\">, rtp_enable=#{rtpEnable}</if>" +
+ "<if test=\"rtpPortRange != null\">, rtp_port_range=#{rtpPortRange}</if>" +
"<if test=\"secret != null\">, secret=#{secret}</if>" +
- "<if test=\"recordAssistPort != null\">, recordAssistPort=#{recordAssistPort}</if>" +
- "<if test=\"hookAliveInterval != null\">, hookAliveInterval=#{hookAliveInterval}</if>" +
+ "<if test=\"recordAssistPort != null\">, record_assist_port=#{recordAssistPort}</if>" +
+ "<if test=\"hookAliveInterval != null\">, hook_alive_interval=#{hookAliveInterval}</if>" +
"WHERE id=#{id}"+
" </script>"})
int update(MediaServerItem mediaServerItem);
@Update(value = {" <script>" +
- "UPDATE media_server " +
- "SET updateTime=#{updateTime}" +
+ "UPDATE wvp_media_server " +
+ "SET update_time=#{updateTime}" +
"<if test=\"id != null\">, id=#{id}</if>" +
- "<if test=\"hookIp != null\">, hookIp=#{hookIp}</if>" +
- "<if test=\"sdpIp != null\">, sdpIp=#{sdpIp}</if>" +
- "<if test=\"streamIp != null\">, streamIp=#{streamIp}</if>" +
- "<if test=\"httpSSlPort != null\">, httpSSlPort=#{httpSSlPort}</if>" +
- "<if test=\"rtmpPort != null\">, rtmpPort=#{rtmpPort}</if>" +
- "<if test=\"rtmpSSlPort != null\">, rtmpSSlPort=#{rtmpSSlPort}</if>" +
- "<if test=\"rtpProxyPort != null\">, rtpProxyPort=#{rtpProxyPort}</if>" +
- "<if test=\"rtspPort != null\">, rtspPort=#{rtspPort}</if>" +
- "<if test=\"rtspSSLPort != null\">, rtspSSLPort=#{rtspSSLPort}</if>" +
- "<if test=\"autoConfig != null\">, autoConfig=#{autoConfig}</if>" +
- "<if test=\"rtpEnable != null\">, rtpEnable=#{rtpEnable}</if>" +
- "<if test=\"rtpPortRange != null\">, rtpPortRange=#{rtpPortRange}</if>" +
+ "<if test=\"hookIp != null\">, hook_ip=#{hookIp}</if>" +
+ "<if test=\"sdpIp != null\">, sdp_ip=#{sdpIp}</if>" +
+ "<if test=\"streamIp != null\">, stream_ip=#{streamIp}</if>" +
+ "<if test=\"httpSSlPort != null\">, http_ssl_port=#{httpSSlPort}</if>" +
+ "<if test=\"rtmpPort != null\">, rtmp_port=#{rtmpPort}</if>" +
+ "<if test=\"rtmpSSlPort != null\">, rtmp_ssl_port=#{rtmpSSlPort}</if>" +
+ "<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=\"autoConfig != null\">, auto_config=#{autoConfig}</if>" +
+ "<if test=\"rtpEnable != null\">, rtp_enable=#{rtpEnable}</if>" +
+ "<if test=\"rtpPortRange != null\">, rtp_port_range=#{rtpPortRange}</if>" +
"<if test=\"secret != null\">, secret=#{secret}</if>" +
- "<if test=\"recordAssistPort != null\">, recordAssistPort=#{recordAssistPort}</if>" +
- "<if test=\"hookAliveInterval != null\">, hookAliveInterval=#{hookAliveInterval}</if>" +
- "WHERE ip=#{ip} and httpPort=#{httpPort}"+
+ "<if test=\"recordAssistPort != null\">, record_assist_port=#{recordAssistPort}</if>" +
+ "<if test=\"hookAliveInterval != null\">, hook_alive_interval=#{hookAliveInterval}</if>" +
+ "WHERE ip=#{ip} and http_port=#{httpPort}"+
" </script>"})
int updateByHostAndPort(MediaServerItem mediaServerItem);
- @Select("SELECT * FROM media_server WHERE id=#{id}")
+ @Select("SELECT * FROM wvp_media_server WHERE id=#{id}")
MediaServerItem queryOne(String id);
- @Select("SELECT * FROM media_server")
+ @Select("SELECT * FROM wvp_media_server")
List<MediaServerItem> queryAll();
- @Delete("DELETE FROM media_server WHERE id=#{id}")
+ @Delete("DELETE FROM wvp_media_server WHERE id=#{id}")
void delOne(String id);
- @Select("DELETE FROM media_server WHERE ip=#{host} and httpPort=#{port}")
+ @Select("DELETE FROM wvp_media_server WHERE ip=#{host} and http_port=#{port}")
void delOneByIPAndPort(String host, int port);
- @Delete("DELETE FROM media_server WHERE defaultServer=1")
+ @Delete("DELETE FROM wvp_media_server WHERE default_server=true")
int delDefault();
- @Select("SELECT * FROM media_server WHERE ip=#{host} and httpPort=#{port}")
+ @Select("SELECT * FROM wvp_media_server WHERE ip=#{host} and http_port=#{port}")
MediaServerItem queryOneByHostAndPort(String host, int port);
- @Select("SELECT * FROM media_server WHERE defaultServer=1")
+ @Select("SELECT * FROM wvp_media_server WHERE default_server=true")
MediaServerItem queryDefault();
}
--
Gitblit v1.8.0