From 086ef5ab15ebd71f8e454868503c6d29b6c5eb98 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 26 Jul 2024 15:48:37 +0800
Subject: [PATCH] 新增图斑上传者
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 118 +++++++++++++++++++++++++---------------------------------
1 files changed, 51 insertions(+), 67 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 c1d2c61..e155d82 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,20 +112,15 @@
}
@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());
- if (!file.getObjectKey().endsWith(".mp4")){
- String url = pojo.getEndpoint() + "/" + pojo.getBucket() + file.getObjectKey();
- File file1 = TbFjServiceImpl.downloadFile(url);
- Object data = ImgUtil.getInfo(file1);
- fileEntity.setDroneData(data);
- }
return mapper.insert(fileEntity);
}
- public void saveMarkFile(String workspaceId, FileUploadDTO file) throws IOException {
+ public void saveNailFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException {
+ updateStatue(file.getName());
boolean endsWith = file.getObjectKey().endsWith(".mp4");
if (endsWith) {
MediaFileNailEntity nailEntity = this.fileUploadConvertToNailEntity((file));
@@ -133,53 +128,36 @@
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);
+ Object data = ImgUtil.getInfo(file1);
+ nailEntity.setIsadd(0);
nailEntity.setIsOriginal(false);
+ nailEntity.setDronedata(data);
nailEntity.setWorkspaceId(workspaceId);
nailEntity.setFileName("nail" + file.getName());
nailEntity.setObjectKey("/nail" + file.getPath() + "/" + file.getName());
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");
+ uploadFile("http://139.196.74.78:9000", "sxkj", "sxkj2024", "cloud-bucket", 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);
}
}
}
@@ -208,11 +186,20 @@
return markEntity.getDronedata();
}
}
+ } else {
+ String names = "nail" + filename;
+ List<MediaFileNailEntity> entities = nailMapper.selectList(new LambdaQueryWrapper<MediaFileNailEntity>()
+ .eq(MediaFileNailEntity::getFileName, names));
+ 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) {
@@ -436,22 +423,18 @@
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);
-
- } catch (Exception e) {
+ downloader.downloadAndZipFolders(jobIds, localSaveDir);
+ } 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(
@@ -462,6 +445,7 @@
.distinct()
.collect(Collectors.toList());
}
+
@Override
public List<MediaFileDTO> getFilesByWorkspaceAndJobId(String workspaceId, String jobId) {
return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
@@ -524,6 +508,7 @@
if (file != null) {
builder.fileName(file.getName())
+ .filePath(file.getPath())
.fingerprint(file.getFingerprint())
.objectKey(file.getObjectKey())
.subFileType(file.getSubFileType())
@@ -553,6 +538,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());
@@ -725,8 +711,8 @@
public void updateMarkMediaFileNames(String jobId) {
try {
// 查询符合条件的数据
- List<MediaFileMarkEntity> mediaFiles = markMapper.selectList(new LambdaQueryWrapper<MediaFileMarkEntity>()
- .eq(MediaFileMarkEntity::getJobId, jobId));
+ List<MediaFileNailEntity> mediaFiles = nailMapper.selectList(new LambdaQueryWrapper<MediaFileNailEntity>()
+ .eq(MediaFileNailEntity::getJobId, jobId));
// 判断所有 fileName 是否都包含 '~' 或者都不包含 '~'
boolean allContainTilde = mediaFiles.stream().allMatch(file -> file.getFileName().contains("~"));
@@ -742,17 +728,17 @@
}
// 筛选出name字段不包含'~'的数据
- List<MediaFileMarkEntity> filteredFiles = mediaFiles.stream()
+ List<MediaFileNailEntity> filteredFiles = mediaFiles.stream()
.filter(file -> !file.getFileName().contains("~"))
.collect(Collectors.toList());
- for (MediaFileMarkEntity currentFile : filteredFiles) {
+ for (MediaFileNailEntity currentFile : filteredFiles) {
String currentName = currentFile.getFileName();
Map<String, Object> currentMetadata = JSON.parseObject(JSON.toJSONString(currentFile.getMetadata()), Map.class);
Long currentCreatedTime = (Long) currentMetadata.get("createdTime");
// 找到metadata中的createdTime小于当前数据的createdTime且最接近的那条数据
- Optional<MediaFileMarkEntity> closestFileOpt = mediaFiles.stream()
+ Optional<MediaFileNailEntity> closestFileOpt = mediaFiles.stream()
.filter(file -> {
Map<String, Object> metadata = JSON.parseObject(JSON.toJSONString(file.getMetadata()), Map.class);
Long createdTime = (Long) metadata.get("createdTime");
@@ -823,6 +809,7 @@
e.printStackTrace();
}
}
+
@Override
public PaginationData<MediaFileEntity> getJobId(int pageNum, int pageSize, String workspaceId) {
List<MediaFileEntity> allRecords = new ArrayList<>();
@@ -877,8 +864,6 @@
}
-
-
@Override
public PaginationData<MediaFileEntity> getPhotoByJobId(int pageNum, int pageSize, String workspaceId, String jobId) {
@@ -918,18 +903,17 @@
}
-
public List<MediaFileEntity> getMedia(String jobId) {
return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
.eq(MediaFileEntity::getJobId, jobId)
.groupBy(MediaFileEntity::getFileName)); // 使用groupBy去重
}
- public void updateById(Integer id, MediaFileMarkEntity entity) {
+ public void updateById(Integer id, MediaFileNailEntity entity) {
entity.setIsadd(1);
- UpdateWrapper<MediaFileMarkEntity> updateWrapper = new UpdateWrapper<>();
+ UpdateWrapper<MediaFileNailEntity> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id", id);
- markMapper.update(entity, updateWrapper);
+ nailMapper.update(entity, updateWrapper);
}
public void updateMediaById(Integer id, MediaFileEntity entity) {
@@ -939,8 +923,8 @@
}
public void getNoaddFile() {
- List<MediaFileMarkEntity> markEntities = markMapper.selectList(new LambdaQueryWrapper<MediaFileMarkEntity>().eq(MediaFileMarkEntity::getIsadd, 0));
- for (MediaFileMarkEntity mark : markEntities) {
+ List<MediaFileNailEntity> markEntities = nailMapper.selectList(new LambdaQueryWrapper<MediaFileNailEntity>().eq(MediaFileNailEntity::getIsadd, 0));
+ for (MediaFileNailEntity mark : markEntities) {
updateMarkMediaFileNames(mark.getJobId());
updateMediaFileNames(mark.getJobId());
}
--
Gitblit v1.9.3