From 82a90f791678dddbc6e1b98ee9e8028b61a38dfe Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 02 Jul 2024 19:17:13 +0800
Subject: [PATCH] 修改环境冲突
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 247 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 226 insertions(+), 21 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 500c5da..27e1e77 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
@@ -1,6 +1,9 @@
package com.dji.sample.media.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
@@ -28,8 +31,12 @@
import com.dji.sample.wayline.service.IWaylineFileService;
import com.dji.sample.wayline.service.IWaylineJobService;
import com.drew.imaging.ImageProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
import io.minio.MinioClient;
import io.minio.PutObjectArgs;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -72,6 +79,9 @@
@Autowired
private IWaylineFileService waylineFileService;
+ private ObjectMapper objectMapper = new ObjectMapper();
+
+
private Optional<MediaFileEntity> getMediaByFingerprint(String workspaceId, String fingerprint) {
MediaFileEntity fileEntity = mapper.selectOne(new LambdaQueryWrapper<MediaFileEntity>()
.eq(MediaFileEntity::getWorkspaceId, workspaceId)
@@ -96,7 +106,6 @@
MediaFileEntity fileEntity = this.fileUploadConvertToEntity(file);
fileEntity.setWorkspaceId(workspaceId);
fileEntity.setFileId(UUID.randomUUID().toString());
- updateInvestigate(file.getExt().getFlightId());
return mapper.insert(fileEntity);
}
@@ -120,7 +129,6 @@
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);
@@ -130,6 +138,7 @@
Object data = ImgUtil.getInfo(file1);
mediaFileMarkEntity.setDronedata(data);
mediaFileMarkEntity.setWorkspaceId(workspaceId);
+ mediaFileMarkEntity.setIsadd(0);
mediaFileMarkEntity.setFileId(UUID.randomUUID().toString());
mediaFileMarkEntity.setObjectKey("/mark" + file.getPath() + "/" + file.getName());
mediaFileMarkEntity.setFileName("mark" + file.getName());
@@ -143,6 +152,7 @@
markMapper.insert(mediaFileMarkEntity);
}
}
+
@Override
public Object mediaInfo(String filename) {
@@ -162,7 +172,7 @@
}
@Override
- public PaginationData<MediaFileEntity> MediaQuery(Integer page, Integer pageSize, Long updateStart, Long updateEnd, Long photoStart, Long photoEnd, String jobName, String workspaceId,String type) {
+ 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);
@@ -170,7 +180,7 @@
LambdaQueryWrapper<MediaFileEntity> queryWrapper = new LambdaQueryWrapper<>();
// 添加查询条件
- queryWrapper.eq(MediaFileEntity::getWorkspaceId,workspaceId);
+ queryWrapper.eq(MediaFileEntity::getWorkspaceId, workspaceId);
if (updateStart != null && updateEnd != null) {
queryWrapper.between(MediaFileEntity::getCreateTime, updateStart, updateEnd);
@@ -182,7 +192,13 @@
if (jobName != null && !jobName.isEmpty()) {
List<String> jobIds = waylineJobService.getJobIds(jobName);
- queryWrapper.in(MediaFileEntity::getJobId, jobIds);
+ // 检查 jobIds 列表是否为空
+ if (jobIds.isEmpty()) {
+ // 如果为空，则直接返回空的分页数据
+ return new PaginationData<>(Collections.emptyList(), new Pagination(pageObj));
+ }
+
+ queryWrapper.in(MediaFileEntity::getJobId, jobIds);
}
if (type != null && !type.isEmpty()) {
if ("图片".equals(type)) {
@@ -191,7 +207,7 @@
queryWrapper.likeLeft(MediaFileEntity::getFileName, ".mp4");
}
}
- queryWrapper.orderByDesc(MediaFileEntity::getCreateTime);
+ queryWrapper.last("ORDER BY JSON_EXTRACT(metadata, '$.createdTime') DESC");
// 执行分页查询
Page<MediaFileEntity> resultPage = mapper.selectPage(pageObj, queryWrapper);
@@ -209,21 +225,6 @@
// 返回分页数据
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);
}
@@ -261,6 +262,12 @@
MediaFileEntity entity = mapper.selectOne(new LambdaQueryWrapper<MediaFileEntity>()
.eq(MediaFileEntity::getFileId, fileId));
return entity.getExamine();
+ }
+
+ public String getDkbhName(String name) {
+ int startIndex = name.indexOf("点") + 1;
+ int endIndex = name.indexOf(".");
+ return name.substring(startIndex, endIndex);
}
@Override
@@ -427,6 +434,7 @@
.bucket(bucketName)
.object(objectName)
.stream(fileInputStream, file.length(), -1)
+ .contentType("image/jpeg")
.build()
);
fileInputStream.close();
@@ -439,6 +447,203 @@
// 获取时间戳（毫秒级别）
return date.getTime();
}
+
+ public List<MediaFileEntity> getSameJobId(String jobId) {
+ return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
+ .eq(MediaFileEntity::getJobId, jobId));
+ }
+
+
+// public void updateMediaFileNames(String jobId) {
+// // 查询符合条件的数据
+// List<MediaFileEntity> mediaFiles = mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
+// .eq(MediaFileEntity::getJobId, jobId)
+//// .eq(MediaFileMarkEntity::getIsadd, 0)
+// );
+//
+// // 筛选出name字段不包含'~'的数据
+// List<MediaFileEntity> filteredFiles = mediaFiles.stream()
+// .filter(file -> !file.getFileName().contains("~"))
+// .toList();
+// for (MediaFileEntity currentFile : filteredFiles) {
+// String currentName = currentFile.getFileName();
+// Map<String, Object> currentMetadata = JSON.parseObject(JSON.toJSONString(currentFile.getMetadata()), Map.class);
+// Long currentCreatedTime = (Long) currentMetadata.get("createdTime");
+// // 找到metadata中的createdTime小于当前数据的createdTime且最接近的那条数据
+// Optional<MediaFileEntity> closestFileOpt = mediaFiles.stream()
+// .filter(file -> {
+// Map<String, Object> metadata = JSON.parseObject(JSON.toJSONString(file.getMetadata()), Map.class);
+// Long createdTime = (Long) metadata.get("createdTime");
+// String filename = file.getFileName();
+// return createdTime < currentCreatedTime && filename.contains("~");
+// })
+// .min((file1, file2) -> {
+// Map<String, Object> metadata1 = JSON.parseObject(JSON.toJSONString(file1.getMetadata()), Map.class);
+// Map<String, Object> metadata2 = JSON.parseObject(JSON.toJSONString(file2.getMetadata()), Map.class);
+// Long time1 = (Long) metadata1.get("createdTime");
+// Long time2 = (Long) metadata2.get("createdTime");
+// return Long.compare(currentCreatedTime - time1, currentCreatedTime - time2);
+// });
+// if (closestFileOpt.isEmpty()) {
+// // 找不到小于的文件，尝试找大于且最接近的文件
+// closestFileOpt = mediaFiles.stream()
+// .filter(file -> {
+// Map<String, Object> metadata = JSON.parseObject(JSON.toJSONString(file.getMetadata()), Map.class);
+// Long createdTime = (Long) metadata.get("createdTime");
+// String filename = file.getFileName();
+// return createdTime > currentCreatedTime && filename.contains("~");
+// })
+// .min((file1, file2) -> {
+// Map<String, Object> metadata1 = JSON.parseObject(JSON.toJSONString(file1.getMetadata()), Map.class);
+// Map<String, Object> metadata2 = JSON.parseObject(JSON.toJSONString(file2.getMetadata()), Map.class);
+// Long time1 = (Long) metadata1.get("createdTime");
+// Long time2 = (Long) metadata2.get("createdTime");
+// return Long.compare(time1 - currentCreatedTime, time2 - currentCreatedTime);
+// });}
+// if (closestFileOpt.isEmpty()) {
+// throw new RuntimeException("当前图片无法绑定图斑");
+// }
+// // 提取并替换name字段
+// closestFileOpt.ifPresent(closestFile -> {
+// String closestName = closestFile.getFileName();
+// int startIndex = closestName.indexOf("V");
+// if (closestName.contains("W")) {
+// startIndex = closestName.indexOf("W");
+// }
+// if (closestName.contains("Z")) {
+// startIndex = closestName.indexOf("Z");
+// }
+// int endIndex = closestName.indexOf(".", startIndex);
+// String replacement = closestName.substring(startIndex, endIndex);
+// int currentStartIndex = currentName.indexOf("V");
+// if (currentName.contains("W")) {
+// currentStartIndex = closestName.indexOf("W");
+// }
+// if (currentName.contains("Z")) {
+// currentStartIndex = closestName.indexOf("Z");
+// }
+// int currentEndIndex = currentName.indexOf(".", currentStartIndex);
+// String newName = currentName.substring(0, currentStartIndex)
+// + replacement
+// + currentName.substring(currentEndIndex);
+// currentFile.setFileName(newName);
+// updateMediaById(currentFile.getId(), currentFile);
+// });
+// }
+// }
+//
+// @Override
+// public void updateMarkMediaFileNames(String jobId) {
+// try {
+//
+//
+// // 查询符合条件的数据
+// List<MediaFileMarkEntity> mediaFiles = markMapper.selectList(new LambdaQueryWrapper<MediaFileMarkEntity>()
+// .eq(MediaFileMarkEntity::getJobId, jobId)
+//// .eq(MediaFileMarkEntity::getIsadd, 0)
+// );
+//
+//
+// // 筛选出name字段不包含'~'的数据
+// List<MediaFileMarkEntity> filteredFiles = mediaFiles.stream()
+// .filter(file -> !file.getFileName().contains("~"))
+// .toList();
+//
+// for (MediaFileMarkEntity currentFile : filteredFiles) {
+// String currentName = currentFile.getFileName();
+// Map<String, Object> currentMetadata = JSON.parseObject(JSON.toJSONString(currentFile.getMetadata()), Map.class);
+// Long currentCreatedTime = (Long) currentMetadata.get("createdTime");
+// // 找到metadata中的createdTime小于当前数据的createdTime且最接近的那条数据
+// Optional<MediaFileMarkEntity> closestFileOpt = mediaFiles.stream()
+// .filter(file -> {
+// Map<String, Object> metadata = JSON.parseObject(JSON.toJSONString(file.getMetadata()), Map.class);
+// Long createdTime = (Long) metadata.get("createdTime");
+// String filename = file.getFileName();
+// return createdTime < currentCreatedTime && filename.contains("~");
+// })
+// .min((file1, file2) -> {
+// Map<String, Object> metadata1 = JSON.parseObject(JSON.toJSONString(file1.getMetadata()), Map.class);
+// Map<String, Object> metadata2 = JSON.parseObject(JSON.toJSONString(file2.getMetadata()), Map.class);
+// Long time1 = (Long) metadata1.get("createdTime");
+// Long time2 = (Long) metadata2.get("createdTime");
+// return Long.compare(currentCreatedTime - time1, currentCreatedTime - time2);
+// });
+// if (closestFileOpt.isEmpty()) {
+// // 找不到小于的文件，尝试找大于且最接近的文件
+// closestFileOpt = mediaFiles.stream()
+// .filter(file -> {
+// Map<String, Object> metadata = JSON.parseObject(JSON.toJSONString(file.getMetadata()), Map.class);
+// Long createdTime = (Long) metadata.get("createdTime");
+// String filename = file.getFileName();
+// return createdTime > currentCreatedTime && filename.contains("~");
+// })
+// .min((file1, file2) -> {
+// Map<String, Object> metadata1 = JSON.parseObject(JSON.toJSONString(file1.getMetadata()), Map.class);
+// Map<String, Object> metadata2 = JSON.parseObject(JSON.toJSONString(file2.getMetadata()), Map.class);
+// Long time1 = (Long) metadata1.get("createdTime");
+// Long time2 = (Long) metadata2.get("createdTime");
+// return Long.compare(time1 - currentCreatedTime, time2 - currentCreatedTime);
+// });
+// }
+// if (closestFileOpt.isEmpty()) {
+// throw new RuntimeException("没有符合时间的对象");
+// }
+// // 提取并替换name字段
+// closestFileOpt.ifPresent(closestFile -> {
+// String closestName = closestFile.getFileName();
+// int startIndex = closestName.indexOf("V");
+// if (closestName.contains("W")) {
+// startIndex = closestName.indexOf("W");
+// }
+// if (closestName.contains("Z")) {
+// startIndex = closestName.indexOf("Z");
+// }
+// int endIndex = closestName.indexOf(".", startIndex);
+// String replacement = closestName.substring(startIndex, endIndex);
+// int currentStartIndex = currentName.indexOf("V");
+// if (currentName.contains("W")) {
+// currentStartIndex = closestName.indexOf("W");
+// }
+// if (currentName.contains("Z")) {
+// currentStartIndex = closestName.indexOf("Z");
+// }
+// int currentEndIndex = currentName.indexOf(".", currentStartIndex);
+// String newName = currentName.substring(0, currentStartIndex)
+// + replacement
+// + currentName.substring(currentEndIndex);
+// currentFile.setFileName(newName);
+// updateById(currentFile.getId(), currentFile);
+// });
+// }
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
+
+ public void updateById(Integer id, MediaFileMarkEntity entity) {
+ entity.setIsadd(1);
+ UpdateWrapper<MediaFileMarkEntity> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("id", id);
+ markMapper.update(entity, updateWrapper);
+ }
+
+ public void updateMediaById(Integer id, MediaFileEntity entity) {
+ UpdateWrapper<MediaFileEntity> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("id", id);
+ mapper.update(entity, updateWrapper);
+ }
+
+// public void getNoaddFile() {
+// List<MediaFileMarkEntity> markEntities = markMapper.selectList(new LambdaQueryWrapper<MediaFileMarkEntity>().eq(MediaFileMarkEntity::getIsadd, 0));
+// for (MediaFileMarkEntity mark : markEntities) {
+// updateMarkMediaFileNames(mark.getJobId());
+// updateMediaFileNames(mark.getJobId());
+// }
+// }
+
}
+
+
+
--
Gitblit v1.9.3