From 7b8c8077af714c808ae7a51ed5d3abbd407cc620 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 26 Jun 2024 17:15:29 +0800
Subject: [PATCH] 修改成果展示查询接口名字为空时的错误bug，加上按拍照时间倒叙。修改定时器时间
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 76fe1b3..63522b2 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
@@ -182,7 +182,13 @@
if (jobName != null && !jobName.isEmpty()) {
List<String> jobIds = waylineJobService.getJobIds(jobName);
- queryWrapper.in(MediaFileEntity::getJobId, jobIds);
+ // 检查 jobIds 列表是否为空
+ if (jobIds.isEmpty()) {
+ // 如果为空，则直接返回空的分页数据
+ return new PaginationData<>(Collections.emptyList(), new Pagination(pageObj));
+ }
+
+ queryWrapper.in(MediaFileEntity::getJobId, jobIds);
}
if (type != null && !type.isEmpty()) {
if ("图片".equals(type)) {
@@ -191,7 +197,7 @@
queryWrapper.likeLeft(MediaFileEntity::getFileName, ".mp4");
}
}
- queryWrapper.orderByDesc(MediaFileEntity::getCreateTime);
+ queryWrapper.last("ORDER BY JSON_EXTRACT(metadata, '$.createdTime') DESC");
// 执行分页查询
Page<MediaFileEntity> resultPage = mapper.selectPage(pageObj, queryWrapper);
@@ -414,7 +420,7 @@
return builder.build();
}
- public static void uploadFile(String endpoint, String accessKey, String secretKey, String bucketName, String objectName, File file) {
+ public static void uploadFile(String endpoint, String accessKey, String secretKey, String bucketName, String objectName, File file ) {
try {
// 创建MinIO客户端实例
MinioClient minioClient = MinioClient.builder()
@@ -428,6 +434,7 @@
.bucket(bucketName)
.object(objectName)
.stream(fileInputStream, file.length(), -1)
+ .contentType("image/jpeg")
.build()
);
fileInputStream.close();
--
Gitblit v1.9.3