From 94a6e4e4bc39153e64f8599e626475c4ce5bdb88 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 16 Jul 2024 13:49:01 +0800
Subject: [PATCH] 修改喊话功能的重新喊话和音频展示接口，新增缩略图展示接口
---
src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java b/src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java
index 8efa814..52da471 100644
--- a/src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java
+++ b/src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java
@@ -192,22 +192,25 @@
}
@Override
- public void importKmzFile(MultipartFile file, String workspaceId, String creator, String patchesId) {
+ public String importKmzFile(MultipartFile file, String workspaceId, String creator, String patchesId, String spotInFreckle) {
Optional<WaylineFileDTO> waylineFileOpt = validKmzFile(file);
if (waylineFileOpt.isEmpty()) {
throw new RuntimeException("文件格式错误");
}
-
+ String back = null;
try {
WaylineFileDTO waylineFile = waylineFileOpt.get();
waylineFile.setWaylineId(workspaceId);
waylineFile.setUsername(creator);
-
- ossService.putObject(OssConfiguration.bucket, waylineFile.getObjectKey(), file.getInputStream());
- this.saveWaylineFiles(workspaceId, waylineFile, patchesId);
+ waylineFile.setSpotInFreckle(spotInFreckle);
+ back = ossService.putObject(OssConfiguration.bucket, waylineFile.getObjectKey(), file.getInputStream());
+ if (back==null) {
+ this.saveWaylineFiles(workspaceId, waylineFile, patchesId);
+ }
} catch (IOException e) {
e.printStackTrace();
}
+ return back;
}
@Override
@@ -222,7 +225,6 @@
waylineFile = waylineFileOpt.get();
waylineFile.setWaylineId(workspaceId);
waylineFile.setUsername(creator);
-
ossService.putObject(OssConfiguration.bucket, waylineFile.getObjectKey(), file.getInputStream());
this.saveWaylineFile(workspaceId, waylineFile);
@@ -355,6 +357,7 @@
.favorited(file.getFavorited())
.sign(file.getSign())
.patchesId(file.getPatchesId())
+ .spotInFreckle(file.getSpotInFreckle())
.build();
}
--
Gitblit v1.9.3