Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

sc.dm

2022-03-10 4abbf4df07f02c0c94baa2787fdcf4a14dcb3463

 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;
@@ -36,7 +33,8 @@
            "recordAssistPort, " +
            "defaultServer, " +
            "createTime, " +
            "updateTime" +
            "updateTime, " +
            "hookAliveInterval" +
            ") VALUES " +
            "(" +
            "'${id}', " +
@@ -60,7 +58,8 @@
            "${recordAssistPort}, " +
            "${defaultServer}, " +
            "'${createTime}', " +
            "'${updateTime}')")
            "'${updateTime}', " +
            "${hookAliveInterval})")
    int add(MediaServerItem mediaServerItem);

    @Update(value = {" <script>" +
@@ -84,6 +83,7 @@
            "<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);
@@ -108,6 +108,7 @@
            "<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 +119,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);