From ec46a32ca330e5c416302eb082e44fa164b37829 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 22 Sep 2023 17:41:16 +0800
Subject: [PATCH] 配置修改
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 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 2037099..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
@@ -7,6 +7,7 @@
import com.dji.sample.component.oss.model.OssConfiguration;
import com.dji.sample.component.oss.service.impl.OssServiceContext;
import com.dji.sample.manage.model.dto.DeviceDictionaryDTO;
+import com.dji.sample.manage.model.enums.DeviceDomainEnum;
import com.dji.sample.manage.service.IDeviceDictionaryService;
import com.dji.sample.media.dao.IFileMapper;
import com.dji.sample.media.model.FileUploadDTO;
@@ -24,6 +25,7 @@
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
+import java.util.UUID;
import java.util.stream.Collectors;
/**
@@ -44,13 +46,17 @@
@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)
.eq(MediaFileEntity::getFingerprint, fingerprint));
+ return Optional.ofNullable(fileEntity);
+ }
+
+ private Optional<MediaFileEntity> getMediaByFileId(String workspaceId, String fileId) {
+ MediaFileEntity fileEntity = mapper.selectOne(new LambdaQueryWrapper<MediaFileEntity>()
+ .eq(MediaFileEntity::getWorkspaceId, workspaceId)
+ .eq(MediaFileEntity::getFileId, fileId));
return Optional.ofNullable(fileEntity);
}
@@ -63,6 +69,7 @@
public Integer saveFile(String workspaceId, FileUploadDTO file) {
MediaFileEntity fileEntity = this.fileUploadConvertToEntity(file);
fileEntity.setWorkspaceId(workspaceId);
+ fileEntity.setFileId(UUID.randomUUID().toString());
return mapper.insert(fileEntity);
}
@@ -76,11 +83,12 @@
}
@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>()
- .eq(MediaFileEntity::getWorkspaceId, workspaceId));
+ .eq(MediaFileEntity::getWorkspaceId, workspaceId)
+ .orderByDesc(MediaFileEntity::getId));
List<MediaFileDTO> records = pageData.getRecords()
.stream()
.map(this::entityConvertToDto)
@@ -90,13 +98,22 @@
}
@Override
- public URL getObjectUrl(String workspaceId, String fingerprint) {
- Optional<MediaFileEntity> mediaFileOpt = getMediaByFingerprint(workspaceId, fingerprint);
+ public URL getObjectUrl(String workspaceId, String fileId) {
+ Optional<MediaFileEntity> mediaFileOpt = getMediaByFileId(workspaceId, fileId);
if (mediaFileOpt.isEmpty()) {
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());
}
/**
@@ -124,7 +141,7 @@
.mapToInt(Integer::intValue)
.toArray();
Optional<DeviceDictionaryDTO> payloadDict = deviceDictionaryService
- .getOneDictionaryInfoByTypeSubType(payloadModel[1], payloadModel[2]);
+ .getOneDictionaryInfoByTypeSubType(DeviceDomainEnum.PAYLOAD.getVal(), payloadModel[1], payloadModel[2]);
payloadDict.ifPresent(payload -> builder.payload(payload.getDeviceName()));
}
return builder.build();
@@ -140,6 +157,7 @@
if (entity != null) {
builder.fileName(entity.getFileName())
+ .fileId(entity.getFileId())
.filePath(entity.getFilePath())
.isOriginal(entity.getIsOriginal())
.fingerprint(entity.getFingerprint())
@@ -148,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