From e945a560b26437d610754cea5abfd992cd63fd7b Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 21 Aug 2024 13:39:14 +0800
Subject: [PATCH] 媒体文件处理，国土对接证书替换
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 b269878..6cf4a3d 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
@@ -120,7 +120,7 @@
return Optional.ofNullable(fileEntity);
}
- public void saveMarkFile(String workspaceId, FileUploadDTO files, File file1) {
+ public void saveMarkFile(String workspaceId, FileUploadDTO files, File file1,String dkbh) {
try {
MediaFileMarkEntity file=fileUploadConvertToMarkEntity(files);
MediaFileMarkEntity mediaFileMarkEntity = new MediaFileMarkEntity();
@@ -131,7 +131,11 @@
mediaFileMarkEntity.setObjectKey("/mark" + file.getFilePath() + "/" + file.getFileName());
mediaFileMarkEntity.setFileName("mark" + file.getFileName());
mediaFileMarkEntity.setFilePath("mark" + file.getFilePath());
-// uploadFile("http://139.196.74.78:9000", "sxkj", "sxkj2024", "cloud-bucket", mediaFileMarkEntity.getObjectKey(), nailFile, "image/jpeg");
+ long timestamp = convertToTimestamp(files.getMetadata().getCreatedTime());
+ int type=getLotInfo(dkbh);
+ File markFile = new File(WaterMarkUtil.addWatermark(file1, timestamp, files.getMetadata().getShootPosition().getLat(),
+ files.getMetadata().getShootPosition().getLng(), files.getMetadata().getGimbalYawDegree(),type).toURI());
+ uploadFile("http://139.196.74.78:9000", "sxkj", "sxkj2024", "cloud-bucket", mediaFileMarkEntity.getObjectKey(), markFile, "image/jpeg");
markMapper.insert(mediaFileMarkEntity);
} catch (Exception e) {
e.printStackTrace();
@@ -159,13 +163,10 @@
updateStatue(file.getName());
saveFiles(workspaceId, file, downloadedFile);
if (isPlane==1){
- saveMarkFile(workspaceId, file, downloadedFile);
+ fileEntity.setDkbh(getDkbh(fileEntity.getFileName()));
+ saveMarkFile(workspaceId, file, downloadedFile, fileEntity.getDkbh());
}
}
- if (fileEntity.getFileName().endsWith("~")) {
- fileEntity.setDkbh(getDkbh(fileEntity.getFileName()));
- }
- waylineJobService.getName(fileEntity.getJobId());
return mapper.insert(fileEntity);
}
@@ -698,6 +699,10 @@
.eq(MediaFileEntity::getJobId, jobId));
}
+ public int getLotInfo(String dkbh){
+ LotInfo lotInfo=patchesMapper.selectOne(new LambdaQueryWrapper<LotInfo>().eq(LotInfo::getDkbh, dkbh));
+ return lotInfo.getType();
+ }
public int checkWaylineType(String jobId) {
WaylineJobEntity jobEntity = jobMapper.selectOne(new LambdaQueryWrapper<WaylineJobEntity>().eq(WaylineJobEntity::getJobId, jobId));
WaylineFileEntity fileEntity=fileMapper.selectOne(new LambdaQueryWrapper<WaylineFileEntity>().eq(WaylineFileEntity::getWaylineId, jobEntity.getFileId()));
--
Gitblit v1.9.3