From 59e3a280d6a2215f767d81e08d2f9e33a7b8e3dc Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 一月 2022 17:42:09 +0800
Subject: [PATCH] 去除目录通知多余的信息

---
 src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 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 455aa2c..8a99d62 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
@@ -11,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}, " +
@@ -30,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,10 +51,10 @@
 
     @Insert("<script>"  +
             "INSERT INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
-            "createStamp, aliveSecond) " +
-            "VALUES <foreach collection='streamPushItems' item='item' index='index' >" +
+            "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.originTypeStr}','${item.createStamp}', '${item.aliveSecond}', '${item.mediaServerId}' )" +
             " </foreach>" +
             "</script>")
     void addAll(List<StreamPushItem> streamPushItems);
@@ -52,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