From faedd5d2f0ee850464f0507da93c37459bd5e3bb Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 26 Sep 2023 16:30:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 63 +++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 13 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..2adfdfb 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
@@ -1,18 +1,23 @@
package com.dji.sample.media.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dji.sample.common.model.Pagination;
import com.dji.sample.common.model.PaginationData;
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;
import com.dji.sample.media.model.MediaFileDTO;
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.wayline.model.entity.WaylineJobEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -24,6 +29,7 @@
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
+import java.util.UUID;
import java.util.stream.Collectors;
/**
@@ -44,13 +50,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 +73,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 +87,15 @@
}
@Override
- public PaginationData<MediaFileDTO> getJobsPaginationByWorkspaceId(String workspaceId, long page, long pageSize) {
- Page<MediaFileEntity> pageData = mapper.selectPage(
- new Page<MediaFileEntity>(page, pageSize),
- new LambdaQueryWrapper<MediaFileEntity>()
- .eq(MediaFileEntity::getWorkspaceId, workspaceId));
+ public PaginationData<MediaFileDTO> 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()
.stream()
.map(this::entityConvertToDto)
@@ -90,13 +105,33 @@
}
@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());
+ }
+
+ @Override
+ public Boolean updateMediaFile(String workspaceId, MediaFileEntity mediaFileEntity) {
+
+ MediaFileEntity params = new MediaFileEntity();
+ params.setFileId(mediaFileEntity.getFileId());
+ params.setWorkspaceId(mediaFileEntity.getWorkspaceId());
+
+ int update = mapper.update(mediaFileEntity, Wrappers.update(params));
+ return update>0;
}
/**
@@ -124,7 +159,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 +175,7 @@
if (entity != null) {
builder.fileName(entity.getFileName())
+ .fileId(entity.getFileId())
.filePath(entity.getFilePath())
.isOriginal(entity.getIsOriginal())
.fingerprint(entity.getFingerprint())
@@ -148,7 +184,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