From e7af0cdd75430765fcb880fa32391847eb6e615d Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Mon, 29 Dec 2025 14:40:59 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/java/com/ard/work/service/impl/ArdMediaServiceImpl.java | 256 +++++++--------------------------------------------
1 files changed, 36 insertions(+), 220 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/ArdMediaServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/ArdMediaServiceImpl.java
index 837d355..87a7abb 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/ArdMediaServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/ArdMediaServiceImpl.java
@@ -18,7 +18,7 @@
import com.ard.work.service.IArdMediaService;
import com.ard.work.util.osSelect;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
@@ -27,18 +27,20 @@
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.io.*;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Set;
import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -56,12 +58,10 @@
private ArdMediaPicMapper ardMediaPicMapper;
@Resource
private ArdMediaVideoMapper ardMediaVideoMapper;
- @Resource
- private OssServiceContext ossServiceContext;
+
@Resource
private ArdFlightTaskMapper ardFlightTaskMapper;
- @Resource
- private ThreadPoolTaskExecutor threadPoolTaskExecutor;
+
// 调用接口获取架次图片
private List<BoxPhotosReceiver> getBoxPhotos(String serverId, BoxPhotosDTO boxPhotosDTO) {
@@ -114,9 +114,8 @@
}
}
-
@Override
- public void updatePhotoToDatabase(ArdFlightTask flightTask, String serverId, String boxSn) {
+ public void syncPicToDatabase(ArdFlightTask flightTask, String serverId, String boxSn) {
// 获取本地数据库中已存在的图片记录
List<ArdMediaPic> existingPhotos = ardMediaPicMapper.selectPicByTaskId(flightTask.getTaskId());
@@ -151,9 +150,8 @@
}
}
-
@Override
- public void updateVideoToDatabase(ArdFlightTask flightTask, String serverId, String boxSn) {
+ public void syncVideoToDatabase(ArdFlightTask flightTask, String serverId, String boxSn) {
// 获取本地数据库中已存在的视频记录
List<ArdMediaVideo> existingVideos = ardMediaVideoMapper.selectArdMediaVideoByTaskId(flightTask.getTaskId());
@@ -193,219 +191,37 @@
private void addPhotos(ArdFlightTask flightTask, List<BoxPhotosReceiver> photoList) {
log.warn("开始添加图片");
- String boxSn = flightTask.getBoxSn();
for (BoxPhotosReceiver photo : photoList) {
- CompletableFuture.runAsync(() -> {
- ArdMediaPic ardMedia = ArdMediaPic.builder()
- .id(photo.getPhotoId())
- .taskId(flightTask.getTaskId())
- .fileSize(photo.getFileSize())
- .fileMd5(photo.getFileMd5())
- .sourceUrl(photo.getImgUrl())
- .longitude(photo.getLng())
- .latitude(photo.getLat())
- .height(photo.getHeight())
- .captureTime(DateUtils.parseDate(photo.getTimeStamp()))
- .build();
-
- String url = "";
- try (InputStream inputStream = openUrlInputStream(photo.getImgUrl(), 5000, 10000)) {
- if (inputStream != null) {
- url = ossServiceContext.upload(
- "pic",
- boxSn + "/" + ardMedia.getId() + ".jpg",
- inputStream,
- MimeTypeUtils.IMAGE_JPG
- );
- }
- } catch (Exception e) {
- log.error("图片上传失败 taskId={}, photoId={}", flightTask.getTaskId(), photo.getPhotoId(), e);
- }
-
- ardMedia.setMediaUrl(url);
- ardMedia.setCreateTime(new Date());
- ardMediaPicMapper.insertPic(ardMedia);
-
- }, threadPoolTaskExecutor); // 使用自定义线程池
+ ArdMediaPic ardMedia = ArdMediaPic.builder()
+ .id(photo.getPhotoId())
+ .taskId(flightTask.getTaskId())
+ .fileSize(photo.getFileSize())
+ .fileMd5(photo.getFileMd5())
+ .sourceUrl(photo.getImgUrl())
+ .longitude(photo.getLng())
+ .latitude(photo.getLat())
+ .height(photo.getHeight())
+ .captureTime(DateUtils.parseDate(photo.getTimeStamp()))
+ .build();
+ ardMedia.setCreateTime(new Date());
+ ardMediaPicMapper.insertPic(ardMedia);
}
}
private void addVideos(ArdFlightTask flightTask, List<BoxVideosReceiver> videoList) {
- String boxSn = flightTask.getBoxSn();
-
for (BoxVideosReceiver video : videoList) {
- CompletableFuture.runAsync(() -> {
- ArdMediaVideo ardMedia = ArdMediaVideo.builder()
- .id(video.getId())
- .name(video.getName())
- .taskId(flightTask.getTaskId())
- .fileSize(getFileSizeByUrl(video.getImgUrl()))
- .sourceUrl(video.getImgUrl())
- .startTime(DateUtils.parseDate(video.getStartTime()))
- .endTime(DateUtils.parseDate(video.getEndTime()))
- .spanSeconds(Integer.parseInt(video.getSpanSeconds()))
- .build();
-
- // 视频上传
- String videoUrl = null;
- try (InputStream videoStream = openUrlInputStream(ardMedia.getSourceUrl(), 5000, 10000)) {
- if (videoStream != null) {
- videoUrl = ossServiceContext.upload("record",
- boxSn + "/" + ardMedia.getId() + ".mp4",
- videoStream,
- MimeTypeUtils.VIDEO_MP4);
- }
- } catch (Exception e) {
- log.error("视频上传失败 taskId={}, videoId={}", flightTask.getTaskId(), video.getId(), e);
- }
-
- // 缩略图上传（失败不影响视频入库）
- String thumbUrl = null;
- try (ByteArrayInputStream thumbStream = generateThumbnail(ardMedia.getSourceUrl(), 1, 200)) {
- if (thumbStream != null) {
- thumbUrl = ossServiceContext.upload("record",
- boxSn + "/" + ardMedia.getId() + ".jpg",
- thumbStream,
- MimeTypeUtils.IMAGE_JPEG);
- }
- } catch (Exception e) {
- log.warn("缩略图生成或上传失败 taskId={}, videoId={}", flightTask.getTaskId(), video.getId(), e);
- }
-
- // 入库（即使缩略图为空也入库）
- ardMedia.setMediaUrl(videoUrl);
- ardMedia.setThumbnailUrl(thumbUrl);
- ardMedia.setCreateTime(new Date());
- ardMediaVideoMapper.insertArdMediaVideo(ardMedia);
-
- }, threadPoolTaskExecutor);
- }
- }
-
- // 获取文件大小
- private long getFileSizeByUrl(String fileUrl) {
- try {
- URL url = new URL(fileUrl);
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- conn.setRequestMethod("HEAD");
- conn.connect();
- return conn.getContentLengthLong(); // 返回字节大小
- } catch (Exception e) {
- return -1;
- }
- }
-
- // 生成视频缩略图
- 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;
+ ArdMediaVideo ardMedia = ArdMediaVideo.builder()
+ .id(video.getId())
+ .name(video.getName())
+ .taskId(flightTask.getTaskId())
+// .fileSize(getFileSizeByUrl(video.getImgUrl()))
+ .sourceUrl(video.getImgUrl())
+ .startTime(DateUtils.parseDate(video.getStartTime()))
+ .endTime(DateUtils.parseDate(video.getEndTime()))
+ .spanSeconds(Integer.parseInt(video.getSpanSeconds()))
+ .build();
+ ardMedia.setCreateTime(new Date());
+ ardMediaVideoMapper.insertArdMediaVideo(ardMedia);
}
}
}
--
Gitblit v1.9.3