From 8c93ab27f55588300dc2bf07b0c1f7001bb78943 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Thu, 15 Aug 2024 17:39:46 +0800
Subject: [PATCH] 拍照录像接口调整
---
src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java | 2 +-
src/main/java/com/dji/sample/common/model/ResponseResult.java | 6 +++---
src/main/java/com/dji/sample/control/service/impl/ControlServiceImpl.java | 2 +-
src/main/java/com/dji/sample/droneairport/controller/MediaApiController.java | 22 +++++++++++++++-------
4 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/dji/sample/common/model/ResponseResult.java b/src/main/java/com/dji/sample/common/model/ResponseResult.java
index 919a8e9..a9b443b 100644
--- a/src/main/java/com/dji/sample/common/model/ResponseResult.java
+++ b/src/main/java/com/dji/sample/common/model/ResponseResult.java
@@ -24,7 +24,7 @@
private T data;
- private String traceId;
+ private String traceid;
public static <T> ResponseResult<T> success(T data) {
return ResponseResult.<T>builder()
@@ -53,14 +53,14 @@
.code(code)
.data(data)
.message(message)
- .traceId(traceid)
+ .traceid(traceid)
.build();
}
public static ResponseResult success(int code, String message,String traceid) {
return ResponseResult.builder()
.code(code)
.message(message)
- .traceId(traceid)
+ .traceid(traceid)
.build();
}
diff --git a/src/main/java/com/dji/sample/control/service/impl/ControlServiceImpl.java b/src/main/java/com/dji/sample/control/service/impl/ControlServiceImpl.java
index c7a10ff..d9d039c 100644
--- a/src/main/java/com/dji/sample/control/service/impl/ControlServiceImpl.java
+++ b/src/main/java/com/dji/sample/control/service/impl/ControlServiceImpl.java
@@ -424,7 +424,7 @@
.checkCondition(param.getSn());
ResponseResult result = ResponseResult.success();
- result.setTraceId(bid);
+ result.setTraceid(bid);
Long timestamp = System.currentTimeMillis();
diff --git a/src/main/java/com/dji/sample/droneairport/controller/MediaApiController.java b/src/main/java/com/dji/sample/droneairport/controller/MediaApiController.java
index 5413184..0dea669 100644
--- a/src/main/java/com/dji/sample/droneairport/controller/MediaApiController.java
+++ b/src/main/java/com/dji/sample/droneairport/controller/MediaApiController.java
@@ -25,13 +25,21 @@
@GetMapping("{sn}/getMedia/{traceid}")
public ResponseResult getMedia(@PathVariable String sn, @PathVariable String traceid) {
- String timestamp = (Long)RedisOpsUtils.hashGet(RedisConst.COMMANDS_PREFIX + sn + RedisConst.DELIMITER + traceid,traceid) / 1000 * 1000 + "";
- MediaFileEntity entity = mediaService.getMediaFieByTid(timestamp);
- String url = "https://wrj.shuixiongit.com/minio/cloud-bucket" + entity.getObjectKey();
- Map ret = new HashMap();
- ret.put("url", url);
- ret.put("metadata", JSONObject.parseObject(entity.getMetadata().toString()));
- return ResponseResult.success(ret);
+ try{
+ String timestamp = (Long)RedisOpsUtils.hashGet(RedisConst.COMMANDS_PREFIX + sn + RedisConst.DELIMITER + traceid,traceid) / 1000 * 1000 + "";
+ MediaFileEntity entity = mediaService.getMediaFieByTid(timestamp);
+ if (null == entity) {
+ return ResponseResult.error(-1,"等待媒体文件上传中");
+ }
+ String url = "https://wrj.shuixiongit.com/minio/cloud-bucket" + entity.getObjectKey();
+ Map ret = new HashMap();
+ ret.put("url", url);
+ ret.put("metadata", JSONObject.parseObject(entity.getMetadata().toString()));
+ return ResponseResult.success(ret);
+ } catch (Exception e) {
+ return ResponseResult.error(-1,"拍摄未完成或者媒体文件未上传");
+ }
+
}
}
diff --git a/src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java b/src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java
index 2ca1a5c..15b4c9e 100644
--- a/src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java
+++ b/src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java
@@ -234,7 +234,7 @@
/**
* Handles the highest priority message about media uploads.
- *
+ * 处理有关媒体上传的最高优先级消息。
* @param receiver
* @param headers
* @return
--
Gitblit v1.9.3