From 86a701ce885871d2468ec31eb13be5595673a01b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 28 三月 2024 10:24:13 +0800
Subject: [PATCH] Merge branch 'master' into dev/abl支持
---
src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 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
old mode 100644
new mode 100755
index cdc303d..4a991f3
--- 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,8 @@
package com.genersoft.iot.vmp.storager.dao;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServer;
import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -30,7 +31,10 @@
"rtp_port_range,"+
"send_rtp_port_range,"+
"record_assist_port,"+
+ "record_day,"+
+ "record_path,"+
"default_server,"+
+ "type,"+
"create_time,"+
"update_time,"+
"hook_alive_interval"+
@@ -54,11 +58,14 @@
"#{rtpPortRange}, " +
"#{sendRtpPortRange}, " +
"#{recordAssistPort}, " +
+ "#{recordDay}, " +
+ "#{recordPath}, " +
"#{defaultServer}, " +
+ "#{type}, " +
"#{createTime}, " +
"#{updateTime}, " +
"#{hookAliveInterval})")
- int add(MediaServerItem mediaServerItem);
+ int add(MediaServer mediaServerItem);
@Update(value = {" <script>" +
"UPDATE wvp_media_server " +
@@ -81,9 +88,12 @@
"<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>" +
+ "<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 " +
@@ -104,29 +114,36 @@
"<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=\"type != null\">, type=#{type}</if>" +
"<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);
@Select("DELETE FROM wvp_media_server WHERE ip=#{host} and http_port=#{port}")
- void delOneByIPAndPort(String host, int 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(String host, 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<MediaServer> queryAllWithAssistPort();
+
}
--
Gitblit v1.8.0