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/droneairport/controller/MediaApiController.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
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,"拍摄未完成或者媒体文件未上传");
+ }
+
}
}
--
Gitblit v1.9.3