From b6294bd36b3023e18606c77553fe136e6500a4b2 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 17 Apr 2024 15:42:34 +0800
Subject: [PATCH] 完善DB数据配置
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 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 af03ad9..72555d3 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,5 +1,6 @@
package com.dji.sample.media.service.impl;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -18,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;
@@ -88,23 +90,31 @@
}
@Override
- public PaginationData<MediaFileDTO> getMediaFilesPaginationByWorkspaceId(String workspaceId, long page, long pageSize, MediaFileQueryParam mediaFileQueryParam) {
+ public List<MediaFileEntity> listMediaFileEntity(String workspaceId, String jobId) {
+ return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
+ .eq(MediaFileEntity::getWorkspaceId, workspaceId).eq(MediaFileEntity::getJobId,jobId));
+ }
+
+ @Override
+ 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));
}
+ public int deleteMedia(String workspaceId, String fileId) {
+ int count=mapper.delete(new LambdaUpdateWrapper<MediaFileEntity>().eq(MediaFileEntity::getFileId, fileId)
+ .eq(MediaFileEntity::getWorkspaceId, workspaceId));
+ return count;
+ }
@Override
public URL getObjectUrl(String workspaceId, String fileId) {
Optional<MediaFileEntity> mediaFileOpt = getMediaByFileId(workspaceId, fileId);
@@ -155,7 +165,7 @@
.subFileType(file.getSubFileType())
.isOriginal(file.getExt().getIsOriginal())
.jobId(file.getExt().getFlightId())
- .drone(file.getExt().getSn())
+ .drone(file.getExt().getSn()).metadata(file.getMetadata())
.tinnyFingerprint(file.getExt().getTinnyFingerprint());
// domain-type-subType
@@ -187,6 +197,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