From 8e10cec76285192d30abecd7d09001a75f2755a3 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 19 Sep 2023 16:11:27 +0800
Subject: [PATCH] 计划查询
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 3a2526d..6d73a24 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
@@ -46,9 +46,6 @@
@Autowired
private OssServiceContext ossService;
- @Autowired
- private OssConfiguration configuration;
-
private Optional<MediaFileEntity> getMediaByFingerprint(String workspaceId, String fingerprint) {
MediaFileEntity fileEntity = mapper.selectOne(new LambdaQueryWrapper<MediaFileEntity>()
.eq(MediaFileEntity::getWorkspaceId, workspaceId)
@@ -86,7 +83,7 @@
}
@Override
- public PaginationData<MediaFileDTO> getJobsPaginationByWorkspaceId(String workspaceId, long page, long pageSize) {
+ public PaginationData<MediaFileDTO> getMediaFilesPaginationByWorkspaceId(String workspaceId, long page, long pageSize) {
Page<MediaFileEntity> pageData = mapper.selectPage(
new Page<MediaFileEntity>(page, pageSize),
new LambdaQueryWrapper<MediaFileEntity>()
@@ -107,7 +104,16 @@
throw new IllegalArgumentException("{} doesn't exist.");
}
- return ossService.getObjectUrl(configuration.getBucket(), mediaFileOpt.get().getObjectKey());
+ return ossService.getObjectUrl(OssConfiguration.bucket, mediaFileOpt.get().getObjectKey());
+ }
+
+ @Override
+ public List<MediaFileDTO> getFilesByWorkspaceAndJobId(String workspaceId, String jobId) {
+ return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
+ .eq(MediaFileEntity::getWorkspaceId, workspaceId)
+ .eq(MediaFileEntity::getJobId, jobId))
+ .stream()
+ .map(this::entityConvertToDto).collect(Collectors.toList());
}
/**
@@ -160,7 +166,8 @@
.payload(entity.getPayload())
.createTime(LocalDateTime.ofInstant(
Instant.ofEpochMilli(entity.getCreateTime()), ZoneId.systemDefault()))
- .drone(entity.getDrone());
+ .drone(entity.getDrone())
+ .jobId(entity.getJobId());
}
--
Gitblit v1.9.3