From d4447ca99df2cfe978ca51790dd2891e9df0d492 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Thu, 25 Jul 2024 16:19:05 +0800
Subject: [PATCH] 修改人工拍照图片保存,新增面状航线保存、修改接口，图斑文件上传格式修改
---
src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java | 63 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java b/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java
index dc69a73..846be5a 100644
--- a/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java
+++ b/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java
@@ -95,36 +95,37 @@
@Override
public PaginationData getPhoto(PatchesParam param, String dkbh) {
- LotInfo lotInfo = getLotinfoToDb(dkbh);
- int statue = lotInfo.getIsPush();
-
- if (statue == 1) {
- List<MediaFileMarkEntity> allResults = markMapper.selectList(
- new LambdaQueryWrapper<MediaFileMarkEntity>()
- .like(MediaFileMarkEntity::getFileName, "%" + dkbh + "~" + "%"));
-
- // 去重处理
- Map<String, MediaFileMarkEntity> uniqueFileMap = new LinkedHashMap<>();
- List<MediaFileMarkEntity> uniqueResults = allResults.stream()
- .filter(mediaFile -> uniqueFileMap.putIfAbsent(mediaFile.getFileName(), mediaFile) == null)
- .collect(Collectors.toList());
-
- // 计算分页信息
- int total = uniqueResults.size();
- int start = (param.getPage() - 1) * param.getPageSize();
- int end = Math.min(start + param.getPageSize(), total);
-
- // 获取当前页的结果
- List<MediaFileMarkEntity> pageResults = uniqueResults.subList(start, end);
-
- // 创建临时的 Page 对象
- Page<MediaFileMarkEntity> resultPage = new Page<>(param.getPage(), param.getPageSize());
- resultPage.setRecords(pageResults);
- resultPage.setTotal(total);
-
- // 返回分页数据
- return new PaginationData<>(pageResults, new Pagination(resultPage));
- } else {
+// LotInfo lotInfo = getLotinfoToDb(dkbh);
+// int statue = lotInfo.getIsPush();
+//
+// if (statue == 1) {
+// List<MediaFileMarkEntity> allResults = markMapper.selectList(
+// new LambdaQueryWrapper<MediaFileMarkEntity>()
+// .like(MediaFileMarkEntity::getFileName, "%" + dkbh + "~" + "%"));
+//
+// // 去重处理
+// Map<String, MediaFileMarkEntity> uniqueFileMap = new LinkedHashMap<>();
+// List<MediaFileMarkEntity> uniqueResults = allResults.stream()
+// .filter(mediaFile -> uniqueFileMap.putIfAbsent(mediaFile.getFileName(), mediaFile) == null)
+// .collect(Collectors.toList());
+//
+// // 计算分页信息
+// int total = uniqueResults.size();
+// int start = (param.getPage() - 1) * param.getPageSize();
+// int end = Math.min(start + param.getPageSize(), total);
+//
+// // 获取当前页的结果
+// List<MediaFileMarkEntity> pageResults = uniqueResults.subList(start, end);
+//
+// // 创建临时的 Page 对象
+// Page<MediaFileMarkEntity> resultPage = new Page<>(param.getPage(), param.getPageSize());
+// resultPage.setRecords(pageResults);
+// resultPage.setTotal(total);
+//
+// // 返回分页数据
+// return new PaginationData<>(pageResults, new Pagination(resultPage));
+// }
+// else {
List<MediaFileEntity> allResults = fileMapper.selectList(
new LambdaQueryWrapper<MediaFileEntity>()
.like(MediaFileEntity::getFileName, "%" + dkbh + "~" + "%"));
@@ -151,7 +152,7 @@
// 返回分页数据
return new PaginationData<>(pageResults, new Pagination(resultPage));
}
- }
+// }
--
Gitblit v1.9.3