From 86d4f663db324121b3685e7f3b792756561f881a Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Thu, 25 Jul 2024 19:54:00 +0800
Subject: [PATCH] 修改人工拍照图片保存
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 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 8233451..9bd4a8c 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
@@ -112,27 +112,14 @@
}
@Override
- public Integer saveFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException {
+ public Integer saveFile(String workspaceId, FileUploadDTO file) {
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();
- 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;
+ return mapper.insert(fileEntity);
}
- public void saveNailFile(String workspaceId, FileUploadDTO file, File file1,Object data) throws IOException {
+ public void saveNailFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException {
updateStatue(file.getName());
boolean endsWith = file.getObjectKey().endsWith(".mp4");
if (endsWith) {
@@ -141,8 +128,11 @@
nailEntity.setFileId(UUID.randomUUID().toString());
nailMapper.insert(nailEntity);
} else {
+ 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);
+ Object data = ImgUtil.getInfo(file1);
nailEntity.setIsOriginal(false);
nailEntity.setDronedata(data);
nailEntity.setWorkspaceId(workspaceId);
@@ -195,11 +185,19 @@
return markEntity.getDronedata();
}
}
+ } else {
+ List<MediaFileNailEntity> entities = nailMapper.selectList(new LambdaQueryWrapper<MediaFileNailEntity>()
+ .eq(MediaFileNailEntity::getFileName, name));
+ if (entities != null && !entities.isEmpty()) {
+ for (MediaFileNailEntity NailEntity : entities) {
+ if (NailEntity.getDronedata() != null) {
+ return NailEntity.getDronedata();
+ }
+ }
+ }
}
-
return "null";
}
-
@Override
public List<MediaFileDTO> getAllFilesByWorkspaceId(String workspaceId) {
--
Gitblit v1.9.3