From 7cb74dbe51bab0457048c27ddc9d7c5a17253e1a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 26 一月 2022 10:55:36 +0800
Subject: [PATCH] Merge pull request #317 from nikmu/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
index c0472a4..e072e27 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
@@ -1,10 +1,10 @@
package com.genersoft.iot.vmp.storager.dao;
-import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
+import java.util.Collection;
import java.util.List;
@Mapper
@@ -12,14 +12,15 @@
public interface StreamPushMapper {
@Insert("INSERT INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
- "createStamp, aliveSecond) VALUES" +
+ "createStamp, aliveSecond, mediaServerId) VALUES" +
"('${app}', '${stream}', '${totalReaderCount}', '${originType}', '${originTypeStr}', " +
- "'${createStamp}', '${aliveSecond}' )")
+ "'${createStamp}', '${aliveSecond}', '${mediaServerId}' )")
int add(StreamPushItem streamPushItem);
@Update("UPDATE stream_push " +
"SET app=#{app}," +
"stream=#{stream}," +
+ "mediaServerId=#{mediaServerId}," +
"totalReaderCount=#{totalReaderCount}, " +
"originType=#{originType}," +
"originTypeStr=#{originTypeStr}, " +
@@ -31,7 +32,15 @@
@Delete("DELETE FROM stream_push WHERE app=#{app} AND stream=#{stream}")
int del(String app, String stream);
- @Select("SELECT st.*, pgs.gbId, pgs.status, pgs.name, pgs.longitude, pgs.latitude FROM stream_push st LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream")
+ @Delete("<script> "+
+ "DELETE FROM stream_push where " +
+ "<foreach collection='streamPushItems' item='item' separator='or'>" +
+ "(app=#{item.app} and stream=#{item.stream}) " +
+ "</foreach>" +
+ "</script>")
+ int delAll(List<StreamPushItem> streamPushItems);
+
+ @Select("SELECT st.*, pgs.gbId, pgs.status, pgs.name, pgs.longitude, pgs.latitude FROM stream_push st LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream order by st.createStamp desc")
List<StreamPushItem> selectAll();
@Select("SELECT st.*, pgs.gbId, pgs.status, pgs.name, pgs.longitude, pgs.latitude FROM stream_push st LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream WHERE st.enable=${enable}")
@@ -41,11 +50,11 @@
StreamPushItem selectOne(String app, String stream);
@Insert("<script>" +
- "INSERT INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
- "createStamp, aliveSecond) " +
- "VALUES <foreach collection='streamPushItems' item='item' index='index' >" +
- "( '${item.app}', '${item.stream}', '${item.totalReaderCount}', '${item.originType}', " +
- "'${item.originTypeStr}','${item.createStamp}', '${item.aliveSecond}' )" +
+ "REPLACE INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
+ "createStamp, aliveSecond, mediaServerId) " +
+ "VALUES <foreach collection='streamPushItems' item='item' index='index' separator=','>" +
+ "( '${item.app}', '${item.stream}', '${item.totalReaderCount}', #{item.originType}, " +
+ "'${item.originTypeStr}',#{item.createStamp}, #{item.aliveSecond}, '${item.mediaServerId}' )" +
" </foreach>" +
"</script>")
void addAll(List<StreamPushItem> streamPushItems);
@@ -53,4 +62,10 @@
@Delete("DELETE FROM stream_push")
void clear();
+ @Delete("DELETE FROM stream_push WHERE mediaServerId=#{mediaServerId}")
+ void deleteWithoutGBId(String mediaServerId);
+
+ @Select("SELECT * FROM stream_push WHERE mediaServerId=#{mediaServerId}")
+ List<StreamPushItem> selectAllByMediaServerId(String mediaServerId);
+
}
--
Gitblit v1.8.0