From d4447ca99df2cfe978ca51790dd2891e9df0d492 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Thu, 25 Jul 2024 16:19:05 +0800
Subject: [PATCH] 修改人工拍照图片保存,新增面状航线保存、修改接口，图斑文件上传格式修改
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java b/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java
index fee7a2c..8233451 100644
--- a/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java
+++ b/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java
@@ -116,25 +116,24 @@
MediaFileEntity fileEntity = this.fileUploadConvertToEntity(file);
fileEntity.setWorkspaceId(workspaceId);
fileEntity.setFileId(UUID.randomUUID().toString());
- 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();
- }
- else {
- File file1 = TbFjServiceImpl.downloadFile(url);
- saveNailFile(workspaceId,file,file1);
- file1.delete();
- }
- return count;
+ int count = mapper.insert(fileEntity);
+ String url = pojo.getEndpoint() + "/" + pojo.getBucket() + file.getObjectKey();
+ if (file.getObjectKey().endsWith(".jpeg")) {
+ File file1 = TbFjServiceImpl.downloadFile(url);
+ Object data = ImgUtil.getInfo(file1);
+ fileEntity.setDroneData(data);
+ saveNailFile(workspaceId, file, file1,data);
+ count = mapper.insert(fileEntity);
+ file1.delete();
+ }
+ if (file.getObjectKey().endsWith(".mp4")) {
+ saveNailFile(workspaceId, file, null,null);
+ }
+ return count;
}
- public void saveNailFile(String workspaceId,FileUploadDTO file,File file1) throws IOException {
+ public void saveNailFile(String workspaceId, FileUploadDTO file, File file1,Object data) throws IOException {
+ updateStatue(file.getName());
boolean endsWith = file.getObjectKey().endsWith(".mp4");
if (endsWith) {
MediaFileNailEntity nailEntity = this.fileUploadConvertToNailEntity((file));
@@ -145,6 +144,7 @@
File nailFile = new File(ImgZipUtil.compressImage(file1, 50).toURI());
MediaFileNailEntity nailEntity = this.fileUploadConvertToNailEntity(file);
nailEntity.setIsOriginal(false);
+ nailEntity.setDronedata(data);
nailEntity.setWorkspaceId(workspaceId);
nailEntity.setFileName("nail" + file.getName());
nailEntity.setObjectKey("/nail" + file.getPath() + "/" + file.getName());
@@ -152,6 +152,7 @@
String nailName = nailEntity.getObjectKey();
nailEntity.setFileId(UUID.randomUUID().toString());
uploadFile(pojo.getEndpoint(), pojo.getAccessKey(), pojo.getSecretKey(), pojo.getBucket(), nailName, nailFile, "image/jpeg");
+ uploadFile("http://139.196.74.78:9000", "sxkj", "sxkj2024", "cloud-bucket", nailName, nailFile, "image/jpeg");
nailMapper.insert(nailEntity);
}
}
@@ -169,6 +170,7 @@
}
}
}
+
@Override
public Object mediaInfo(String filename) {
String name = filename;
@@ -426,12 +428,13 @@
// 下载并压缩文件到本地目录
String localSaveDir = "/data/software/minio-data/zip-bucket/"; // 修改为你想保存的本地目录
downloader.downloadAndZipFolders(jobIds, localSaveDir);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
- return ResponseResult.error("下载失败"+e.getMessage());
+ return ResponseResult.error("下载失败" + e.getMessage());
}
return ResponseResult.success("下载成功");
}
+
@Override
public List<String> getUniqueFilePaths(List<String> jobIds) {
return mapper.selectList(
@@ -442,6 +445,7 @@
.distinct()
.collect(Collectors.toList());
}
+
@Override
public List<MediaFileDTO> getFilesByWorkspaceAndJobId(String workspaceId, String jobId) {
return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
@@ -580,6 +584,7 @@
return builder.build();
}
+
public static void uploadFile(String endpoint, String accessKey, String secretKey, String bucketName, String objectName, File file, String type) {
try {
// 创建MinIO客户端实例
@@ -804,6 +809,7 @@
e.printStackTrace();
}
}
+
@Override
public PaginationData<MediaFileEntity> getJobId(int pageNum, int pageSize, String workspaceId) {
List<MediaFileEntity> allRecords = new ArrayList<>();
@@ -858,8 +864,6 @@
}
-
-
@Override
public PaginationData<MediaFileEntity> getPhotoByJobId(int pageNum, int pageSize, String workspaceId, String jobId) {
@@ -897,7 +901,6 @@
return new PaginationData<>(pagedUniqueFiles, pagination);
}
-
public List<MediaFileEntity> getMedia(String jobId) {
--
Gitblit v1.9.3