From 12c17fa208e060a2c4407e2ae70e61957935ae7c Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 25 Jun 2024 16:53:24 +0800
Subject: [PATCH] 航线错误码修改，图斑规划状态修改
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 158 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 121 insertions(+), 37 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 e5e90e0..76fe1b3 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,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;
@@ -59,9 +63,14 @@
private GetPatchesMapper patchesMapper;
@Autowired
private IDeviceDictionaryService deviceDictionaryService;
-
@Autowired
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>()
@@ -87,53 +96,59 @@
MediaFileEntity fileEntity = this.fileUploadConvertToEntity(file);
fileEntity.setWorkspaceId(workspaceId);
fileEntity.setFileId(UUID.randomUUID().toString());
+ updateInvestigate(file.getExt().getFlightId());
return mapper.insert(fileEntity);
}
public void saveMarkFile(String workspaceId, FileUploadDTO file) throws IOException, FontFormatException, ImageProcessingException {
- String name = TimerUtil.getDkbh(file.getName());
- List<LotInfo> lotInfos = patchesMapper.selectList(new LambdaQueryWrapper<LotInfo>().eq(LotInfo::getDkbh, name));
- if (!lotInfos.isEmpty()) {
- LambdaUpdateWrapper<LotInfo> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(LotInfo::getDkbh, name)
- .eq(LotInfo::getInvestigate, 0)
- .set(LotInfo::getInvestigate, 1);
- patchesMapper.update(null, updateWrapper);
- }
-
boolean endsWith = file.getObjectKey().endsWith(".mp4");
if (endsWith) {
MediaFileMarkEntity mediaFileMarkEntity = this.fileUploadConvertToMarkEntity(file);
mediaFileMarkEntity.setWorkspaceId(workspaceId);
mediaFileMarkEntity.setFileId(UUID.randomUUID().toString());
markMapper.insert(mediaFileMarkEntity);
+ } else {
+ boolean contains = file.getName().contains("~");
+ if (contains) {
+ String name = TimerUtil.getDkbh(file.getName());
+ List<LotInfo> lotInfos = patchesMapper.selectList(new LambdaQueryWrapper<LotInfo>().eq(LotInfo::getDkbh, name));
+ if (!lotInfos.isEmpty()) {
+ LambdaUpdateWrapper<LotInfo> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(LotInfo::getDkbh, name)
+ .eq(LotInfo::getInvestigate, 0)
+ .set(LotInfo::getInvestigate, 1);
+ patchesMapper.update(null, updateWrapper);
+ }
+ }
+
+ MediaFileMarkEntity mediaFileMarkEntity = this.fileUploadConvertToMarkEntity(file);
+ String url = "http://dev.jxpskj.com:9000/cloud-bucket" + file.getObjectKey();
+ 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());
+ Object data = ImgUtil.getInfo(file1);
+ mediaFileMarkEntity.setDronedata(data);
+ mediaFileMarkEntity.setWorkspaceId(workspaceId);
+ mediaFileMarkEntity.setFileId(UUID.randomUUID().toString());
+ mediaFileMarkEntity.setObjectKey("/mark" + file.getPath() + "/" + file.getName());
+ mediaFileMarkEntity.setFileName("mark" + file.getName());
+ mediaFileMarkEntity.setFilePath("mark" + file.getPath());
+ String endpoint = "http://dev.jxpskj.com:9000";
+ String accessKey = "pskj";
+ String secretKey = "pskj@2021";
+ String bucketName = "cloud-bucket";
+ String objectName = mediaFileMarkEntity.getObjectKey(); // 例如 "folder/file.txt"
+ uploadFile(endpoint, accessKey, secretKey, bucketName, objectName, file2);
+ markMapper.insert(mediaFileMarkEntity);
}
- MediaFileMarkEntity mediaFileMarkEntity = this.fileUploadConvertToMarkEntity(file);
- String url = "http://dev.jxpskj.com:9000/cloud-bucket" + file.getObjectKey();
- 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());
- Object data = ImgUtil.getInfo(file1);
- mediaFileMarkEntity.setDronedata(data);
- mediaFileMarkEntity.setWorkspaceId(workspaceId);
- mediaFileMarkEntity.setFileId(UUID.randomUUID().toString());
- mediaFileMarkEntity.setObjectKey("/mark" + file.getPath() + "/" + file.getName());
- mediaFileMarkEntity.setFileName("mark" + file.getName());
- mediaFileMarkEntity.setFilePath("mark" + file.getPath());
- String endpoint = "http://dev.jxpskj.com:9000";
- String accessKey = "pskj";
- String secretKey = "pskj@2021";
- String bucketName = "cloud-bucket";
- String objectName = mediaFileMarkEntity.getObjectKey(); // 例如 "folder/file.txt"
- uploadFile(endpoint, accessKey, secretKey, bucketName, objectName, file2);
- markMapper.insert(mediaFileMarkEntity);
}
@Override
- public Object mediaInfo(String fileId) {
+ public Object mediaInfo(String filename) {
+ String name = "mark" + filename;
MediaFileMarkEntity entity = markMapper.selectOne(new LambdaQueryWrapper<MediaFileMarkEntity>()
- .eq(MediaFileMarkEntity::getFileId, fileId));
+ .eq(MediaFileMarkEntity::getFileName, name));
return entity.getDronedata();
}
@@ -147,13 +162,80 @@
}
@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)
+ .set(LotInfo::getIsPlan,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));
}
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 + "~"));
}
@@ -195,6 +277,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));
}
@@ -251,7 +338,6 @@
if (file != null) {
builder.fileName(file.getName())
.filePath(file.getPath())
- .isadd(0)
.examine(1)
.fingerprint(file.getFingerprint())
.objectKey(file.getObjectKey())
@@ -278,8 +364,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