From c719838525c874e1527b6ee137a163f044ba4a80 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Thu, 11 Jul 2024 20:42:26 +0800
Subject: [PATCH] 新增喊话模块，更新shp文件入库，对图片返回做去重处理
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 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 067b622..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
@@ -183,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<>();
@@ -202,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");
@@ -217,28 +212,42 @@
queryWrapper.likeLeft(MediaFileEntity::getFileName, ".mp4");
}
}
- queryWrapper.last("ORDER BY JSON_EXTRACT(metadata, '$.createdTime') DESC");
- // 执行分页查询
- Page<MediaFileEntity> resultPage = mapper.selectPage(pageObj, queryWrapper);
- // 处理查询结果并去重
+ queryWrapper.last("ORDER BY JSON_EXTRACT(metadata, '$.createdTime') DESC");
+
+ // 执行查询获取所有结果
+ List<MediaFileEntity> allResults = mapper.selectList(queryWrapper);
+
+ // 处理结果去重并设置任务名称
Map<String, MediaFileEntity> uniqueFileMap = new LinkedHashMap<>();
- List<MediaFileEntity> records = resultPage.getRecords()
- .stream()
+ List<MediaFileEntity> uniqueResults = allResults.stream()
.peek(mediaFile -> {
- // 获取任务名称并设置到fileId
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<MediaFileEntity> pageResults = uniqueResults.subList(start, end);
+
+ // 创建临时的 Page 对象
+ Page<MediaFileEntity> resultPage = new Page<>(page, pageSize);
+ resultPage.setRecords(pageResults);
+ resultPage.setTotal(total);
+
// 返回分页数据
- return new PaginationData<>(records, new Pagination(resultPage));
+ return new PaginationData<>(pageResults, new Pagination(resultPage));
}
+
@Override
public List<MediaFileEntity> listMediaFileEntity(String workspaceId, String jobId) {
return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
--
Gitblit v1.9.3