From 62425ee97401796752694001a2222dd38aa34c71 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 24 Nov 2025 15:34:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceServiceImpl.java |  622 +++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 413 insertions(+), 209 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 2e19dc8..cb0a57b 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
@@ -16,15 +16,25 @@
 import com.ard.work.mapper.ArdMediaMapper;
 import com.ard.work.service.IArdFlightTaskService;
 import com.ard.work.service.IArdServerInfoService;
+import com.ard.work.util.osSelect;
 import lombok.extern.slf4j.Slf4j;
 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;
@@ -45,16 +55,23 @@
     private TyClient tyClient;
     @Resource
     private OssServiceContext ossServiceContext;
-
     @Resource
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;  // 使用线程池执行异步任务
 
+    /**
+     * 查询飞行架次列表
+     *
+     * @param ardFlightTask 飞行架次
+     * @return 飞行架次集合
+     */
     @Override
     public List<ArdFlightTask> selectArdFlightTask(ArdFlightTask ardFlightTask) {
         return ardFlightTaskMapper.selectArdFlightTask(ardFlightTask);
     }
 
-    // 同步所有服务的飞行历史
+    /**
+     * 同步所有服务的飞行历史
+     */
     @Scheduled(fixedDelay = 10000)
     public void syncAllFlightHistory() {
         List<String> serverIds = ardServerInfoService.getServerIdsList();
@@ -72,12 +89,12 @@
         return maxStartTime != null ? maxStartTime : new Date(0);  // 如果没有数据,返回 Unix 纪元时间作为起点
     }
 
-    // 调用接口获取飞行历史数据
     // 根据上次同步时间同步飞行历史
-    public void syncFlightHistory(String serverId, Date lastSyncTime) {
+    public void syncFlightHistory(String serverId, Date startTime) {
         // 创建查询条件 BoxHistoryDTO,并设置 startTime 作为过滤条件
-        BoxHistoryDTO boxHistoryDTO = new BoxHistoryDTO();
-        boxHistoryDTO.setStartTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, lastSyncTime));  // 传递 lastSyncTime 参数
+        BoxHistoryDTO boxHistoryDTO = BoxHistoryDTO.builder()
+                .startTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, startTime))
+                .build();
 
         // 获取飞行历史
         List<BoxHistoryReceiver> historyList = getBoxHistory(serverId, boxHistoryDTO);
@@ -90,44 +107,28 @@
         }
     }
 
-    // 调用接口获取飞行历史数据
-    private List<BoxHistoryReceiver> getBoxHistory(String serverId, BoxHistoryDTO boxHistoryDTO) {
-        TyHttpCommonReceiver<List<BoxHistoryReceiver>> boxHistory = tyClient.getBoxHistory(serverId, boxHistoryDTO);
-        return boxHistory.getContent();
-    }
-
     // 将数据同步到本地数据库
     private void syncToLocalDatabase(String serverId, BoxHistoryReceiver boxHistoryReceiver) {
-        // 创建FlightTask实体对象并填充数据
-        ArdFlightTask flightTask = new ArdFlightTask();
-        flightTask.setTaskId(boxHistoryReceiver.getTaskId());
-        flightTask.setBoxSn(boxHistoryReceiver.getBoxSn());
-        flightTask.setBoxName(boxHistoryReceiver.getBoxName());
-        flightTask.setTaskName(boxHistoryReceiver.getTaskName());
-
-        Integer photoCount = Integer.parseInt(boxHistoryReceiver.getPhotoCount());
-        flightTask.setPhotoCount(photoCount);
-
-        Integer videoCount = (boxHistoryReceiver.getVideoPathList() != null) ?
-                boxHistoryReceiver.getVideoPathList().size() : 0;
-        flightTask.setVideoCount(videoCount);
-
-        flightTask.setVideoPath(boxHistoryReceiver.getVideoPath());
-        flightTask.setServerId(serverId);
-
-        Date startTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, boxHistoryReceiver.getStartTime());
-        flightTask.setStartTime(startTime);
-
-        Date endTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, boxHistoryReceiver.getEndTime());
-        flightTask.setEndTime(endTime);
-
-        flightTask.setCreateTime(DateUtils.getNowDate());
-
         // 检查是否已经存在相同任务ID的记录
-        ArdFlightTask ardFlightTask = ardFlightTaskMapper.getArdFlightTaskById(flightTask.getTaskId());
+        ArdFlightTask ardFlightTask = ardFlightTaskMapper.getArdFlightTaskById(boxHistoryReceiver.getTaskId());
         if (ardFlightTask == null) {
             // 如果不存在,则插入新记录
-            log.info("Syncing task {}", boxHistoryReceiver.getTaskId());
+            log.debug("insert task {}", boxHistoryReceiver.getTaskId());
+            // 创建FlightTask实体对象并填充数据
+            ArdFlightTask flightTask = ArdFlightTask.builder()
+                    .taskId(boxHistoryReceiver.getTaskId())
+                    .boxSn(boxHistoryReceiver.getBoxSn())
+                    .boxName(boxHistoryReceiver.getBoxName())
+                    .taskName(boxHistoryReceiver.getTaskName())
+                    .photoCount(Integer.parseInt(boxHistoryReceiver.getPhotoCount()))
+                    .videoCount((boxHistoryReceiver.getVideoPathList() != null) ?
+                            boxHistoryReceiver.getVideoPathList().size() : 0)
+                    .videoPath(boxHistoryReceiver.getVideoPath())
+                    .serverId(serverId)
+                    .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();
+            flightTask.setCreateTime(DateUtils.getNowDate());
             // 插入新记录
             int rows = ardFlightTaskMapper.insertArdFlightTask(flightTask);
             if (rows > 0) {
@@ -135,14 +136,14 @@
                 ardMediaMapper.deleteArdMediaByTaskId(flightTask.getTaskId());
 
                 // 插入视频
-                syncVideoToDatabase(flightTask, boxHistoryReceiver.getVideoPathList());
+                insertVideoToDatabase(flightTask, boxHistoryReceiver.getVideoPathList());
 
                 // 插入图片
-                syncPhotoToDatabase(flightTask, serverId, boxHistoryReceiver.getBoxSn());
+                insertPhotoToDatabase(flightTask, serverId, boxHistoryReceiver.getBoxSn());
             }
         } else {
             // 如果存在,则更新记录
-            log.info("Updating task {}", boxHistoryReceiver.getTaskId());
+            log.debug("Updating task {}", boxHistoryReceiver.getTaskId());
             // 增量更新
             updateVideoToDatabase(ardFlightTask, boxHistoryReceiver.getVideoPathList());
             // 增量更新图片
@@ -151,25 +152,80 @@
         }
     }
 
-    // 插入视频记录
-    private void syncVideoToDatabase(ArdFlightTask flightTask, List<String> videoPathList) {
-        if (videoPathList != null && !videoPathList.isEmpty()) {
-            for (String videoPath : videoPathList) {
 
-                ArdMedia ardMedia = new ArdMedia();
-                ardMedia.setId(IdUtils.simpleUUID());
-                ardMedia.setTaskId(flightTask.getTaskId());
-                ardMedia.setMediaType(1); // 1表示视频
-                ardMedia.setSourceUrl(videoPath);
-                // 异步上传文件到OSS,并在上传完成后插入数据库
-                CompletableFuture.supplyAsync(() -> uploadFileToOss(flightTask.getBoxSn(), videoPath, "record",
-                                MimeTypeUtils.VIDEO_MP4), threadPoolTaskExecutor)
-                        .thenAccept(url -> {
-                            ardMedia.setMediaUrl(url);  // 获取上传后的文件 URL
-                            ardMedia.setCreateTime(new Date());
-                            ardMediaMapper.insertArdMedia(ardMedia);  // 插入数据库
-                        });
-            }
+    // 调用接口获取飞行历史数据
+    private List<BoxHistoryReceiver> getBoxHistory(String serverId, BoxHistoryDTO boxHistoryDTO) {
+        TyHttpCommonReceiver<List<BoxHistoryReceiver>> boxHistory = tyClient.getBoxHistory(serverId, boxHistoryDTO);
+        return boxHistory.getContent();
+    }
+
+    //调用接口获取架次图片
+    private List<BoxPhotosReceiver> getBoxPhotos(String serverId, BoxPhotosDTO boxPhotosDTO) {
+        TyHttpCommonReceiver<List<BoxPhotosReceiver>> boxPhotos = tyClient.getBoxPhotos(serverId, boxPhotosDTO);
+        return boxPhotos.getContent();
+    }
+
+
+    // 插入视频记录
+    private void insertVideoToDatabase(ArdFlightTask flightTask, List<String> videoPathList) {
+        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);
         }
     }
 
@@ -180,29 +236,71 @@
         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);
-            List<String> newVideos = getNewVideos(existingVideos, videoPathList);
+            // 提取现有的视频路径
+            List<String> existingVideoPaths = existingVideos.stream()
+                    .map(ArdMedia::getSourceUrl) // 获取每个视频的 URL
+                    .collect(Collectors.toList());
+
+            // 从接口返回的视频路径中找出新的视频
+            List<String> newVideos = videoPathList.stream()
+                    .filter(videoPath -> !existingVideoPaths.contains(videoPath)) // 过滤出新的视频
+                    .collect(Collectors.toList());
             if (!newVideos.isEmpty()) {
+                String boxSn = flightTask.getBoxSn();
                 // 插入新的视频记录
                 for (String videoPath : newVideos) {
-                    ArdMedia ardMedia = new ArdMedia();
-                    ardMedia.setId(IdUtils.simpleUUID());
-                    ardMedia.setTaskId(flightTask.getTaskId());
-                    ardMedia.setMediaType(1); // 1表示视频
-                    ardMedia.setSourceUrl(videoPath);
-                    // 异步上传文件到OSS,并在上传完成后插入数据库
-                    CompletableFuture.supplyAsync(() -> uploadFileToOss(flightTask.getBoxSn(), videoPath, "record",
-                                    MimeTypeUtils.VIDEO_MP4), threadPoolTaskExecutor)
-                            .thenAccept(url -> {
-                                ardMedia.setMediaUrl(url);  // 获取上传后的文件 URL
-                                ardMedia.setCreateTime(new Date());
-                                ardMediaMapper.insertArdMedia(ardMedia);  // 插入数据库
-                            });
+                    ArdMedia ardMedia = ArdMedia.builder()
+                            .id(IdUtils.simpleUUID())
+                            .taskId(flightTask.getTaskId())
+                            .mediaType(1) // 1表示视频
+                            .fileSize(getFileSizeByUrl(videoPath))
+                            .sourceUrl(videoPath)
+                            .build();
+                    // ---- 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);
@@ -210,91 +308,50 @@
         }
     }
 
-    // 获取需要插入的新视频路径
-    private List<String> getNewVideos(List<ArdMedia> existingVideos, List<String> videoPathList) {
-        // 提取现有的视频路径
-        List<String> existingVideoPaths = existingVideos.stream()
-                .map(ArdMedia::getSourceUrl) // 获取每个视频的 URL
-                .collect(Collectors.toList());
-
-        // 从接口返回的视频路径中找出新的视频
-        List<String> newVideos = videoPathList.stream()
-                .filter(videoPath -> !existingVideoPaths.contains(videoPath)) // 过滤出新的视频
-                .collect(Collectors.toList());
-
-        return newVideos;
-    }
-
     // 插入图片记录
-    private void syncPhotoToDatabase(ArdFlightTask flightTask, String serverId, String boxSn) {
+    private void insertPhotoToDatabase(ArdFlightTask flightTask, String serverId, String boxSn) {
         // 查询图片
         BoxPhotosDTO boxPhotosDTO = new BoxPhotosDTO();
         boxPhotosDTO.setTaskId(flightTask.getTaskId());
         boxPhotosDTO.setBoxSn(boxSn);
         boxPhotosDTO.setPageIndex(1);
         boxPhotosDTO.setPageSize(500);
-
-        TyHttpCommonReceiver<List<BoxPhotosReceiver>> boxPhotos = tyClient.getBoxPhotos(serverId, boxPhotosDTO);
-        List<BoxPhotosReceiver> photoList = boxPhotos.getContent();
-
+        List<BoxPhotosReceiver> photoList = getBoxPhotos(serverId, boxPhotosDTO);
         if (photoList != null && !photoList.isEmpty()) {
-            for (BoxPhotosReceiver photo : photoList) {
-                ArdMedia ardMedia = new ArdMedia();
-                ardMedia.setId(IdUtils.simpleUUID());
-                ardMedia.setTaskId(flightTask.getTaskId());
-                ardMedia.setMediaType(0); // 0表示图片
-                ardMedia.setFileSize(photo.getFileSize());
-                ardMedia.setFileMd5(photo.getFileMd5());
-                ardMedia.setSourceUrl(photo.getImgUrl());
-                // 异步上传文件到OSS,并在上传完成后插入数据库
-                CompletableFuture.supplyAsync(() -> uploadFileToOss(flightTask.getBoxSn(), photo.getImgUrl(), "pic",
-                                MimeTypeUtils.IMAGE_JPG), threadPoolTaskExecutor)
-                        .thenAccept(url -> {
-                            ardMedia.setMediaUrl(url);  // 获取上传后的文件 URL
-                            ardMedia.setCreateTime(new Date());
-                            ardMediaMapper.insertArdMedia(ardMedia);  // 插入数据库
-                        });
-            }
+            addPhotos(flightTask, photoList);
         }
     }
 
     private void updatePhotoToDatabase(ArdFlightTask flightTask, String serverId, String boxSn) {
         int count = flightTask.getPhotoCount(); //获取本地库图片数量
         // 查询图片
-        BoxPhotosDTO boxPhotosDTO = new BoxPhotosDTO();
-        boxPhotosDTO.setTaskId(flightTask.getTaskId());
-        boxPhotosDTO.setBoxSn(boxSn);
-        boxPhotosDTO.setPageIndex(1);
-        boxPhotosDTO.setPageSize(500);
+        BoxPhotosDTO boxPhotosDTO = BoxPhotosDTO.builder()
+                .taskId(flightTask.getTaskId())
+                .boxSn(boxSn)
+                .pageIndex(1)
+                .pageSize(500)
+                .build();
         TyHttpCommonReceiver<List<BoxPhotosReceiver>> boxPhotos = tyClient.getBoxPhotos(serverId, boxPhotosDTO);
         List<BoxPhotosReceiver> photoList = boxPhotos.getContent();
         int size = photoList.size();
 
         if (size > count) {
-            log.info("图片数量不一致,需要更新数据库");
+            log.info("任务【{}】图片数量不一致,需要更新数据库", flightTask.getTaskId());
             // 获取本地数据库中已存在的图片记录(类型为 0 表示图片)
             List<ArdMedia> existingPhotos = ardMediaMapper.selectArdMediaByTaskIdAndType(flightTask.getTaskId(), 0);
             // 需要插入新的视频
-            List<BoxPhotosReceiver> newPhotos = getNewPhotos(existingPhotos, photoList);
+            // 提取现有的图片路径(根据 imgUrl 来判断是否重复)
+            List<String> existingPhotoUrls = existingPhotos.stream()
+                    .map(ArdMedia::getSourceUrl) // 提取 ArdMedia 中的图片 URL
+                    .collect(Collectors.toList());
+
+            // 筛选出 photoList 中没有出现在 existingPhotos 中的新图片
+            List<BoxPhotosReceiver> newPhotos = photoList.stream()
+                    .filter(photo -> !existingPhotoUrls.contains(photo.getImgUrl())) // 过滤出新图片
+                    .collect(Collectors.toList());
             if (!newPhotos.isEmpty()) {
                 // 插入新的视频记录
-                for (BoxPhotosReceiver photo : newPhotos) {
-                    ArdMedia ardMedia = new ArdMedia();
-                    ardMedia.setId(IdUtils.simpleUUID());
-                    ardMedia.setTaskId(flightTask.getTaskId());
-                    ardMedia.setMediaType(0); // 0表示图片
-                    ardMedia.setFileSize(photo.getFileSize());
-                    ardMedia.setFileMd5(photo.getFileMd5());
-                    ardMedia.setSourceUrl(photo.getImgUrl());
-                    // 异步上传文件到OSS,并在上传完成后插入数据库
-                    CompletableFuture.supplyAsync(() -> uploadFileToOss(flightTask.getBoxSn(), photo.getImgUrl(), "pic",
-                                    MimeTypeUtils.IMAGE_JPG), threadPoolTaskExecutor)
-                            .thenAccept(url -> {
-                                ardMedia.setMediaUrl(url);  // 获取上传后的文件 URL
-                                ardMedia.setCreateTime(new Date());
-                                ardMediaMapper.insertArdMedia(ardMedia);  // 插入数据库
-                            });
-                }
+                addPhotos(flightTask, newPhotos);
 
                 // 更新任务的视频数量
                 flightTask.setPhotoCount(flightTask.getPhotoCount() + newPhotos.size());
@@ -303,86 +360,233 @@
         }
     }
 
-    // 获取需要插入的新图片
-    private List<BoxPhotosReceiver> getNewPhotos(List<ArdMedia> existingPhotos, List<BoxPhotosReceiver> photoList) {
-        // 提取现有的图片路径(根据 imgUrl 来判断是否重复)
-        List<String> existingPhotoUrls = existingPhotos.stream()
-                .map(ArdMedia::getSourceUrl) // 提取 ArdMedia 中的图片 URL
-                .collect(Collectors.toList());
-
-        // 筛选出 photoList 中没有出现在 existingPhotos 中的新图片
-        List<BoxPhotosReceiver> newPhotos = photoList.stream()
-                .filter(photo -> !existingPhotoUrls.contains(photo.getImgUrl())) // 过滤出新图片
-                .collect(Collectors.toList());
-
-        return newPhotos; // 返回新增的图片列表
+    private void addPhotos(ArdFlightTask flightTask, List<BoxPhotosReceiver> photoList) {
+        String boxSn = flightTask.getBoxSn();
+        for (BoxPhotosReceiver photo : photoList) {
+            ArdMedia ardMedia = ArdMedia.builder()
+                    .id(IdUtils.simpleUUID())
+                    .taskId(flightTask.getTaskId())
+                    .mediaType(0) // 0表示图片
+                    .fileSize(photo.getFileSize())
+                    .fileMd5(photo.getFileMd5())
+                    .sourceUrl(photo.getImgUrl())
+                    .photoId(photo.getPhotoId())
+                    .longitude(photo.getLng())
+                    .latitude(photo.getLat())
+                    .height(photo.getHeight())
+                    .captureTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, photo.getTimeStamp()))
+                    .build();
+            // 异步上传文件到OSS,并在上传完成后插入数据库
+            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);
+                        ardMedia.setCreateTime(new Date());
+                        ardMediaMapper.insertArdMedia(ardMedia);
+                    });
+        }
     }
 
-    // 通用的上传方法,支持视频和图片等文件上传
-    public String uploadFileToOss(String boxSn, String fileUrl, String bucket, String contentType) {
-        InputStream fileInputStream = null;
-        String fileOssUrl = "";
+
+    // 获取文件大小
+    private long getFileSizeByUrl(String fileUrl) {
         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();
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+            conn.setRequestMethod("HEAD");
+            conn.connect();
+            return conn.getContentLengthLong(); // 返回字节大小
+        } catch (Exception e) {
+            return -1;
+        }
+    }
 
-            // 文件名
-            String fileName = boxSn + "/" + IdUtils.fastSimpleUUID() + "." + MimeTypeUtils.getExtension(contentType);
+    // 生成视频缩略图
+    public ByteArrayInputStream generateThumbnail1(String videoFile, int skipFrames, int targetWidth) {
+//        long start = System.currentTimeMillis();
+//        FFmpegFrameGrabber grabber = null;
+//
+//        try {
+//            grabber = new FFmpegFrameGrabber(videoFile);
+//            grabber.start();
+//
+//            int totalFrames = grabber.getLengthInFrames();
+//            System.out.println("视频总帧数: " + totalFrames);
+//            System.out.println("视频时长: " + grabber.getLengthInTime() / 1000000 + "秒");
+//
+//            Frame frame = null;
+//            int currentFrame = 0;
+//
+//            // 读取指定帧数后的第一帧有效图像
+//            while (currentFrame < totalFrames) {
+//                frame = grabber.grabImage();
+//                if (frame == null) {
+//                    break;
+//                }
+//
+//                if (currentFrame > skipFrames && frame.image != null) {
+//                    break;
+//                }
+//                currentFrame++;
+//            }
+//
+//            if (frame == null || frame.image == null) {
+//                throw new Exception("无法获取有效视频帧");
+//            }
+//
+//            // 转换 Frame 为 BufferedImage
+//            Java2DFrameConverter converter = new Java2DFrameConverter();
+//            BufferedImage image = converter.getBufferedImage(frame);
+//
+//            // 按目标宽度等比缩放
+//            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);
+//
+//            // 转成 ByteArrayInputStream
+//            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+//            ImageIO.write(scaledImage, "jpg", baos);
+//            long cost = System.currentTimeMillis() - start;
+//            System.out.println("处理耗时: " + cost + "ms");
+//
+//            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();
+//                }
+//            }
+//        }
+        return null;
+    }
 
-            // 调用OSS服务上下文进行文件上传
-            fileOssUrl = ossServiceContext.upload(bucket, fileName, fileInputStream, contentType);
+    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("-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();
-            // 异常处理,可以选择记录日志或者抛出业务异常
-        } finally {
-            // 关闭InputStream
-            if (fileInputStream != null) {
-                try {
-                    fileInputStream.close();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
+            return null;
         }
-
-        return fileOssUrl; // 返回上传后的文件OSS URL
     }
 
 }

--
Gitblit v1.9.3