From c2defb8ee038ae780e2f8c57839ea3558f4f1f4b Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Fri, 19 Jul 2024 17:20:26 +0800
Subject: [PATCH] 新建面状航线
---
src/main/java/com/dji/sample/media/controller/FileController.java | 78 ++++++++++++++++++++++++++++++++------
1 files changed, 65 insertions(+), 13 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 d138998..785b2d0 100644
--- a/src/main/java/com/dji/sample/media/controller/FileController.java
+++ b/src/main/java/com/dji/sample/media/controller/FileController.java
@@ -8,6 +8,7 @@
import com.dji.sample.media.model.MediaFileEntity;
import com.dji.sample.media.model.MediaFileQueryParam;
import com.dji.sample.media.service.IFileService;
+import com.drew.imaging.ImageProcessingException;
import org.apache.ibatis.annotations.Update;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -15,9 +16,11 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.awt.*;
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;
@@ -49,31 +52,80 @@
return ResponseResult.success(filesList);
}
- @GetMapping("/listAdded")
- public ResponseResult listIsadd() {
- List<MediaFileEntity> entityList = fileService.listByIsadd();
+ @GetMapping("/{workspace_id}/listAdded")
+ public ResponseResult listIsadd(@RequestParam String dkbh,
+ @PathVariable(name = "workspace_id") String workspaceId) {
+ List<MediaFileEntity> entityList = fileService.listByIsadd(dkbh, workspaceId);
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) {
- int is = fileService.updateExamByFileId(fileId);
- if (is != 0) {
- return ResponseResult.success();
- } else {
- return ResponseResult.error("更新状态失败");
- }
-
+ return fileService.updateExamByFileId(fileId);
}
@GetMapping("/getMediaInfo")
- public ResponseResult mediaInfo(@RequestParam String fileId) {
- return ResponseResult.success(fileService.mediaInfo(fileId));
+ public ResponseResult mediaInfo(@RequestParam String fileName) {
+
+ Object info = fileService.mediaInfo(fileName);
+ if (info != null) {
+ return ResponseResult.success(info);
+ }
+ return ResponseResult.error("图片正在加载");
}
@GetMapping("/{workspace_id}/files/{job_id}")
public ResponseResult findFilesList(@PathVariable(name = "workspace_id") String workspaceId, @PathVariable(name = "job_id") String jobId) {
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));
+
+ }
+
+ @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
+ ) {
+
+ return ResponseResult.success(fileService.mediaNailQuery(page, pageSize, updateStart, updateEnd, photoStart, photoEnd, jobName, workspaceId, type));
+
}
@PostMapping("/{workspace_id}/updateFile")
@@ -84,8 +136,8 @@
}
@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("删除失败");
--
Gitblit v1.9.3