From b734acd444d4daac583527142160af1326327380 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Sat, 29 Nov 2025 08:56:13 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceServiceImpl.java | 422 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 309 insertions(+), 113 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 38f4c77..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,16 +19,27 @@
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.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.net.ssl.*;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+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;
@@ -48,7 +62,10 @@
private OssServiceContext ossServiceContext;
@Resource
private ThreadPoolTaskExecutor threadPoolTaskExecutor; // 使用线程池执行异步任务
-
+ @Resource
+ private UavControlService uavControlService;
+ @Autowired
+ private RedisCache redisCache;
/**
* 查询飞行架次列表
*
@@ -62,7 +79,6 @@
/**
* 同步所有服务的飞行历史
- *
*/
@Scheduled(fixedDelay = 10000)
public void syncAllFlightHistory() {
@@ -120,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);
@@ -136,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());
}
@@ -160,24 +218,64 @@
// 插入视频记录
private void insertVideoToDatabase(ArdFlightTask flightTask, List<String> videoPathList) {
- if (videoPathList != null && !videoPathList.isEmpty()) {
- for (String videoPath : videoPathList) {
- ArdMedia ardMedia = ArdMedia.builder()
- .id(IdUtils.simpleUUID())
- .taskId(flightTask.getTaskId())
- .mediaType(1) // 1表示视频
- .sourceUrl(videoPath)
- .fileSize(getFileSizeByUrl(videoPath))
- .build();
- // 异步上传文件到OSS，并在上传完成后插入数据库
- CompletableFuture.supplyAsync(() -> uploadFileToOss(flightTask.getBoxSn(), videoPath, "record1",
- MimeTypeUtils.VIDEO_MP4), threadPoolTaskExecutor)
- .thenAccept(url -> {
- ardMedia.setMediaUrl(url); // 获取上传后的文件 URL
- ardMedia.setCreateTime(new Date());
- ardMediaMapper.insertArdMedia(ardMedia); // 插入数据库
- });
- }
+ if (videoPathList == null || videoPathList.isEmpty()) {
+ return;
+ }
+ 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())
+ .mediaType(1)
+ .sourceUrl(videoPath)
+ .fileSize(getFileSizeByUrl(videoPath))
+ .build();
+
+ // ---- 1. 视频上传（失败不抛异常，返回 null） ----
+
+ CompletableFuture<String> videoFuture = CompletableFuture.supplyAsync(() -> {
+ try (InputStream inputStream = openUrlInputStream(videoPath, 5000, 10000)) {
+ if (inputStream != null) {
+ return ossServiceContext.upload(
+ "record",
+ boxSn + "/" + media.getId() + ".mp4",
+ inputStream,
+ MimeTypeUtils.VIDEO_MP4
+ );
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }, threadPoolTaskExecutor);
+ // ---- 2. 缩略图上传（失败不抛异常，返回 null） ----
+
+ CompletableFuture<String> thumbFuture = CompletableFuture.supplyAsync(() -> {
+ try {
+ try (ByteArrayInputStream thumbStream = generateThumbnail(videoPath, 1, 200)) {
+ if (thumbStream != null) {
+ return ossServiceContext.upload(
+ "record",
+ boxSn + "/" + media.getId() + ".jpg",
+ thumbStream,
+ MimeTypeUtils.IMAGE_JPEG
+ );
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }, threadPoolTaskExecutor);
+
+ // 两个完成后写数据库（任意失败不阻断流程）
+ videoFuture.thenCombine(thumbFuture, (vUrl, tUrl) -> {
+ media.setMediaUrl(vUrl);
+ media.setThumbnailUrl(tUrl);
+ media.setCreateTime(new Date());
+ return media;
+ }).thenAcceptAsync(ardMediaMapper::insertArdMedia, threadPoolTaskExecutor);
}
}
@@ -185,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("录像数量不一致，需要更新数据库");
- // 需要插入新的视频
- List<ArdMedia> existingVideos = ardMediaMapper.selectArdMediaByTaskIdAndType(flightTask.getTaskId(), 1);
+ log.info("任务【{}】录像数量不一致，需要更新数据库", flightTask.getTaskId());
+
// 提取现有的视频路径
List<String> existingVideoPaths = existingVideos.stream()
.map(ArdMedia::getSourceUrl) // 获取每个视频的 URL
@@ -201,32 +300,64 @@
.filter(videoPath -> !existingVideoPaths.contains(videoPath)) // 过滤出新的视频
.collect(Collectors.toList());
if (!newVideos.isEmpty()) {
+ String boxSn = flightTask.getBoxSn();
// 插入新的视频记录
for (String videoPath : newVideos) {
- ArdMedia ardMedia = ArdMedia.builder()
+ ArdMedia ardMedia = ArdMedia.builder()
.id(IdUtils.simpleUUID())
.taskId(flightTask.getTaskId())
.mediaType(1) // 1表示视频
.fileSize(getFileSizeByUrl(videoPath))
.sourceUrl(videoPath)
.build();
- // 异步上传文件到OSS，并在上传完成后插入数据库
- CompletableFuture.supplyAsync(() -> uploadFileToOss(flightTask.getBoxSn(), videoPath, "record1",
- MimeTypeUtils.VIDEO_MP4), threadPoolTaskExecutor)
- .thenAccept(url -> {
- ardMedia.setMediaUrl(url); // 获取上传后的文件 URL
- ardMedia.setCreateTime(new Date());
- ardMediaMapper.insertArdMedia(ardMedia); // 插入数据库
- });
+ // ---- 1. 视频上传（失败不抛异常，返回 null） ----
+ CompletableFuture<String> videoFuture = CompletableFuture.supplyAsync(() -> {
+ try (InputStream inputStream = openUrlInputStream(videoPath, 5000, 10000)) {
+ if (inputStream != null) {
+ return ossServiceContext.upload(
+ "record",
+ boxSn + "/" + ardMedia.getId() + ".mp4",
+ inputStream,
+ MimeTypeUtils.VIDEO_MP4
+ );
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }, threadPoolTaskExecutor);
+ // ---- 2. 缩略图上传（失败不抛异常，返回 null） ----
+ CompletableFuture<String> thumbFuture = CompletableFuture.supplyAsync(() -> {
+ try {
+ try (ByteArrayInputStream thumbStream = generateThumbnail(videoPath, 1, 200)) {
+ if (thumbStream != null) {
+ return ossServiceContext.upload(
+ "record",
+ boxSn + "/" + ardMedia.getId() + ".jpg",
+ thumbStream,
+ MimeTypeUtils.IMAGE_JPEG
+ );
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }, threadPoolTaskExecutor);
+ // 两个完成后写数据库（任意失败不阻断流程）
+ videoFuture.thenCombine(thumbFuture, (vUrl, tUrl) -> {
+ ardMedia.setMediaUrl(vUrl);
+ ardMedia.setThumbnailUrl(tUrl);
+ ardMedia.setCreateTime(new Date());
+ return ardMedia;
+ }).thenAcceptAsync(ardMediaMapper::insertArdMedia, threadPoolTaskExecutor);
}
-
// 更新任务的视频数量
flightTask.setVideoCount(flightTask.getVideoCount() + newVideos.size());
ardFlightTaskMapper.updateArdFlightTask(flightTask);
}
}
}
-
// 插入图片记录
private void insertPhotoToDatabase(ArdFlightTask flightTask, String serverId, String boxSn) {
@@ -243,9 +374,12 @@
}
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()
+ BoxPhotosDTO boxPhotosDTO = BoxPhotosDTO.builder()
.taskId(flightTask.getTaskId())
.boxSn(boxSn)
.pageIndex(1)
@@ -256,9 +390,7 @@
int size = photoList.size();
if (size > count) {
- log.info("图片数量不一致，需要更新数据库");
- // 获取本地数据库中已存在的图片记录（类型为 0 表示图片）
- List<ArdMedia> existingPhotos = ardMediaMapper.selectArdMediaByTaskIdAndType(flightTask.getTaskId(), 0);
+ log.info("任务【{}】图片数量不一致，需要更新数据库", flightTask.getTaskId());
// 需要插入新的视频
// 提取现有的图片路径（根据 imgUrl 来判断是否重复）
List<String> existingPhotoUrls = existingPhotos.stream()
@@ -281,6 +413,7 @@
}
private void addPhotos(ArdFlightTask flightTask, List<BoxPhotosReceiver> photoList) {
+ String boxSn = flightTask.getBoxSn();
for (BoxPhotosReceiver photo : photoList) {
ArdMedia ardMedia = ArdMedia.builder()
.id(IdUtils.simpleUUID())
@@ -296,85 +429,31 @@
.captureTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, photo.getTimeStamp()))
.build();
// 异步上传文件到OSS，并在上传完成后插入数据库
- CompletableFuture.supplyAsync(() -> uploadFileToOss(flightTask.getBoxSn(), photo.getImgUrl(), "pic1",
- MimeTypeUtils.IMAGE_JPG), threadPoolTaskExecutor)
+ CompletableFuture.supplyAsync(() -> {
+ try (InputStream inputStream = openUrlInputStream(photo.getImgUrl(), 5000, 10000)) {
+ if (inputStream != null) {
+ return ossServiceContext.upload(
+ "pic",
+ boxSn + "/" + ardMedia.getId() + ".jpg",
+ inputStream,
+ MimeTypeUtils.IMAGE_JPG
+ );
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }, threadPoolTaskExecutor)
.thenAccept(url -> {
- ardMedia.setMediaUrl(url); // 获取上传后的文件 URL
+ ardMedia.setMediaUrl(url);
ardMedia.setCreateTime(new Date());
- ardMediaMapper.insertArdMedia(ardMedia); // 插入数据库
+ ardMediaMapper.insertArdMedia(ardMedia);
});
}
}
- // 通用的上传方法，支持视频和图片等文件上传
- private String uploadFileToOss(String boxSn, String fileUrl, String bucket, String contentType) {
- InputStream fileInputStream = null;
- String fileOssUrl = "";
- try {
- // 创建信任所有证书的SSLContext
- TrustManager[] trustAllCerts = new TrustManager[]{
- new X509TrustManager() {
- @Override
- public java.security.cert.X509Certificate[] getAcceptedIssuers() {
- return null;
- }
-
- @Override
- public void checkClientTrusted(
- java.security.cert.X509Certificate[] certs, String authType) {
- }
-
- @Override
- public void checkServerTrusted(
- java.security.cert.X509Certificate[] certs, String authType) {
- }
- }
- };
-
- SSLContext sc = SSLContext.getInstance("SSL");
- sc.init(null, trustAllCerts, new java.security.SecureRandom());
- HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
-
- // 创建所有主机名都信任的HostnameVerifier
- HostnameVerifier allHostsValid = new HostnameVerifier() {
- @Override
- public boolean verify(String hostname, SSLSession session) {
- return true;
- }
- };
- HttpsURLConnection.setDefaultHostnameVerifier(allHostsValid);
-
- // 现在可以正常访问
-
- // 从URL创建InputStream
- URL url = new URL(fileUrl);
- fileInputStream = url.openStream();
-
- // 文件名
- String fileName = boxSn + "/" + IdUtils.fastSimpleUUID() + "." + MimeTypeUtils.getExtension(contentType);
-
- // 调用OSS服务上下文进行文件上传
- fileOssUrl = ossServiceContext.upload(bucket, fileName, fileInputStream, contentType);
-
- } catch (Exception e) {
- e.printStackTrace();
- // 异常处理，可以选择记录日志或者抛出业务异常
- } finally {
- // 关闭InputStream
- if (fileInputStream != null) {
- try {
- fileInputStream.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- return fileOssUrl; // 返回上传后的文件OSS URL
- }
-
- //获取文件大小
+ // 获取文件大小
private long getFileSizeByUrl(String fileUrl) {
try {
URL url = new URL(fileUrl);
@@ -387,4 +466,121 @@
}
}
+ // 生成视频缩略图
+ 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 {
+ List<String> command = new ArrayList<>();
+ command.add(ffmpegPath);
+
+ command.add("-timeout");
+ command.add("3000000");
+ command.add("-rw_timeout");
+ command.add("3000000");
+
+ command.add("-ss");
+ command.add(String.format("00:00:%02d", skipSeconds));
+ command.add("-i");
+ command.add(videoFile);
+ command.add("-vframes");
+ command.add("1");
+
+ // 等比缩放
+ command.add("-vf");
+ command.add("scale=" + targetWidth + ":-1");
+
+ // **确保输出 JPEG**
+ command.add("-f");
+ command.add("mjpeg"); // 关键点：输出格式固定为 JPEG
+ command.add("-vcodec");
+ command.add("mjpeg");
+
+ // 输出到管道
+ command.add("pipe:1");
+
+ // ⭐ 打印最终命令（可复制）
+ log.info("ffmpeg command: {}", String.join(" ", command));
+
+ ProcessBuilder pb = new ProcessBuilder(command);
+ pb.redirectErrorStream(false);
+ Process process = pb.start();
+
+ // 读取 FFmpeg 输出（JPEG 数据）到内存
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ 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 (IOException | InterruptedException e) {
+ throw new RuntimeException("FFmpeg 生成缩略图失败", e);
+ }
+ }
+
+ /**
+ * 将 URL 转成 InputStream
+ *
+ * @param fileUrl 文件 URL
+ * @param connectTimeoutMillis 连接超时（毫秒）
+ * @param readTimeoutMillis 读取超时（毫秒）
+ * @return InputStream，如果失败返回 null
+ */
+ public InputStream openUrlInputStream(String fileUrl, int connectTimeoutMillis, int readTimeoutMillis) {
+ try {
+ URL url = new URL(fileUrl);
+
+ // 支持 HTTPS 信任所有证书（如果需要访问自签名证书）
+ if ("https".equalsIgnoreCase(url.getProtocol())) {
+ TrustManager[] trustAllCerts = new TrustManager[]{
+ new X509TrustManager() {
+ @Override
+ public void checkClientTrusted(X509Certificate[] chain, String authType) {
+ }
+
+ @Override
+ public void checkServerTrusted(X509Certificate[] chain, String authType) {
+ }
+
+ @Override
+ public X509Certificate[] getAcceptedIssuers() {
+ return null;
+ }
+ }
+ };
+ SSLContext sc = SSLContext.getInstance("SSL");
+ sc.init(null, trustAllCerts, new java.security.SecureRandom());
+ HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+ HttpsURLConnection.setDefaultHostnameVerifier((hostname, session) -> true);
+ }
+
+ URLConnection connection = url.openConnection();
+ connection.setConnectTimeout(connectTimeoutMillis);
+ connection.setReadTimeout(readTimeoutMillis);
+
+ return connection.getInputStream();
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
}
--
Gitblit v1.9.3