From 914a1a800b7f8758cfd4d08704e8bbd0cf3e83be Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Mon, 15 Jul 2024 14:05:19 +0800
Subject: [PATCH] 航线云台俯仰角事件
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 119 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 65 insertions(+), 54 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 20eca7e..621b57d 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
@@ -78,6 +78,8 @@
private IWaylineJobService waylineJobService;
@Autowired
private IWaylineFileService waylineFileService;
+ @Autowired
+ private MinioPojo pojo;
private ObjectMapper objectMapper = new ObjectMapper();
@@ -102,11 +104,15 @@
}
@Override
- public Integer saveFile(String workspaceId, FileUploadDTO file) throws ImageProcessingException, IOException {
+ public Integer saveFile(String workspaceId, FileUploadDTO file) {
MediaFileEntity fileEntity = this.fileUploadConvertToEntity(file);
fileEntity.setWorkspaceId(workspaceId);
fileEntity.setFileId(UUID.randomUUID().toString());
- Integer count= mapper.insert(fileEntity);
+ return mapper.insert(fileEntity);
+ }
+
+ public void saveMarkFile(String workspaceId, FileUploadDTO file) throws IOException, FontFormatException, ImageProcessingException {
+
try {
boolean contains = file.getName().contains("~");
if (contains) {
@@ -123,10 +129,6 @@
} catch (Exception e) {
e.printStackTrace();
}
- return count;
- }
-
- public void saveMarkFile(String workspaceId, FileUploadDTO file) throws IOException, FontFormatException, ImageProcessingException {
boolean endsWith = file.getObjectKey().endsWith(".mp4");
if (endsWith) {
MediaFileMarkEntity mediaFileMarkEntity = this.fileUploadConvertToMarkEntity(file);
@@ -134,39 +136,38 @@
mediaFileMarkEntity.setFileId(UUID.randomUUID().toString());
markMapper.insert(mediaFileMarkEntity);
}
- MediaFileMarkEntity mediaFileMarkEntity = this.fileUploadConvertToMarkEntity(file);
- String url = "http://139.196.74.78:9000/cloud-bucket" + file.getObjectKey();
- File file1 = TbFjServiceImpl.downloadFile(url);
- long timestamp = convertToTimestamp(file.getMetadata().getCreatedTime());
- File file2 = 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.setFileId(UUID.randomUUID().toString());
- mediaFileMarkEntity.setObjectKey("/mark" + file.getPath() + "/" + file.getName());
- mediaFileMarkEntity.setFileName("mark" + file.getName());
- mediaFileMarkEntity.setFilePath("mark" + file.getPath());
- String endpoint = "http://139.196.74.78:9000";
- String accessKey = "sxkj";
- String secretKey = "sxkj2024";
- String bucketName = "cloud-bucket";
- String objectName = mediaFileMarkEntity.getObjectKey(); // 例如 "folder/file.txt"
- uploadFile(endpoint, accessKey, secretKey, bucketName, objectName, file2);
- markMapper.insert(mediaFileMarkEntity);
- }
-
+ MediaFileMarkEntity mediaFileMarkEntity = this.fileUploadConvertToMarkEntity(file);
+ String url = pojo.getEndpoint()+"/"+pojo.getBucket() + file.getObjectKey();
+ File file1 = TbFjServiceImpl.downloadFile(url);
+ long timestamp = convertToTimestamp(file.getMetadata().getCreatedTime());
+ File file2 = 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.setFileId(UUID.randomUUID().toString());
+ mediaFileMarkEntity.setObjectKey("/mark" + file.getPath() + "/" + file.getName());
+ mediaFileMarkEntity.setFileName("mark" + file.getName());
+ mediaFileMarkEntity.setFilePath("mark" + file.getPath());
+ String endpoint = pojo.getEndpoint();
+ String accessKey = pojo.getAccessKey();
+ String secretKey = pojo.getSecretKey();
+ String bucketName = pojo.getBucket();
+ String objectName = mediaFileMarkEntity.getObjectKey(); // 例如 "folder/file.txt"
+ uploadFile(endpoint, accessKey, secretKey, bucketName, objectName, file2,"image/jpeg");
+ markMapper.insert(mediaFileMarkEntity);
+ }
@Override
public Object mediaInfo(String filename) {
- String name = "mark"+filename;
- MediaFileMarkEntity entity = markMapper.selectOne(new LambdaQueryWrapper<MediaFileMarkEntity>()
+ String name = "mark" + filename;
+ List<MediaFileMarkEntity> entity = markMapper.selectList(new LambdaQueryWrapper<MediaFileMarkEntity>()
.eq(MediaFileMarkEntity::getFileName, name));
- if (entity!=null){
- return entity.getDronedata();}
- else {
+ if (entity != null) {
+ return entity.get(0).getDronedata();
+ } else {
return "该图片信息正在加载";
}
}
@@ -182,9 +183,6 @@
@Override
public PaginationData<MediaFileEntity> MediaQuery(Integer page, Integer pageSize, Long updateStart, Long updateEnd, Long photoStart, Long photoEnd, String jobName, String workspaceId, String type) {
- // 创建分页对象
- Page<MediaFileEntity> pageObj = new Page<>(page, pageSize);
-
// 创建查询条件对象
LambdaQueryWrapper<MediaFileEntity> queryWrapper = new LambdaQueryWrapper<>();
@@ -201,14 +199,12 @@
if (jobName != null && !jobName.isEmpty()) {
List<String> jobIds = waylineJobService.getJobIds(jobName);
- // 检查 jobIds 列表是否为空
if (jobIds.isEmpty()) {
- // 如果为空，则直接返回空的分页数据
- return new PaginationData<>(Collections.emptyList(), new Pagination(pageObj));
+ return new PaginationData<>(Collections.emptyList(), new Pagination(new Page<>(page, pageSize)));
}
-
queryWrapper.in(MediaFileEntity::getJobId, jobIds);
}
+
if (type != null && !type.isEmpty()) {
if ("图片".equals(type)) {
queryWrapper.likeLeft(MediaFileEntity::getFileName, ".jpeg");
@@ -216,25 +212,40 @@
queryWrapper.likeLeft(MediaFileEntity::getFileName, ".mp4");
}
}
- queryWrapper.last("ORDER BY JSON_EXTRACT(metadata, '$.createdTime') DESC");
- // 执行分页查询
- Page<MediaFileEntity> resultPage = mapper.selectPage(pageObj, queryWrapper);
- // 处理查询结果
- List<MediaFileEntity> records = resultPage.getRecords()
- .stream()
+ queryWrapper.last("ORDER BY JSON_EXTRACT(metadata, '$.createdTime') DESC");
+
+ // 执行查询获取所有结果
+ List<MediaFileEntity> allResults = mapper.selectList(queryWrapper);
+
+ // 处理结果去重并设置任务名称
+ Map<String, MediaFileEntity> uniqueFileMap = new LinkedHashMap<>();
+ List<MediaFileEntity> uniqueResults = allResults.stream()
.peek(mediaFile -> {
- // 获取任务名称并设置到fileId
String taskNameResult = waylineJobService.getName(mediaFile.getJobId());
mediaFile.setJobName(taskNameResult);
})
- .collect(Collectors.toList()
- );
+ .filter(mediaFile -> uniqueFileMap.putIfAbsent(mediaFile.getFileName(), mediaFile) == null)
+ .collect(Collectors.toList());
-// 返回分页数据
- return new PaginationData<>(records, new Pagination(resultPage));
+ // 计算分页信息
+ int total = uniqueResults.size();
+ int start = (page - 1) * pageSize;
+ int end = Math.min(start + pageSize, total);
+ // 获取当前页的结果
+ List<MediaFileEntity> pageResults = uniqueResults.subList(start, end);
+
+ // 创建临时的 Page 对象
+ Page<MediaFileEntity> resultPage = new Page<>(page, pageSize);
+ resultPage.setRecords(pageResults);
+ resultPage.setTotal(total);
+
+ // 返回分页数据
+ return new PaginationData<>(pageResults, new Pagination(resultPage));
}
+
+
@Override
@@ -429,7 +440,7 @@
return builder.build();
}
- public static void uploadFile(String endpoint, String accessKey, String secretKey, String bucketName, String objectName, File file) {
+ public static void uploadFile(String endpoint, String accessKey, String secretKey, String bucketName, String objectName, File file,String type) {
try {
// 创建MinIO客户端实例
MinioClient minioClient = MinioClient.builder()
@@ -443,7 +454,7 @@
.bucket(bucketName)
.object(objectName)
.stream(fileInputStream, file.length(), -1)
- .contentType("image/jpeg")
+ .contentType(type)
.build()
);
fileInputStream.close();
--
Gitblit v1.9.3