From 0e63f83f9391c17e5920605dc3de4713ef8b8f67 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 08 Apr 2024 16:29:42 +0800
Subject: [PATCH] 新增相机拍照时间记录
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 8 ++++----
src/main/java/com/dji/sample/media/controller/FileController.java | 4 ++--
src/main/java/com/dji/sample/media/model/MediaFileDTO.java | 2 ++
src/main/java/com/dji/sample/media/service/IFileService.java | 2 +-
4 files changed, 9 insertions(+), 7 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 e0545b7..4834b0f 100644
--- a/src/main/java/com/dji/sample/media/controller/FileController.java
+++ b/src/main/java/com/dji/sample/media/controller/FileController.java
@@ -36,11 +36,11 @@
* @return
*/
@GetMapping("/{workspace_id}/files")
- public ResponseResult<PaginationData<MediaFileDTO>> getFilesList(@RequestParam(defaultValue = "1") Long page,
+ public ResponseResult<PaginationData<MediaFileEntity>> getFilesList(@RequestParam(defaultValue = "1") Long page,
@RequestParam(name = "page_size", defaultValue = "10") Long pageSize,
@PathVariable(name = "workspace_id") String workspaceId,
MediaFileQueryParam mediaFileQueryParam) {
- PaginationData<MediaFileDTO> filesList = fileService.getMediaFilesPaginationByWorkspaceId(workspaceId, page, pageSize,mediaFileQueryParam);
+ PaginationData<MediaFileEntity> filesList = fileService.getMediaFilesPaginationByWorkspaceId(workspaceId, page, pageSize,mediaFileQueryParam);
return ResponseResult.success(filesList);
}
diff --git a/src/main/java/com/dji/sample/media/model/MediaFileDTO.java b/src/main/java/com/dji/sample/media/model/MediaFileDTO.java
index dec1a1b..101d3ca 100644
--- a/src/main/java/com/dji/sample/media/model/MediaFileDTO.java
+++ b/src/main/java/com/dji/sample/media/model/MediaFileDTO.java
@@ -41,4 +41,6 @@
private LocalDateTime createTime;
private String jobId;
+
+ private Object metadata;
}
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 fde21ec..bc63bcd 100644
--- a/src/main/java/com/dji/sample/media/service/IFileService.java
+++ b/src/main/java/com/dji/sample/media/service/IFileService.java
@@ -48,7 +48,7 @@
* @param pageSize
* @return
*/
- PaginationData<MediaFileDTO> getMediaFilesPaginationByWorkspaceId(String workspaceId, long page, long pageSize, MediaFileQueryParam mediaFileQueryParam);
+ PaginationData<MediaFileEntity> getMediaFilesPaginationByWorkspaceId(String workspaceId, long page, long pageSize, MediaFileQueryParam mediaFileQueryParam);
/**
* Get the download address of the file.
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..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
@@ -95,7 +95,7 @@
}
@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>()
@@ -104,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
@@ -194,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