From 4ce73562f23f501ac3fd7341a9e2bf3768d0a34b Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 18 Jun 2024 11:42:38 +0800
Subject: [PATCH] 航线定时任务，水印工具地址，修改方法注释
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 79c5c3c..c31027e 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
@@ -21,6 +21,7 @@
import com.dji.sample.patches.dao.GetPatchesMapper;
import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.utils.TimerUtil;
+import com.dji.sample.territory.pojo.TerritoryConfigPojo;
import com.dji.sample.territory.service.impl.TbFjServiceImpl;
import com.dji.sample.territory.utils.WaterMarkUtil;
import com.drew.imaging.ImageProcessingException;
@@ -61,7 +62,8 @@
private IDeviceDictionaryService deviceDictionaryService;
@Autowired
private OssServiceContext ossService;
-
+ @Autowired
+ private TerritoryConfigPojo territoryConfigPojo;
private Optional<MediaFileEntity> getMediaByFingerprint(String workspaceId, String fingerprint) {
MediaFileEntity fileEntity = mapper.selectOne(new LambdaQueryWrapper<MediaFileEntity>()
.eq(MediaFileEntity::getWorkspaceId, workspaceId)
@@ -115,7 +117,7 @@
File file1 = TbFjServiceImpl.downloadFile(url);
long timestamp = convertToTimestamp(file.getMetadata().getCreatedTime());
File file2 = new File(WaterMarkUtil.addWatermark(file1, timestamp, file.getMetadata().getShootPosition().getLat(),
- file.getMetadata().getShootPosition().getLng(), file.getMetadata().getGimbalYawDegree()).toURI());
+ file.getMetadata().getShootPosition().getLng(), file.getMetadata().getGimbalYawDegree(),territoryConfigPojo.getWatermark()).toURI());
Object data = ImgUtil.getInfo(file1);
mediaFileMarkEntity.setDronedata(data);
mediaFileMarkEntity.setWorkspaceId(workspaceId);
--
Gitblit v1.9.3