From eb4651f6828d2b8479197b1562ce1e480f703f32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Sat, 28 Feb 2026 09:42:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=9C=BA=E5=9C=BA=E9=A3=9E?= =?UTF-8?q?=E8=A1=8C=E6=8E=A7=E5=88=B6=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FlightServiceImpl.java | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ruoyi/device/service/impl/FlightServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/FlightServiceImpl.java index 1634d75..71b0a1f 100644 --- a/src/main/java/com/ruoyi/device/service/impl/FlightServiceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/FlightServiceImpl.java @@ -13,6 +13,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -130,7 +131,26 @@ public class FlightServiceImpl implements FlightService result.put("createTime", flight.getCreateTime()); List preCheckLogs = preCheckLogMapper.selectPreCheckLogListByFlightId(flight.getFlightId()); - result.put("preCheckLogs", preCheckLogs); + List> preCheckLogsWithExecTime = new ArrayList<>(); + Date prevTime = flight.getCreateTime(); + + for (PreCheckLogEntity log : preCheckLogs) { + Map logMap = new HashMap<>(); + logMap.put("logId", log.getLogId()); + logMap.put("flightId", log.getFlightId()); + logMap.put("logContent", log.getLogContent()); + logMap.put("success", log.getSuccess()); + logMap.put("createTime", log.getCreateTime()); + logMap.put("updateTime", log.getUpdateTime()); + + if (log.getCreateTime() != null && prevTime != null) { + logMap.put("execTime", log.getCreateTime().getTime() - prevTime.getTime()); + prevTime = log.getCreateTime(); + } + + preCheckLogsWithExecTime.add(logMap); + } + result.put("preCheckLogs", preCheckLogsWithExecTime); List flightLogs = flightLogMapper.selectFlightLogListByFlightId(flight.getFlightId()); result.put("flightLogs", flightLogs);