From de390d39825469c4ba0bf1fda2a6383fc1a3cb47 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 28 五月 2024 10:16:46 +0800
Subject: [PATCH] Merge branch 'refs/heads/2.7.1'
---
src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 08f67ba..a654ea0 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
@@ -1,6 +1,6 @@
package com.genersoft.iot.vmp.storager.dao;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.bean.MediaServer;
import com.genersoft.iot.vmp.service.bean.CloudRecordItem;
import org.apache.ibatis.annotations.*;
@@ -50,12 +50,15 @@
" <if test= 'mediaServerItemList != null ' > and media_server_id in " +
" <foreach collection='mediaServerItemList' item='item' open='(' separator=',' close=')' > #{item.id}</foreach>" +
" </if>" +
+ " <if test= 'ids != null ' > and id in " +
+ " <foreach collection='ids' item='item' open='(' separator=',' close=')' > #{item}</foreach>" +
+ " </if>" +
" order by start_time DESC" +
-
" </script>")
List<CloudRecordItem> getList(@Param("query") String query, @Param("app") String app, @Param("stream") String stream,
@Param("startTimeStamp")Long startTimeStamp, @Param("endTimeStamp")Long endTimeStamp,
- @Param("callId")String callId, List<MediaServerItem> mediaServerItemList);
+ @Param("callId")String callId, List<MediaServer> mediaServerItemList,
+ List<Integer> ids);
@Select(" <script>" +
@@ -73,7 +76,7 @@
" </script>")
List<String> queryRecordFilePathList(@Param("app") String app, @Param("stream") String stream,
@Param("startTimeStamp")Long startTimeStamp, @Param("endTimeStamp")Long endTimeStamp,
- @Param("callId")String callId, List<MediaServerItem> mediaServerItemList);
+ @Param("callId")String callId, List<MediaServer> mediaServerItemList);
@Update(" <script>" +
"update wvp_cloud_record set collect = #{collect} where file_path in " +
--
Gitblit v1.8.0