From f45ebeed1eb31505f7fd36f03050cb09a4319b90 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 11 Apr 2024 11:59:36 +0800
Subject: [PATCH] 图斑配置
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 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 6092fb5..77272e0 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
@@ -19,6 +19,7 @@
import com.dji.sample.media.model.MediaFileEntity;
import com.dji.sample.media.model.MediaFileQueryParam;
import com.dji.sample.media.service.IFileService;
+import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.wayline.model.entity.WaylineJobEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -95,21 +96,18 @@
}
@Override
- public PaginationData<MediaFileDTO> getMediaFilesPaginationByWorkspaceId(String workspaceId, long page, long pageSize, MediaFileQueryParam mediaFileQueryParam) {
+ 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>()
// .eq(MediaFileEntity::getWorkspaceId, workspaceId)
// .orderByDesc(MediaFileEntity::getId));
-
- Page<MediaFileEntity> pageData = mapper.getPage(new Page<MediaFileEntity>(page, pageSize),workspaceId,mediaFileQueryParam);
-
- List<MediaFileDTO> records = pageData.getRecords()
+ Page<MediaFileEntity> pageData = mapper.selectPage(new Page<MediaFileEntity>(page, pageSize), new LambdaQueryWrapper<MediaFileEntity>()
+ .eq(MediaFileEntity::getWorkspaceId,workspaceId));
+ 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
@@ -194,6 +192,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