21.本地自测”查询当天开航每小时区域过检人数“接口，

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/OperationStationHourlyThroughput.java

@@ -53,12 +53,12 @@ public class OperationStationHourlyThroughput extends BaseEntity {
     @Excel(name = "通道号")
     private String laneId;
 
-    /** 记录日期（YYYYMMDD） */
+    /** 记录日期（yyyy-MM-dd） */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "记录日期", width = 20, dateFormat = "yyyy-MM-dd")
     private Date recordDate;
 
-    /** 小时（0:00~1:00、1:00~2:00、23:00~24:00等） */
+    /** 小时（0:00、1:00、2:00等） */
     @Excel(name = "小时")
     private String hourOfDay;
 

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

@@ -1,6 +1,8 @@
 package com.sundot.airport.ledger.domain.vo;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -11,6 +13,8 @@ import java.io.Serializable;
  * @date 2026/5/19 16:55
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class AreaFlowVO implements Serializable {
     /**
      * 区域ID

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

@@ -45,10 +45,11 @@ public class LaneThroughputResVO implements Serializable {
      */
     private BigDecimal throughputRate;
 
-    public LaneThroughputResVO(Date date) {
+    public LaneThroughputResVO(Date date, String groupName) {
         this.recordDate = date;
         this.totalThroughput = 0;
         this.totalRecord = 0;
         this.throughputRate = java.math.BigDecimal.ZERO;
+        this.groupName = groupName;
     }
 }

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

@@ -14,11 +14,16 @@ import java.util.List;
 @Data
 public class StationHourlyThroughputGroupResVO implements Serializable {
     /**
-     * 小时（0,1,2...23）
+     * 小时（2026-05-20 16:00）
      */
     private String hourOfDay;
 
     /**
+     * 小时（16:00）
+     */
+    private String hour;
+
+    /**
      * 当前小时 所有区域总人流量
      */
     private Integer totalHourFlow;

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

@@ -128,7 +128,13 @@ public class OperationLanePeakThroughputServiceImpl extends ServiceImpl<Operatio
                 ));
         
         log.info("数据Map中的日期键: {}", dataMap.keySet());
-        
+
+        // 获取小组名称
+        String groupName = "";
+        if (CollUtil.isNotEmpty(laneThroughputResList)) {
+            groupName = laneThroughputResList.get(0).getGroupName();
+        }
+
         // 补齐缺失的日期数据
         List<LaneThroughputResVO> resultList = Lists.newArrayList();
         for (Date date : last30Days) {
@@ -138,8 +144,8 @@ public class OperationLanePeakThroughputServiceImpl extends ServiceImpl<Operatio
                 resultList.add(dataMap.get(dateKey));
             } else {
                 // 缺失的日期，补充0数据
-                LaneThroughputResVO emptyVO = this.createEmptyVO(date, laneThroughputResList);
-                resultList.add(emptyVO);
+                LaneThroughputResVO emptyLaneThroughput = new LaneThroughputResVO(date, groupName);
+                resultList.add(emptyLaneThroughput);
             }
         }
         
@@ -150,16 +156,4 @@ public class OperationLanePeakThroughputServiceImpl extends ServiceImpl<Operatio
         
         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;
-    }
 }

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

@@ -1,25 +1,23 @@
 package com.sundot.airport.ledger.service.impl;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.sundot.airport.common.utils.DateUtils;
 import com.sundot.airport.ledger.domain.OperationStationHourlyThroughput;
 import com.sundot.airport.ledger.domain.vo.AreaFlowVO;
+import com.sundot.airport.ledger.domain.vo.LaneThroughputResVO;
 import com.sundot.airport.ledger.domain.vo.StationHourlyThroughputGroupResVO;
 import com.sundot.airport.ledger.domain.vo.StationHourlyThroughputVO;
 import com.sundot.airport.ledger.mapper.OperationStationHourlyThroughputMapper;
 import com.sundot.airport.ledger.service.IOperationStationHourlyThroughputService;
 import com.sundot.airport.system.domain.BasePosition;
 import com.sundot.airport.system.mapper.BasePositionMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 /**
  * 站级时间段别总过检Service业务层处理
  */
+@Slf4j
 @Service
 public class OperationStationHourlyThroughputServiceImpl extends ServiceImpl<OperationStationHourlyThroughputMapper, OperationStationHourlyThroughput> implements IOperationStationHourlyThroughputService {
 
@@ -107,8 +106,15 @@ public class OperationStationHourlyThroughputServiceImpl extends ServiceImpl<Ope
     @Override
     public List<StationHourlyThroughputGroupResVO> countStationHourlyThroughput() {
         List<StationHourlyThroughputVO> stationHourlyThroughputList = this.baseMapper.countStationHourlyThroughput();
-        if (CollUtil.isEmpty(stationHourlyThroughputList)) {
-            return Collections.emptyList();
+        stationHourlyThroughputList = CollUtil.emptyIfNull(stationHourlyThroughputList);
+
+        log.info("SQL查询返回数据条数: {}", stationHourlyThroughputList.size());
+        if (!stationHourlyThroughputList.isEmpty()) {
+            log.info("SQL查询返回的时间点列表: {}", 
+                    stationHourlyThroughputList.stream()
+                            .map(StationHourlyThroughputVO::getHourOfDay)
+                            .distinct()
+                            .collect(Collectors.toList()));
         }
 
         Map<Long, BasePosition> areaInfoMap = Maps.newHashMap();
@@ -124,33 +130,146 @@ public class OperationStationHourlyThroughputServiceImpl extends ServiceImpl<Ope
             areaInfoMap = CollUtil.emptyIfNull(basePositions).stream().collect(Collectors.toMap(BasePosition::getId, v -> v));
         }
 
-        // 2. 核心：按小时分组 → 组装成前端需要的层级结构
-        Map<String, List<StationHourlyThroughputVO>> hourGroupMap = stationHourlyThroughputList.stream().collect(Collectors.groupingBy(StationHourlyThroughputVO::getHourOfDay));
+        // 2. 按时间点分组
+        Map<String, List<StationHourlyThroughputVO>> hourGroupMap = stationHourlyThroughputList.stream()
+                .collect(Collectors.groupingBy(StationHourlyThroughputVO::getHourOfDay));
+
+        // 3. 生成近24个具体时间点（从当前时间向前推24小时）
+        List<String> last24Hours = this.generateLast24Hours();
+        
+        log.info("需要补齐的24个时间点: {}", last24Hours);
 
         Map<Long, BasePosition> finalAreaInfoMap = areaInfoMap;
-        return hourGroupMap.entrySet().stream().map(entry -> {
-            String hour = entry.getKey();
-            List<StationHourlyThroughputVO> hourDataList = entry.getValue();
-
-            // 构建区域列表
-            List<AreaFlowVO> areaList = hourDataList.stream().map(stats -> {
-                BasePosition basePosition = finalAreaInfoMap.get(stats.getAreaId());
-
-                AreaFlowVO areaFlowVO = new AreaFlowVO();
-                areaFlowVO.setAreaId(stats.getAreaId());
-                areaFlowVO.setAreaName(Objects.nonNull(basePosition) ? basePosition.getName() : "");
-                areaFlowVO.setAreaFlow(stats.getAreaFlow());
-                return areaFlowVO;
-            }).collect(Collectors.toList());
-
-            // 构建小时分组对象
-            StationHourlyThroughputGroupResVO groupVO = new StationHourlyThroughputGroupResVO();
-            groupVO.setHourOfDay(hour);
-            // 总人流量（取第一条即可，同小时数据总流量一致）
-            groupVO.setTotalHourFlow(hourDataList.get(0).getTotalHourFlow());
-            // 区域信息
-            groupVO.setAreaList(areaList);
-            return groupVO;
-        }).collect(Collectors.toList());
+        
+        // 4. 补齐24个时间点数据
+        List<StationHourlyThroughputGroupResVO> resultList = Lists.newArrayList();
+        for (String hourTime : last24Hours) {
+            // 处理日期 转换hourTime格式的日期，例如：2026-05-21 00:00转成0:00，2026-05-21 01:00转成01:00，2026-05-21 11:00转成11:00
+            // 提取小时和分钟部分（去掉日期）
+            String hourOnly = this.extractHourAndMinute(hourTime);
+
+            if (hourGroupMap.containsKey(hourTime)) {
+                // 存在数据的时间点，正常组装
+                List<StationHourlyThroughputVO> hourDataList = hourGroupMap.get(hourTime);
+                
+                List<AreaFlowVO> areaList = hourDataList.stream().map(stats -> {
+                    BasePosition basePosition = finalAreaInfoMap.get(stats.getAreaId());
+                    AreaFlowVO areaFlowVO = new AreaFlowVO();
+                    areaFlowVO.setAreaId(stats.getAreaId());
+                    areaFlowVO.setAreaName(Objects.nonNull(basePosition) ? basePosition.getName() : "");
+                    areaFlowVO.setAreaFlow(stats.getAreaFlow());
+                    return areaFlowVO;
+                }).collect(Collectors.toList());
+
+                // 补充缺失的区域信息
+                if (CollUtil.isEmpty(areaList)){
+                    areaInfoMap.forEach((id, basePosition) -> {
+                        areaList.add(new AreaFlowVO(id, basePosition.getName(), 0));
+                    });
+                } else {
+                    if (areaList.size() != areaInfoMap.size()) {
+                        areaInfoMap.forEach((id, basePosition) -> {
+                            AreaFlowVO newAreaFlow = areaList.stream().filter(areaFlowVO -> areaFlowVO.getAreaId().equals(id)).findFirst().orElse(null);
+                            if (Objects.isNull(newAreaFlow)) {
+                                areaList.add(new AreaFlowVO(id, basePosition.getName(), 0));
+                            }
+                        });
+                    }
+                }
+
+                // 按区域id升序排序
+                if (CollUtil.isNotEmpty(areaList)){
+                    areaList.sort(Comparator.comparing(AreaFlowVO::getAreaId));
+                }
+
+                StationHourlyThroughputGroupResVO groupVO = new StationHourlyThroughputGroupResVO();
+                groupVO.setHourOfDay(hourTime);
+                groupVO.setHour(hourOnly);
+                groupVO.setTotalHourFlow(hourDataList.get(0).getTotalHourFlow());
+                groupVO.setAreaList(areaList);
+                resultList.add(groupVO);
+            } else {
+                List<AreaFlowVO> areaList = Lists.newArrayList();
+                areaInfoMap.forEach((id, basePosition) -> {
+                    areaList.add(new AreaFlowVO(id, basePosition.getName(), 0));
+                });
+
+                // 按区域id升序排序
+                if (CollUtil.isNotEmpty(areaList)){
+                    areaList.sort(Comparator.comparing(AreaFlowVO::getAreaId));
+                }
+
+                // 缺失的时间点，补充空数据
+                StationHourlyThroughputGroupResVO emptyVO = new StationHourlyThroughputGroupResVO();
+                emptyVO.setHourOfDay(hourTime);
+                emptyVO.setHour(hourOnly);
+                emptyVO.setTotalHourFlow(0);
+                emptyVO.setAreaList(areaList);
+                resultList.add(emptyVO);
+            }
+        }
+        
+        log.info("补齐后返回的总时间点数: {}", resultList.size());
+        return resultList;
+    }
+    
+    /**
+     * 生成近24个具体时间点（从当前时间向前推24小时）
+     * 格式：yyyy-MM-dd HH:00
+     */
+    private List<String> generateLast24Hours() {
+        List<String> hours = new ArrayList<>();
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        
+        // 从当前小时向前推23小时，共24个时间点
+        for (int i = 23; i >= 0; i--) {
+            Calendar cal = (Calendar) calendar.clone();
+            cal.add(Calendar.HOUR_OF_DAY, -i);
+            
+            String hourTime = String.format("%04d-%02d-%02d %02d:00",
+                    cal.get(Calendar.YEAR),
+                    cal.get(Calendar.MONTH) + 1,
+                    cal.get(Calendar.DAY_OF_MONTH),
+                    cal.get(Calendar.HOUR_OF_DAY));
+            hours.add(hourTime);
+        }
+        
+        return hours;
+    }
+    
+    /**
+     * 从完整日期时间中提取小时和分钟部分
+     * 例如：2026-05-21 00:00 → 0:00
+     *      2026-05-21 01:00 → 01:00
+     *      2026-05-21 11:00 → 11:00
+     * 
+     * @param hourTime 完整日期时间字符串（格式：yyyy-MM-dd HH:00）
+     * @return 小时和分钟字符串（格式：H:00 或 HH:00）
+     */
+    private String extractHourAndMinute(String hourTime) {
+        if (hourTime == null || hourTime.trim().isEmpty()) {
+            return "";
+        }
+        
+        // 按空格分割，取时间部分
+        String[] parts = hourTime.split(" ");
+        if (parts.length < 2) {
+            return hourTime;
+        }
+        
+        String timePart = parts[1]; // 获取 "00:00" 部分
+        
+        // 去掉小时的前导0（如果有的话）
+        String[] timeComponents = timePart.split(":");
+        if (timeComponents.length >= 2) {
+            int hour = Integer.parseInt(timeComponents[0]);
+            String minute = timeComponents[1];
+            return hour + ":" + minute;
+        }
+        
+        return timePart;
     }
 }

airport-ledger/src/main/resources/mapper/ledger/OperationStationHourlyThroughputMapper.xml

@@ -53,25 +53,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="countStationHourlyThroughput" resultType="com.sundot.airport.ledger.domain.vo.StationHourlyThroughputVO">
         SELECT
-            t.hour_of_day AS hourOfDay,
+            DATE_FORMAT(STR_TO_DATE(CONCAT(t.record_date, ' ', t.hour_of_day), '%Y-%m-%d %H:%i'), '%Y-%m-%d %H:00') AS hourOfDay,
             t.area_id AS areaId,
             IFNULL(SUM(t.throughput), 0) AS areaFlow,
-            t.total_hour_flow AS totalHourFlow
+            IFNULL(total_flow.total_hour_flow, 0) AS totalHourFlow
         FROM (
             SELECT
+                record_date,
                 hour_of_day,
                 area_id,
-                throughput,
-                SUM(throughput) OVER (PARTITION BY hour_of_day) AS total_hour_flow
+                throughput
             FROM operation_station_hourly_throughput
             WHERE
                 del_flag = '0'
                 AND hour_of_day IS NOT NULL
                 AND hour_of_day != ''
-            -- 近24小时自动匹配
-            AND STR_TO_DATE(CONCAT(record_date, hour_of_day), '%Y%m%d%H') >= DATE_SUB(NOW(), INTERVAL 24 HOUR)
+                -- 近24小时自动匹配
+                AND STR_TO_DATE(CONCAT(record_date, ' ', hour_of_day), '%Y-%m-%d %H:%i') >= DATE_SUB(NOW(), INTERVAL 24 HOUR)
         ) t
-        GROUP BY t.hour_of_day, t.area_id
-        ORDER BY t.hour_of_day ASC
+        LEFT JOIN (
+            SELECT
+                DATE_FORMAT(STR_TO_DATE(CONCAT(record_date, ' ', hour_of_day), '%Y-%m-%d %H:%i'), '%Y-%m-%d %H:00') AS hour_time,
+                SUM(throughput) AS total_hour_flow
+            FROM operation_station_hourly_throughput
+            WHERE
+                del_flag = '0'
+                AND hour_of_day IS NOT NULL
+                AND hour_of_day != ''
+                -- 近24小时自动匹配
+                AND STR_TO_DATE(CONCAT(record_date, ' ', hour_of_day), '%Y-%m-%d %H:%i') >= DATE_SUB(NOW(), INTERVAL 24 HOUR)
+            GROUP BY hour_time
+        ) total_flow ON DATE_FORMAT(STR_TO_DATE(CONCAT(t.record_date, ' ', t.hour_of_day), '%Y-%m-%d %H:%i'), '%Y-%m-%d %H:00') = total_flow.hour_time
+        GROUP BY hourOfDay, t.area_id, total_flow.total_hour_flow
+        ORDER BY hourOfDay ASC
     </select>
 </mapper>

airport-system/src/main/java/com/sundot/airport/system/mapper/BasePositionMapper.java

@@ -79,7 +79,7 @@ public interface BasePositionMapper {
      * @author PanHu Sun
      * @date 2026/5/20 9:36
      */
-    List<BasePosition> selectPositionListByIds(Set<Long> ids);
+    List<BasePosition> selectPositionListByIds(@Param("ids") Set<Long> ids);
 
     /**
      * 修改子元素关系

sql/station_hourly_throughput.sql

@@ -11,8 +11,8 @@ CREATE TABLE `operation_station_hourly_throughput` (
   `group_id` bigint(20) DEFAULT NULL COMMENT '通道/小组ID',
   `group_name` varchar(100) DEFAULT NULL COMMENT '通道/小组',
   `lane_id` varchar(50) DEFAULT NULL COMMENT '通道号',
-  `record_date` varchar(8) DEFAULT NULL COMMENT '记录日期（YYYYMMDD）',
-  `hour_of_day` varchar(20) DEFAULT NULL COMMENT '小时（0:00~1:00、1:00~2:00、23:00~24:00等）',
+  `record_date` varchar(8) DEFAULT NULL COMMENT '记录日期（yyyy-MM-ddYYYYMMDD）',
+  `hour_of_day` varchar(20) DEFAULT NULL COMMENT '小时（0:00、1:00、2:00等）',
   `throughput` int(11) DEFAULT NULL COMMENT '过检人数',
   `throughput_rate` decimal(10,2) DEFAULT NULL COMMENT '过检率',
   `remark` varchar(500) DEFAULT NULL COMMENT '备注',