9.根据区域id查询区域名称

airport-common/pom.xml

@@ -155,6 +155,11 @@
             <version>4.5.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>33.5.0-jre</version>
+        </dependency>
     </dependencies>
 
 </project>

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

@@ -1,6 +1,8 @@
 package com.sundot.airport.ledger.domain;
 
 import java.math.BigDecimal;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -24,7 +26,7 @@ public class OperationStationHourlyThroughput extends BaseEntity {
     private Long id;
 
     /** 区域ID */
-    private String areaId;
+    private Long areaId;
 
     /** 部门ID */
     private Long deptId;
@@ -52,9 +54,9 @@ public class OperationStationHourlyThroughput extends BaseEntity {
     private String laneId;
 
     /** 记录日期（YYYYMMDD） */
-    @JsonFormat(pattern = "yyyyMMdd")
-    @Excel(name = "记录日期", width = 20, dateFormat = "yyyyMMdd")
-    private String recordDate;
+    @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等） */
     @Excel(name = "小时")

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

@@ -15,7 +15,7 @@ public class AreaFlowVO implements Serializable {
     /**
      * 区域ID
      */
-    private String areaId;
+    private Long areaId;
     /**
      * 区域名称
      */

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

@@ -15,7 +15,7 @@ public class StationHourlyThroughputVO implements Serializable {
     // 小时段
     private String hourOfDay;
     // 区域ID
-    private String areaId;
+    private Long areaId;
     // 区域名称
     private String areaName;
     // 当前区域人流量

airport-ledger/src/main/java/com/sundot/airport/ledger/mapper/OperationStationHourlyThroughputMapper.java

@@ -4,10 +4,12 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sundot.airport.ledger.domain.OperationStationHourlyThroughput;
 import com.sundot.airport.ledger.domain.vo.StationHourlyThroughputVO;
+import org.springframework.stereotype.Repository;
 
 /**
  * 站级时间段别总过检Mapper接口
  */
+@Repository
 public interface OperationStationHourlyThroughputMapper extends BaseMapper<OperationStationHourlyThroughput> {
     /**
      * 查询站级时间段别总过检列表

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

@@ -1,13 +1,16 @@
 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.stream.Collectors;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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;
@@ -15,6 +18,8 @@ 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -23,11 +28,12 @@ import org.springframework.transaction.annotation.Transactional;
  * 站级时间段别总过检Service业务层处理
  */
 @Service
-public class OperationStationHourlyThroughputServiceImpl extends ServiceImpl<OperationStationHourlyThroughputMapper, OperationStationHourlyThroughput>
-        implements IOperationStationHourlyThroughputService {
+public class OperationStationHourlyThroughputServiceImpl extends ServiceImpl<OperationStationHourlyThroughputMapper, OperationStationHourlyThroughput> implements IOperationStationHourlyThroughputService {
 
     @Autowired
     private OperationStationHourlyThroughputMapper operationStationHourlyThroughputMapper;
+    @Autowired
+    private BasePositionMapper basePositionMapper;
 
     /**
      * 查询站级时间段别总过检列表
@@ -105,22 +111,34 @@ public class OperationStationHourlyThroughputServiceImpl extends ServiceImpl<Ope
             return Collections.emptyList();
         }
 
+        Map<Long, BasePosition> areaInfoMap = Maps.newHashMap();
         // 1. 预处理：获取区域名称
-        Set<String> areaIds = stationHourlyThroughputList.stream().map(StationHourlyThroughputVO::getAreaId).collect(Collectors.toSet());
-
-        // TODO PanHu Sun 2026/5/19 17:16 待办事项：查询base_position表获取区域名称
+        Set<Long> areaIds = stationHourlyThroughputList.stream()
+                .filter(station -> Objects.nonNull(station.getAreaId()))
+                .map(StationHourlyThroughputVO::getAreaId)
+                .collect(Collectors.toSet());
+        if (CollUtil.isNotEmpty(areaIds)) {
+            // 查询base_position表获取区域名称
+            List<BasePosition> basePositions = basePositionMapper.selectPositionListByIds(areaIds);
+            // 将basePositions转成map，key是id，value是BasePosition
+            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));
 
+        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());

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

@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="groupId != null "> and group_id = #{groupId}</if>
             <if test="groupName != null  and groupName != ''"> and group_name like concat('%', #{groupName}, '%')</if>
             <if test="laneId != null  and laneId != ''"> and lane_id = #{laneId}</if>
-            <if test="recordDate != null  and recordDate != ''"> and record_date = #{recordDate}</if>
+            <if test="recordDate != null"> and record_date = #{recordDate}</if>
             <if test="hourOfDay != null  and hourOfDay != ''"> and hour_of_day = #{hourOfDay}</if>
         </where>
         order by record_date desc, create_time desc

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

@@ -1,6 +1,7 @@
 package com.sundot.airport.system.mapper;
 
 import java.util.List;
+import java.util.Set;
 
 import com.sundot.airport.system.domain.BasePosition;
 import com.sundot.airport.system.domain.vo.PositionInfoVO;
@@ -70,6 +71,17 @@ public interface BasePositionMapper {
     public List<BasePosition> selectChildrenById(Long id);
 
     /**
+     * 功能描述：根据多个id查询元素列表
+     *
+     * @param ids ID集合
+     * @return List<BasePosition>
+     * @method selectPositionListByIds
+     * @author PanHu Sun
+     * @date 2026/5/20 9:36
+     */
+    List<BasePosition> selectPositionListByIds(Set<Long> ids);
+
+    /**
      * 修改子元素关系
      *
      * @param list 子元素

airport-system/src/main/resources/mapper/system/BasePositionMapper.xml

@@ -235,5 +235,12 @@
         ORDER BY la.code, sa.code, ch.code
     </select>
 
-
+    <select id="selectPositionListByIds" resultType="com.sundot.airport.system.domain.BasePosition">
+        SELECT *
+        FROM base_position
+        WHERE id IN
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
 </mapper>