From 587e31924f7bae43f8f31cb4fc9bf5f33593b50f Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 31 Jul 2024 19:14:05 +0800
Subject: [PATCH] 修改面状航线搜索bug
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 70 ++++++++++++++++++++++++++++++++---
src/main/java/com/dji/sample/media/controller/FileController.java | 2
src/main/java/com/dji/sample/media/service/IFileService.java | 2
3 files changed, 66 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/dji/sample/media/controller/FileController.java b/src/main/java/com/dji/sample/media/controller/FileController.java
index 09c9b03..7fad72c 100644
--- a/src/main/java/com/dji/sample/media/controller/FileController.java
+++ b/src/main/java/com/dji/sample/media/controller/FileController.java
@@ -80,7 +80,7 @@
@RequestParam(defaultValue = "1") int page,
@RequestParam(name = "page_size", defaultValue = "10") int pageSize
) {
- return ResponseResult.success(fileService.getJobId(page, pageSize, workspaceId));
+ return ResponseResult.success(fileService.mediaQuerys(page, pageSize, workspaceId));
}
@PutMapping("/examine")
diff --git a/src/main/java/com/dji/sample/media/service/IFileService.java b/src/main/java/com/dji/sample/media/service/IFileService.java
index 03354a4..19b1696 100644
--- a/src/main/java/com/dji/sample/media/service/IFileService.java
+++ b/src/main/java/com/dji/sample/media/service/IFileService.java
@@ -43,7 +43,7 @@
void updateNailMediaFileNames(String jobId);
PaginationData<MediaFileEntity> getJobId( int pageNum, int pageSize,String workspaceId);
PaginationData<MediaFileEntity> getPhotoByJobId(int page,int pageSize ,String workspaceId,String jobId);
-
+ PaginationData<MediaFileEntity> mediaQuerys(Integer page, Integer pageSize, String workspaceId );
/**
* 获取媒体文件状态
* @param fileId
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 5837292..b6a047e 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
@@ -312,6 +312,47 @@
}
@Override
+ public PaginationData<MediaFileEntity> mediaQuerys(Integer page, Integer pageSize, String workspaceId) {
+ // 创建查询条件对象
+ LambdaQueryWrapper<MediaFileEntity> queryWrapper = new LambdaQueryWrapper<>();
+
+ // 添加查询条件
+ queryWrapper.eq(MediaFileEntity::getWorkspaceId, workspaceId);
+
+
+ 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 -> {
+ String taskNameResult = waylineJobService.getName(mediaFile.getJobId());
+ mediaFile.setJobName(taskNameResult);
+ })
+ .filter(mediaFile -> uniqueFileMap.putIfAbsent(mediaFile.getJobId(), 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<>(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<>();
@@ -940,31 +981,48 @@
// 分页查询
Page<MediaFileEntity> page = new Page<>(pageNum, pageSize);
- // 使用 QueryWrapper 来执行 DISTINCT 查询，并且选择 payload 和 create_time 字段
+ // 使用 QueryWrapper 执行查询
QueryWrapper<MediaFileEntity> queryWrapper = new QueryWrapper<>();
queryWrapper
- .select("DISTINCT job_id", "payload", "create_time") // 选择 job_id, payload 和 create_time 字段
.eq("workspace_id", workspaceId)
- .orderByDesc("create_time");
+ .orderByDesc("create_time"); // 根据 create_time 降序排序
+ // 执行分页查询
Page<MediaFileEntity> resultPage = mapper.selectPage(page, queryWrapper);
List<MediaFileEntity> result = resultPage.getRecords();
+
+ // 根据 job_id 字段进行去重
+ Map<String, MediaFileEntity> uniqueFilesMap = result.stream()
+ .collect(Collectors.toMap(
+ MediaFileEntity::getJobId,
+ entity -> entity,
+ (existing, replacement) -> existing // 如果有重复的，保留已有的
+ ));
+
+ List<MediaFileEntity> uniqueFiles = new ArrayList<>(uniqueFilesMap.values());
+
+
// 为每个 MediaFileEntity 设置 jobName
- for (MediaFileEntity mediaFile : result) {
+ for (MediaFileEntity mediaFile : uniqueFiles) {
String taskNameResult = waylineJobService.getName(mediaFile.getJobId());
mediaFile.setJobName(taskNameResult);
}
// 使用分页对象构造 Pagination
- Pagination pagination = new Pagination(resultPage);
- return new PaginationData<>(result, pagination);
+ Page<MediaFileEntity> newPage = new Page<>(pageNum, pageSize);
+ newPage.setRecords(uniqueFiles);
+ newPage.setTotal(resultPage.getTotal()); // 设置总记录数为原始查询的总记录数
+
+ Pagination pagination = new Pagination(newPage);
+ return new PaginationData<>(uniqueFiles, pagination);
}
+
@Override
public PaginationData<MediaFileEntity> getPhotoByJobId(int pageNum, int pageSize, String workspaceId, String jobId) {
// 分页查询
--
Gitblit v1.9.3