airport-admin/src/main/java/com/sundot/airport/web/controller/ledger/OperationLanePeakThroughputController.java

@@ -2,6 +2,9 @@ package com.sundot.airport.web.controller.ledger;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.sundot.airport.ledger.domain.vo.LaneThroughputReqVO;
+import com.sundot.airport.ledger.domain.vo.LaneThroughputResVO;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -96,4 +99,19 @@ public class OperationLanePeakThroughputController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(operationLanePeakThroughputService.deleteOperationLanePeakThroughputByIds(ids));
     }
+
+    /**
+     * 功能描述：统计通道日级别高峰时段过检率（小组/班组/部门级别）
+     *
+     * @param LaneThroughputReq 筛选条件
+     * @return AjaxResult
+     * @method countLanePeakThroughput
+     * @author PanHu Sun
+     * @date 2026/5/19 15:21
+     */
+    @PostMapping("/countLanePeakThroughput")
+    public AjaxResult countLanePeakThroughput(@RequestBody LaneThroughputReqVO LaneThroughputReq) {
+        List<LaneThroughputResVO> lanePeakThroughputList = operationLanePeakThroughputService.countLanePeakThroughput(LaneThroughputReq);
+        return success(lanePeakThroughputList);
+    }
 }

airport-admin/src/main/java/com/sundot/airport/web/controller/ledger/OperationStationHourlyThroughputController.java

@@ -2,6 +2,8 @@ package com.sundot.airport.web.controller.ledger;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.sundot.airport.ledger.domain.vo.StationHourlyThroughputGroupResVO;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -96,4 +98,18 @@ public class OperationStationHourlyThroughputController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(operationStationHourlyThroughputService.deleteOperationStationHourlyThroughputByIds(ids));
     }
+
+    /**
+     * 功能描述：统计站级时间段人流量
+     *
+     * @return AjaxResult
+     * @method countLanePeakThroughput
+     * @author PanHu Sun
+     * @date 2026/5/19 15:21
+     */
+    @GetMapping("/countStationHourlyThroughput")
+    public AjaxResult countStationHourlyThroughput() {
+        List<StationHourlyThroughputGroupResVO> StationHourlyThroughputList = operationStationHourlyThroughputService.countStationHourlyThroughput();
+        return success(StationHourlyThroughputList);
+    }
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/OperationLanePeakThroughput.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;
@@ -51,7 +53,7 @@ public class OperationLanePeakThroughput extends BaseEntity {
     /** 记录日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "记录日期", width = 20, dateFormat = "yyyy-MM-dd")
-    private java.util.Date recordDate;
+    private Date recordDate;
 
     /** 小时（记录高峰时段，以流量峰值前后半小时计算） */
     @Excel(name = "小时")

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

@@ -23,6 +23,9 @@ public class OperationStationHourlyThroughput extends BaseEntity {
     @TableId(type = IdType.AUTO)
     private Long id;
 
+    /** 区域ID */
+    private String areaId;
+
     /** 部门ID */
     private Long deptId;
 

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

@@ -0,0 +1,27 @@
+package com.sundot.airport.ledger.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 功能描述：单个区域人流量（小时组内的子项）
+ *
+ * @author PanHu Sun
+ * @date 2026/5/19 16:55
+ */
+@Data
+public class AreaFlowVO implements Serializable {
+    /**
+     * 区域ID
+     */
+    private String areaId;
+    /**
+     * 区域名称
+     */
+    private String areaName;
+    /**
+     * 当前区域人流量
+     */
+    private Integer areaFlow;
+}

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

@@ -0,0 +1,29 @@
+package com.sundot.airport.ledger.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 功能描述：统计通道日级别高峰时段过检率 Req Entity
+ *
+ * @author PanHu Sun
+ * @date 2026/5/19 15:25
+ */
+@Data
+public class LaneThroughputReqVO implements Serializable {
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 班组ID
+     */
+    private Long teamId;
+
+    /**
+     * 小组ID
+     */
+    private Long groupId;
+}

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

@@ -0,0 +1,41 @@
+package com.sundot.airport.ledger.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 功能描述：统计通道日级别高峰时段过检率 Res Entity
+ *
+ * @author PanHu Sun
+ * @date 2026/5/19 15:27
+ */
+@Data
+public class LaneThroughputResVO implements Serializable {
+    /**
+     * 日期
+     */
+    private Date recordDate;
+
+    /**
+     * 分组名称（部门/班组/小组 自动适配）
+     */
+    private String groupName;
+
+    /**
+     * 总过检人数（湖绿色柱形数据）
+     */
+    private Integer totalThroughput;
+
+    /**
+     * 总录入条数
+     */
+    private Integer totalRecord;
+
+    /**
+     * 过检率（保留1位小数）
+     */
+    private BigDecimal throughputRate;
+}

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

@@ -0,0 +1,30 @@
+package com.sundot.airport.ledger.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 功能描述：统计通道站级别高峰时段过检率 Res Entity
+ *
+ * @author PanHu Sun
+ * @date 2026/5/19 15:48
+ */
+@Data
+public class StationHourlyThroughputGroupResVO implements Serializable {
+    /**
+     * 小时（0,1,2...23）
+     */
+    private String hourOfDay;
+
+    /**
+     * 当前小时 所有区域总人流量
+     */
+    private Integer totalHourFlow;
+
+    /**
+     * 当前小时 所有区域的人流量列表
+     */
+    private List<AreaFlowVO> areaList;
+}

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

@@ -0,0 +1,25 @@
+package com.sundot.airport.ledger.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 功能描述：统计通道站级别高峰时段过检率 Res Entity
+ *
+ * @author PanHu Sun
+ * @date 2026/5/19 15:48
+ */
+@Data
+public class StationHourlyThroughputVO implements Serializable {
+    // 小时段
+    private String hourOfDay;
+    // 区域ID
+    private String areaId;
+    // 区域名称
+    private String areaName;
+    // 当前区域人流量
+    private Integer areaFlow;
+    // 当前小时所有区域总人流量
+    private Integer totalHourFlow;
+}

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

@@ -3,6 +3,8 @@ package com.sundot.airport.ledger.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sundot.airport.ledger.domain.OperationLanePeakThroughput;
+import com.sundot.airport.ledger.domain.vo.LaneThroughputReqVO;
+import com.sundot.airport.ledger.domain.vo.LaneThroughputResVO;
 
 /**
  * 通道日别高峰时段过检Mapper接口
@@ -15,4 +17,15 @@ public interface OperationLanePeakThroughputMapper extends BaseMapper<OperationL
      * @return 通道日别高峰时段过检集合
      */
     List<OperationLanePeakThroughput> selectOperationLanePeakThroughputList(OperationLanePeakThroughput operationLanePeakThroughput);
+
+    /**
+     * 功能描述：统计近30天过检数据（三级联动筛选）
+     *
+     * @param queryVO 筛选条件
+     * @return List<LaneThroughputStatsVO>
+     * @method countLanePeakThroughput
+     * @author PanHu Sun
+     * @date 2026/5/19 15:31
+     */
+    List<LaneThroughputResVO> countLanePeakThroughput(LaneThroughputReqVO queryVO);
 }

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

@@ -3,6 +3,7 @@ package com.sundot.airport.ledger.mapper;
 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;
 
 /**
  * 站级时间段别总过检Mapper接口
@@ -15,4 +16,14 @@ public interface OperationStationHourlyThroughputMapper extends BaseMapper<Opera
      * @return 站级时间段别总过检集合
      */
     List<OperationStationHourlyThroughput> selectOperationStationHourlyThroughputList(OperationStationHourlyThroughput operationStationHourlyThroughput);
+
+    /**
+     * 功能描述：统计站级时间段人流量
+     *
+     * @return List<StationHourlyThroughputResVO>
+     * @method countStationHourlyThroughput
+     * @author PanHu Sun
+     * @date 2026/5/19 16:48
+     */
+    List<StationHourlyThroughputVO> countStationHourlyThroughput();
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/service/IOperationLanePeakThroughputService.java

@@ -1,8 +1,11 @@
 package com.sundot.airport.ledger.service;
 
 import java.util.List;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.sundot.airport.ledger.domain.OperationLanePeakThroughput;
+import com.sundot.airport.ledger.domain.vo.LaneThroughputReqVO;
+import com.sundot.airport.ledger.domain.vo.LaneThroughputResVO;
 
 /**
  * 通道日别高峰时段过检Service接口
@@ -47,4 +50,15 @@ public interface IOperationLanePeakThroughputService extends IService<OperationL
      * @return 结果
      */
     int deleteOperationLanePeakThroughputById(Long id);
+
+    /**
+     * 功能描述：统计通道日级别高峰时段过检率
+     *
+     * @param laneThroughputQuery 筛选条件
+     * @return List<LaneThroughputStatsVO>
+     * @method countLanePeakThroughput
+     * @author PanHu Sun
+     * @date 2026/5/19 15:29
+     */
+    List<LaneThroughputResVO> countLanePeakThroughput(LaneThroughputReqVO laneThroughputQuery);
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/service/IOperationStationHourlyThroughputService.java

@@ -3,6 +3,7 @@ package com.sundot.airport.ledger.service;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.sundot.airport.ledger.domain.OperationStationHourlyThroughput;
+import com.sundot.airport.ledger.domain.vo.StationHourlyThroughputGroupResVO;
 
 /**
  * 站级时间段别总过检Service接口
@@ -47,4 +48,14 @@ public interface IOperationStationHourlyThroughputService extends IService<Opera
      * @return 结果
      */
     int deleteOperationStationHourlyThroughputById(Long id);
+
+    /**
+     * 功能描述：统计站级时间段人流量
+     *
+     * @return List<StationHourlyThroughputGroupResVO> 站级时间段人流量
+     * @method countStationHourlyThroughput
+     * @author PanHu Sun
+     * @date 2026/5/19 16:46
+     */
+    List<StationHourlyThroughputGroupResVO> countStationHourlyThroughput();
 }

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

@@ -1,9 +1,15 @@
 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.sundot.airport.common.utils.DateUtils;
 import com.sundot.airport.ledger.domain.OperationLanePeakThroughput;
+import com.sundot.airport.ledger.domain.vo.LaneThroughputReqVO;
+import com.sundot.airport.ledger.domain.vo.LaneThroughputResVO;
 import com.sundot.airport.ledger.mapper.OperationLanePeakThroughputMapper;
 import com.sundot.airport.ledger.service.IOperationLanePeakThroughputService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,4 +86,23 @@ public class OperationLanePeakThroughputServiceImpl extends ServiceImpl<Operatio
     public int deleteOperationLanePeakThroughputById(Long id) {
         return operationLanePeakThroughputMapper.deleteById(id);
     }
+
+    /**
+     * 功能描述：统计通道日级别高峰时段过检率
+     *
+     * @param laneThroughputQuery 筛选条件
+     * @return List<LaneThroughputStatsVO>
+     * @method countLanePeakThroughput
+     * @author PanHu Sun
+     * @date 2026/5/19 15:29
+     */
+    @Override
+    public List<LaneThroughputResVO> countLanePeakThroughput(LaneThroughputReqVO laneThroughputQuery) {
+        // 核心逻辑：未选择任何筛选条件，返回空数组
+        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);
+    }
 }

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

@@ -1,9 +1,18 @@
 package com.sundot.airport.ledger.service.impl;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+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.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.StationHourlyThroughputGroupResVO;
+import com.sundot.airport.ledger.domain.vo.StationHourlyThroughputVO;
 import com.sundot.airport.ledger.mapper.OperationStationHourlyThroughputMapper;
 import com.sundot.airport.ledger.service.IOperationStationHourlyThroughputService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,4 +89,50 @@ public class OperationStationHourlyThroughputServiceImpl extends ServiceImpl<Ope
     public int deleteOperationStationHourlyThroughputById(Long id) {
         return operationStationHourlyThroughputMapper.deleteById(id);
     }
+
+    /**
+     * 功能描述：统计站级时间段人流量
+     *
+     * @return List<StationHourlyThroughputGroupResVO> 站级时间段人流量
+     * @method countStationHourlyThroughput
+     * @author PanHu Sun
+     * @date 2026/5/19 16:46
+     */
+    @Override
+    public List<StationHourlyThroughputGroupResVO> countStationHourlyThroughput() {
+        List<StationHourlyThroughputVO> stationHourlyThroughputList = this.baseMapper.countStationHourlyThroughput();
+        if (CollUtil.isEmpty(stationHourlyThroughputList)) {
+            return Collections.emptyList();
+        }
+
+        // 1. 预处理：获取区域名称
+        Set<String> areaIds = stationHourlyThroughputList.stream().map(StationHourlyThroughputVO::getAreaId).collect(Collectors.toSet());
+
+        // TODO PanHu Sun 2026/5/19 17:16 待办事项：查询base_position表获取区域名称
+
+        // 2. 核心：按小时分组 → 组装成前端需要的层级结构
+        Map<String, List<StationHourlyThroughputVO>> hourGroupMap = stationHourlyThroughputList.stream().collect(Collectors.groupingBy(StationHourlyThroughputVO::getHourOfDay));
+
+        return hourGroupMap.entrySet().stream().map(entry -> {
+            String hour = entry.getKey();
+            List<StationHourlyThroughputVO> hourDataList = entry.getValue();
+
+            // 构建区域列表
+            List<AreaFlowVO> areaList = hourDataList.stream().map(stats -> {
+                AreaFlowVO areaFlowVO = new AreaFlowVO();
+                areaFlowVO.setAreaId(stats.getAreaId());
+                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());
+    }
 }

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

@@ -49,4 +49,56 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by record_date desc, create_time desc
     </select>
 
+    <select id="countLanePeakThroughput" parameterType="com.sundot.airport.ledger.domain.vo.LaneThroughputReqVO" resultType="com.sundot.airport.ledger.domain.vo.LaneThroughputResVO">
+        SELECT
+            record_date AS recordDate,
+            <!-- 动态分组名称：小组>班组>部门 -->
+            <choose>
+                <when test="groupId != null">
+                    group_name AS groupName
+                </when>
+                <when test="teamId != null">
+                    team_name AS groupName
+                </when>
+                <when test="deptId != null">
+                    dept_name AS groupName
+                </when>
+            </choose>,
+            SUM(throughput) AS totalThroughput,
+            COUNT(*) AS totalRecord,
+            <!-- 过检率：分母0返回0.0，保留1位小数 -->
+            ROUND(IF(COUNT(*) = 0, 0, SUM(throughput) / COUNT(*)), 1) AS throughputRate
+        FROM operation_lane_peak_throughput
+        WHERE
+            del_flag = '0'
+            <!-- 近30天自然日 -->
+            AND record_date >= DATE_SUB(CURDATE(), INTERVAL 29 DAY)
+            AND record_date &lt;= CURDATE()
+            <!-- 三级联动动态筛选 -->
+            <if test="deptId != null">
+                AND dept_id = #{deptId}
+            </if>
+            <if test="teamId != null">
+                AND team_id = #{teamId}
+            </if>
+            <if test="groupId != null">
+                AND group_id = #{groupId}
+            </if>
+            <!-- 动态分组：按选中层级+日期分组 -->
+        GROUP BY
+            <choose>
+                <when test="groupId != null">
+                    group_id, record_date
+                </when>
+                <when test="teamId != null">
+                    team_id, record_date
+                </when>
+                <when test="deptId != null">
+                    dept_id, record_date
+                </when>
+            </choose>
+        <!-- 按日期升序，大屏展示顺序 -->
+        ORDER BY record_date ASC
+    </select>
+
 </mapper>

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

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="OperationStationHourlyThroughput" id="OperationStationHourlyThroughputResult">
         <id     property="id"              column="id"              />
+        <result property="areaId"          column="area_id"         />
         <result property="deptId"          column="dept_id"         />
         <result property="deptName"        column="dept_name"       />
         <result property="teamId"          column="team_id"         />
@@ -26,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectOperationStationHourlyThroughputVo">
-        select id, dept_id, dept_name, team_id, team_name, group_id, group_name, 
+        select id, area_id, dept_id, dept_name, team_id, team_name, group_id, group_name,
                lane_id, record_date, hour_of_day, throughput, throughput_rate, remark, 
                create_by, create_time, update_by, update_time, del_flag
         from operation_station_hourly_throughput
@@ -36,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectOperationStationHourlyThroughputVo"/>
         <where>  
             del_flag = '0'
+            <if test="areaId != null and areaId != '' "> and area_id = #{areaId}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="teamId != null "> and team_id = #{teamId}</if>
@@ -49,4 +51,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by record_date desc, create_time desc
     </select>
 
+    <select id="countStationHourlyThroughput" resultType="com.sundot.airport.ledger.domain.vo.StationHourlyThroughputVO">
+        SELECT
+            t.hour_of_day AS hourOfDay,
+            t.area_id AS areaId,
+            IFNULL(SUM(t.throughput), 0) AS areaFlow,
+            t.total_hour_flow AS totalHourFlow
+        FROM (
+            SELECT
+                hour_of_day,
+                area_id,
+                throughput,
+                SUM(throughput) OVER (PARTITION BY hour_of_day) 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') >= DATE_SUB(NOW(), INTERVAL 24 HOUR)
+        ) t
+        GROUP BY t.hour_of_day, t.area_id
+        ORDER BY t.hour_of_day ASC
+    </select>
 </mapper>