~nishiwei/ard-uav-server.git

			@@ -1,6 +1,7 @@
			package com.ard.work.service.impl;

			import com.ard.common.utils.DateUtils;
			import com.ard.common.utils.StringUtils;
			import com.ard.common.utils.file.MimeTypeUtils;
			import com.ard.oss.service.impl.OssServiceContext;
			import com.ard.work.component.forest.TyClient;
			@@ -34,10 +35,7 @@
			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.*;
			import java.util.concurrent.CompletableFuture;
			import java.util.concurrent.ConcurrentHashMap;
			import java.util.concurrent.TimeUnit;
			@@ -58,15 +56,10 @@
			private ArdMediaPicMapper ardMediaPicMapper;
			@Resource
			private ArdMediaVideoMapper ardMediaVideoMapper;
			@Resource
			private OssServiceContext ossServiceContext;

			@Resource
			private ArdFlightTaskMapper ardFlightTaskMapper;
			@Resource
			private ThreadPoolTaskExecutor threadPoolTaskExecutor;

			private final Set<Long> uploadingVideos = ConcurrentHashMap.newKeySet();
			private final Set<Long> uploadingPics = ConcurrentHashMap.newKeySet();

			// 调用接口获取架次图片
			private List<BoxPhotosReceiver> getBoxPhotos(String serverId, BoxPhotosDTO boxPhotosDTO) {
			@@ -122,35 +115,65 @@
			@Override
			public void syncPicToDatabase(ArdFlightTask flightTask, String serverId, String boxSn) {

			// 获取本地数据库中已存在的图片记录
			List<ArdMediaPic> existingPhotos = ardMediaPicMapper.selectPicByTaskId(flightTask.getTaskId());
			int count = existingPhotos.size(); //获取本地库图片数量
			// 查询图片
			BoxPhotosDTO boxPhotosDTO = BoxPhotosDTO.builder()
			// 1️⃣ 查第三方图片列表
			BoxPhotosDTO dto = BoxPhotosDTO.builder()
			.taskId(flightTask.getTaskId())
			.boxSn(boxSn)
			.pageIndex(1)
			.pageSize(500)
			.pageSize(100)
			.build();
			TyHttpCommonReceiver<List<BoxPhotosReceiver>> boxPhotos = tyClient.getBoxPhotos(serverId, boxPhotosDTO);
			List<BoxPhotosReceiver> photoList = boxPhotos.getContent();
			int size = photoList.size();

			if (size > count) {
			log.info("任务【{}】图片数量不一致，需要更新数据库", flightTask.getTaskId());
			// 需要插入新的视频
			// 提取现有的图片路径（根据 imgUrl 来判断是否重复）
			List<String> existingPhotoUrls = existingPhotos.stream()
			.map(ArdMediaPic::getSourceUrl) // 提取 ArdMediaPic 中的图片 URL
			.collect(Collectors.toList());
			TyHttpCommonReceiver<List<BoxPhotosReceiver>> resp = tyClient.getBoxPhotos(serverId, dto);

			// 筛选出 photoList 中没有出现在 existingPhotos 中的新图片
			List<BoxPhotosReceiver> newPhotos = photoList.stream()
			.filter(photo -> !existingPhotoUrls.contains(photo.getImgUrl())) // 过滤出新图片
			.collect(Collectors.toList());
			if (!newPhotos.isEmpty()) {
			// 插入新的图片记录
			addPhotos(flightTask, newPhotos);
			List<BoxPhotosReceiver> photoList = resp.getContent();
			if (photoList == null \|\| photoList.isEmpty()) {
			return;
			}

			// 2️⃣ 本地图片转 Map（用“业务唯一键”）
			List<ArdMediaPic> existingList = ardMediaPicMapper.selectPicByTaskId(flightTask.getTaskId());

			Map<Long, ArdMediaPic> localPicMap = existingList.stream()
			.filter(p -> p.getId() != null)
			.collect(Collectors.toMap(
			ArdMediaPic::getId, // ✅ 远端 photoId
			p -> p,
			(a, b) -> a
			));


			// 3️⃣ 逐条处理（新增 or 补全）
			for (BoxPhotosReceiver remote : photoList) {

			String imgUrl = remote.getImgUrl();
			if (StringUtils.isBlank(imgUrl)) {
			continue; // 第三方字段还没准备好
			}
			ArdMediaPic local = localPicMap.get(remote.getPhotoId());
			if (local == null) {
			// ✅ 新图片 → 插入
			addPhotos(flightTask, List.of(remote));
			continue;
			}

			// ✅ 已存在 → 补字段
			boolean needUpdate = false;

			if (local.getCaptureTime() == null && remote.getTimeStamp() != null) {
			local.setCaptureTime(DateUtils.parseDate(remote.getTimeStamp()));
			needUpdate = true;
			}
			if (local.getFileSize() == 0 && remote.getFileSize() != 0) {
			local.setFileSize(remote.getFileSize());
			needUpdate = true;
			}
			if ("0".equals(local.getFileMd5())&& !"0".equals(remote.getFileMd5())) {
			local.setFileMd5(remote.getFileMd5());
			needUpdate = true;
			}
			if (needUpdate) {
			local.setUpdateTime(new Date());
			ardMediaPicMapper.updatePic(local);
			}
			}
			}
			@@ -158,38 +181,63 @@
			@Override
			public void syncVideoToDatabase(ArdFlightTask flightTask, String serverId, String boxSn) {

			// 获取本地数据库中已存在的视频记录
			List<ArdMediaVideo> existingVideos = ardMediaVideoMapper.selectArdMediaVideoByTaskId(flightTask.getTaskId());
			int count = existingVideos.size(); //获取本地库视频数量
			// 查询图片
			BoxVideosDTO boxVideosDTO = BoxVideosDTO.builder()
			// 1️⃣ 拉取远端视频列表
			BoxVideosDTO dto = BoxVideosDTO.builder()
			.taskId(flightTask.getTaskId())
			.boxSn(boxSn)
			.pageIndex(1)
			.pageSize(500)
			.pageSize(100)
			.build();
			TyHttpCommonReceiver<List<BoxVideosReceiver>> boxVideos = tyClient.getBoxVideos(serverId, boxVideosDTO);
			List<BoxVideosReceiver> videoList = boxVideos.getContent();
			int size = videoList.size();
			TyHttpCommonReceiver<List<BoxVideosReceiver>> resp = tyClient.getBoxVideos(serverId, dto);
			List<BoxVideosReceiver> videoList = resp.getContent();
			if (videoList == null \|\| videoList.isEmpty()) {
			return;
			}

			if (size > count) {
			log.info("任务【{}】视频数量不一致，需要更新数据库", flightTask.getTaskId());
			// 需要插入新的视频
			// 提取现有的图片路径（根据 imgUrl 来判断是否重复）
			List<String> existingVideoUrls = existingVideos.stream()
			.map(ArdMediaVideo::getSourceUrl) // 提取 ArdMedia 中的视频 URL
			.collect(Collectors.toList());
			// 2️⃣ 本地视频转 Map（videoId 为唯一键）
			List<ArdMediaVideo> existingVideos = ardMediaVideoMapper.selectArdMediaVideoByTaskId(flightTask.getTaskId());
			Map<Long, ArdMediaVideo> localVideoMap = existingVideos.stream()
			.filter(v -> v.getId() != null)
			.collect(Collectors.toMap(
			ArdMediaVideo::getId, // 远端 videoId
			v -> v,
			(a, b) -> a
			));

			// 筛选出 photoList 中没有出现在 existingPhotos 中的新图片
			List<BoxVideosReceiver> newVideos = videoList.stream()
			.filter(photo -> !existingVideoUrls.contains(photo.getImgUrl())) // 过滤出新视频
			.collect(Collectors.toList());
			if (!newVideos.isEmpty()) {
			// 插入新的视频记录
			addVideos(flightTask, newVideos);
			// 更新任务的视频数量
			flightTask.setVideoCount(flightTask.getVideoCount() + newVideos.size());
			// 3️⃣ 遍历远端视频，逐条处理
			for (BoxVideosReceiver remote : videoList) {

			ArdMediaVideo local = localVideoMap.get(remote.getId());
			if (local == null) {
			// 新视频 → 立即插入
			addVideos(flightTask, List.of(remote));
			localVideoMap.put(remote.getId(), new ArdMediaVideo()); // 占位
			flightTask.setVideoCount(flightTask.getVideoCount() + 1);
			ardFlightTaskMapper.updateArdFlightTask(flightTask);
			continue;
			}

			// 已存在 → 补字段
			boolean needUpdate = false;
			if (local.getName() == null && remote.getName() != null) {
			local.setName(remote.getName());
			needUpdate = true;
			}
			if (local.getStartTime() == null && remote.getStartTime() != null) {
			local.setStartTime(DateUtils.parseDate(remote.getStartTime()));
			needUpdate = true;
			}
			if (local.getEndTime() == null && remote.getEndTime() != null) {
			local.setEndTime(DateUtils.parseDate(remote.getEndTime()));
			needUpdate = true;
			}
			if (local.getSpanSeconds() == null && remote.getSpanSeconds() != null) {
			local.setSpanSeconds(Integer.parseInt(remote.getSpanSeconds()));
			needUpdate = true;
			}
			if (needUpdate) {
			local.setUpdateTime(new Date());
			ardMediaVideoMapper.updateArdMediaVideo(local);
			}
			}
			}
			@@ -229,228 +277,4 @@
			ardMediaVideoMapper.insertArdMediaVideo(ardMedia);
			}
			}

			/**
			* 处理视频缩略图
			*/
			private void processVideoThumbnail(ArdMediaVideo video) {
			// 生成缩略图
			try (ByteArrayInputStream in = generateThumbnail(video.getSourceUrl())) {
			String thumbUrl = ossServiceContext.upload(
			"record",
			video.getTaskId() + "/" + video.getId() + ".jpg",
			in,
			MimeTypeUtils.IMAGE_JPEG
			);
			video.setThumbnailUrl(thumbUrl);
			} catch (Exception e) {
			log.warn("视频缩略图生成或上传失败 taskId={}, videoId={}", video.getTaskId(), video.getId(), e);
			}
			// 获取文件大小
			try {
			long videoSize = getFileSizeFromUrl(video.getSourceUrl());
			video.setFileSize(videoSize);
			} catch (Exception e) {
			log.warn("获取视频大小失败 url={}", video.getSourceUrl(), e);
			}
			// 更新数据库
			video.setUpdateTime(new Date());
			ardMediaVideoMapper.updateArdMediaVideo(video);
			}

			public long getFileSizeFromUrl(String fileUrl) throws IOException {
			URL url = new URL(fileUrl);
			HttpURLConnection conn = (HttpURLConnection) url.openConnection();
			conn.setRequestMethod("HEAD");
			conn.setConnectTimeout(5000);
			conn.setReadTimeout(5000);
			conn.connect();
			long size = conn.getContentLengthLong(); // 返回字节数
			conn.disconnect();
			return size;
			}


			private ByteArrayInputStream generateThumbnail(String videoFile) {

			String ffmpeg = osSelect.isWindows()
			? "ffmpeg"
			: "/usr/local/ffmpeg/bin/ffmpeg";

			Path tempImg = null;
			try {
			tempImg = Files.createTempFile("thumb_", ".jpg");

			List<String> cmd = new ArrayList<>();
			cmd.add(ffmpeg);
			cmd.add("-y");
			cmd.add("-loglevel");
			cmd.add("error");
			cmd.add("-i");
			cmd.add(videoFile);
			cmd.add("-ss");
			cmd.add(String.valueOf(1));
			cmd.add("-vframes");
			cmd.add("1");
			cmd.add("-vf");
			cmd.add("scale=" + 200 + ":-1");
			cmd.add(tempImg.toAbsolutePath().toString());

			log.info("ffmpeg cmd: {}", String.join(" ", cmd));

			Process process = new ProcessBuilder(cmd).start();

			drain(process.getErrorStream());

			boolean finished = process.waitFor(15, TimeUnit.SECONDS); // 超时保护
			if (!finished) {
			process.destroyForcibly();
			throw new RuntimeException("ffmpeg timeout");
			}

			if (process.exitValue() != 0) {
			throw new RuntimeException("ffmpeg exit=" + process.exitValue());
			}

			byte[] data = Files.readAllBytes(tempImg);
			return new ByteArrayInputStream(data);

			} catch (Exception e) {
			throw new RuntimeException("生成缩略图失败", e);
			} finally {
			if (tempImg != null) {
			try {
			Files.deleteIfExists(tempImg);
			} catch (IOException ignore) {
			}
			}
			}
			}

			private static void drain(InputStream is) {
			new Thread(() -> {
			try (BufferedReader br = new BufferedReader(new InputStreamReader(is))) {
			while (br.readLine() != null) {
			}
			} catch (IOException ignore) {
			}
			}, "ffmpeg-stderr").start();
			}


			/**
			* 将 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;
			}
			}

			@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); // 使用自定义线程池
			}
			}

			}