From 75e6eea8cd3fac9cc888e2ffc9cdb126fab8429d Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 14 Aug 2024 15:45:55 +0800
Subject: [PATCH] 任务下发、更新、取消，优化图斑逻辑
---
src/main/java/com/dji/sample/media/controller/FileController.java | 134 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 126 insertions(+), 8 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 6b0c8e8..d1c231d 100644
--- a/src/main/java/com/dji/sample/media/controller/FileController.java
+++ b/src/main/java/com/dji/sample/media/controller/FileController.java
@@ -1,17 +1,35 @@
package com.dji.sample.media.controller;
+import com.dji.sample.common.model.CustomClaim;
import com.dji.sample.common.model.PaginationData;
import com.dji.sample.common.model.ResponseResult;
+import com.dji.sample.media.model.FileUploadDTO;
import com.dji.sample.media.model.MediaFileDTO;
import com.dji.sample.media.model.MediaFileEntity;
import com.dji.sample.media.model.MediaFileQueryParam;
import com.dji.sample.media.service.IFileService;
+import com.dji.sample.media.util.ImageDownloaderAndCompressor;
+import com.dji.sample.media.util.MinioFileDownloader;
+import com.drew.imaging.ImageProcessingException;
+import org.apache.ibatis.annotations.Update;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
+
+import java.awt.*;
+import java.io.File;
import java.io.IOException;
import java.net.URL;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
+import static com.dji.sample.media.util.ImageDownloaderAndCompressor.*;
/**
* @author sean
@@ -28,28 +46,118 @@
/**
* Get information about all the media files in this workspace based on the workspace id.
* 根据工作空间id获取有关此工作空间中所有媒体文件的信息。
+ *
* @param workspaceId
* @return
*/
@GetMapping("/{workspace_id}/files")
- public ResponseResult<PaginationData<MediaFileDTO>> getFilesList(@RequestParam(defaultValue = "1") Long page,
- @RequestParam(name = "page_size", defaultValue = "10") Long pageSize,
- @PathVariable(name = "workspace_id") String workspaceId,
- MediaFileQueryParam mediaFileQueryParam) {
- PaginationData<MediaFileDTO> filesList = fileService.getMediaFilesPaginationByWorkspaceId(workspaceId, page, pageSize,mediaFileQueryParam);
+ public ResponseResult<PaginationData<MediaFileEntity>> getFilesList(@RequestParam(defaultValue = "1") Long page,
+ @RequestParam(name = "page_size", defaultValue = "10") Long pageSize,
+ @PathVariable(name = "workspace_id") String workspaceId,
+ MediaFileQueryParam mediaFileQueryParam) {
+ PaginationData<MediaFileEntity> filesList = fileService.getMediaFilesPaginationByWorkspaceId(workspaceId, page, pageSize, mediaFileQueryParam);
return ResponseResult.success(filesList);
}
- @GetMapping("/{workspace_id}/updateFile")
- public ResponseResult updateFile(@PathVariable(name = "workspace_id") String workspaceId, MediaFileEntity mediaFileEntity) {
+ @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.mediaQuerys(page, pageSize, workspaceId));
+ }
+
+ @PutMapping("/examine")
+ public ResponseResult examineData(@RequestParam String fileId) {
+ return fileService.updateExamByFileId(fileId);
+ }
+
+ @GetMapping("/getMediaInfo")
+ 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(name = "jobId", required = false) String jobId,
+ @RequestParam(required = false) String type
+ ) {
+
+ return ResponseResult.success(fileService.mediaQuery(page, pageSize, updateStart, updateEnd, photoStart, photoEnd, jobName, workspaceId, type,jobId));
+
+ }
+
+ @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")
+ public ResponseResult updateFile(HttpServletRequest request, @PathVariable(name = "workspace_id") String workspaceId, @RequestBody MediaFileEntity mediaFileEntity) {
+ CustomClaim claims = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
+ mediaFileEntity.setUserId(claims.getId());
return ResponseResult.success(fileService.updateMediaFile(workspaceId, mediaFileEntity));
}
+ @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("删除失败");
+ }
+ return ResponseResult.success();
+ }
/**
* Query the download address of the file according to the media file id,
* and redirect to this address directly for download.
+ *
* @param workspaceId
* @param fileId
* @param response
@@ -65,4 +173,14 @@
e.printStackTrace();
}
}
-}
+
+ @PostMapping("/download-images")
+ public ResponseResult downloadImages(@RequestBody List<String> jobIds) {
+ return fileService.downloadImages(jobIds);
+ }
+
+ @GetMapping("/refreshPhoto")
+ public void refreshPhoto(){
+ fileService.getNoaddFile();
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3