From cc7b680aa5b2a6ad599c394715bb4327de8670bf Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 25 Jun 2024 14:37:32 +0800
Subject: [PATCH] 调查取证手动航线更新图斑调查状态，新增媒体查询接口视频图片筛查，调整定时任务时间，新增航线任务错误代码识别
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 80 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 80 insertions(+), 0 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 7b739d0..500c5da 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,10 +20,13 @@
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.IWaylineFileService;
+import com.dji.sample.wayline.service.IWaylineJobService;
import com.drew.imaging.ImageProcessingException;
import io.minio.MinioClient;
import io.minio.PutObjectArgs;
@@ -64,6 +67,11 @@
private OssServiceContext ossService;
@Autowired
private TerritoryConfigPojo territoryConfigPojo;
+ @Autowired
+ private IWaylineJobService waylineJobService;
+ @Autowired
+ private IWaylineFileService waylineFileService;
+
private Optional<MediaFileEntity> getMediaByFingerprint(String workspaceId, String fingerprint) {
MediaFileEntity fileEntity = mapper.selectOne(new LambdaQueryWrapper<MediaFileEntity>()
.eq(MediaFileEntity::getWorkspaceId, workspaceId)
@@ -88,6 +96,7 @@
MediaFileEntity fileEntity = this.fileUploadConvertToEntity(file);
fileEntity.setWorkspaceId(workspaceId);
fileEntity.setFileId(UUID.randomUUID().toString());
+ updateInvestigate(file.getExt().getFlightId());
return mapper.insert(fileEntity);
}
@@ -153,6 +162,72 @@
}
@Override
+ public PaginationData<MediaFileEntity> MediaQuery(Integer page, Integer pageSize, Long updateStart, Long updateEnd, Long photoStart, Long photoEnd, String jobName, String workspaceId,String type) {
+ // 创建分页对象
+ 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.getJobIds(jobName);
+ queryWrapper.in(MediaFileEntity::getJobId, jobIds);
+ }
+ if (type != null && !type.isEmpty()) {
+ if ("图片".equals(type)) {
+ queryWrapper.likeLeft(MediaFileEntity::getFileName, ".jpeg");
+ } else if ("视频".equals(type)) {
+ queryWrapper.likeLeft(MediaFileEntity::getFileName, ".mp4");
+ }
+ }
+ queryWrapper.orderByDesc(MediaFileEntity::getCreateTime);
+ // 执行分页查询
+ 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));
+
+ }
+
+ public void updateInvestigate(String jobId){
+ String waylineId=waylineJobService.getWaylineId(jobId);
+ String patchesId=waylineFileService.getPatchesId(waylineId);
+ if (patchesId==null){
+ return;
+ }
+ List<Long> ids = Arrays.stream(patchesId.split(","))
+ .map(Long::parseLong)
+ .collect(Collectors.toList());
+ LambdaUpdateWrapper<LotInfo> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.in(LotInfo::getId, ids)
+ .set(LotInfo::getInvestigate, 1);
+ patchesMapper.update(null, updateWrapper);
+ }
+
+
+ @Override
public List<MediaFileEntity> listMediaFileEntity(String workspaceId, String jobId) {
return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
.eq(MediaFileEntity::getWorkspaceId, workspaceId).eq(MediaFileEntity::getJobId, jobId));
@@ -201,6 +276,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));
}
--
Gitblit v1.9.3