From 1af77ab5f7c11a4b3d59c1989b51b9fca29679ce Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 18 十月 2022 22:18:49 +0800
Subject: [PATCH] Merge pull request #645 from IKangXu/wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java |   23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 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 aaa1845..95b3d15 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
@@ -1,10 +1,7 @@
 package com.genersoft.iot.vmp.storager.dao;
 
 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.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -29,14 +26,14 @@
             "rtspSSLPort, " +
             "autoConfig, " +
             "secret, " +
-            "streamNoneReaderDelayMS, " +
             "rtpEnable, " +
             "rtpPortRange, " +
             "sendRtpPortRange, " +
             "recordAssistPort, " +
             "defaultServer, " +
             "createTime, " +
-            "updateTime" +
+            "updateTime, " +
+            "hookAliveInterval" +
             ") VALUES " +
             "(" +
             "'${id}', " +
@@ -53,14 +50,14 @@
             "${rtspSSLPort}, " +
             "${autoConfig}, " +
             "'${secret}', " +
-            "${streamNoneReaderDelayMS}, " +
             "${rtpEnable}, " +
             "'${rtpPortRange}', " +
             "'${sendRtpPortRange}', " +
             "${recordAssistPort}, " +
             "${defaultServer}, " +
             "'${createTime}', " +
-            "'${updateTime}')")
+            "'${updateTime}', " +
+            "${hookAliveInterval})")
     int add(MediaServerItem mediaServerItem);
 
     @Update(value = {" <script>" +
@@ -78,12 +75,12 @@
             "<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=\"sendRtpPortRange != null\">, sendRtpPortRange='${sendRtpPortRange}'</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);
@@ -102,12 +99,12 @@
             "<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=\"sendRtpPortRange != null\">, sendRtpPortRange='${sendRtpPortRange}'</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);
@@ -118,14 +115,14 @@
     @Select("SELECT * FROM media_server")
     List<MediaServerItem> queryAll();
 
-    @Select("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}")
     void delOneByIPAndPort(String host, int port);
 
-    @Select("DELETE FROM media_server WHERE defaultServer=1;")
-    void delDefault();
+    @Delete("DELETE FROM media_server WHERE defaultServer=1")
+    int delDefault();
 
     @Select("SELECT * FROM media_server WHERE ip='${host}' and httpPort=${port}")
     MediaServerItem queryOneByHostAndPort(String host, int port);

--
Gitblit v1.8.0