From c1915a7e947710572826a746e975e8d09516a0e7 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 08 Apr 2024 16:29:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 48107de..f53e96d 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
@@ -89,7 +89,13 @@
}
@Override
- public PaginationData<MediaFileDTO> getMediaFilesPaginationByWorkspaceId(String workspaceId, long page, long pageSize, MediaFileQueryParam mediaFileQueryParam) {
+ public List<MediaFileEntity> listMediaFileEntity(String workspaceId, String jobId) {
+ return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
+ .eq(MediaFileEntity::getWorkspaceId, workspaceId).eq(MediaFileEntity::getJobId,jobId));
+ }
+
+ @Override
+ public PaginationData<MediaFileEntity> getMediaFilesPaginationByWorkspaceId(String workspaceId, long page, long pageSize, MediaFileQueryParam mediaFileQueryParam) {
// Page<MediaFileEntity> pageData = mapper.selectPage(
// new Page<MediaFileEntity>(page, pageSize),
// new LambdaQueryWrapper<MediaFileEntity>()
@@ -98,12 +104,11 @@
Page<MediaFileEntity> pageData = mapper.getPage(new Page<MediaFileEntity>(page, pageSize),workspaceId,mediaFileQueryParam);
- List<MediaFileDTO> records = pageData.getRecords()
+ List<MediaFileEntity> records = pageData.getRecords()
.stream()
- .map(this::entityConvertToDto)
.collect(Collectors.toList());
- return new PaginationData<MediaFileDTO>(records, new Pagination(pageData));
+ return new PaginationData<MediaFileEntity>(records, new Pagination(pageData));
}
@Override
@@ -188,6 +193,7 @@
.objectKey(entity.getObjectKey())
.tinnyFingerprint(entity.getTinnyFingerprint())
.payload(entity.getPayload())
+ .metadata(entity.getMetadata())
.createTime(LocalDateTime.ofInstant(
Instant.ofEpochMilli(entity.getCreateTime()), ZoneId.systemDefault()))
.drone(entity.getDrone())
--
Gitblit v1.9.3