From 2caa210098644f51ff46daa33b87ce4b7f862a91 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 13 Nov 2023 10:12:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/htxx_dev' into htxx_dev
---
src/main/java/com/dji/sample/media/controller/MediaController.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/dji/sample/media/controller/MediaController.java b/src/main/java/com/dji/sample/media/controller/MediaController.java
index a448dcf..3acd920 100644
--- a/src/main/java/com/dji/sample/media/controller/MediaController.java
+++ b/src/main/java/com/dji/sample/media/controller/MediaController.java
@@ -1,9 +1,13 @@
package com.dji.sample.media.controller;
+import com.dji.sample.common.model.PaginationData;
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.component.mqtt.model.MapKeyConst;
import com.dji.sample.media.model.FileUploadDTO;
+import com.dji.sample.media.model.MediaJobDTO;
+import com.dji.sample.media.model.param.SearchMediaParam;
import com.dji.sample.media.service.IMediaService;
+import com.dji.sample.wayline.model.dto.WaylineJobDTO;
import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -71,4 +75,22 @@
return ResponseResult.success(new ConcurrentHashMap<>(Map.of(MapKeyConst.TINY_FINGERPRINTS, existingList)));
}
+ @GetMapping("/{workspace_id}/files/media_page")
+ public ResponseResult<PaginationData<MediaJobDTO>> mediaPage(
+ @PathVariable(name = "workspace_id") String workspaceId, @RequestBody SearchMediaParam param) {
+
+ PaginationData<MediaJobDTO> data = mediaService.mediaPage(workspaceId, param);
+ return ResponseResult.success(data);
+ }
+
+
+ @GetMapping("/files/detail/{job_id}")
+ public ResponseResult<PaginationData<MediaJobDTO>> mediaDetail(
+ @PathVariable(name = "job_id") String jobId, @RequestParam Long page, @RequestParam Long pageSize) {
+
+ PaginationData<MediaJobDTO> data = mediaService.mediaDetail(jobId, page, pageSize);
+ return ResponseResult.success(data);
+ }
+
+
}
--
Gitblit v1.9.3