From 638408723ebbf884f59ecaafcaab1c29f69bc689 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 15 Jul 2024 16:58:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/media/controller/FileController.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 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 13dd656..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;
@@ -58,7 +59,6 @@
return ResponseResult.success(entityList);
}
-
@PutMapping("/examine")
public ResponseResult examineData(@RequestParam String fileId) {
return fileService.updateExamByFileId(fileId);
@@ -66,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}")
@@ -74,6 +79,22 @@
return ResponseResult.success(fileService.listMediaFileEntity(workspaceId, jobId));
}
+ @GetMapping("dataShow/{workspace_id}")
+ public ResponseResult getMeidaData(@PathVariable(name = "workspace_id") String workspaceId,
+ @RequestParam Integer page,
+ @RequestParam(name = "page_size", defaultValue = "10") Integer pageSize,
+ @RequestParam(name = "photoStart", required = false) Long updateStart,
+ @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(required = false) String type
+ ) {
+
+ return ResponseResult.success(fileService.MediaQuery(page, pageSize, updateStart, updateEnd, photoStart, photoEnd, jobName, workspaceId, type));
+
+ }
+
@PostMapping("/{workspace_id}/updateFile")
public ResponseResult updateFile(HttpServletRequest request, @PathVariable(name = "workspace_id") String workspaceId, @RequestBody MediaFileEntity mediaFileEntity) {
CustomClaim claims = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
--
Gitblit v1.9.3