From 32e90b2537364433b5c87a35de72835b54b6b816 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Tue, 31 Dec 2024 15:13:56 +0800
Subject: [PATCH] =?UTF-8?q?[RPC=20=E4=BA=91=E7=AB=AF=E5=BD=95=E5=83=8F]=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=95=BF=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/service/impl/CloudRecordServiceImpl.java |  3 ++-
 .../vmp/storager/dao/CloudRecordServiceMapper.java   |  2 +-
 .../vmanager/cloudRecord/CloudRecordController.java  | 12 ++++++------
 web_src/src/components/CloudRecord.vue               |  4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
index f127a9f2..6f1ed436 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
@@ -58,7 +58,8 @@ public class CloudRecordServiceImpl implements ICloudRecordService {
     private IRedisRpcPlayService redisRpcPlayService;
 
     @Override
-    public PageInfo<CloudRecordItem> getList(int page, int count, String query, String app, String stream, String startTime, String endTime, List<MediaServer> mediaServerItems, String callId) {
+    public PageInfo<CloudRecordItem> getList(int page, int count, String query, String app, String stream, String startTime,
+                                             String endTime, List<MediaServer> mediaServerItems, String callId) {
         // 开始时间和结束时间在数据库中都是以秒为单位的
         Long startTimeStamp = null;
         Long endTimeStamp = null;
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 7e7ee54c..b0c90fd0 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
@@ -40,7 +40,7 @@ public interface CloudRecordServiceMapper {
     @Select(" <script>" +
             "select * " +
             " from wvp_cloud_record " +
-            " where 0 = 0" +
+            " where 1 = 1" +
             " <if test='query != null'> AND (app LIKE concat('%',#{query},'%') escape '/' OR stream LIKE concat('%',#{query},'%') escape '/' )</if> " +
             " <if test= 'app != null '> and app=#{app}</if>" +
             " <if test= 'stream != null '> and stream=#{stream}</if>" +
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
index 78f4fef2..4b9e34d4 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
@@ -103,12 +103,12 @@ public class CloudRecordController {
 
         List<MediaServer> mediaServers;
         if (!ObjectUtils.isEmpty(mediaServerId)) {
-            mediaServers = new ArrayList<>();
-            MediaServer mediaServer = mediaServerService.getOne(mediaServerId);
-            if (mediaServer == null) {
-                throw new ControllerException(ErrorCode.ERROR100.getCode(), "未找到流媒体: " + mediaServerId);
-            }
-            mediaServers.add(mediaServer);
+            mediaServers = null;
+//            MediaServer mediaServer = mediaServerService.getOne(mediaServerId);
+//            if (mediaServer == null) {
+//                throw new ControllerException(ErrorCode.ERROR100.getCode(), "未找到流媒体: " + mediaServerId);
+//            }
+//            mediaServers.add(mediaServer);
         } else {
             mediaServers = mediaServerService.getAllOnlineList();
         }
diff --git a/web_src/src/components/CloudRecord.vue b/web_src/src/components/CloudRecord.vue
index b45df61f..0e627228 100755
--- a/web_src/src/components/CloudRecord.vue
+++ b/web_src/src/components/CloudRecord.vue
@@ -65,8 +65,8 @@
       </el-table-column>
       <el-table-column  label="时长">
         <template v-slot:default="scope">
-          <el-tag v-if="scope.row.pushing && serverId !== scope.row.serverId" style="border-color: #ecf1af">{{formatTime(scope.row.timeLen)}}</el-tag>
-          <el-tag v-if="scope.row.pushing && serverId === scope.row.serverId">{{formatTime(scope.row.timeLen)}}</el-tag>
+          <el-tag v-if="serverId !== scope.row.serverId" style="border-color: #ecf1af">{{formatTime(scope.row.timeLen)}}</el-tag>
+          <el-tag v-if="serverId === scope.row.serverId">{{formatTime(scope.row.timeLen)}}</el-tag>
         </template>
       </el-table-column>
       <el-table-column prop="fileName" label="文件名称">