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);