From c592740efa9d907eac3ad7d8f6e720608f3e962f Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期日, 01 五月 2022 21:33:56 +0800
Subject: [PATCH] 升级shelljs，解决较高版本node打包时的警告
---
src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java | 61 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 12 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 475ec6d..0e37bbf 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,12 +1,7 @@
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.springframework.stereotype.Repository;
import java.util.List;
@@ -34,9 +29,12 @@
"streamNoneReaderDelayMS, " +
"rtpEnable, " +
"rtpPortRange, " +
+ "sendRtpPortRange, " +
"recordAssistPort, " +
+ "defaultServer, " +
"createTime, " +
- "updateTime" +
+ "updateTime, " +
+ "hookAliveInterval" +
") VALUES " +
"(" +
"'${id}', " +
@@ -56,10 +54,13 @@
"${streamNoneReaderDelayMS}, " +
"${rtpEnable}, " +
"'${rtpPortRange}', " +
+ "'${sendRtpPortRange}', " +
"${recordAssistPort}, " +
+ "${defaultServer}, " +
"'${createTime}', " +
- "'${updateTime}')")
- int add(IMediaServerItem mediaServerItem);
+ "'${updateTime}', " +
+ "${hookAliveInterval})")
+ int add(MediaServerItem mediaServerItem);
@Update(value = {" <script>" +
"UPDATE media_server " +
@@ -79,11 +80,38 @@
"<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(IMediaServerItem mediaServerItem);
+ 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=\"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);
@Select("SELECT * FROM media_server WHERE id='${id}'")
MediaServerItem queryOne(String id);
@@ -91,9 +119,18 @@
@Select("SELECT * FROM media_server")
List<MediaServerItem> queryAll();
- @Select("DELETE FROM media_server WHERE id='${id}'")
- int delOne(String secret);
+ @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);
+
+ @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);
+
+ @Select("SELECT * FROM media_server WHERE defaultServer=1")
+ MediaServerItem queryDefault();
}
--
Gitblit v1.8.0