From 4bd4f50b4165953018a9f9174056d29d087fdaee Mon Sep 17 00:00:00 2001
From: szy833 <31844882+szy833@users.noreply.github.com>
Date: 星期日, 16 一月 2022 23:32:51 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 9fe6ebf..6a1093c 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
@@ -4,6 +4,7 @@
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
+import java.util.Collection;
import java.util.List;
@Mapper
@@ -31,6 +32,14 @@
@Delete("DELETE FROM stream_push WHERE app=#{app} AND stream=#{stream}")
int del(String app, String 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")
List<StreamPushItem> selectAll();
@@ -43,7 +52,7 @@
@Insert("<script>" +
"INSERT INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
"createStamp, aliveSecond, mediaServerId) " +
- "VALUES <foreach collection='streamPushItems' item='item' index='index' >" +
+ "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>" +
@@ -56,4 +65,7 @@
@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