From 1fc2b9a38ce7fb5f0a78361a731e98750fbd20c1 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 24 Jun 2024 10:28:09 +0800
Subject: [PATCH] 定时四个九洲巡查任务，新增媒体文件任务查询、搜索接口
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 5 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..f69292b 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
@@ -20,9 +20,12 @@
import com.dji.sample.media.util.ImgUtil;
import com.dji.sample.patches.dao.GetPatchesMapper;
import com.dji.sample.patches.model.entity.LotInfo;
+import com.dji.sample.patches.utils.DistrictCodeUtils;
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.dji.sample.wayline.service.IWaylineJobService;
import com.drew.imaging.ImageProcessingException;
import io.minio.MinioClient;
import io.minio.PutObjectArgs;
@@ -61,6 +64,10 @@
private IDeviceDictionaryService deviceDictionaryService;
@Autowired
private OssServiceContext ossService;
+ @Autowired
+ private TerritoryConfigPojo territoryConfigPojo;
+ @Autowired
+ private IWaylineJobService waylineJobService;
private Optional<MediaFileEntity> getMediaByFingerprint(String workspaceId, String fingerprint) {
MediaFileEntity fileEntity = mapper.selectOne(new LambdaQueryWrapper<MediaFileEntity>()
@@ -138,7 +145,6 @@
String name = "mark" + filename;
MediaFileMarkEntity entity = markMapper.selectOne(new LambdaQueryWrapper<MediaFileMarkEntity>()
.eq(MediaFileMarkEntity::getFileName, name));
-
return entity.getDronedata();
}
@@ -152,13 +158,55 @@
}
@Override
+ public PaginationData<MediaFileEntity> MediaQuery(Integer page, Integer pageSize, Long updateStart, Long updateEnd, Long photoStart, Long photoEnd, String jobName, String workspaceId) {
+ // 创建分页对象
+ Page<MediaFileEntity> pageObj = new Page<>(page, pageSize);
+
+ // 创建查询条件对象
+ LambdaQueryWrapper<MediaFileEntity> queryWrapper = new LambdaQueryWrapper<>();
+
+ // 添加查询条件
+ queryWrapper.eq(MediaFileEntity::getWorkspaceId,workspaceId);
+
+ if (updateStart != null && updateEnd != null) {
+ queryWrapper.between(MediaFileEntity::getCreateTime, updateStart, updateEnd);
+ }
+
+ if (photoStart != null && photoEnd != null) {
+ queryWrapper.apply("JSON_UNQUOTE(JSON_EXTRACT(metadata, '$.createdTime')) BETWEEN {0} AND {1}", photoStart, photoEnd);
+ }
+
+ if (jobName != null && !jobName.isEmpty()) {
+ List<String> jobIds = waylineJobService.getJobId(jobName);
+ queryWrapper.in(MediaFileEntity::getJobId, jobIds);
+ }
+
+ // 执行分页查询
+ Page<MediaFileEntity> resultPage = mapper.selectPage(pageObj, queryWrapper);
+
+ // 处理查询结果
+ List<MediaFileEntity> records = resultPage.getRecords()
+ .stream()
+ .peek(mediaFile -> {
+ // 获取任务名称并设置到fileId
+ String taskNameResult = waylineJobService.getName(mediaFile.getJobId());
+ mediaFile.setJobName(taskNameResult);
+ })
+ .collect(Collectors.toList());
+
+// 返回分页数据
+ return new PaginationData<>(records, new Pagination(resultPage));
+
+ }
+
+ @Override
public List<MediaFileEntity> listMediaFileEntity(String workspaceId, String jobId) {
return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
.eq(MediaFileEntity::getWorkspaceId, workspaceId).eq(MediaFileEntity::getJobId, jobId));
}
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 + "~"));
}
@@ -200,6 +248,11 @@
List<MediaFileEntity> records = pageData.getRecords()
.stream()
+ .peek(mediaFile -> {
+ // 获取任务名称并设置到fileId
+ String taskNameResult = waylineJobService.getName(mediaFile.getJobId());
+ mediaFile.setJobName(taskNameResult);
+ })
.collect(Collectors.toList());
return new PaginationData<MediaFileEntity>(records, new Pagination(pageData));
}
@@ -256,7 +309,6 @@
if (file != null) {
builder.fileName(file.getName())
.filePath(file.getPath())
- .isadd(0)
.examine(1)
.fingerprint(file.getFingerprint())
.objectKey(file.getObjectKey())
@@ -283,8 +335,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