From dea44dcd78418ed3e7f191a73cee2b81a7a0019f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 13 一月 2023 16:21:17 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java | 124 ++++++++++++++++++++--------------------
1 files changed, 62 insertions(+), 62 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 e9254a5..97e74ae 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
@@ -35,92 +35,92 @@
"hookAliveInterval" +
") VALUES " +
"(" +
- "'${id}', " +
- "'${ip}', " +
- "'${hookIp}', " +
- "'${sdpIp}', " +
- "'${streamIp}', " +
- "${httpPort}, " +
- "${httpSSlPort}, " +
- "${rtmpPort}, " +
- "${rtmpSSlPort}, " +
- "${rtpProxyPort}, " +
- "${rtspPort}, " +
- "${rtspSSLPort}, " +
- "${autoConfig}, " +
- "'${secret}', " +
- "${rtpEnable}, " +
- "'${rtpPortRange}', " +
- "${recordAssistPort}, " +
- "${defaultServer}, " +
- "'${createTime}', " +
- "'${updateTime}', " +
- "${hookAliveInterval})")
+ "#{id}, " +
+ "#{ip}, " +
+ "#{hookIp}, " +
+ "#{sdpIp}, " +
+ "#{streamIp}, " +
+ "#{httpPort}, " +
+ "#{httpSSlPort}, " +
+ "#{rtmpPort}, " +
+ "#{rtmpSSlPort}, " +
+ "#{rtpProxyPort}, " +
+ "#{rtspPort}, " +
+ "#{rtspSSLPort}, " +
+ "#{autoConfig}, " +
+ "#{secret}, " +
+ "#{rtpEnable}, " +
+ "#{rtpPortRange}, " +
+ "#{recordAssistPort}, " +
+ "#{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=\"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>" +
- "<if test=\"hookAliveInterval != null\">, hookAliveInterval=${hookAliveInterval}</if>" +
- "WHERE id='${id}'"+
+ "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=\"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>" +
+ "<if test=\"hookAliveInterval != null\">, hookAliveInterval=#{hookAliveInterval}</if>" +
+ "WHERE id=#{id}"+
" </script>"})
int update(MediaServerItem mediaServerItem);
@Update(value = {" <script>" +
"UPDATE media_server " +
- "SET updateTime='${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=\"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}"+
+ "SET updateTime=#{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=\"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}"+
" </script>"})
int updateByHostAndPort(MediaServerItem mediaServerItem);
- @Select("SELECT * FROM media_server WHERE id='${id}'")
+ @Select("SELECT * FROM media_server WHERE id=#{id}")
MediaServerItem queryOne(String id);
@Select("SELECT * FROM media_server")
List<MediaServerItem> queryAll();
- @Delete("DELETE FROM media_server WHERE id='${id}'")
+ @Delete("DELETE FROM media_server WHERE id=#{id}")
void delOne(String id);
- @Select("DELETE FROM media_server WHERE ip='${host}' and httpPort=${port}")
+ @Select("DELETE FROM media_server WHERE ip=#{host} and httpPort=#{port}")
void delOneByIPAndPort(String host, int port);
@Delete("DELETE FROM media_server WHERE defaultServer=1")
int delDefault();
- @Select("SELECT * FROM media_server WHERE ip='${host}' and httpPort=${port}")
+ @Select("SELECT * FROM media_server WHERE ip=#{host} and httpPort=#{port}")
MediaServerItem queryOneByHostAndPort(String host, int port);
@Select("SELECT * FROM media_server WHERE defaultServer=1")
--
Gitblit v1.8.0