From 62f930cee9ef7031421890cd2c9b636f10ef727a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 20 Nov 2025 10:13:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceServiceImpl.java | 299 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 166 insertions(+), 133 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 bcc4d7d..31fccef 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
@@ -26,13 +26,18 @@
import javax.annotation.Resource;
import javax.imageio.ImageIO;
-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.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.net.URLConnection;
+import java.security.cert.X509Certificate;
import java.util.Date;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@@ -165,45 +170,62 @@
// 插入视频记录
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();
- CompletableFuture.supplyAsync(() -> {
- try {
- // 上传视频
- String videoUrl = uploadFileToOss(flightTask.getBoxSn(), videoPath, "record",
- MimeTypeUtils.VIDEO_MP4);
- ardMedia.setMediaUrl(videoUrl);
- // 生成缩略图 InputStream
- ByteArrayInputStream thumbnailStream = generateThumbnailInputStream(videoPath, 2, 200);
- if (thumbnailStream != null) {
- String thumbnailUrl = ossServiceContext.upload("record",
- flightTask.getBoxSn() + "/" + IdUtils.fastSimpleUUID() + ".jpg",
- thumbnailStream,
- MimeTypeUtils.IMAGE_JPEG);
- ardMedia.setThumbnailUrl(thumbnailUrl);
+ if (videoPathList == null || videoPathList.isEmpty()) {
+ return;
+ }
+ String boxSn = flightTask.getBoxSn();
+ for (String videoPath : videoPathList) {
+
+ 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, 2, 200)) {
+ if (thumbStream != null) {
+ return ossServiceContext.upload(
+ "record",
+ boxSn + "/" + media.getId() + ".jpg",
+ thumbStream,
+ MimeTypeUtils.IMAGE_JPEG
+ );
}
-
- ardMedia.setCreateTime(new Date());
- return ardMedia;
-
- } catch (Exception e) {
- e.printStackTrace();
- return null;
}
- }, threadPoolTaskExecutor).thenAccept(am -> {
- if (am != null) {
- ardMediaMapper.insertArdMedia(am);
- }
- });
+ } 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);
}
}
@@ -214,7 +236,7 @@
Integer count = flightTask.getVideoCount();//获取本地库视频数量
int size = videoPathList.size();//获取接口返回的视频数量
if (count != null && size > count) {
- log.info("录像数量不一致，需要更新数据库");
+ log.info("任务【{}】录像数量不一致，需要更新数据库", flightTask.getTaskId());
// 需要插入新的视频
List<ArdMedia> existingVideos = ardMediaMapper.selectArdMediaByTaskIdAndType(flightTask.getTaskId(), 1);
// 提取现有的视频路径
@@ -227,6 +249,7 @@
.filter(videoPath -> !existingVideoPaths.contains(videoPath)) // 过滤出新的视频
.collect(Collectors.toList());
if (!newVideos.isEmpty()) {
+ String boxSn = flightTask.getBoxSn();
// 插入新的视频记录
for (String videoPath : newVideos) {
ArdMedia ardMedia = ArdMedia.builder()
@@ -236,36 +259,47 @@
.fileSize(getFileSizeByUrl(videoPath))
.sourceUrl(videoPath)
.build();
- CompletableFuture.supplyAsync(() -> {
- try {
- // 上传视频
- String videoUrl = uploadFileToOss(flightTask.getBoxSn(), videoPath, "record",
- MimeTypeUtils.VIDEO_MP4);
- ardMedia.setMediaUrl(videoUrl);
-
-
- // 生成缩略图 InputStream
- ByteArrayInputStream thumbnailStream = generateThumbnailInputStream(videoPath, 2, 200);
- if (thumbnailStream != null) {
- String thumbnailUrl = ossServiceContext.upload("record",
- flightTask.getBoxSn() + "/" + IdUtils.fastSimpleUUID() + ".jpg",
- thumbnailStream,
- MimeTypeUtils.IMAGE_JPEG);
- ardMedia.setThumbnailUrl(thumbnailUrl);
+ // ---- 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
+ );
}
-
- ardMedia.setCreateTime(new Date());
- return ardMedia;
-
} catch (Exception e) {
e.printStackTrace();
- return null;
}
- }, threadPoolTaskExecutor).thenAccept(am -> {
- if (am != null) {
- ardMediaMapper.insertArdMedia(am);
+ return null;
+ }, threadPoolTaskExecutor);
+ // ---- 2. 缩略图上传（失败不抛异常，返回 null） ----
+ CompletableFuture<String> thumbFuture = CompletableFuture.supplyAsync(() -> {
+ try {
+ try (ByteArrayInputStream thumbStream = generateThumbnail(videoPath, 2, 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());
@@ -302,7 +336,7 @@
int size = photoList.size();
if (size > count) {
- log.info("图片数量不一致，需要更新数据库");
+ log.info("任务【{}】图片数量不一致，需要更新数据库", flightTask.getTaskId());
// 获取本地数据库中已存在的图片记录（类型为 0 表示图片）
List<ArdMedia> existingPhotos = ardMediaMapper.selectArdMediaByTaskIdAndType(flightTask.getTaskId(), 0);
// 需要插入新的视频
@@ -327,6 +361,7 @@
}
private void addPhotos(ArdFlightTask flightTask, List<BoxPhotosReceiver> photoList) {
+ String boxSn = flightTask.getBoxSn();
for (BoxPhotosReceiver photo : photoList) {
ArdMedia ardMedia = ArdMedia.builder()
.id(IdUtils.simpleUUID())
@@ -342,78 +377,29 @@
.captureTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, photo.getTimeStamp()))
.build();
// 异步上传文件到OSS，并在上传完成后插入数据库
- CompletableFuture.supplyAsync(() -> uploadFileToOss(flightTask.getBoxSn(), photo.getImgUrl(), "pic",
- 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 = (hostname, session) -> 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) {
@@ -429,9 +415,7 @@
}
// 生成视频缩略图
- public ByteArrayInputStream generateThumbnailInputStream(String videoFile,
- int skipFrames,
- int targetWidth) throws Exception {
+ public ByteArrayInputStream generateThumbnail(String videoFile, int skipFrames, int targetWidth) {
long start = System.currentTimeMillis();
FFmpegFrameGrabber grabber = null;
@@ -480,6 +464,8 @@
return new ByteArrayInputStream(baos.toByteArray());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
} finally {
if (grabber != null) {
try {
@@ -492,5 +478,52 @@
}
}
+ /**
+ * 将 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