From cf8a1261b5a27b0e3270da2bd57fbe936b4e809b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 19 一月 2024 17:44:31 +0800
Subject: [PATCH] 支持合并录像使用https

---
 src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 594bcee..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
@@ -91,7 +91,7 @@
     @Select(" <script>" +
             "select *" +
             " from wvp_cloud_record " +
-            " where end_time &lt;= #{endTimeStamp} and media_server_id  = #{mediaServerId} " +
+            " where collect = false and end_time &lt;= #{endTimeStamp} and media_server_id  = #{mediaServerId} " +
             " </script>")
     List<CloudRecordItem> queryRecordListForDelete(@Param("endTimeStamp")Long endTimeStamp, String mediaServerId);
 
@@ -101,7 +101,7 @@
     int changeCollectById(@Param("collect") boolean collect, @Param("recordId") Integer recordId);
 
     @Delete(" <script>" +
-            "delete from wvp_cloud_record where media_server_id=#{mediaServerId} and id in " +
+            "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