From 2aaaaf4598b869085ae35871de018cd35847c232 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Tue, 09 Jul 2024 16:41:39 +0800
Subject: [PATCH] 航线拐点
---
src/main/java/com/dji/sample/media/controller/FileController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 eff6ca0..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,7 +66,12 @@
@GetMapping("/getMediaInfo")
public ResponseResult mediaInfo(@RequestParam String fileName) {
- return ResponseResult.success(fileService.mediaInfo(fileName));
+
+ Object info = fileService.mediaInfo(fileName);
+ if (info!=null){
+ return ResponseResult.success(info);
+ }
+ return ResponseResult.success("图片正在加载");
}
@GetMapping("/{workspace_id}/files/{job_id}")
@@ -81,9 +87,11 @@
@RequestParam(name = "photoEnd", required = false) Long updateEnd,
@RequestParam(name = "updateStart", required = false) Long photoStart,
@RequestParam(name = "updateEnd", required = false) Long photoEnd,
- @RequestParam(name = "jobName", required = false) String jobName) {
+ @RequestParam(name = "jobName", required = false) String jobName,
+ @RequestParam(required = false) String type
+ ) {
- return ResponseResult.success(fileService.MediaQuery(page, pageSize, updateStart, updateEnd, photoStart, photoEnd, jobName,workspaceId));
+ return ResponseResult.success(fileService.MediaQuery(page, pageSize, updateStart, updateEnd, photoStart, photoEnd, jobName, workspaceId, type));
}
--
Gitblit v1.9.3