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/wayline/service/impl/WaylineFileServiceImpl.java | 32 +++++++++-----------------------
1 files changed, 9 insertions(+), 23 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 e5d31c4..319e549 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,6 +138,7 @@
WaylineFileEntity file = this.dtoConvertToEntity(metadata);
file.setWaylineId(UUID.randomUUID().toString());
file.setWorkspaceId(workspaceId);
+ file.setWaylineType(metadata.getWaylineType());
if (!StringUtils.hasText(file.getSign())) {
try (InputStream object = ossService.getObject(OssConfiguration.bucket, metadata.getObjectKey())) {
if (object.available() == 0) {
@@ -153,30 +154,14 @@
return insertId > 0 ? file.getId() : insertId;
}
- public Integer updateWaylineFile(String workspaceId, String newName, String id) {
- String objectKey = "/" + newName;
- LambdaUpdateWrapper<WaylineFileEntity> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(WaylineFileEntity::getWaylineId, id)
- .eq(WaylineFileEntity::getWorkspaceId, workspaceId)
- .set(WaylineFileEntity::getObjectKey, objectKey);
-
- // 使用 mapper 执行更新操作
- boolean updated = mapper.update(null, updateWrapper) > 0;
- if (!updated) {
- throw new RuntimeException("更新 objectKey 失败");
- }
-
- return updated ? 1 : 0; // 返回更新结果
- }
-
-
@Override
- public Integer saveWaylineFiles(String workspaceId, WaylineFileDTO metadata, String patchesId,String isTemp) {
+ public Integer saveWaylineFiles(String workspaceId, WaylineFileDTO metadata, String patchesId,String isTemp,int waylineType) {
metadata.setPatchesId(patchesId);
WaylineFileEntity file = this.dtoConvertToEntity(metadata);
file.setWaylineId(UUID.randomUUID().toString());
file.setWorkspaceId(workspaceId);
file.setIsTemp(isTemp);
+ file.setWaylineType(waylineType);
if (!StringUtils.hasText(file.getSign())) {
try (InputStream object = ossService.getObject(OssConfiguration.bucket, metadata.getObjectKey())) {
if (object.available() == 0) {
@@ -235,7 +220,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,int waylineType) {
Optional<WaylineFileDTO> waylineFileOpt = validKmzFile(file);
if (waylineFileOpt.isEmpty()) {
throw new RuntimeException("文件格式错误");
@@ -246,9 +231,10 @@
waylineFile.setWaylineId(workspaceId);
waylineFile.setUsername(creator);
waylineFile.setIsTemp(isTemp);
+ waylineFile.setWaylineType(waylineType);
back = ossService.putObject(OssConfiguration.bucket, waylineFile.getObjectKey(), file.getInputStream());
if (back == null) {
- this.saveWaylineFiles(workspaceId, waylineFile, patchesId,isTemp);
+ this.saveWaylineFiles(workspaceId, waylineFile, patchesId,isTemp, waylineType);
}
} catch (IOException e) {
e.printStackTrace();
@@ -258,7 +244,7 @@
@Override
- public WaylineFileDTO importKmzFileBack(MultipartFile file, String workspaceId, String creator) {
+ public WaylineFileDTO importKmzFileBack(MultipartFile file, String workspaceId, String creator,int waylineType) {
WaylineFileDTO waylineFile = null;
Optional<WaylineFileDTO> waylineFileOpt = validKmzFile(file);
if (waylineFileOpt.isEmpty()) {
@@ -269,6 +255,7 @@
waylineFile = waylineFileOpt.get();
waylineFile.setWaylineId(workspaceId);
waylineFile.setUsername(creator);
+ waylineFile.setWaylineType(waylineType);
ossService.putObject(OssConfiguration.bucket, waylineFile.getObjectKey(), file.getInputStream());
this.saveWaylineFile(workspaceId, waylineFile);
@@ -278,7 +265,7 @@
return waylineFile;
}
@Override
- public WaylineFileDTO importPlaneKmzFile(MultipartFile file, String workspaceId, String creator,String newName,String id) {
+ public WaylineFileDTO importPlaneKmzFile(MultipartFile file, String workspaceId, String creator,String newName,String id,int waylineType) {
WaylineFileDTO waylineFile = null;
Optional<WaylineFileDTO> waylineFileOpt = validKmzFile(file);
if (waylineFileOpt.isEmpty()) {
@@ -290,7 +277,6 @@
waylineFile.setWaylineId(workspaceId);
waylineFile.setUsername(creator);
ossService.putObject(OssConfiguration.bucket, waylineFile.getObjectKey(), file.getInputStream());
- this.updateWaylineFile(workspaceId,newName,id);
} catch (IOException e) {
e.printStackTrace();
}
--
Gitblit v1.9.3