From aba5f5bf919b7023744dc70ea28d479656e07c9b Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 08 Jul 2024 18:36:21 +0800
Subject: [PATCH] 更新图片信息返回提示信息
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 6 +++++-
src/main/java/com/dji/sample/media/controller/FileController.java | 8 +++++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/dji/sample/media/controller/FileController.java b/src/main/java/com/dji/sample/media/controller/FileController.java
index b034651..4fdd5cd 100644
--- a/src/main/java/com/dji/sample/media/controller/FileController.java
+++ b/src/main/java/com/dji/sample/media/controller/FileController.java
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.net.URL;
import java.util.List;
+import java.util.Objects;
import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
@@ -65,11 +66,12 @@
@GetMapping("/getMediaInfo")
public ResponseResult mediaInfo(@RequestParam String fileName) {
+
Object info = fileService.mediaInfo(fileName);
- if (info == null) {
- return ResponseResult.error("图片正在解析中");
+ if (info!=null){
+ return ResponseResult.success(info);
}
- return ResponseResult.success(fileService.mediaInfo(fileName));
+ return ResponseResult.success("图片正在加载");
}
@GetMapping("/{workspace_id}/files/{job_id}")
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 0b3e5a2..20eca7e 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
@@ -164,7 +164,11 @@
String name = "mark"+filename;
MediaFileMarkEntity entity = markMapper.selectOne(new LambdaQueryWrapper<MediaFileMarkEntity>()
.eq(MediaFileMarkEntity::getFileName, name));
- return entity.getDronedata();
+ if (entity!=null){
+ return entity.getDronedata();}
+ else {
+ return "该图片信息正在加载";
+ }
}
@Override
--
Gitblit v1.9.3