From 94174d2cc22afed6f41c270d970903484bfc5708 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 05 Aug 2024 16:06:18 +0800
Subject: [PATCH] SM2测试类
---
src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 29a93f8..5b62e43 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
@@ -138,7 +138,6 @@
WaylineFileEntity file = this.dtoConvertToEntity(metadata);
file.setWaylineId(UUID.randomUUID().toString());
file.setWorkspaceId(workspaceId);
-
if (!StringUtils.hasText(file.getSign())) {
try (InputStream object = ossService.getObject(OssConfiguration.bucket, metadata.getObjectKey())) {
if (object.available() == 0) {
@@ -155,7 +154,7 @@
}
@Override
- public Integer saveWaylineFiles(String workspaceId, WaylineFileDTO metadata, String patchesId, String isTemp) {
+ public Integer saveWaylineFiles(String workspaceId, WaylineFileDTO metadata, String patchesId,String isTemp) {
metadata.setPatchesId(patchesId);
WaylineFileEntity file = this.dtoConvertToEntity(metadata);
file.setWaylineId(UUID.randomUUID().toString());
@@ -219,7 +218,7 @@
}
@Override
- public String importKmzFile(MultipartFile file, String workspaceId, String creator, String patchesId, String isTemp) {
+ public String importKmzFile(MultipartFile file, String workspaceId, String creator, String patchesId,String isTemp) {
Optional<WaylineFileDTO> waylineFileOpt = validKmzFile(file);
if (waylineFileOpt.isEmpty()) {
throw new RuntimeException("文件格式错误");
@@ -232,7 +231,7 @@
waylineFile.setIsTemp(isTemp);
back = ossService.putObject(OssConfiguration.bucket, waylineFile.getObjectKey(), file.getInputStream());
if (back == null) {
- this.saveWaylineFiles(workspaceId, waylineFile, patchesId, isTemp);
+ this.saveWaylineFiles(workspaceId, waylineFile, patchesId,isTemp);
}
} catch (IOException e) {
e.printStackTrace();
@@ -261,6 +260,24 @@
}
return waylineFile;
}
+ @Override
+ public WaylineFileDTO importPlaneKmzFile(MultipartFile file, String workspaceId, String creator,String newName,String id) {
+ WaylineFileDTO waylineFile = null;
+ Optional<WaylineFileDTO> waylineFileOpt = validKmzFile(file);
+ if (waylineFileOpt.isEmpty()) {
+ throw new RuntimeException("文件格式错误");
+ }
+
+ try {
+ waylineFile = waylineFileOpt.get();
+ waylineFile.setWaylineId(workspaceId);
+ waylineFile.setUsername(creator);
+ ossService.putObject(OssConfiguration.bucket, waylineFile.getObjectKey(), file.getInputStream());
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return waylineFile;
+ }
@Override
public WaylineFileEntity selectByName(String name) {
--
Gitblit v1.9.3