From cbbb9003b44d7c9d7adc80188343f0065732b0ce Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 19 Jun 2024 14:31:31 +0800
Subject: [PATCH] 航线定时任务调整，视频播放接口返回地址修改
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 12 +++++-------
1 files changed, 5 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 4ed3b88..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);
@@ -138,7 +140,6 @@
String name = "mark" + filename;
MediaFileMarkEntity entity = markMapper.selectOne(new LambdaQueryWrapper<MediaFileMarkEntity>()
.eq(MediaFileMarkEntity::getFileName, name));
-
return entity.getDronedata();
}
@@ -158,7 +159,7 @@
}
public List<MediaFileEntity> listByIsadd(String dkbh, String workspaceId) {
- return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>().eq(MediaFileEntity::getIsadd, 0)
+ return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
.eq(MediaFileEntity::getWorkspaceId, workspaceId)
.like(MediaFileEntity::getFileName, dkbh + "~"));
}
@@ -256,7 +257,6 @@
if (file != null) {
builder.fileName(file.getName())
.filePath(file.getPath())
- .isadd(0)
.examine(1)
.fingerprint(file.getFingerprint())
.objectKey(file.getObjectKey())
@@ -283,8 +283,6 @@
if (file != null) {
builder.fileName(file.getName())
- .filePath(file.getPath())
- .isadd(0)
.fingerprint(file.getFingerprint())
.objectKey(file.getObjectKey())
.subFileType(file.getSubFileType())
--
Gitblit v1.9.3