From 3db92a6fff18c1591b298fa0bf8085dfcbdb6747 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Sat, 06 Jul 2024 15:08:11 +0800
Subject: [PATCH] 修改智能航线规划，修改南昌机场和西安机场人工接管时图片绑定图斑问题
---
src/main/java/com/dji/sample/media/controller/FileController.java | 21 +++++++++++++++++----
1 files changed, 17 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 e32836a..4d0574c 100644
--- a/src/main/java/com/dji/sample/media/controller/FileController.java
+++ b/src/main/java/com/dji/sample/media/controller/FileController.java
@@ -73,6 +73,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);
@@ -82,6 +98,7 @@
@DeleteMapping("/{workspace_id}/deleteFile")
public ResponseResult deleteFile(@PathVariable(name = "workspace_id") String workspaceId, @RequestParam String fileId) {
+ //根据fileId删除图片
int count = fileService.deleteMedia(workspaceId, fileId);
if (count == 0) {
return ResponseResult.error("删除失败");
@@ -108,9 +125,5 @@
} catch (IOException e) {
e.printStackTrace();
}
- }
- @PostMapping("/{workspace_id}/mark")
- public void eaveMarkFile(@PathVariable(name = "workspace_id") String workspaceId,@RequestBody FileUploadDTO file) throws ImageProcessingException, IOException, FontFormatException {
- fileService.saveMarkFile(workspaceId,file);
}
}
--
Gitblit v1.9.3