From 473b5351fbbfd4e5fa4b0f87356253776bfa6da6 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 02 Mar 2026 08:25:41 +0800
Subject: [PATCH] 2026-03-02 优化媒体文件查询列表，新增任务名称
---
ard-sample/src/main/java/com/ard/sample/media/service/impl/FileServiceImpl.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/media/service/impl/FileServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/media/service/impl/FileServiceImpl.java
index f177c56..ebf91a4 100644
--- a/ard-sample/src/main/java/com/ard/sample/media/service/impl/FileServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/media/service/impl/FileServiceImpl.java
@@ -4,6 +4,8 @@
import com.ard.oss.service.impl.OssServiceContext;
import com.ard.sample.utils.TimestampUtils;
import com.ard.sample.utils.VideoDurationUtilFFmpeg;
+import com.ard.sample.wayline.model.dto.WaylineJobDTO;
+import com.ard.sample.wayline.service.IWaylineJobService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ard.sample.common.model.Pagination;
@@ -48,6 +50,9 @@
@Autowired
private IDeviceDictionaryService deviceDictionaryService;
+
+ @Autowired
+ private IWaylineJobService _waylineJobService;
@Autowired
private OssServiceContext ossService;
@@ -129,11 +134,21 @@
return new PaginationData<MediaFileDTO>(records, new Pagination(pageData));
}
+ /**
+ * 分页获取媒体文件列表
+ * 增加筛选条件
+ * @param page 当前页码
+ * @param pageSize 每页大小
+ * @return 分页数据对象，包含媒体文件列表和分页信息
+ */
@Override
- public PaginationData<MediaFileDTO> getMediaFilesPagination(long page, long pageSize) {
+ public PaginationData<MediaFileDTO> getMediaFilesPagination(long page, long pageSize, String jobId, Long startTime, Long endTime) {
Page<MediaFileEntity> pageData = mapper.selectPage(
new Page<MediaFileEntity>(page, pageSize),
new LambdaQueryWrapper<MediaFileEntity>()
+ .eq(jobId != null, MediaFileEntity::getJobId, jobId)
+ .ge(startTime != null, MediaFileEntity::getStartTime, startTime)
+ .le(endTime != null, MediaFileEntity::getStartTime, endTime)
.orderByDesc(MediaFileEntity::getId));
List<MediaFileDTO> records = pageData.getRecords()
.stream()
@@ -162,7 +177,7 @@
}
/**
- * Convert the received file object into a database entity object.
+ * 将接收到的文件对象转换为数据库实体对象。
* @param file
* @return
*/
@@ -198,7 +213,7 @@
}
/**
- * Convert database entity objects into file data transfer object.
+ * 将数据库实体对象转换为文件数据传输对象。
* @param entity
* @return
*/
@@ -224,7 +239,8 @@
Instant.ofEpochMilli(entity.getEndTime()), ZoneId.systemDefault()).format(DATE_TIME_FORMATTER))
.duration(entity.getDuration())
.drone(entity.getDrone())
- .jobId(entity.getJobId());
+ .jobId(entity.getJobId())
+ .jobName(entity.getJobName());
}
--
Gitblit v1.9.3