From d125bf54fd48661cf03a3e6083bdb764fde3c347 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 26 Jul 2024 09:30:04 +0800
Subject: [PATCH] 图斑图片绑定
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 237 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 188 insertions(+), 49 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 ab36fe7..e155d82 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
@@ -22,6 +22,7 @@
import com.dji.sample.media.model.*;
import com.dji.sample.media.service.IFileService;
import com.dji.sample.media.util.ImgUtil;
+import com.dji.sample.media.util.MinioFileDownloader;
import com.dji.sample.patches.dao.GetPatchesMapper;
import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.utils.DistrictCodeUtils;
@@ -43,6 +44,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.servlet.http.HttpServletResponse;
import java.awt.*;
import java.io.File;
import java.io.FileInputStream;
@@ -54,6 +56,8 @@
import java.util.*;
import java.util.List;
import java.util.stream.Collectors;
+
+import static com.dji.sample.media.util.ImageDownloaderAndCompressor.*;
/**
* @author sean
@@ -115,7 +119,8 @@
return mapper.insert(fileEntity);
}
- public void saveMarkFile(String workspaceId, FileUploadDTO file) throws IOException {
+ public void saveNailFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException {
+ updateStatue(file.getName());
boolean endsWith = file.getObjectKey().endsWith(".mp4");
if (endsWith) {
MediaFileNailEntity nailEntity = this.fileUploadConvertToNailEntity((file));
@@ -123,53 +128,36 @@
nailEntity.setFileId(UUID.randomUUID().toString());
nailMapper.insert(nailEntity);
} else {
- String endpoint = pojo.getEndpoint();
- String accessKey = pojo.getAccessKey();
- String secretKey = pojo.getSecretKey();
- String bucketName = pojo.getBucket();
String url = pojo.getEndpoint() + "/" + pojo.getBucket() + file.getObjectKey();
File file1 = TbFjServiceImpl.downloadFile(url);
File nailFile = new File(ImgZipUtil.compressImage(file1, 50).toURI());
MediaFileNailEntity nailEntity = this.fileUploadConvertToNailEntity(file);
+ Object data = ImgUtil.getInfo(file1);
+ nailEntity.setIsadd(0);
nailEntity.setIsOriginal(false);
+ nailEntity.setDronedata(data);
nailEntity.setWorkspaceId(workspaceId);
nailEntity.setFileName("nail" + file.getName());
nailEntity.setObjectKey("/nail" + file.getPath() + "/" + file.getName());
nailEntity.setFilePath("nail" + file.getPath());
String nailName = nailEntity.getObjectKey();
nailEntity.setFileId(UUID.randomUUID().toString());
- uploadFile(endpoint, accessKey, secretKey, bucketName, nailName, nailFile, "image/jpeg");
+ uploadFile(pojo.getEndpoint(), pojo.getAccessKey(), pojo.getSecretKey(), pojo.getBucket(), nailName, nailFile, "image/jpeg");
+ uploadFile("http://139.196.74.78:9000", "sxkj", "sxkj2024", "cloud-bucket", nailName, nailFile, "image/jpeg");
nailMapper.insert(nailEntity);
- try {
- if (file.getName().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);
- long timestamp = convertToTimestamp(file.getMetadata().getCreatedTime());
- File markFile = 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.setIsadd(0);
- mediaFileMarkEntity.setIsOriginal(false);
- mediaFileMarkEntity.setFileId(UUID.randomUUID().toString());
- mediaFileMarkEntity.setObjectKey("/mark" + file.getPath() + "/" + file.getName());
- mediaFileMarkEntity.setFileName("mark" + file.getName());
- mediaFileMarkEntity.setFilePath("mark" + file.getPath());
- String objectName = mediaFileMarkEntity.getObjectKey(); // 例如 "folder/file.txt"
- uploadFile(endpoint, accessKey, secretKey, bucketName, objectName, markFile, "image/jpeg");
- markMapper.insert(mediaFileMarkEntity);
- } catch (Exception e) {
- e.printStackTrace();
+ }
+ }
+
+ public void updateStatue(String filename) {
+ if (filename.contains("~")) {
+ String name = TimerUtil.getDkbh(filename);
+ 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);
}
}
}
@@ -177,16 +165,40 @@
@Override
public Object mediaInfo(String filename) {
String name = filename;
+ List<MediaFileEntity> entitys = mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
+ .eq(MediaFileEntity::getFileName, name));
+ if (entitys != null && !entitys.isEmpty()) {
+ for (MediaFileEntity entity : entitys) {
+ if (entity.getDroneData() != null) {
+ return entity.getDroneData();
+ }
+ }
+ }
+
if (!filename.contains("mark")) {
name = "mark" + filename;
}
List<MediaFileMarkEntity> entity = markMapper.selectList(new LambdaQueryWrapper<MediaFileMarkEntity>()
.eq(MediaFileMarkEntity::getFileName, name));
- if (entity != null) {
- return entity.get(0).getDronedata();
+ if (entity != null && !entity.isEmpty()) {
+ for (MediaFileMarkEntity markEntity : entity) {
+ if (markEntity.getDronedata() != null) {
+ return markEntity.getDronedata();
+ }
+ }
} else {
- return "该图片信息正在加载";
+ String names = "nail" + filename;
+ List<MediaFileNailEntity> entities = nailMapper.selectList(new LambdaQueryWrapper<MediaFileNailEntity>()
+ .eq(MediaFileNailEntity::getFileName, names));
+ if (entities != null && !entities.isEmpty()) {
+ for (MediaFileNailEntity NailEntity : entities) {
+ if (NailEntity.getDronedata() != null) {
+ return NailEntity.getDronedata();
+ }
+ }
+ }
}
+ return "null";
}
@Override
@@ -408,6 +420,33 @@
}
@Override
+ public ResponseResult downloadImages(List<String> jobIds) {
+ try {
+ String bucketPath = "/data/software/minio-data/cloud-bucket/";
+ // List<String> prefixes = getUniqueFilePaths(jobIds);
+ MinioFileDownloader downloader = new MinioFileDownloader(bucketPath);
+ // 下载并压缩文件到本地目录
+ String localSaveDir = "/data/software/minio-data/zip-bucket/"; // 修改为你想保存的本地目录
+ downloader.downloadAndZipFolders(jobIds, localSaveDir);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResponseResult.error("下载失败" + e.getMessage());
+ }
+ return ResponseResult.success("下载成功");
+ }
+
+ @Override
+ public List<String> getUniqueFilePaths(List<String> jobIds) {
+ return mapper.selectList(
+ new LambdaQueryWrapper<MediaFileEntity>()
+ .in(MediaFileEntity::getJobId, jobIds))
+ .stream()
+ .map(MediaFileEntity::getFilePath)
+ .distinct()
+ .collect(Collectors.toList());
+ }
+
+ @Override
public List<MediaFileDTO> getFilesByWorkspaceAndJobId(String workspaceId, String jobId) {
return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
.eq(MediaFileEntity::getWorkspaceId, workspaceId)
@@ -469,6 +508,7 @@
if (file != null) {
builder.fileName(file.getName())
+ .filePath(file.getPath())
.fingerprint(file.getFingerprint())
.objectKey(file.getObjectKey())
.subFileType(file.getSubFileType())
@@ -498,6 +538,7 @@
.objectKey(file.getObjectKey())
.subFileType(file.getSubFileType())
.isOriginal(file.getExt().getIsOriginal())
+ .filePath(file.getPath())
.jobId(file.getExt().getFlightId())
.drone(file.getExt().getSn()).metadata(file.getMetadata())
.tinnyFingerprint(file.getExt().getTinnyFingerprint());
@@ -670,8 +711,8 @@
public void updateMarkMediaFileNames(String jobId) {
try {
// 查询符合条件的数据
- List<MediaFileMarkEntity> mediaFiles = markMapper.selectList(new LambdaQueryWrapper<MediaFileMarkEntity>()
- .eq(MediaFileMarkEntity::getJobId, jobId));
+ List<MediaFileNailEntity> mediaFiles = nailMapper.selectList(new LambdaQueryWrapper<MediaFileNailEntity>()
+ .eq(MediaFileNailEntity::getJobId, jobId));
// 判断所有 fileName 是否都包含 '~' 或者都不包含 '~'
boolean allContainTilde = mediaFiles.stream().allMatch(file -> file.getFileName().contains("~"));
@@ -687,17 +728,17 @@
}
// 筛选出name字段不包含'~'的数据
- List<MediaFileMarkEntity> filteredFiles = mediaFiles.stream()
+ List<MediaFileNailEntity> filteredFiles = mediaFiles.stream()
.filter(file -> !file.getFileName().contains("~"))
.collect(Collectors.toList());
- for (MediaFileMarkEntity currentFile : filteredFiles) {
+ for (MediaFileNailEntity 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()
+ Optional<MediaFileNailEntity> closestFileOpt = mediaFiles.stream()
.filter(file -> {
Map<String, Object> metadata = JSON.parseObject(JSON.toJSONString(file.getMetadata()), Map.class);
Long createdTime = (Long) metadata.get("createdTime");
@@ -769,12 +810,110 @@
}
}
+ @Override
+ public PaginationData<MediaFileEntity> getJobId(int pageNum, int pageSize, String workspaceId) {
+ List<MediaFileEntity> allRecords = new ArrayList<>();
+ int currentPageNum = 1; // 从第一页开始获取记录
- public void updateById(Integer id, MediaFileMarkEntity entity) {
+ // 用于存储去重后的记录
+ Map<String, MediaFileEntity> uniqueFilesMap = new HashMap<>();
+
+ while (true) {
+ // 分页查询
+ Page<MediaFileEntity> page = new Page<>(currentPageNum, pageSize);
+ Page<MediaFileEntity> resultPage = mapper.selectPage(page, new LambdaQueryWrapper<MediaFileEntity>()
+ .eq(MediaFileEntity::getWorkspaceId, workspaceId));
+
+ List<MediaFileEntity> result = resultPage.getRecords();
+
+ // 检查是否还有更多记录
+ if (result.isEmpty()) {
+ break; // 没有更多记录了，停止请求
+ }
+
+ // 根据 fileName 字段进行去重并设置 JobName
+ result.stream()
+ .peek(mediaFile -> {
+ String taskNameResult = waylineJobService.getName(mediaFile.getJobId());
+ mediaFile.setJobName(taskNameResult);
+ })
+ .forEach(mediaFile -> uniqueFilesMap.putIfAbsent(mediaFile.getFileName(), mediaFile));
+
+ // 增加当前页数以获取更多记录
+ currentPageNum++;
+ }
+
+ // 获取去重后的实际总数
+ List<MediaFileEntity> uniqueFiles = new ArrayList<>(uniqueFilesMap.values());
+ int uniqueTotal = uniqueFiles.size();
+
+ // 计算当前页的起始和结束索引
+ int fromIndex = Math.min((pageNum - 1) * pageSize, uniqueTotal);
+ int toIndex = Math.min(fromIndex + pageSize, uniqueTotal);
+
+ // 获取当前页的数据
+ List<MediaFileEntity> pagedUniqueFiles = uniqueFiles.subList(fromIndex, toIndex);
+
+ // 创建新的分页对象，使用去重后的总数
+ Page<MediaFileEntity> uniquePage = new Page<>(pageNum, pageSize, uniqueTotal);
+
+ // 使用新的分页对象构造 Pagination
+ Pagination pagination = new Pagination(uniquePage);
+
+ return new PaginationData<>(pagedUniqueFiles, pagination);
+ }
+
+
+ @Override
+ public PaginationData<MediaFileEntity> getPhotoByJobId(int pageNum, int pageSize, String workspaceId, String jobId) {
+
+ // 分页查询
+ Page<MediaFileEntity> page = new Page<>(pageNum, pageSize);
+ Page<MediaFileEntity> resultPage = mapper.selectPage(page, new LambdaQueryWrapper<MediaFileEntity>()
+ .eq(MediaFileEntity::getJobId, jobId)
+ .eq(MediaFileEntity::getWorkspaceId, workspaceId));
+
+ List<MediaFileEntity> result = resultPage.getRecords();
+
+ // 根据 fileName 字段进行去重
+ Map<String, MediaFileEntity> uniqueFilesMap = result.stream()
+ .collect(Collectors.toMap(
+ MediaFileEntity::getFileName,
+ entity -> entity,
+ (existing, replacement) -> existing // 如果有重复的，保留已有的
+ ));
+
+ List<MediaFileEntity> uniqueFiles = new ArrayList<>(uniqueFilesMap.values());
+
+ // 使用去重后的列表重新计算总数
+ int uniqueTotal = uniqueFiles.size();
+
+ // 创建新的分页对象，使用去重后的总数
+ Page<MediaFileEntity> uniquePage = new Page<>(pageNum, pageSize, uniqueTotal);
+
+ // 截取当前页的数据
+ int fromIndex = Math.min((pageNum - 1) * pageSize, uniqueTotal);
+ int toIndex = Math.min(fromIndex + pageSize, uniqueTotal);
+ List<MediaFileEntity> pagedUniqueFiles = uniqueFiles.subList(fromIndex, toIndex);
+
+ // 使用新的分页对象构造 Pagination
+ Pagination pagination = new Pagination(uniquePage);
+
+ return new PaginationData<>(pagedUniqueFiles, pagination);
+ }
+
+
+ public List<MediaFileEntity> getMedia(String jobId) {
+ return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
+ .eq(MediaFileEntity::getJobId, jobId)
+ .groupBy(MediaFileEntity::getFileName)); // 使用groupBy去重
+ }
+
+ public void updateById(Integer id, MediaFileNailEntity entity) {
entity.setIsadd(1);
- UpdateWrapper<MediaFileMarkEntity> updateWrapper = new UpdateWrapper<>();
+ UpdateWrapper<MediaFileNailEntity> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id", id);
- markMapper.update(entity, updateWrapper);
+ nailMapper.update(entity, updateWrapper);
}
public void updateMediaById(Integer id, MediaFileEntity entity) {
@@ -784,8 +923,8 @@
}
public void getNoaddFile() {
- List<MediaFileMarkEntity> markEntities = markMapper.selectList(new LambdaQueryWrapper<MediaFileMarkEntity>().eq(MediaFileMarkEntity::getIsadd, 0));
- for (MediaFileMarkEntity mark : markEntities) {
+ List<MediaFileNailEntity> markEntities = nailMapper.selectList(new LambdaQueryWrapper<MediaFileNailEntity>().eq(MediaFileNailEntity::getIsadd, 0));
+ for (MediaFileNailEntity mark : markEntities) {
updateMarkMediaFileNames(mark.getJobId());
updateMediaFileNames(mark.getJobId());
}
--
Gitblit v1.9.3