From 426ab1ff3eb77393746cbe6b26db34058b58e14c Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 05 Jul 2024 14:16:35 +0800
Subject: [PATCH] 完成航线智能生成接口，修改水印图片上传地址
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java b/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java
index e01b386..00b0753 100644
--- a/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java
+++ b/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java
@@ -130,7 +130,7 @@
}
}
MediaFileMarkEntity mediaFileMarkEntity = this.fileUploadConvertToMarkEntity(file);
- String url = "http://dev.jxpskj.com:9000/cloud-bucket" + file.getObjectKey();
+ String url = "http://139.196.74.78:9000/cloud-bucket" + file.getObjectKey();
File file1 = TbFjServiceImpl.downloadFile(url);
long timestamp = convertToTimestamp(file.getMetadata().getCreatedTime());
File file2 = new File(WaterMarkUtil.addWatermark(file1, timestamp, file.getMetadata().getShootPosition().getLat(),
@@ -143,9 +143,9 @@
mediaFileMarkEntity.setObjectKey("/mark" + file.getPath() + "/" + file.getName());
mediaFileMarkEntity.setFileName("mark" + file.getName());
mediaFileMarkEntity.setFilePath("mark" + file.getPath());
- String endpoint = "http://dev.jxpskj.com:9000";
- String accessKey = "pskj";
- String secretKey = "pskj@2021";
+ String endpoint = "http://139.196.74.78:9000";
+ String accessKey = "sxkj";
+ String secretKey = "sxkj2024";
String bucketName = "cloud-bucket";
String objectName = mediaFileMarkEntity.getObjectKey(); // 例如 "folder/file.txt"
uploadFile(endpoint, accessKey, secretKey, bucketName, objectName, file2);
@@ -344,7 +344,7 @@
if (file != null) {
builder.fileName(file.getName())
.filePath(file.getPath())
- .examine(1)
+ .examine(0)
.fingerprint(file.getFingerprint())
.objectKey(file.getObjectKey())
.subFileType(file.getSubFileType())
@@ -460,11 +460,18 @@
.eq(MediaFileEntity::getJobId, jobId)
// .eq(MediaFileMarkEntity::getIsadd, 0)
);
+ boolean allContainTilde = mediaFiles.stream().allMatch(file -> file.getFileName().contains("~"));
+ boolean noneContainTilde = mediaFiles.stream().noneMatch(file -> file.getFileName().contains("~"));
+
+ // 如果所有 fileName 都包含 '~' 或者都不包含 '~'，将 is_add 字段改为 1
+ if (allContainTilde || noneContainTilde) {
+ return;
+ }
// 筛选出name字段不包含'~'的数据
List<MediaFileEntity> filteredFiles = mediaFiles.stream()
.filter(file -> !file.getFileName().contains("~"))
- .toList();
+ .collect(Collectors.toList());
for (MediaFileEntity currentFile : filteredFiles) {
String currentName = currentFile.getFileName();
Map<String, Object> currentMetadata = JSON.parseObject(JSON.toJSONString(currentFile.getMetadata()), Map.class);
@@ -499,9 +506,7 @@
Long time1 = (Long) metadata1.get("createdTime");
Long time2 = (Long) metadata2.get("createdTime");
return Long.compare(time1 - currentCreatedTime, time2 - currentCreatedTime);
- });}
- if (closestFileOpt.isEmpty()) {
- throw new RuntimeException("当前图片无法绑定图斑");
+ });
}
// 提取并替换name字段
closestFileOpt.ifPresent(closestFile -> {
@@ -542,12 +547,23 @@
.eq(MediaFileMarkEntity::getJobId, jobId)
// .eq(MediaFileMarkEntity::getIsadd, 0)
);
+ // 判断所有 fileName 是否都包含 '~' 或者都不包含 '~'
+ boolean allContainTilde = mediaFiles.stream().allMatch(file -> file.getFileName().contains("~"));
+ boolean noneContainTilde = mediaFiles.stream().noneMatch(file -> file.getFileName().contains("~"));
+ // 如果所有 fileName 都包含 '~' 或者都不包含 '~'，将 is_add 字段改为 1
+ if (allContainTilde || noneContainTilde) {
+ mediaFiles.forEach(file -> {
+ file.setIsadd(1);
+ updateById(file.getId(), file);
+ });
+ return;
+ }
// 筛选出name字段不包含'~'的数据
List<MediaFileMarkEntity> filteredFiles = mediaFiles.stream()
.filter(file -> !file.getFileName().contains("~"))
- .toList();
+ .collect(Collectors.toList());
for (MediaFileMarkEntity currentFile : filteredFiles) {
String currentName = currentFile.getFileName();
@@ -584,9 +600,6 @@
Long time2 = (Long) metadata2.get("createdTime");
return Long.compare(time1 - currentCreatedTime, time2 - currentCreatedTime);
});
- }
- if (closestFileOpt.isEmpty()) {
- throw new RuntimeException("没有符合时间的对象");
}
// 提取并替换name字段
closestFileOpt.ifPresent(closestFile -> {
--
Gitblit v1.9.3