From 44b0221f5cc46d3c7e2693382a1fd0937a5b0cc9 Mon Sep 17 00:00:00 2001
From: sdy <mhy_ad1929@163.com>
Date: Fri, 12 Jun 2026 10:35:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9E=E8=A1=8C=E8=A7=86=E9=A2=91=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E5=B0=81=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FlightTaskServiceImpl.java         | 13 +++++++------
 .../business/service/impl/SrsServiceImpl.java       |  8 ++------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/admin/src/main/java/com/multictrl/modules/business/service/impl/FlightTaskServiceImpl.java b/admin/src/main/java/com/multictrl/modules/business/service/impl/FlightTaskServiceImpl.java
index fb2afd5..fd066b0 100644
--- a/admin/src/main/java/com/multictrl/modules/business/service/impl/FlightTaskServiceImpl.java
+++ b/admin/src/main/java/com/multictrl/modules/business/service/impl/FlightTaskServiceImpl.java
@@ -23,7 +23,6 @@ import com.multictrl.modules.business.entity.*;
 import com.multictrl.modules.business.influxdb.UavReport;
 import com.multictrl.modules.business.service.*;
 import com.multictrl.modules.job.dao.ScheduleJobDao;
-import com.multictrl.modules.job.dto.ScheduleJobDTO;
 import com.multictrl.modules.job.entity.ScheduleJobEntity;
 import com.multictrl.modules.security.user.SecurityUser;
 import com.multictrl.modules.sys.dto.SysUserDTO;
@@ -341,8 +340,8 @@ public class FlightTaskServiceImpl extends CrudServiceImpl<FlightTaskDao, Flight
             String file = srsRecordEntity.getFile();
             srsRecordEntity.setRecordDate(DateUtils.getBeforeHour(srsRecordEntity.getRecordDate(), 8));
             srsRecordEntity.setUrl(BusinessConstant.VIDEO_PATH + file);
-//            srsRecordEntity.setCover(BusinessConstant.IMAGE_PATH + getVideoCover(srsRecordEntity.getFile(), srsRecordEntity.getStreamUrl()));
-            srsRecordEntity.setCover(BusinessConstant.IMAGE_PATH + file.replaceAll(".mp4", BusinessConstant.VIDEO_COVER_SUFFIX));
+            srsRecordEntity.setCover(BusinessConstant.IMAGE_PATH + getVideoCover(srsRecordEntity.getFile(), srsRecordEntity.getStreamUrl()));
+//            srsRecordEntity.setCover(BusinessConstant.IMAGE_PATH + file.replaceAll(".mp4", BusinessConstant.VIDEO_COVER_SUFFIX));
         }
 
         return list;
@@ -366,11 +365,13 @@ public class FlightTaskServiceImpl extends CrudServiceImpl<FlightTaskDao, Flight
     }
 
     //使用ffmpeg 用视频提取封面
-   /* private String getVideoCover(String file, String streamUrl) {
+    private String getVideoCover(String file, String streamUrl) {
         String fileName = file.replace("live_record" + streamUrl + "/", "");
         String videoCoverPath = "live_record" + streamUrl + "/" + FileUtil.getPrefix(fileName) + BusinessConstant.VIDEO_COVER_SUFFIX;
-        FfmpegUtils.generateVideoCover("/" + file, "/" + videoCoverPath);
+        if (!FileUtil.exist("/" + videoCoverPath)) {
+            FfmpegUtils.generateVideoCover("/" + file, "/" + videoCoverPath);
+        }
 
         return videoCoverPath;
-    }*/
+    }
 }
\ No newline at end of file
diff --git a/admin/src/main/java/com/multictrl/modules/business/service/impl/SrsServiceImpl.java b/admin/src/main/java/com/multictrl/modules/business/service/impl/SrsServiceImpl.java
index 7b457d9..cb228ec 100644
--- a/admin/src/main/java/com/multictrl/modules/business/service/impl/SrsServiceImpl.java
+++ b/admin/src/main/java/com/multictrl/modules/business/service/impl/SrsServiceImpl.java
@@ -44,11 +44,7 @@ public class SrsServiceImpl implements SrsService {
                 SrsRecordEntity srsRecordEntity = new SrsRecordEntity();
                 srsRecordEntity.setApp(srsCallBack.getApp());
                 srsRecordEntity.setStream(srsCallBack.getStream());
-                if (callBackFile.startsWith("/")) {
-                    srsRecordEntity.setFile(callBackFile.substring(1));
-                } else {
-                    srsRecordEntity.setFile(callBackFile);
-                }
+                srsRecordEntity.setFile(callBackFile.substring(1));
                 srsRecordEntity.setStreamUrl(srsCallBack.getStream_url());
                 String file = callBackFile;
                 //  /live_record/aaa/bbb/2025-04-03_16-33-43-404.mp4
@@ -63,7 +59,7 @@ public class SrsServiceImpl implements SrsService {
 
                 //设置封面
                 String videoCoverPath = srsRecordEntity.getFile().replaceAll(".mp4", BusinessConstant.VIDEO_COVER_SUFFIX);
-                FfmpegUtils.generateVideoCover("/" + file, "/" + videoCoverPath);
+                FfmpegUtils.generateVideoCover("/" + srsRecordEntity.getFile(), "/" + videoCoverPath);
                 srsRecordDao.insert(srsRecordEntity);
             }
         } catch (Exception e) {