From 2db1aa88e8ab53096a936163d686b90d8e056a99 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 21 Aug 2024 23:18:33 +0800
Subject: [PATCH] 国土对接返回信息加密
---
src/main/java/com/dji/sample/media/controller/FileController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 55 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 4fdd5cd..d1c231d 100644
--- a/src/main/java/com/dji/sample/media/controller/FileController.java
+++ b/src/main/java/com/dji/sample/media/controller/FileController.java
@@ -8,21 +8,28 @@
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
@@ -59,6 +66,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.mediaQuerys(page, pageSize, workspaceId));
+ }
+
@PutMapping("/examine")
public ResponseResult examineData(@RequestParam String fileId) {
return fileService.updateExamByFileId(fileId);
@@ -68,10 +92,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}")
@@ -88,10 +112,27 @@
@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));
+ 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));
}
@@ -132,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