From c5695db0d767fea3a24ecb1757a832314a3aa382 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Fri, 26 Dec 2025 15:11:50 +0800
Subject: [PATCH] 优化架次和媒体
---
ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceImpl.java | 2 ++
ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml | 2 +-
ard-work/src/main/java/com/ard/work/service/impl/ArdMediaServiceImpl.java | 6 +++---
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceImpl.java
index 97dc505..fd9e9e2 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceImpl.java
@@ -80,6 +80,8 @@
public void syncFlightHistory(String serverId, Date startTime) {
// 创建查询条件 BoxHistoryDTO，并设置 startTime 作为过滤条件
BoxHistoryDTO boxHistoryDTO = BoxHistoryDTO.builder()
+ .pageIndex(1)
+ .pageSize(100)
.startTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, startTime))
.build();
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/ArdMediaServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/ArdMediaServiceImpl.java
index 1f95bce..b0c3c7f 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/ArdMediaServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/ArdMediaServiceImpl.java
@@ -118,7 +118,7 @@
@Override
public void updatePhotoToDatabase(ArdFlightTask flightTask, String serverId, String boxSn) {
- // 获取本地数据库中已存在的图片记录（类型为 0 表示图片）
+ // 获取本地数据库中已存在的图片记录
List<ArdMediaPic> existingPhotos = ardMediaPicMapper.selectPicByTaskId(flightTask.getTaskId());
int count = existingPhotos.size(); //获取本地库图片数量
// 查询图片
@@ -145,10 +145,10 @@
.filter(photo -> !existingPhotoUrls.contains(photo.getImgUrl())) // 过滤出新图片
.collect(Collectors.toList());
if (!newPhotos.isEmpty()) {
- // 插入新的视频记录
+ // 插入新的图片记录
addPhotos(flightTask, newPhotos);
- // 更新任务的视频数量
+ // 更新任务的图片数量
flightTask.setPhotoCount(flightTask.getPhotoCount() + newPhotos.size());
ardFlightTaskMapper.updateArdFlightTask(flightTask);
}
diff --git a/ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml b/ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml
index a231ccf..906d113 100644
--- a/ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml
@@ -146,13 +146,13 @@
WHERE task_id = #{taskId}
</select>
-
<!-- 获取某个时间戳后的任务 -->
<select id="getTasksAfter" resultType="ArdFlightTask">
SELECT *
FROM ard_flight_task
WHERE end_time > #{lastSyncTime}
</select>
+
<select id="findMaxStartTimeByServerId" resultType="java.util.Date">
SELECT MAX(start_time)
FROM ard_flight_task
--
Gitblit v1.9.3