From 40f1ac26483b71ff1ea5f042a795e9a3842a5827 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Thu, 18 Jul 2024 17:25:45 +0800
Subject: [PATCH] 修改航线文件存入、查看接口，新增根据任务ID查找航线接口。新增媒体文件根据任务ID去重、匹配图片。
---
src/main/java/com/dji/sample/media/controller/FileController.java | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 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 89feb4d..785b2d0 100644
--- a/src/main/java/com/dji/sample/media/controller/FileController.java
+++ b/src/main/java/com/dji/sample/media/controller/FileController.java
@@ -59,6 +59,23 @@
return ResponseResult.success(entityList);
}
+ @GetMapping("/{workspace_id}/getPhotoByJobId")
+ public ResponseResult getPhotoByJobId(@RequestParam String jobId,
+ @RequestParam(defaultValue = "1") int page,
+ @RequestParam(name = "page_size", defaultValue = "10") int pageSize,
+ @PathVariable(name = "workspace_id") String workspaceId
+ ) {
+ return ResponseResult.success(fileService.getPhotoByJobId(page,pageSize,workspaceId, jobId));
+ }
+
+ @GetMapping("/{workspace_id}/getJobIds")
+ public ResponseResult getJobIds(@PathVariable(name = "workspace_id") String workspaceId,
+ @RequestParam(defaultValue = "1") int page,
+ @RequestParam(name = "page_size", defaultValue = "10") int pageSize
+ ) {
+ return ResponseResult.success(fileService.getJobId(page,pageSize,workspaceId));
+ }
+
@PutMapping("/examine")
public ResponseResult examineData(@RequestParam String fileId) {
return fileService.updateExamByFileId(fileId);
@@ -68,10 +85,10 @@
public ResponseResult mediaInfo(@RequestParam String fileName) {
Object info = fileService.mediaInfo(fileName);
- if (info!=null){
+ if (info != null) {
return ResponseResult.success(info);
}
- return ResponseResult.success("图片正在加载");
+ return ResponseResult.error("图片正在加载");
}
@GetMapping("/{workspace_id}/files/{job_id}")
@@ -94,16 +111,17 @@
return ResponseResult.success(fileService.mediaQuery(page, pageSize, updateStart, updateEnd, photoStart, photoEnd, jobName, workspaceId, type));
}
+
@GetMapping("nailDataShow/{workspace_id}")
public ResponseResult getNailMeidaData(@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
+ @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.mediaNailQuery(page, pageSize, updateStart, updateEnd, photoStart, photoEnd, jobName, workspaceId, type));
--
Gitblit v1.9.3