速率表大屏

airport-admin/src/main/java/com/sundot/airport/web/controller/blocked/BlockedRateScreenController.java

@@ -0,0 +1,66 @@
+package com.sundot.airport.web.controller.blocked;
+
+import com.sundot.airport.blocked.dto.BlockedRateScreenBrigadeDto;
+import com.sundot.airport.blocked.dto.BlockedRateScreenT1Dto;
+import com.sundot.airport.blocked.dto.BlockedRateScreenT2Dto;
+import com.sundot.airport.blocked.service.IBlockedRateScreenService;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.BlockedRateQueryParamDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 速率大屏Controller
+ *
+ * @author ruoyi
+ * @date 2026-04-15
+ */
+@RestController
+@RequestMapping("/blocked/rate/screen")
+public class BlockedRateScreenController extends BaseController {
+
+    @Autowired
+    private IBlockedRateScreenService blockedRateScreenService;
+
+    /**
+     * T1速率统计数据
+     */
+    @GetMapping("/t1")
+    public AjaxResult t1(BlockedRateQueryParamDto dto) {
+        List<BlockedRateScreenT1Dto> result = blockedRateScreenService.t1(dto);
+        return success(result);
+    }
+
+    /**
+     * T2速率统计数据
+     */
+    @GetMapping("/t2")
+    public AjaxResult t2(BlockedRateQueryParamDto dto) {
+        List<BlockedRateScreenT2Dto> result = blockedRateScreenService.t2(dto);
+        return success(result);
+    }
+
+    /**
+     * 国内速率统计数据
+     */
+    @GetMapping("/domestic")
+    public AjaxResult domestic(BlockedRateQueryParamDto dto) {
+        List<BlockedRateScreenBrigadeDto> result = blockedRateScreenService.domestic(dto);
+        return success(result);
+    }
+
+    /**
+     * 国际速率统计数据
+     */
+    @GetMapping("/international")
+    public AjaxResult international(BlockedRateQueryParamDto dto) {
+        List<BlockedRateScreenBrigadeDto> result = blockedRateScreenService.international(dto);
+        return success(result);
+    }
+
+}

airport-blocked/src/main/java/com/sundot/airport/blocked/dto/BlockedRateScreenBrigadeDto.java

@@ -0,0 +1,41 @@
+package com.sundot.airport.blocked.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 速率-国内/国际统计数据
+ *
+ * @author ruoyi
+ * @date 2026-04-15
+ */
+@Data
+public class BlockedRateScreenBrigadeDto {
+
+    /**
+     * 日期（格式：yyyy-MM-dd）
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date statDate;
+
+    /**
+     * 当班大队ID
+     */
+    private Long dutyBrigadeId;
+
+    /**
+     * 当班大队名称
+     */
+    private String dutyBrigadeName;
+
+    /**
+     * 平均速率
+     */
+    private BigDecimal avgRatePeak;
+
+}

airport-blocked/src/main/java/com/sundot/airport/blocked/dto/BlockedRateScreenT1Dto.java

@@ -0,0 +1,36 @@
+package com.sundot.airport.blocked.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 速率-T1统计数据
+ *
+ * @author ruoyi
+ * @date 2026-04-15
+ */
+@Data
+public class BlockedRateScreenT1Dto {
+
+    /**
+     * 日期（格式：yyyy-MM-dd）
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date statDate;
+
+    /**
+     * T1-A区速率（高峰期时段）
+     */
+    private BigDecimal t1AAreaRatePeak;
+
+    /**
+     * T1-B区速率（高峰期时段）
+     */
+    private BigDecimal t1BAreaRatePeak;
+
+}

airport-blocked/src/main/java/com/sundot/airport/blocked/dto/BlockedRateScreenT2Dto.java

@@ -0,0 +1,36 @@
+package com.sundot.airport.blocked.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 速率-T2统计数据
+ *
+ * @author ruoyi
+ * @date 2026-04-15
+ */
+@Data
+public class BlockedRateScreenT2Dto {
+
+    /**
+     * 日期（格式：yyyy-MM-dd）
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date statDate;
+
+    /**
+     * T2-国内速率（高峰期时段）
+     */
+    private BigDecimal t2DomesticRatePeak;
+
+    /**
+     * T2-国际速率（高峰期时段）
+     */
+    private BigDecimal t2InternationalRatePeak;
+
+}

airport-blocked/src/main/java/com/sundot/airport/blocked/mapper/BlockedRateScreenMapper.java

@@ -0,0 +1,11 @@
+package com.sundot.airport.blocked.mapper;
+
+/**
+ * 速率大屏Mapper接口
+ *
+ * @author ruoyi
+ * @date 2026-04-13
+ */
+public interface BlockedRateScreenMapper {
+
+}

airport-blocked/src/main/java/com/sundot/airport/blocked/service/IBlockedRateScreenService.java

@@ -0,0 +1,50 @@
+package com.sundot.airport.blocked.service;
+
+import com.sundot.airport.blocked.dto.BlockedRateScreenBrigadeDto;
+import com.sundot.airport.blocked.dto.BlockedRateScreenT1Dto;
+import com.sundot.airport.blocked.dto.BlockedRateScreenT2Dto;
+import com.sundot.airport.common.core.domain.BlockedRateQueryParamDto;
+
+import java.util.List;
+
+/**
+ * 速率大屏Service接口
+ *
+ * @author ruoyi
+ * @date 2026-04-13
+ */
+public interface IBlockedRateScreenService {
+
+    /**
+     * T1速率统计数据
+     *
+     * @param dto 上行参数
+     * @return 结果
+     */
+    public List<BlockedRateScreenT1Dto> t1(BlockedRateQueryParamDto dto);
+
+    /**
+     * T2速率统计数据
+     *
+     * @param dto 上行参数
+     * @return 结果
+     */
+    public List<BlockedRateScreenT2Dto> t2(BlockedRateQueryParamDto dto);
+
+    /**
+     * 国内速率统计数据
+     *
+     * @param dto 上行参数
+     * @return 结果
+     */
+    public List<BlockedRateScreenBrigadeDto> domestic(BlockedRateQueryParamDto dto);
+
+    /**
+     * 国际速率统计数据
+     *
+     * @param dto 上行参数
+     * @return 结果
+     */
+    public List<BlockedRateScreenBrigadeDto> international(BlockedRateQueryParamDto dto);
+
+}

airport-blocked/src/main/java/com/sundot/airport/blocked/service/impl/BlockedRateScreenServiceImpl.java

@@ -0,0 +1,249 @@
+package com.sundot.airport.blocked.service.impl;
+
+import com.sundot.airport.blocked.domain.BlockedRate;
+import com.sundot.airport.blocked.dto.BlockedRateScreenBrigadeDto;
+import com.sundot.airport.blocked.dto.BlockedRateScreenT1Dto;
+import com.sundot.airport.blocked.dto.BlockedRateScreenT2Dto;
+import com.sundot.airport.blocked.mapper.BlockedRateMapper;
+import com.sundot.airport.blocked.mapper.BlockedRateScreenMapper;
+import com.sundot.airport.blocked.service.IBlockedRateScreenService;
+import com.sundot.airport.common.core.domain.BlockedRateQueryParamDto;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.utils.BlockedDateUtils;
+import com.sundot.airport.system.service.ISysDeptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 速率大屏Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2026-04-13
+ */
+@Service
+public class BlockedRateScreenServiceImpl implements IBlockedRateScreenService {
+
+    // 默认的精度
+    private static final int SCALE = 2;
+    // 默认的舍入模式
+    private static final RoundingMode ROUNDING_MODE = RoundingMode.HALF_UP;
+    // 目标大队名称列表
+    private static final List<String> BRIGADE_NAMES = Arrays.asList("安检一大队", "安检二大队", "安检三大队");
+
+    @Autowired
+    private BlockedRateScreenMapper blockedRateScreenMapper;
+    @Autowired
+    private BlockedRateMapper blockedRateMapper;
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+    /**
+     * T1速率统计数据
+     *
+     * @param dto 上行参数
+     * @return 结果
+     */
+    @Override
+    public List<BlockedRateScreenT1Dto> t1(BlockedRateQueryParamDto dto) {
+        initDefaultDateRange(dto);
+        List<Date> dateList = getDateList(dto);
+        List<BlockedRate> blockedRateList = queryBlockedRateList(dto);
+        Map<Date, List<BlockedRate>> dateGroupMap = groupByDate(blockedRateList);
+        List<BlockedRateScreenT1Dto> result = new ArrayList<>();
+        dateList.forEach(date -> {
+            BlockedRateScreenT1Dto dtoItem = new BlockedRateScreenT1Dto();
+            dtoItem.setStatDate(date);
+            List<BlockedRate> dateData = dateGroupMap.getOrDefault(date, Collections.emptyList());
+            dtoItem.setT1AAreaRatePeak(calculateAvg(dateData, BlockedRate::getT1AAreaRatePeak));
+            dtoItem.setT1BAreaRatePeak(calculateAvg(dateData, BlockedRate::getT1BAreaRatePeak));
+            result.add(dtoItem);
+        });
+        return result;
+    }
+
+    /**
+     * T2速率统计数据
+     *
+     * @param dto 上行参数
+     * @return 结果
+     */
+    @Override
+    public List<BlockedRateScreenT2Dto> t2(BlockedRateQueryParamDto dto) {
+        initDefaultDateRange(dto);
+        List<Date> dateList = getDateList(dto);
+        List<BlockedRate> blockedRateList = queryBlockedRateList(dto);
+        Map<Date, List<BlockedRate>> dateGroupMap = groupByDate(blockedRateList);
+        List<BlockedRateScreenT2Dto> result = new ArrayList<>();
+        dateList.forEach(date -> {
+            BlockedRateScreenT2Dto dtoItem = new BlockedRateScreenT2Dto();
+            dtoItem.setStatDate(date);
+            List<BlockedRate> dateData = dateGroupMap.getOrDefault(date, Collections.emptyList());
+            dtoItem.setT2DomesticRatePeak(calculateAvg(dateData, BlockedRate::getT2DomesticRatePeak));
+            dtoItem.setT2InternationalRatePeak(calculateAvg(dateData, BlockedRate::getT2InternationalRatePeak));
+            result.add(dtoItem);
+        });
+        return result;
+    }
+
+    /**
+     * 国内速率统计数据
+     *
+     * @param dto 上行参数
+     * @return 结果
+     */
+    @Override
+    public List<BlockedRateScreenBrigadeDto> domestic(BlockedRateQueryParamDto dto) {
+        initDefaultDateRange(dto);
+        List<Date> dateList = getDateList(dto);
+        List<SysDept> targetDeptList = getTargetDeptList(dto);
+        List<BlockedRate> blockedRateList = queryBlockedRateList(dto);
+        Map<Date, List<BlockedRate>> dateGroupMap = groupByDate(blockedRateList);
+        List<BlockedRateScreenBrigadeDto> result = new ArrayList<>();
+        dateList.forEach(date -> {
+            List<BlockedRate> dateData = dateGroupMap.getOrDefault(date, Collections.emptyList());
+            targetDeptList.forEach(dept -> {
+                BlockedRateScreenBrigadeDto dtoItem = new BlockedRateScreenBrigadeDto();
+                dtoItem.setStatDate(date);
+                dtoItem.setDutyBrigadeId(dept.getDeptId());
+                dtoItem.setDutyBrigadeName(dept.getDeptName());
+                List<BlockedRate> deptData = dateData.stream()
+                        .filter(rate -> dept.getDeptId().equals(rate.getDutyBrigadeId()))
+                        .collect(Collectors.toList());
+                dtoItem.setAvgRatePeak(calculateAvg(deptData, BlockedRate::getTravelInspectionDomesticAvgRatePeak));
+                result.add(dtoItem);
+            });
+        });
+        return result;
+    }
+
+    /**
+     * 国际速率统计数据
+     *
+     * @param dto 上行参数
+     * @return 结果
+     */
+    @Override
+    public List<BlockedRateScreenBrigadeDto> international(BlockedRateQueryParamDto dto) {
+        initDefaultDateRange(dto);
+        List<Date> dateList = getDateList(dto);
+        List<SysDept> targetDeptList = getTargetDeptList(dto);
+        List<BlockedRate> blockedRateList = queryBlockedRateList(dto);
+        Map<Date, List<BlockedRate>> dateGroupMap = groupByDate(blockedRateList);
+        List<BlockedRateScreenBrigadeDto> result = new ArrayList<>();
+        dateList.forEach(date -> {
+            List<BlockedRate> dateData = dateGroupMap.getOrDefault(date, Collections.emptyList());
+            targetDeptList.forEach(dept -> {
+                BlockedRateScreenBrigadeDto dtoItem = new BlockedRateScreenBrigadeDto();
+                dtoItem.setStatDate(date);
+                dtoItem.setDutyBrigadeId(dept.getDeptId());
+                dtoItem.setDutyBrigadeName(dept.getDeptName());
+                List<BlockedRate> deptData = dateData.stream()
+                        .filter(rate -> dept.getDeptId().equals(rate.getDutyBrigadeId()))
+                        .collect(Collectors.toList());
+                dtoItem.setAvgRatePeak(calculateAvg(deptData, BlockedRate::getInternationalTransferAvgRatePeak));
+                result.add(dtoItem);
+            });
+        });
+        return result;
+    }
+
+    /**
+     * 初始化默认日期范围
+     *
+     * @param dto 上行参数
+     */
+    private void initDefaultDateRange(BlockedRateQueryParamDto dto) {
+        if (dto.getSpecifiedDate() == null && dto.getStartDate() == null && dto.getEndDate() == null) {
+            dto.setStartDate(BlockedDateUtils.getFirstDayOfYear());
+            dto.setEndDate(BlockedDateUtils.getCurrentDate());
+        }
+    }
+
+    /**
+     * 获取指定日期列表
+     *
+     * @param dto 上行参数
+     * @return 日期列表
+     */
+    private List<Date> getDateList(BlockedRateQueryParamDto dto) {
+        if (dto.getSpecifiedDate() != null) {
+            return Collections.singletonList(dto.getSpecifiedDate());
+        }
+        return BlockedDateUtils.generateDateList(dto.getStartDate(), dto.getEndDate());
+    }
+
+    /**
+     * 查询数据
+     *
+     * @param dto 上行参数
+     * @return 列表
+     */
+    private List<BlockedRate> queryBlockedRateList(BlockedRateQueryParamDto dto) {
+        BlockedRate query = new BlockedRate();
+        query.setStatDate(dto.getSpecifiedDate());
+        query.setStartDate(dto.getStartDate());
+        query.setEndDate(dto.getEndDate());
+        query.setDutyBrigadeId(dto.getBrigadeId());
+        query.setDutyBrigadeName(dto.getBrigadeName());
+        return blockedRateMapper.selectBlockedRateList(query);
+    }
+
+    /**
+     * 按日期分组
+     *
+     * @param blockedRateList 数据列表
+     * @return 分组结果
+     */
+    private Map<Date, List<BlockedRate>> groupByDate(List<BlockedRate> blockedRateList) {
+        return blockedRateList.stream()
+                .filter(rate -> rate.getStatDate() != null)
+                .collect(Collectors.groupingBy(BlockedRate::getStatDate));
+    }
+
+    /**
+     * 计算平均值
+     *
+     * @param dataList        数据列表
+     * @param valueExtractor  值提取器
+     * @return 平均值
+     */
+    private BigDecimal calculateAvg(List<BlockedRate> dataList, java.util.function.Function<BlockedRate, BigDecimal> valueExtractor) {
+        List<BigDecimal> values = dataList.stream()
+                .map(valueExtractor)
+                .filter(val -> val != null && val.compareTo(BigDecimal.ZERO) != 0)
+                .collect(Collectors.toList());
+        if (values.isEmpty()) {
+            return BigDecimal.ZERO;
+        }
+        BigDecimal sum = values.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
+        return sum.divide(BigDecimal.valueOf(values.size()), SCALE, ROUNDING_MODE);
+    }
+
+    /**
+     * 获取指定部门列表
+     *
+     * @param dto 上行参数
+     * @return 部门列表
+     */
+    private List<SysDept> getTargetDeptList(BlockedRateQueryParamDto dto) {
+        if (dto.getBrigadeId() == null) {
+            List<SysDept> deptListAll = sysDeptService.selectDeptInfoAll(new SysDept());
+            return deptListAll.stream()
+                    .filter(dept -> BRIGADE_NAMES.contains(dept.getDeptName()))
+                    .collect(Collectors.toList());
+        } else {
+            return sysDeptService.selectDeptByIdList(Collections.singletonList(dto.getBrigadeId()));
+        }
+    }
+
+}

airport-blocked/src/main/resources/mapper/blocked/BlockedRateScreenMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sundot.airport.blocked.mapper.BlockedRateScreenMapper">
+
+</mapper>

airport-common/src/main/java/com/sundot/airport/common/core/domain/BaseScreenQueryParamDto.java

@@ -0,0 +1,41 @@
+package com.sundot.airport.common.core.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 大屏查询基础参数
+ *
+ * @author ruoyi
+ */
+@Data
+public class BaseScreenQueryParamDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 指定日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date specifiedDate;
+
+    /**
+     * 开始日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+
+}

airport-common/src/main/java/com/sundot/airport/common/core/domain/BlockedRateQueryParamDto.java

@@ -0,0 +1,23 @@
+package com.sundot.airport.common.core.domain;
+
+import lombok.Data;
+
+/**
+ * 速率查询参数
+ *
+ * @author ruoyi
+ */
+@Data
+public class BlockedRateQueryParamDto extends BaseScreenQueryParamDto {
+
+    /**
+     * 大队ID
+     */
+    private Long brigadeId;
+
+    /**
+     * 大队名称
+     */
+    private String brigadeName;
+
+}

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

@@ -0,0 +1,81 @@
+package com.sundot.airport.common.utils;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 日期工具类
+ */
+public class BlockedDateUtils {
+
+    /**
+     * 生成从开始日期到结束日期（含）的所有日期列表（时间部分为00:00:00）
+     * @param startDate 开始日期
+     * @param endDate 结束日期
+     * @return 日期列表（按升序排列）
+     */
+    public static List<Date> generateDateList(Date startDate, Date endDate) {
+        List<Date> dateList = new ArrayList<>();
+        if (startDate == null || endDate == null || startDate.after(endDate)) {
+            return dateList; // 无效输入返回空列表
+        }
+
+        // 创建Calendar实例并标准化时间
+        Calendar startCal = Calendar.getInstance();
+        startCal.setTime(startDate);
+        setTimeToMidnight(startCal);
+
+        Calendar endCal = Calendar.getInstance();
+        endCal.setTime(endDate);
+        setTimeToMidnight(endCal);
+
+        // 遍历日期范围
+        while (!startCal.after(endCal)) {
+            dateList.add(startCal.getTime()); // 添加当前日期
+            startCal.add(Calendar.DAY_OF_MONTH, 1); // 增加一天
+        }
+        return dateList;
+    }
+
+    /**
+     * 将Calendar的时间部分设置为00:00:00.000
+     */
+    private static void setTimeToMidnight(Calendar calendar) {
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+    }
+
+    /**
+     *  当前日期（时间部分为 00:00:00）
+     */
+    public static Date getCurrentDate() {
+        Calendar cal = Calendar.getInstance();
+        resetTimeFields(cal);
+        return cal.getTime();
+    }
+
+    /**
+     *  本年度 1 月 1 日（时间部分为 00:00:00）
+     */
+    public static Date getFirstDayOfYear() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.DAY_OF_YEAR, 1);  // 设置为当年第一天
+        resetTimeFields(cal);
+        return cal.getTime();
+    }
+
+    /**
+     * 重置Calendar的时间字段（秒毫秒）
+     */
+    private static void resetTimeFields(Calendar cal) {
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+    }
+
+}