From 2b2efb59a61a54b398f8f6c9263f37d41c18e65c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 11 一月 2024 14:56:11 +0800
Subject: [PATCH] 修复多个推流推送到上级是不完整的问题，修改平台注销时不删除自己模拟的订阅信息

---
 src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
index 5fdf2f5..d51f3f9 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
@@ -82,25 +82,28 @@
     int updateCollectList(@Param("collect") boolean collect, List<CloudRecordItem> cloudRecordItemList);
 
     @Delete(" <script>" +
-            "delete from wvp_cloud_record where media_server_id=#{mediaServerId} file_path in " +
+            "delete from wvp_cloud_record where media_server_id=#{mediaServerId} and file_path in " +
             " <foreach collection='filePathList'  item='item'  open='(' separator=',' close=')' > #{item}</foreach>" +
             " </script>")
     void deleteByFileList(List<String> filePathList, @Param("mediaServerId") String mediaServerId);
 
 
     @Select(" <script>" +
-            "select file_path" +
+            "select *" +
             " from wvp_cloud_record " +
-            " where collect = false " +
-            " <if test= 'endTimeStamp != null '> and start_time &lt;= #{endTimeStamp}</if>" +
-            " <if test= 'callId != null '> and call_id = #{callId}</if>" +
-            " <if test= 'mediaServerId != null  ' > and media_server_id  = #{mediaServerId} </if>" +
+            " where collect = false and end_time &lt;= #{endTimeStamp} and media_server_id  = #{mediaServerId} " +
             " </script>")
-    List<String> queryRecordFilePathListForDelete(@Param("endTimeStamp")Long endTimeStamp, String mediaServerId);
+    List<CloudRecordItem> queryRecordListForDelete(@Param("endTimeStamp")Long endTimeStamp, String mediaServerId);
 
     @Update(" <script>" +
             "update wvp_cloud_record set collect = #{collect} where id = #{recordId} " +
             " </script>")
     int changeCollectById(@Param("collect") boolean collect, @Param("recordId") Integer recordId);
 
+    @Delete(" <script>" +
+            "delete from wvp_cloud_record where id in " +
+            " <foreach collection='cloudRecordItemIdList'  item='item'  open='(' separator=',' close=')' > #{item.id}</foreach>" +
+            " </script>")
+    int deleteList(List<CloudRecordItem> cloudRecordItemIdList);
+
 }

--
Gitblit v1.8.0