From f10e12cd88f5f73fc57667ff958abdda50c23ec4 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 29 Nov 2025 09:11:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceServiceImpl.java | 181 +++++++++++++++++++++++++++++---------------
1 files changed, 119 insertions(+), 62 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceServiceImpl.java
index 31fccef..cca3705 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceServiceImpl.java
@@ -1,5 +1,8 @@
package com.ard.work.service.impl;
+import com.ard.common.constant.CacheConstants;
+import com.ard.common.core.domain.entity.SysUser;
+import com.ard.common.core.redis.RedisCache;
import com.ard.common.utils.DateUtils;
import com.ard.common.utils.file.MimeTypeUtils;
import com.ard.common.utils.uuid.IdUtils;
@@ -16,28 +19,28 @@
import com.ard.work.mapper.ArdMediaMapper;
import com.ard.work.service.IArdFlightTaskService;
import com.ard.work.service.IArdServerInfoService;
+import com.ard.work.service.control.UavControlService;
+import com.ard.work.util.osSelect;
import lombok.extern.slf4j.Slf4j;
-import org.bytedeco.javacv.FFmpegFrameGrabber;
-import org.bytedeco.javacv.Frame;
-import org.bytedeco.javacv.Java2DFrameConverter;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import javax.imageio.ImageIO;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
-import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
import java.security.cert.X509Certificate;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@@ -59,7 +62,10 @@
private OssServiceContext ossServiceContext;
@Resource
private ThreadPoolTaskExecutor threadPoolTaskExecutor; // 使用线程池执行异步任务
-
+ @Resource
+ private UavControlService uavControlService;
+ @Autowired
+ private RedisCache redisCache;
/**
* 查询飞行架次列表
*
@@ -130,6 +136,14 @@
.startTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, boxHistoryReceiver.getStartTime()))
.endTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, boxHistoryReceiver.getEndTime()))
.build();
+
+ Long flyUserId = uavControlService.getCurrentController(flightTask.getBoxSn(), "fly");
+ if (flyUserId != null) {
+ SysUser flyUser = redisCache.getCacheObject(CacheConstants.SYS_USER_KEY + flyUserId);
+ if (flyUser != null && flyUser.getNickName() != null) {
+ flightTask.setCreateBy(flyUser.getNickName());
+ }
+ }
flightTask.setCreateTime(DateUtils.getNowDate());
// 插入新记录
int rows = ardFlightTaskMapper.insertArdFlightTask(flightTask);
@@ -146,12 +160,46 @@
} else {
// 如果存在，则更新记录
log.debug("Updating task {}", boxHistoryReceiver.getTaskId());
+ updateFlightTask(ardFlightTask, boxHistoryReceiver);
// 增量更新
updateVideoToDatabase(ardFlightTask, boxHistoryReceiver.getVideoPathList());
// 增量更新图片
updatePhotoToDatabase(ardFlightTask, serverId, boxHistoryReceiver.getBoxSn());
}
+ }
+ private void updateFlightTask(ArdFlightTask local, BoxHistoryReceiver remote) {
+
+ boolean needUpdate = false;
+
+ // endTime 更新（重要！！！）
+ Date newEnd = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, remote.getEndTime());
+ if (newEnd != null && (local.getEndTime() == null || !local.getEndTime().equals(newEnd))) {
+ local.setEndTime(newEnd);
+ needUpdate = true;
+ }
+
+ // photoCount 更新
+ int remotePhotoCount = Integer.parseInt(remote.getPhotoCount());
+ if (local.getPhotoCount() != remotePhotoCount) {
+ local.setPhotoCount(remotePhotoCount);
+ needUpdate = true;
+ }
+
+ // videoCount 更新
+ int remoteVideoCount = remote.getVideoPathList() != null ? remote.getVideoPathList().size() : 0;
+ if (local.getVideoCount() != remoteVideoCount) {
+ local.setVideoCount(remoteVideoCount);
+ needUpdate = true;
+ }
+
+ if (needUpdate) {
+ ardFlightTaskMapper.updateArdFlightTask(local);
+ }
+
+ // 其它媒体增量更新
+ updateVideoToDatabase(local, remote.getVideoPathList());
+ updatePhotoToDatabase(local, local.getServerId(), remote.getBoxSn());
}
@@ -175,7 +223,7 @@
}
String boxSn = flightTask.getBoxSn();
for (String videoPath : videoPathList) {
-
+ //videoPath = "https://192.168.1.3:9001/record/DBM250974065008/8212fd8e89814d66b6c32f48d05f5101.mp4";
ArdMedia media = ArdMedia.builder()
.id(IdUtils.simpleUUID())
.taskId(flightTask.getTaskId())
@@ -185,6 +233,7 @@
.build();
// ---- 1. 视频上传（失败不抛异常，返回 null） ----
+
CompletableFuture<String> videoFuture = CompletableFuture.supplyAsync(() -> {
try (InputStream inputStream = openUrlInputStream(videoPath, 5000, 10000)) {
if (inputStream != null) {
@@ -201,9 +250,10 @@
return null;
}, threadPoolTaskExecutor);
// ---- 2. 缩略图上传（失败不抛异常，返回 null） ----
+
CompletableFuture<String> thumbFuture = CompletableFuture.supplyAsync(() -> {
try {
- try (ByteArrayInputStream thumbStream = generateThumbnail(videoPath, 2, 200)) {
+ try (ByteArrayInputStream thumbStream = generateThumbnail(videoPath, 1, 200)) {
if (thumbStream != null) {
return ossServiceContext.upload(
"record",
@@ -233,12 +283,13 @@
if (videoPathList == null) {
return;
}
- Integer count = flightTask.getVideoCount();//获取本地库视频数量
+ // 需要插入新的视频
+ List<ArdMedia> existingVideos = ardMediaMapper.selectArdMediaByTaskIdAndType(flightTask.getTaskId(), 1);
+ Integer count = existingVideos.size();//获取本地库视频数量
int size = videoPathList.size();//获取接口返回的视频数量
if (count != null && size > count) {
log.info("任务【{}】录像数量不一致，需要更新数据库", flightTask.getTaskId());
- // 需要插入新的视频
- List<ArdMedia> existingVideos = ardMediaMapper.selectArdMediaByTaskIdAndType(flightTask.getTaskId(), 1);
+
// 提取现有的视频路径
List<String> existingVideoPaths = existingVideos.stream()
.map(ArdMedia::getSourceUrl) // 获取每个视频的 URL
@@ -278,7 +329,7 @@
// ---- 2. 缩略图上传（失败不抛异常，返回 null） ----
CompletableFuture<String> thumbFuture = CompletableFuture.supplyAsync(() -> {
try {
- try (ByteArrayInputStream thumbStream = generateThumbnail(videoPath, 2, 200)) {
+ try (ByteArrayInputStream thumbStream = generateThumbnail(videoPath, 1, 200)) {
if (thumbStream != null) {
return ossServiceContext.upload(
"record",
@@ -323,7 +374,10 @@
}
private void updatePhotoToDatabase(ArdFlightTask flightTask, String serverId, String boxSn) {
- int count = flightTask.getPhotoCount(); //获取本地库图片数量
+
+ // 获取本地数据库中已存在的图片记录（类型为 0 表示图片）
+ List<ArdMedia> existingPhotos = ardMediaMapper.selectArdMediaByTaskIdAndType(flightTask.getTaskId(), 0);
+ int count = existingPhotos.size(); //获取本地库图片数量
// 查询图片
BoxPhotosDTO boxPhotosDTO = BoxPhotosDTO.builder()
.taskId(flightTask.getTaskId())
@@ -337,8 +391,6 @@
if (size > count) {
log.info("任务【{}】图片数量不一致，需要更新数据库", flightTask.getTaskId());
- // 获取本地数据库中已存在的图片记录（类型为 0 表示图片）
- List<ArdMedia> existingPhotos = ardMediaMapper.selectArdMediaByTaskIdAndType(flightTask.getTaskId(), 0);
// 需要插入新的视频
// 提取现有的图片路径（根据 imgUrl 来判断是否重复）
List<String> existingPhotoUrls = existingPhotos.stream()
@@ -415,66 +467,71 @@
}
// 生成视频缩略图
- public ByteArrayInputStream generateThumbnail(String videoFile, int skipFrames, int targetWidth) {
- long start = System.currentTimeMillis();
- FFmpegFrameGrabber grabber = null;
-
+ public ByteArrayInputStream generateThumbnail(
+ String videoFile,
+ int skipSeconds,
+ int targetWidth) {
+ String ffmpegPath = "";
+ if (osSelect.isWindows()) {
+ ffmpegPath = "ffmpeg";
+ } else if (osSelect.isLinux()) {
+ ffmpegPath = "/usr/local/ffmpeg/bin/ffmpeg";
+ }
try {
- grabber = new FFmpegFrameGrabber(videoFile);
- grabber.start();
+ List<String> command = new ArrayList<>();
+ command.add(ffmpegPath);
- int totalFrames = grabber.getLengthInFrames();
- System.out.println("视频总帧数: " + totalFrames);
- System.out.println("视频时长: " + grabber.getLengthInTime() / 1000000 + "秒");
+ command.add("-timeout");
+ command.add("3000000");
+ command.add("-rw_timeout");
+ command.add("3000000");
- Frame frame = null;
- int currentFrame = 0;
+ command.add("-ss");
+ command.add(String.format("00:00:%02d", skipSeconds));
+ command.add("-i");
+ command.add(videoFile);
+ command.add("-vframes");
+ command.add("1");
- // 读取指定帧数后的第一帧有效图像
- while (currentFrame < totalFrames) {
- frame = grabber.grabImage();
- if (frame == null) {
- break;
- }
+ // 等比缩放
+ command.add("-vf");
+ command.add("scale=" + targetWidth + ":-1");
- if (currentFrame > skipFrames && frame.image != null) {
- break;
- }
- currentFrame++;
- }
+ // **确保输出 JPEG**
+ command.add("-f");
+ command.add("mjpeg"); // 关键点：输出格式固定为 JPEG
+ command.add("-vcodec");
+ command.add("mjpeg");
- if (frame == null || frame.image == null) {
- throw new Exception("无法获取有效视频帧");
- }
+ // 输出到管道
+ command.add("pipe:1");
- // 转换 Frame 为 BufferedImage
- Java2DFrameConverter converter = new Java2DFrameConverter();
- BufferedImage image = converter.getBufferedImage(frame);
+ // ⭐ 打印最终命令（可复制）
+ log.info("ffmpeg command: {}", String.join(" ", command));
- // 按目标宽度等比缩放
- int targetHeight = (int) ((double) targetWidth / image.getWidth() * image.getHeight());
- BufferedImage scaledImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_3BYTE_BGR);
- scaledImage.getGraphics().drawImage(image, 0, 0, targetWidth, targetHeight, null);
+ ProcessBuilder pb = new ProcessBuilder(command);
+ pb.redirectErrorStream(false);
+ Process process = pb.start();
- // 转成 ByteArrayInputStream
+ // 读取 FFmpeg 输出（JPEG 数据）到内存
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ImageIO.write(scaledImage, "jpg", baos);
- long cost = System.currentTimeMillis() - start;
- System.out.println("处理耗时: " + cost + "ms");
+ try (InputStream is = process.getInputStream()) {
+ byte[] buffer = new byte[8192];
+ int len;
+ while ((len = is.read(buffer)) != -1) {
+ baos.write(buffer, 0, len);
+ }
+ }
+
+ int exitCode = process.waitFor();
+ if (exitCode != 0) {
+ throw new RuntimeException("FFmpeg 执行失败，退出码: " + exitCode);
+ }
return new ByteArrayInputStream(baos.toByteArray());
- } catch (Exception e) {
- throw new RuntimeException(e);
- } finally {
- if (grabber != null) {
- try {
- grabber.stop();
- grabber.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
+ } catch (IOException | InterruptedException e) {
+ throw new RuntimeException("FFmpeg 生成缩略图失败", e);
}
}
--
Gitblit v1.9.3