liusuyi
2025-12-29 e7af0cdd75430765fcb880fa32391847eb6e615d
优化
3 files modified
72 ■■■■■ changed files
ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskPartServiceImpl.java 1 ●●●●● patch | view | raw | blame | history
ard-work/src/main/java/com/ard/work/service/impl/ArdMediaServiceImpl.java 70 ●●●●● patch | view | raw | blame | history
ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java 1 ●●●●● patch | view | raw | blame | history
ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskPartServiceImpl.java
@@ -45,7 +45,6 @@
    /**
     * 定时任务:每秒读取一次设备状态数据
     * 注意:这里模拟读取状态,实际应该调用设备接口或缓存
     */
    @Scheduled(fixedRate = 1000)
    public void readTelemetryTask() {
ard-work/src/main/java/com/ard/work/service/impl/ArdMediaServiceImpl.java
@@ -224,74 +224,4 @@
            ardMediaVideoMapper.insertArdMediaVideo(ardMedia);
        }
    }
//    @Scheduled(fixedDelay = 10000) // 每10秒执行一次
//    public void syncVideoMediaUrl() {
//        List<ArdMediaVideo> videos = ardMediaVideoMapper.selectVideosWithNullMedia();
//        for (ArdMediaVideo video : videos) {
//            if (!uploadingVideos.add(video.getId())) {
//                continue;
//            }
//            CompletableFuture.runAsync(() -> {
//                try {
//                    // 上传视频到 OSS
//                    try (InputStream is = openUrlInputStream(video.getSourceUrl(), 5000, 10000)) {
//                        if (is != null) {
//                            String mediaUrl = ossServiceContext.upload(
//                                    "record",
//                                    video.getTaskId() + "/" + video.getId() + ".mp4",
//                                    is,
//                                    MimeTypeUtils.VIDEO_MP4
//                            );
//                            log.info("upload mediaUrl={}", mediaUrl);
//                            video.setMediaUrl(mediaUrl);
//                        }
//                    }
//                    // 生成缩略图
//                    processVideoThumbnail(video);
//
//                    // 更新数据库
//                    video.setUpdateTime(new Date());
//                    ardMediaVideoMapper.updateArdMediaVideo(video);
//                } catch (Exception e) {
//                    log.error("生成 mediaUrl/缩略图失败 videoId={}", video.getId(), e);
//                } finally {
//                    uploadingVideos.remove(video.getId());
//                }
//            }, threadPoolTaskExecutor);
//        }
//    }
//
//    @Scheduled(fixedDelay = 10000) // 每10秒执行一次
//    public void syncPicMediaUrl() {
//        List<ArdMediaPic> pics = ardMediaPicMapper.selectPicsWithNullMedia();
//        for (ArdMediaPic pic : pics) {
//            if (!uploadingPics.add(pic.getId())) {
//                continue;
//            }
//            CompletableFuture.runAsync(() -> {
//                try (InputStream inputStream = openUrlInputStream(pic.getSourceUrl(), 5000, 10000)) {
//                    if (inputStream != null) {
//                        String url = ossServiceContext.upload(
//                                "pic",
//                                pic.getTaskId() + "/" + pic.getId() + ".jpg",
//                                inputStream,
//                                MimeTypeUtils.IMAGE_JPG
//                        );
//                        pic.setMediaUrl(url);
//                        pic.setUpdateTime(new Date());
//                        ardMediaPicMapper.updatePic(pic);
//                    }
//                } catch (Exception e) {
//                    log.error("图片上传失败 taskId={}, photoId={}", pic.getTaskId(), pic.getId(), e);
//                } finally {
//                    uploadingPics.remove(pic.getId());
//                }
//
//            }, threadPoolTaskExecutor); // 使用自定义线程池
//        }
//    }
}
ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
@@ -978,7 +978,6 @@
                // 处理无人机遥测消息
                UavTelemetryDataCmd uavTelemetryDataCmd = (UavTelemetryDataCmd) tyCommand;
                TelemetryData telemetryData = uavTelemetryDataCmd.getTelemetryData();
                telemetryData.setTimestamp(System.currentTimeMillis());//由于六合提供的状态时间戳不准,先以接收状态作为时间戳
                UavTelemetryDataCache.put(telemetryData);
                //logPrint("无人机遥测", uavTelemetryDataCmd.getTelemetryData().getBoxSn());
                //WebSocketUtil.sendMessageAll(uavTelemetryDataCmd.getTelemetryData());