From 76b7d06f5f8ff283279fcc8409b3c28f02cbd37c Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Thu, 18 Jul 2024 10:29:27 +0800
Subject: [PATCH] 修复图斑图片信息缺失
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 180 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 125 insertions(+), 55 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 81ad2af..ebc2d92 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
@@ -108,72 +108,75 @@
}
@Override
- public Integer saveFile(String workspaceId, FileUploadDTO file) {
+ public Integer saveFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException {
MediaFileEntity fileEntity = this.fileUploadConvertToEntity(file);
fileEntity.setWorkspaceId(workspaceId);
fileEntity.setFileId(UUID.randomUUID().toString());
+ 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, FontFormatException, ImageProcessingException {
- 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);
- 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");
- nailMapper.insert(nailEntity);
- try {
- boolean contains = file.getName().contains("~");
- if (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);
+ public void saveMarkFile(String workspaceId, FileUploadDTO file) throws IOException {
+ boolean endsWith = file.getObjectKey().endsWith(".mp4");
+ if (endsWith) {
+ MediaFileNailEntity nailEntity = this.fileUploadConvertToNailEntity((file));
+ nailEntity.setWorkspaceId(workspaceId);
+ 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);
+ 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");
+ 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);
+ }
}
-
- boolean endsWith = file.getObjectKey().endsWith(".mp4");
- if (endsWith) {
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);
- }
- 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();
}
- } catch (Exception e) {
- e.printStackTrace();
}
- }
+ }
@Override
public Object mediaInfo(String filename) {
@@ -186,7 +189,9 @@
if (entity != null) {
return entity.get(0).getDronedata();
} else {
- return "该图片信息正在加载";
+ List<MediaFileEntity> entitys = mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
+ .eq(MediaFileEntity::getFileName, name));
+ return entitys.get(0).getDroneData();
}
}
@@ -200,7 +205,7 @@
}
@Override
- public PaginationData<MediaFileEntity> MediaQuery(Integer page, Integer pageSize, Long updateStart, Long updateEnd, Long photoStart, Long photoEnd, String jobName, String workspaceId, String type) {
+ public PaginationData<MediaFileEntity> mediaQuery(Integer page, Integer pageSize, Long updateStart, Long updateEnd, Long photoStart, Long photoEnd, String jobName, String workspaceId, String type) {
// 创建查询条件对象
LambdaQueryWrapper<MediaFileEntity> queryWrapper = new LambdaQueryWrapper<>();
@@ -256,6 +261,70 @@
// 创建临时的 Page 对象
Page<MediaFileEntity> resultPage = new Page<>(page, pageSize);
+ resultPage.setRecords(pageResults);
+ resultPage.setTotal(total);
+
+ // 返回分页数据
+ return new PaginationData<>(pageResults, new Pagination(resultPage));
+ }
+
+ @Override
+ public PaginationData<MediaFileNailEntity> mediaNailQuery(Integer page, Integer pageSize, Long updateStart, Long updateEnd, Long photoStart, Long photoEnd, String jobName, String workspaceId, String type) {
+ // 创建查询条件对象
+ LambdaQueryWrapper<MediaFileNailEntity> queryWrapper = new LambdaQueryWrapper<>();
+
+ // 添加查询条件
+ queryWrapper.eq(MediaFileNailEntity::getWorkspaceId, workspaceId);
+
+ if (updateStart != null && updateEnd != null) {
+ queryWrapper.between(MediaFileNailEntity::getCreateTime, updateStart, updateEnd);
+ }
+
+ if (photoStart != null && photoEnd != null) {
+ queryWrapper.apply("JSON_UNQUOTE(JSON_EXTRACT(metadata, '$.createdTime')) BETWEEN {0} AND {1}", photoStart, photoEnd);
+ }
+
+ if (jobName != null && !jobName.isEmpty()) {
+ List<String> jobIds = waylineJobService.getJobIds(jobName);
+ if (jobIds.isEmpty()) {
+ return new PaginationData<>(Collections.emptyList(), new Pagination(new Page<>(page, pageSize)));
+ }
+ queryWrapper.in(MediaFileNailEntity::getJobId, jobIds);
+ }
+
+ if (type != null && !type.isEmpty()) {
+ if ("图片".equals(type)) {
+ queryWrapper.likeLeft(MediaFileNailEntity::getFileName, ".jpeg");
+ } else if ("视频".equals(type)) {
+ queryWrapper.likeLeft(MediaFileNailEntity::getFileName, ".mp4");
+ }
+ }
+
+ queryWrapper.last("ORDER BY JSON_EXTRACT(metadata, '$.createdTime') DESC");
+
+ // 执行查询获取所有结果
+ List<MediaFileNailEntity> allResults = nailMapper.selectList(queryWrapper);
+
+ // 处理结果去重并设置任务名称
+ Map<String, MediaFileNailEntity> uniqueFileMap = new LinkedHashMap<>();
+ List<MediaFileNailEntity> uniqueResults = allResults.stream()
+ .peek(mediaFile -> {
+ String taskNameResult = waylineJobService.getName(mediaFile.getJobId());
+ mediaFile.setJobName(taskNameResult);
+ })
+ .filter(mediaFile -> uniqueFileMap.putIfAbsent(mediaFile.getFileName(), mediaFile) == null)
+ .collect(Collectors.toList());
+
+ // 计算分页信息
+ int total = uniqueResults.size();
+ int start = (page - 1) * pageSize;
+ int end = Math.min(start + pageSize, total);
+
+ // 获取当前页的结果
+ List<MediaFileNailEntity> pageResults = uniqueResults.subList(start, end);
+
+ // 创建临时的 Page 对象
+ Page<MediaFileNailEntity> resultPage = new Page<>(page, pageSize);
resultPage.setRecords(pageResults);
resultPage.setTotal(total);
@@ -436,6 +505,7 @@
.subFileType(file.getSubFileType())
.isOriginal(file.getExt().getIsOriginal())
.jobId(file.getExt().getFlightId())
+ .drone(file.getExt().getSn()).metadata(file.getMetadata())
.tinnyFingerprint(file.getExt().getTinnyFingerprint());
// domain-type-subType
--
Gitblit v1.9.3