20.本地自测"统计通道日级别高峰时段过检率接口"，添加补齐日期逻辑

airport-common/src/main/java/com/sundot/airport/common/utils/DateUtils.java

@@ -8,16 +8,20 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+import com.google.common.collect.Lists;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
 /**
  * 时间工具类
- * 
+ *
  * @author ruoyi
  */
-public class DateUtils extends org.apache.commons.lang3.time.DateUtils
-{
+public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
     public static String YYYY = "yyyy";
 
     public static String YYYY_MM = "yyyy-MM";
@@ -29,63 +33,52 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
 
     private static String[] parsePatterns = {
-            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", 
+            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
             "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
             "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
 
     /**
      * 获取当前Date型日期
-     * 
+     *
      * @return Date() 当前日期
      */
-    public static Date getNowDate()
-    {
+    public static Date getNowDate() {
         return new Date();
     }
 
     /**
      * 获取当前日期, 默认格式为yyyy-MM-dd
-     * 
+     *
      * @return String
      */
-    public static String getDate()
-    {
+    public static String getDate() {
         return dateTimeNow(YYYY_MM_DD);
     }
 
-    public static final String getTime()
-    {
+    public static final String getTime() {
         return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
     }
 
-    public static final String dateTimeNow()
-    {
+    public static final String dateTimeNow() {
         return dateTimeNow(YYYYMMDDHHMMSS);
     }
 
-    public static final String dateTimeNow(final String format)
-    {
+    public static final String dateTimeNow(final String format) {
         return parseDateToStr(format, new Date());
     }
 
-    public static final String dateTime(final Date date)
-    {
+    public static final String dateTime(final Date date) {
         return parseDateToStr(YYYY_MM_DD, date);
     }
 
-    public static final String parseDateToStr(final String format, final Date date)
-    {
+    public static final String parseDateToStr(final String format, final Date date) {
         return new SimpleDateFormat(format).format(date);
     }
 
-    public static final Date dateTime(final String format, final String ts)
-    {
-        try
-        {
+    public static final Date dateTime(final String format, final String ts) {
+        try {
             return new SimpleDateFormat(format).parse(ts);
-        }
-        catch (ParseException e)
-        {
+        } catch (ParseException e) {
             throw new RuntimeException(e);
         }
     }
@@ -93,8 +86,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期路径 即年/月/日 如2018/08/08
      */
-    public static final String datePath()
-    {
+    public static final String datePath() {
         Date now = new Date();
         return DateFormatUtils.format(now, "yyyy/MM/dd");
     }
@@ -102,8 +94,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期路径 即年/月/日 如20180808
      */
-    public static final String dateTime()
-    {
+    public static final String dateTime() {
         Date now = new Date();
         return DateFormatUtils.format(now, "yyyyMMdd");
     }
@@ -111,18 +102,13 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期型字符串转化为日期 格式
      */
-    public static Date parseDate(Object str)
-    {
-        if (str == null)
-        {
+    public static Date parseDate(Object str) {
+        if (str == null) {
             return null;
         }
-        try
-        {
+        try {
             return parseDate(str.toString(), parsePatterns);
-        }
-        catch (ParseException e)
-        {
+        } catch (ParseException e) {
             return null;
         }
     }
@@ -130,8 +116,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 获取服务器启动时间
      */
-    public static Date getServerStartDate()
-    {
+    public static Date getServerStartDate() {
         long time = ManagementFactory.getRuntimeMXBean().getStartTime();
         return new Date(time);
     }
@@ -139,20 +124,18 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 计算相差天数
      */
-    public static int differentDaysByMillisecond(Date date1, Date date2)
-    {
+    public static int differentDaysByMillisecond(Date date1, Date date2) {
         return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24)));
     }
 
     /**
      * 计算时间差
      *
-     * @param endDate 最后时间
+     * @param endDate   最后时间
      * @param startTime 开始时间
      * @return 时间差（天/小时/分钟）
      */
-    public static String timeDistance(Date endDate, Date startTime)
-    {
+    public static String timeDistance(Date endDate, Date startTime) {
         long nd = 1000 * 24 * 60 * 60;
         long nh = 1000 * 60 * 60;
         long nm = 1000 * 60;
@@ -173,8 +156,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 增加 LocalDateTime ==> Date
      */
-    public static Date toDate(LocalDateTime temporalAccessor)
-    {
+    public static Date toDate(LocalDateTime temporalAccessor) {
         ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault());
         return Date.from(zdt.toInstant());
     }
@@ -182,10 +164,47 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 增加 LocalDate ==> Date
      */
-    public static Date toDate(LocalDate temporalAccessor)
-    {
+    public static Date toDate(LocalDate temporalAccessor) {
         LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0));
         ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
         return Date.from(zdt.toInstant());
     }
+
+    /**
+     * 生成近30天的日期列表（包含今天）
+     */
+    public static List<Date> generateLast30Days() {
+        List<Date> dates = Lists.newArrayList();
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+
+        for (int i = 29; i >= 0; i--) {
+            Calendar cal = (Calendar) calendar.clone();
+            cal.add(Calendar.DAY_OF_MONTH, -i);
+            dates.add(cal.getTime());
+        }
+        return dates;
+    }
+
+    /**
+     * 格式化日期为字符串键值（yyyy-MM-dd）
+     */
+    public static String formatDateKey(Date date) {
+        if (Objects.isNull(date)) {
+            return "";
+        }
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+        return String.format("%04d-%02d-%02d",
+                cal.get(Calendar.YEAR),
+                cal.get(Calendar.MONTH) + 1,
+                cal.get(Calendar.DAY_OF_MONTH));
+    }
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/vo/LaneThroughputResVO.java

@@ -1,9 +1,11 @@
 package com.sundot.airport.ledger.domain.vo;
 
     import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+    import lombok.AllArgsConstructor;
+    import lombok.Data;
+    import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
+    import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @date 2026/5/19 15:27
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class LaneThroughputResVO implements Serializable {
     /**
      * 日期
@@ -40,4 +44,11 @@ public class LaneThroughputResVO implements Serializable {
      * 过检率（保留1位小数）
      */
     private BigDecimal throughputRate;
+
+    public LaneThroughputResVO(Date date) {
+        this.recordDate = date;
+        this.totalThroughput = 0;
+        this.totalRecord = 0;
+        this.throughputRate = java.math.BigDecimal.ZERO;
+    }
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/OperationLanePeakThroughputServiceImpl.java

@@ -1,24 +1,31 @@
 package com.sundot.airport.ledger.service.impl;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
 import com.sundot.airport.common.utils.DateUtils;
 import com.sundot.airport.ledger.domain.OperationLanePeakThroughput;
 import com.sundot.airport.ledger.domain.vo.CountQueryReqVO;
 import com.sundot.airport.ledger.domain.vo.LaneThroughputResVO;
 import com.sundot.airport.ledger.mapper.OperationLanePeakThroughputMapper;
 import com.sundot.airport.ledger.service.IOperationLanePeakThroughputService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 /**
  * 通道日别高峰时段过检Service业务层处理
  */
+@Slf4j
 @Service
 public class OperationLanePeakThroughputServiceImpl extends ServiceImpl<OperationLanePeakThroughputMapper, OperationLanePeakThroughput>
         implements IOperationLanePeakThroughputService {
@@ -102,7 +109,57 @@ public class OperationLanePeakThroughputServiceImpl extends ServiceImpl<Operatio
         if (Objects.isNull(laneThroughputQuery.getDeptId()) && Objects.isNull(laneThroughputQuery.getTeamId()) && Objects.isNull(laneThroughputQuery.getGroupId())) {
             return Collections.emptyList();
         }
+        
+        // 查询数据库中存在的日期数据
         List<LaneThroughputResVO> laneThroughputResList = this.baseMapper.countLanePeakThroughput(laneThroughputQuery);
-        return CollUtil.emptyIfNull(laneThroughputResList);
+        laneThroughputResList = CollUtil.emptyIfNull(laneThroughputResList);
+        
+        log.info("SQL查询返回数据条数: {}", laneThroughputResList.size());
+        
+        // 生成近30天的日期列表
+        List<Date> last30Days = DateUtils.generateLast30Days();
+        
+        // 将查询结果按日期建立映射（只比较日期部分，忽略时间）
+        Map<String, LaneThroughputResVO> dataMap = laneThroughputResList.stream()
+                .collect(Collectors.toMap(
+                        vo -> DateUtils.formatDateKey(vo.getRecordDate()),
+                        vo -> vo,
+                        (existing, replacement) -> existing
+                ));
+        
+        log.info("数据Map中的日期键: {}", dataMap.keySet());
+        
+        // 补齐缺失的日期数据
+        List<LaneThroughputResVO> resultList = Lists.newArrayList();
+        for (Date date : last30Days) {
+            String dateKey = DateUtils.formatDateKey(date);
+            if (dataMap.containsKey(dateKey)) {
+                // 存在的日期，使用查询结果
+                resultList.add(dataMap.get(dateKey));
+            } else {
+                // 缺失的日期，补充0数据
+                LaneThroughputResVO emptyVO = this.createEmptyVO(date, laneThroughputResList);
+                resultList.add(emptyVO);
+            }
+        }
+        
+        log.info("补齐后返回的总数据条数: {}", resultList.size());
+        
+        // 按日期升序排序
+        resultList.sort(Comparator.comparing(LaneThroughputResVO::getRecordDate));
+        
+        return resultList;
+    }
+    
+    /**
+     * 创建空的VO对象
+     */
+    private LaneThroughputResVO createEmptyVO(Date date, List<LaneThroughputResVO> existingList) {
+        LaneThroughputResVO emptyVO = new LaneThroughputResVO(date);
+        // 从已有数据中获取groupName（如果有的话）
+        if (CollUtil.isNotEmpty(existingList)) {
+            emptyVO.setGroupName(existingList.get(0).getGroupName());
+        }
+        return emptyVO;
     }
 }