drone/drone-java.git

			@@ -116,16 +116,25 @@
			MediaFileEntity fileEntity = this.fileUploadConvertToEntity(file);
			fileEntity.setWorkspaceId(workspaceId);
			fileEntity.setFileId(UUID.randomUUID().toString());
			if (!file.getObjectKey().endsWith(".mp4")){
			int count=mapper.insert(fileEntity);
			String url = pojo.getEndpoint() + "/" + pojo.getBucket() + file.getObjectKey();
			updateStatue(file.getName());
			if (!file.getObjectKey().endsWith(".mp4")){
			File file1 = TbFjServiceImpl.downloadFile(url);
			saveNailFile(workspaceId,file,file1);
			Object data = ImgUtil.getInfo(file1);
			fileEntity.setDroneData(data);
			file1.delete();
			}
			return mapper.insert(fileEntity);
			else {
			File file1 = TbFjServiceImpl.downloadFile(url);
			saveNailFile(workspaceId,file,file1);
			file1.delete();
			}
			return count;
			}

			public void saveMarkFile(String workspaceId, FileUploadDTO file) throws IOException {
			public void saveNailFile(String workspaceId,FileUploadDTO file,File file1) throws IOException {
			boolean endsWith = file.getObjectKey().endsWith(".mp4");
			if (endsWith) {
			MediaFileNailEntity nailEntity = this.fileUploadConvertToNailEntity((file));
			@@ -133,12 +142,6 @@
			nailEntity.setFileId(UUID.randomUUID().toString());
			nailMapper.insert(nailEntity);
			} else {
			String endpoint = pojo.getEndpoint();
			String accessKey = pojo.getAccessKey();
			String secretKey = pojo.getSecretKey();
			String bucketName = pojo.getBucket();
			String url = pojo.getEndpoint() + "/" + pojo.getBucket() + file.getObjectKey();
			File file1 = TbFjServiceImpl.downloadFile(url);
			File nailFile = new File(ImgZipUtil.compressImage(file1, 50).toURI());
			MediaFileNailEntity nailEntity = this.fileUploadConvertToNailEntity(file);
			nailEntity.setIsOriginal(false);
			@@ -148,42 +151,24 @@
			nailEntity.setFilePath("nail" + file.getPath());
			String nailName = nailEntity.getObjectKey();
			nailEntity.setFileId(UUID.randomUUID().toString());
			uploadFile(endpoint, accessKey, secretKey, bucketName, nailName, nailFile, "image/jpeg");
			uploadFile(pojo.getEndpoint(), pojo.getAccessKey(), pojo.getSecretKey(), pojo.getBucket(), nailName, nailFile, "image/jpeg");
			nailMapper.insert(nailEntity);
			try {
			if (file.getName().contains("~")) {
			String name = TimerUtil.getDkbh(file.getName());
			List<LotInfo> lotInfos = patchesMapper.selectList(new LambdaQueryWrapper<LotInfo>().eq(LotInfo::getDkbh, name));
			if (!lotInfos.isEmpty()) {
			LambdaUpdateWrapper<LotInfo> updateWrapper = new LambdaUpdateWrapper<>();
			updateWrapper.eq(LotInfo::getDkbh, name)
			.eq(LotInfo::getInvestigate, 0)
			.set(LotInfo::getInvestigate, 1);
			patchesMapper.update(null, updateWrapper);
			}
			}
			MediaFileMarkEntity mediaFileMarkEntity = this.fileUploadConvertToMarkEntity(file);
			long timestamp = convertToTimestamp(file.getMetadata().getCreatedTime());
			File markFile = new File(WaterMarkUtil.addWatermark(file1, timestamp, file.getMetadata().getShootPosition().getLat(),
			file.getMetadata().getShootPosition().getLng(), file.getMetadata().getGimbalYawDegree()).toURI());
			Object data = ImgUtil.getInfo(file1);
			mediaFileMarkEntity.setDronedata(data);
			mediaFileMarkEntity.setWorkspaceId(workspaceId);
			mediaFileMarkEntity.setIsadd(0);
			mediaFileMarkEntity.setIsOriginal(false);
			mediaFileMarkEntity.setFileId(UUID.randomUUID().toString());
			mediaFileMarkEntity.setObjectKey("/mark" + file.getPath() + "/" + file.getName());
			mediaFileMarkEntity.setFileName("mark" + file.getName());
			mediaFileMarkEntity.setFilePath("mark" + file.getPath());
			String objectName = mediaFileMarkEntity.getObjectKey(); // 例如 "folder/file.txt"
			uploadFile(endpoint, accessKey, secretKey, bucketName, objectName, markFile, "image/jpeg");
			markMapper.insert(mediaFileMarkEntity);
			} catch (Exception e) {
			e.printStackTrace();
			}
			}
			}

			public void updateStatue(String filename) {
			if (filename.contains("~")) {
			String name = TimerUtil.getDkbh(filename);
			List<LotInfo> lotInfos = patchesMapper.selectList(new LambdaQueryWrapper<LotInfo>().eq(LotInfo::getDkbh, name));
			if (!lotInfos.isEmpty()) {
			LambdaUpdateWrapper<LotInfo> updateWrapper = new LambdaUpdateWrapper<>();
			updateWrapper.eq(LotInfo::getDkbh, name)
			.eq(LotInfo::getInvestigate, 0)
			.set(LotInfo::getInvestigate, 1);
			patchesMapper.update(null, updateWrapper);
			}
			}
			}
			@Override
			public Object mediaInfo(String filename) {
			String name = filename;
			@@ -436,16 +421,11 @@
			public ResponseResult downloadImages(List<String> jobIds) {
			try {
			String bucketPath = "/data/software/minio-data/cloud-bucket/";
			List<String> prefixes = getUniqueFilePaths(jobIds);

			// List<String> prefixes = getUniqueFilePaths(jobIds);
			MinioFileDownloader downloader = new MinioFileDownloader(bucketPath);

			// 下载并压缩文件到本地目录
			String localSaveDir = "/data/software/minio-data/zip-bucket/"; // 修改为你想保存的本地目录
			downloader.downloadAndZipFolders(prefixes, localSaveDir);

			System.out.println("压缩文件已保存到：" + localSaveDir);

			downloader.downloadAndZipFolders(jobIds, localSaveDir);
			} catch (Exception e) {
			e.printStackTrace();
			return ResponseResult.error("下载失败"+e.getMessage());
			@@ -524,6 +504,7 @@

			if (file != null) {
			builder.fileName(file.getName())
			.filePath(file.getPath())
			.fingerprint(file.getFingerprint())
			.objectKey(file.getObjectKey())
			.subFileType(file.getSubFileType())
			@@ -553,6 +534,7 @@
			.objectKey(file.getObjectKey())
			.subFileType(file.getSubFileType())
			.isOriginal(file.getExt().getIsOriginal())
			.filePath(file.getPath())
			.jobId(file.getExt().getFlightId())
			.drone(file.getExt().getSn()).metadata(file.getMetadata())
			.tinnyFingerprint(file.getExt().getTinnyFingerprint());
			@@ -598,7 +580,6 @@

			return builder.build();
			}

			public static void uploadFile(String endpoint, String accessKey, String secretKey, String bucketName, String objectName, File file, String type) {
			try {
			// 创建MinIO客户端实例