From c21d973977a9f1d00d26179de764687ddd0ec56c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 24 四月 2024 14:59:41 +0800
Subject: [PATCH] 修复收到catalog消息是更新导致是否有音频的设置失效的BUG
---
src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java | 196 ++++++++++++++++++++++++++++++------------------
1 files changed, 121 insertions(+), 75 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
old mode 100644
new mode 100755
index 475ec6d..4678591
--- 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,12 +1,8 @@
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;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -16,84 +12,134 @@
@Repository
public interface MediaServerMapper {
- @Insert("INSERT INTO media_server (" +
- "id, " +
- "ip, " +
- "hookIp, " +
- "sdpIp, " +
- "streamIp, " +
- "httpPort, " +
- "httpSSlPort, " +
- "rtmpPort, " +
- "rtmpSSlPort, " +
- "rtpProxyPort, " +
- "rtspPort, " +
- "rtspSSLPort, " +
- "autoConfig, " +
- "secret, " +
- "streamNoneReaderDelayMS, " +
- "rtpEnable, " +
- "rtpPortRange, " +
- "recordAssistPort, " +
- "createTime, " +
- "updateTime" +
+ @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,"+
+ "send_rtp_port_range,"+
+ "record_assist_port,"+
+ "record_day,"+
+ "record_path,"+
+ "default_server,"+
+ "create_time,"+
+ "update_time,"+
+ "hook_alive_interval"+
") VALUES " +
"(" +
- "'${id}', " +
- "'${ip}', " +
- "'${hookIp}', " +
- "'${sdpIp}', " +
- "'${streamIp}', " +
- "${httpPort}, " +
- "${httpSSlPort}, " +
- "${rtmpPort}, " +
- "${rtmpSSlPort}, " +
- "${rtpProxyPort}, " +
- "${rtspPort}, " +
- "${rtspSSLPort}, " +
- "${autoConfig}, " +
- "'${secret}', " +
- "${streamNoneReaderDelayMS}, " +
- "${rtpEnable}, " +
- "'${rtpPortRange}', " +
- "${recordAssistPort}, " +
- "'${createTime}', " +
- "'${updateTime}')")
- int add(IMediaServerItem mediaServerItem);
+ "#{id}, " +
+ "#{ip}, " +
+ "#{hookIp}, " +
+ "#{sdpIp}, " +
+ "#{streamIp}, " +
+ "#{httpPort}, " +
+ "#{httpSSlPort}, " +
+ "#{rtmpPort}, " +
+ "#{rtmpSSlPort}, " +
+ "#{rtpProxyPort}, " +
+ "#{rtspPort}, " +
+ "#{rtspSSLPort}, " +
+ "#{autoConfig}, " +
+ "#{secret}, " +
+ "#{rtpEnable}, " +
+ "#{rtpPortRange}, " +
+ "#{sendRtpPortRange}, " +
+ "#{recordAssistPort}, " +
+ "#{recordDay}, " +
+ "#{recordPath}, " +
+ "#{defaultServer}, " +
+ "#{createTime}, " +
+ "#{updateTime}, " +
+ "#{hookAliveInterval})")
+ int add(MediaServerItem mediaServerItem);
@Update(value = {" <script>" +
- "UPDATE media_server " +
- "SET updateTime='${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=\"streamNoneReaderDelayMS != null\">, streamNoneReaderDelayMS=${streamNoneReaderDelayMS}</if>" +
- "<if test=\"rtpEnable != null\">, rtpEnable=${rtpEnable}</if>" +
- "<if test=\"rtpPortRange != null\">, rtpPortRange='${rtpPortRange}'</if>" +
- "<if test=\"secret != null\">, secret='${secret}'</if>" +
- "<if test=\"recordAssistPort != null\">, recordAssistPort=${recordAssistPort}</if>" +
- "WHERE id='${id}'"+
+ "UPDATE wvp_media_server " +
+ "SET update_time=#{updateTime}" +
+ "<if test=\"ip != null\">, ip=#{ip}</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=\"sendRtpPortRange != null\">, send_rtp_port_range=#{sendRtpPortRange}</if>" +
+ "<if test=\"secret != null\">, secret=#{secret}</if>" +
+ "<if test=\"recordAssistPort != null\">, record_assist_port=#{recordAssistPort}</if>" +
+ "<if test=\"hookAliveInterval != null\">, hook_alive_interval=#{hookAliveInterval}</if>" +
+ "<if test=\"recordDay != null\">, record_day=#{recordDay}</if>" +
+ "<if test=\"recordPath != null\">, record_path=#{recordPath}</if>" +
+ "WHERE id=#{id}"+
" </script>"})
- int update(IMediaServerItem mediaServerItem);
+ int update(MediaServerItem mediaServerItem);
- @Select("SELECT * FROM media_server WHERE id='${id}'")
+ @Update(value = {" <script>" +
+ "UPDATE wvp_media_server " +
+ "SET update_time=#{updateTime}" +
+ "<if test=\"id != null\">, id=#{id}</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=\"sendRtpPortRange != null\">, send_rtp_port_range=#{sendRtpPortRange}</if>" +
+ "<if test=\"secret != null\">, secret=#{secret}</if>" +
+ "<if test=\"recordAssistPort != null\">, record_assist_port=#{recordAssistPort}</if>" +
+ "<if test=\"recordDay != null\">, record_day=#{recordDay}</if>" +
+ "<if test=\"recordPath != null\">, record_path=#{recordPath}</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 wvp_media_server WHERE id=#{id}")
MediaServerItem queryOne(String id);
- @Select("SELECT * FROM media_server")
+ @Select("SELECT * FROM wvp_media_server")
List<MediaServerItem> queryAll();
- @Select("DELETE FROM media_server WHERE id='${id}'")
- int delOne(String secret);
+ @Delete("DELETE FROM wvp_media_server WHERE id=#{id}")
+ void delOne(String id);
- @Select("SELECT * FROM media_server WHERE ip='${host}' and httpPort=${port}")
- MediaServerItem queryOneByHostAndPort(String host, int port);
+ @Select("DELETE FROM wvp_media_server WHERE ip=#{host} and http_port=#{port}")
+ void delOneByIPAndPort(@Param("host") String host, @Param("port") int port);
+
+ @Delete("DELETE FROM wvp_media_server WHERE default_server=true")
+ 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);
+
+ @Select("SELECT * FROM wvp_media_server WHERE default_server=true")
+ MediaServerItem queryDefault();
+
+ @Select("SELECT * FROM wvp_media_server WHERE record_assist_port > 0")
+ List<MediaServerItem> queryAllWithAssistPort();
+
}
--
Gitblit v1.8.0