Merge remote-tracking branch 'origin/feature/dev' into feature/dev

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

@@ -0,0 +1,132 @@
+package com.sundot.airport.web.controller.blocked;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.blocked.domain.BlockedBootPersonnelTenure;
+import com.sundot.airport.blocked.service.IBlockedBootPersonnelTenureService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 开机人员年限分布Controller
+ *
+ * @author ruoyi
+ * @date 2026-04-16
+ */
+@RestController
+@RequestMapping("/blocked/tenure")
+public class BlockedBootPersonnelTenureController extends BaseController {
+    @Autowired
+    private IBlockedBootPersonnelTenureService blockedBootPersonnelTenureService;
+
+    /**
+     * 查询开机人员年限分布列表
+     */
+    @PreAuthorize("@ss.hasPermi('blocked:tenure:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BlockedBootPersonnelTenure blockedBootPersonnelTenure) {
+        startPage();
+        List<BlockedBootPersonnelTenure> list = blockedBootPersonnelTenureService.selectBlockedBootPersonnelTenureList(blockedBootPersonnelTenure);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出开机人员年限分布列表
+     */
+    @PreAuthorize("@ss.hasPermi('blocked:tenure:export')")
+    @Log(title = "导出开机人员年限分布列表", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BlockedBootPersonnelTenure blockedBootPersonnelTenure) {
+        List<BlockedBootPersonnelTenure> list = blockedBootPersonnelTenureService.selectBlockedBootPersonnelTenureList(blockedBootPersonnelTenure);
+        ExcelUtil<BlockedBootPersonnelTenure> util = new ExcelUtil<BlockedBootPersonnelTenure>(BlockedBootPersonnelTenure.class);
+        util.exportExcel(response, list, "开机人员年限分布数据");
+    }
+
+    /**
+     * 导入开机人员年限分布列表
+     */
+    @PreAuthorize("@ss.hasPermi('blocked:rate:import')")
+    @Log(title = "导入开机人员年限分布列表", businessType = BusinessType.IMPORT)
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
+        ExcelUtil<BlockedBootPersonnelTenure> util = new ExcelUtil<>(BlockedBootPersonnelTenure.class);
+        List<BlockedBootPersonnelTenure> list = util.importExcel(file.getInputStream());
+        String message = blockedBootPersonnelTenureService.importData(list, updateSupport);
+        return success(message);
+    }
+
+    /**
+     * 获取导入模板
+     */
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil<BlockedBootPersonnelTenure> util = new ExcelUtil<>(BlockedBootPersonnelTenure.class);
+        util.importTemplateExcel(response, "开机人员年限分布数据导入模板");
+    }
+
+    /**
+     * 获取开机人员年限分布详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('blocked:tenure:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(blockedBootPersonnelTenureService.selectBlockedBootPersonnelTenureById(id));
+    }
+
+    /**
+     * 新增开机人员年限分布
+     */
+    @PreAuthorize("@ss.hasPermi('blocked:tenure:add')")
+    @Log(title = "开机人员年限分布", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody BlockedBootPersonnelTenure blockedBootPersonnelTenure) {
+        blockedBootPersonnelTenure.setCreateBy(getUsername());
+        return toAjax(blockedBootPersonnelTenureService.insertBlockedBootPersonnelTenure(blockedBootPersonnelTenure));
+    }
+
+    /**
+     * 修改开机人员年限分布
+     */
+    @PreAuthorize("@ss.hasPermi('blocked:tenure:edit')")
+    @Log(title = "开机人员年限分布", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody BlockedBootPersonnelTenure blockedBootPersonnelTenure) {
+        blockedBootPersonnelTenure.setUpdateBy(getUsername());
+        return toAjax(blockedBootPersonnelTenureService.updateBlockedBootPersonnelTenure(blockedBootPersonnelTenure));
+    }
+
+    /**
+     * 删除开机人员年限分布
+     */
+    @PreAuthorize("@ss.hasPermi('blocked:tenure:remove')")
+    @Log(title = "开机人员年限分布", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(blockedBootPersonnelTenureService.deleteBlockedBootPersonnelTenureByIds(ids));
+    }
+
+    /**
+     * 查询开机人员年限分布列表全量
+     */
+    @PreAuthorize("@ss.hasPermi('blocked:tenure:list')")
+    @GetMapping("/listAll")
+    public AjaxResult listAll(BlockedBootPersonnelTenure blockedBootPersonnelTenure) {
+        List<BlockedBootPersonnelTenure> list = blockedBootPersonnelTenureService.selectBlockedBootPersonnelTenureList(blockedBootPersonnelTenure);
+        return success(list);
+    }
+}

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/domain/BlockedBootPersonnelTenure.java

@@ -0,0 +1,171 @@
+package com.sundot.airport.blocked.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.sundot.airport.common.annotation.Excel;
+import com.sundot.airport.common.core.domain.BaseEntity;
+
+/**
+ * 开机人员年限分布对象 blocked_boot_personnel_tenure
+ *
+ * @author ruoyi
+ * @date 2026-04-16
+ */
+@TableName("blocked_boot_personnel_tenure")
+public class BlockedBootPersonnelTenure extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 租户号 */
+    private String tenantId;
+
+    /** 乐观锁 */
+    private Long revision;
+
+    /** 主键 */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /** 业务大队id */
+    private Long brigadeId;
+
+    /** 业务大队名称 */
+    @Excel(name = "业务大队")
+    private String brigadeName;
+
+    /** 5年及5年以上人员数 */
+    @Excel(name = "5年及5年以上人员数")
+    private Integer cntGe5Year;
+
+    /** 4年人员数 */
+    @Excel(name = "4年人员数")
+    private Integer cnt4Years;
+
+    /** 3年人员数 */
+    @Excel(name = "3年人员数")
+    private Integer cnt3Years;
+
+    /** 2年人员数 */
+    @Excel(name = "2年人员数")
+    private Integer cnt2Years;
+
+    /** 1年人员数 */
+    @Excel(name = "1年人员数")
+    private Integer cnt1Years;
+
+    /** 不足1年人员数 */
+    @Excel(name = "不足1年人员数")
+    private Integer cntLt1Year;
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setRevision(Long revision) {
+        this.revision = revision;
+    }
+
+    public Long getRevision() {
+        return revision;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setBrigadeId(Long brigadeId) {
+        this.brigadeId = brigadeId;
+    }
+
+    public Long getBrigadeId() {
+        return brigadeId;
+    }
+
+    public void setBrigadeName(String brigadeName) {
+        this.brigadeName = brigadeName;
+    }
+
+    public String getBrigadeName() {
+        return brigadeName;
+    }
+
+    public void setCntGe5Year(Integer cntGe5Year) {
+        this.cntGe5Year = cntGe5Year;
+    }
+
+    public Integer getCntGe5Year() {
+        return cntGe5Year;
+    }
+
+    public void setCnt4Years(Integer cnt4Years) {
+        this.cnt4Years = cnt4Years;
+    }
+
+    public Integer getCnt4Years() {
+        return cnt4Years;
+    }
+
+    public void setCnt3Years(Integer cnt3Years) {
+        this.cnt3Years = cnt3Years;
+    }
+
+    public Integer getCnt3Years() {
+        return cnt3Years;
+    }
+
+    public void setCnt2Years(Integer cnt2Years) {
+        this.cnt2Years = cnt2Years;
+    }
+
+    public Integer getCnt2Years() {
+        return cnt2Years;
+    }
+
+    public void setCnt1Years(Integer cnt1Years) {
+        this.cnt1Years = cnt1Years;
+    }
+
+    public Integer getCnt1Years() {
+        return cnt1Years;
+    }
+
+    public void setCntLt1Year(Integer cntLt1Year) {
+        this.cntLt1Year = cntLt1Year;
+    }
+
+    public Integer getCntLt1Year() {
+        return cntLt1Year;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("tenantId", getTenantId())
+                .append("revision", getRevision())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .append("id", getId())
+                .append("brigadeId", getBrigadeId())
+                .append("brigadeName", getBrigadeName())
+                .append("cntGe5Year", getCntGe5Year())
+                .append("cnt4Years", getCnt4Years())
+                .append("cnt3Years", getCnt3Years())
+                .append("cnt2Years", getCnt2Years())
+                .append("cnt1Years", getCnt1Years())
+                .append("cntLt1Year", getCntLt1Year())
+                .toString();
+    }
+}

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/BlockedBootPersonnelTenureMapper.java

@@ -0,0 +1,62 @@
+package com.sundot.airport.blocked.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sundot.airport.blocked.domain.BlockedBootPersonnelTenure;
+
+/**
+ * 开机人员年限分布Mapper接口
+ *
+ * @author ruoyi
+ * @date 2026-04-16
+ */
+public interface BlockedBootPersonnelTenureMapper extends BaseMapper<BlockedBootPersonnelTenure> {
+    /**
+     * 查询开机人员年限分布
+     *
+     * @param id 开机人员年限分布主键
+     * @return 开机人员年限分布
+     */
+    public BlockedBootPersonnelTenure selectBlockedBootPersonnelTenureById(Long id);
+
+    /**
+     * 查询开机人员年限分布列表
+     *
+     * @param blockedBootPersonnelTenure 开机人员年限分布
+     * @return 开机人员年限分布集合
+     */
+    public List<BlockedBootPersonnelTenure> selectBlockedBootPersonnelTenureList(BlockedBootPersonnelTenure blockedBootPersonnelTenure);
+
+    /**
+     * 新增开机人员年限分布
+     *
+     * @param blockedBootPersonnelTenure 开机人员年限分布
+     * @return 结果
+     */
+    public int insertBlockedBootPersonnelTenure(BlockedBootPersonnelTenure blockedBootPersonnelTenure);
+
+    /**
+     * 修改开机人员年限分布
+     *
+     * @param blockedBootPersonnelTenure 开机人员年限分布
+     * @return 结果
+     */
+    public int updateBlockedBootPersonnelTenure(BlockedBootPersonnelTenure blockedBootPersonnelTenure);
+
+    /**
+     * 删除开机人员年限分布
+     *
+     * @param id 开机人员年限分布主键
+     * @return 结果
+     */
+    public int deleteBlockedBootPersonnelTenureById(Long id);
+
+    /**
+     * 批量删除开机人员年限分布
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBlockedBootPersonnelTenureByIds(Long[] ids);
+}

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/IBlockedBootPersonnelTenureService.java

@@ -0,0 +1,71 @@
+package com.sundot.airport.blocked.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sundot.airport.blocked.domain.BlockedBootPersonnelTenure;
+
+/**
+ * 开机人员年限分布Service接口
+ *
+ * @author ruoyi
+ * @date 2026-04-16
+ */
+public interface IBlockedBootPersonnelTenureService extends IService<BlockedBootPersonnelTenure> {
+    /**
+     * 查询开机人员年限分布
+     *
+     * @param id 开机人员年限分布主键
+     * @return 开机人员年限分布
+     */
+    public BlockedBootPersonnelTenure selectBlockedBootPersonnelTenureById(Long id);
+
+    /**
+     * 查询开机人员年限分布列表
+     *
+     * @param blockedBootPersonnelTenure 开机人员年限分布
+     * @return 开机人员年限分布集合
+     */
+    public List<BlockedBootPersonnelTenure> selectBlockedBootPersonnelTenureList(BlockedBootPersonnelTenure blockedBootPersonnelTenure);
+
+    /**
+     * 新增开机人员年限分布
+     *
+     * @param blockedBootPersonnelTenure 开机人员年限分布
+     * @return 结果
+     */
+    public int insertBlockedBootPersonnelTenure(BlockedBootPersonnelTenure blockedBootPersonnelTenure);
+
+    /**
+     * 修改开机人员年限分布
+     *
+     * @param blockedBootPersonnelTenure 开机人员年限分布
+     * @return 结果
+     */
+    public int updateBlockedBootPersonnelTenure(BlockedBootPersonnelTenure blockedBootPersonnelTenure);
+
+    /**
+     * 批量删除开机人员年限分布
+     *
+     * @param ids 需要删除的开机人员年限分布主键集合
+     * @return 结果
+     */
+    public int deleteBlockedBootPersonnelTenureByIds(Long[] ids);
+
+    /**
+     * 删除开机人员年限分布信息
+     *
+     * @param id 开机人员年限分布主键
+     * @return 结果
+     */
+    public int deleteBlockedBootPersonnelTenureById(Long id);
+
+    /**
+     * 导入开机人员年限分布列表
+     *
+     * @param list          数据列表
+     * @param updateSupport 是否更新支持
+     * @return 导入结果信息
+     */
+    public String importData(List<BlockedBootPersonnelTenure> list, boolean updateSupport);
+}

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/BlockedBootPersonnelTenureServiceImpl.java

@@ -0,0 +1,193 @@
+package com.sundot.airport.blocked.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.exception.ServiceException;
+import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.system.service.ISysDeptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.sundot.airport.blocked.mapper.BlockedBootPersonnelTenureMapper;
+import com.sundot.airport.blocked.domain.BlockedBootPersonnelTenure;
+import com.sundot.airport.blocked.service.IBlockedBootPersonnelTenureService;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 开机人员年限分布Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2026-04-16
+ */
+@Service
+public class BlockedBootPersonnelTenureServiceImpl extends ServiceImpl<BlockedBootPersonnelTenureMapper, BlockedBootPersonnelTenure> implements IBlockedBootPersonnelTenureService {
+    @Autowired
+    private BlockedBootPersonnelTenureMapper blockedBootPersonnelTenureMapper;
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+    /**
+     * 查询开机人员年限分布
+     *
+     * @param id 开机人员年限分布主键
+     * @return 开机人员年限分布
+     */
+    @Override
+    public BlockedBootPersonnelTenure selectBlockedBootPersonnelTenureById(Long id) {
+        return blockedBootPersonnelTenureMapper.selectBlockedBootPersonnelTenureById(id);
+    }
+
+    /**
+     * 查询开机人员年限分布列表
+     *
+     * @param blockedBootPersonnelTenure 开机人员年限分布
+     * @return 开机人员年限分布
+     */
+    @Override
+    public List<BlockedBootPersonnelTenure> selectBlockedBootPersonnelTenureList(BlockedBootPersonnelTenure blockedBootPersonnelTenure) {
+        return blockedBootPersonnelTenureMapper.selectBlockedBootPersonnelTenureList(blockedBootPersonnelTenure);
+    }
+
+    /**
+     * 新增开机人员年限分布
+     *
+     * @param blockedBootPersonnelTenure 开机人员年限分布
+     * @return 结果
+     */
+    @Override
+    public int insertBlockedBootPersonnelTenure(BlockedBootPersonnelTenure blockedBootPersonnelTenure) {
+        blockedBootPersonnelTenure.setCreateTime(DateUtils.getNowDate());
+        LambdaQueryWrapper<BlockedBootPersonnelTenure> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(BlockedBootPersonnelTenure::getBrigadeId, blockedBootPersonnelTenure.getBrigadeId());
+        BlockedBootPersonnelTenure existingRate = blockedBootPersonnelTenureMapper.selectOne(queryWrapper);
+        if (ObjUtil.isNotNull(existingRate)) {
+            blockedBootPersonnelTenure.setId(existingRate.getId());
+            return blockedBootPersonnelTenureMapper.updateBlockedBootPersonnelTenure(blockedBootPersonnelTenure);
+        } else {
+            return blockedBootPersonnelTenureMapper.insertBlockedBootPersonnelTenure(blockedBootPersonnelTenure);
+        }
+    }
+
+    /**
+     * 修改开机人员年限分布
+     *
+     * @param blockedBootPersonnelTenure 开机人员年限分布
+     * @return 结果
+     */
+    @Override
+    public int updateBlockedBootPersonnelTenure(BlockedBootPersonnelTenure blockedBootPersonnelTenure) {
+        blockedBootPersonnelTenure.setUpdateTime(DateUtils.getNowDate());
+        return blockedBootPersonnelTenureMapper.updateBlockedBootPersonnelTenure(blockedBootPersonnelTenure);
+    }
+
+    /**
+     * 批量删除开机人员年限分布
+     *
+     * @param ids 需要删除的开机人员年限分布主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBlockedBootPersonnelTenureByIds(Long[] ids) {
+        return blockedBootPersonnelTenureMapper.deleteBlockedBootPersonnelTenureByIds(ids);
+    }
+
+    /**
+     * 删除开机人员年限分布信息
+     *
+     * @param id 开机人员年限分布主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBlockedBootPersonnelTenureById(Long id) {
+        return blockedBootPersonnelTenureMapper.deleteBlockedBootPersonnelTenureById(id);
+    }
+
+    /**
+     * 导入开机人员年限分布列表
+     *
+     * @param list            数据列表
+     * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
+     * @return 结果
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String importData(List<BlockedBootPersonnelTenure> list, boolean isUpdateSupport) {
+        if (CollUtil.isEmpty(list)) {
+            throw new ServiceException("导入开机人员年限分布数据不能为空！");
+        }
+
+        List<SysDept> deptListAll = sysDeptService.selectDeptInfoAll(new SysDept());
+        Map<String, Long> deptMap = deptListAll.stream().collect(Collectors.toMap(SysDept::getDeptName, SysDept::getDeptId, (oldValue, newValue) -> newValue));
+
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+
+        for (BlockedBootPersonnelTenure data : list) {
+            // 根据名称填充ID字段
+            fillIdsByName(data, deptMap);
+            try {
+                if (ObjUtil.isNull(data.getBrigadeId()) || ObjUtil.isNull(data.getBrigadeName())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、业务大队不能为空");
+                    continue;
+                }
+
+                // 查询是否已存在（根据【日期+当班大队+班次】唯一）
+                BlockedBootPersonnelTenure queryParam = new BlockedBootPersonnelTenure();
+                queryParam.setBrigadeId(data.getBrigadeId());
+                List<BlockedBootPersonnelTenure> existingList = blockedBootPersonnelTenureMapper.selectBlockedBootPersonnelTenureList(queryParam);
+
+                if (CollUtil.isEmpty(existingList)) {
+                    // 新增
+                    data.setCreateTime(DateUtils.getNowDate());
+                    blockedBootPersonnelTenureMapper.insertBlockedBootPersonnelTenure(data);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、业务大队【" + data.getBrigadeName() + "】导入成功");
+                } else if (isUpdateSupport) {
+                    // 更新
+                    BlockedBootPersonnelTenure old = existingList.get(0);
+                    data.setId(old.getId());
+                    data.setUpdateTime(DateUtils.getNowDate());
+                    blockedBootPersonnelTenureMapper.updateBlockedBootPersonnelTenure(data);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、业务大队【" + data.getBrigadeName() + "】更新成功");
+                } else {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、业务大队【" + data.getBrigadeName() + "】已存在");
+                }
+            } catch (Exception e) {
+                failureNum++;
+                String msg = "<br/>" + failureNum + "、业务大队【" + data.getBrigadeName() + "】导入失败：";
+                failureMsg.append(msg + e.getMessage());
+            }
+        }
+
+        if (failureNum > 0) {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new ServiceException(failureMsg.toString());
+        } else {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+        }
+        return successMsg.toString();
+    }
+
+    /**
+     * 根据名称填充ID字段
+     *
+     * @param data 速率数据
+     */
+    private void fillIdsByName(BlockedBootPersonnelTenure data, Map<String, Long> deptMap) {
+        // 业务大队
+        if (ObjUtil.isNotNull(data.getBrigadeName())) {
+            data.setBrigadeId(deptMap.get(data.getBrigadeName()));
+        }
+    }
+}

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/BlockedBootPersonnelTenureMapper.xml

@@ -0,0 +1,143 @@
+<?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.BlockedBootPersonnelTenureMapper">
+
+    <resultMap type="BlockedBootPersonnelTenure" id="BlockedBootPersonnelTenureResult">
+        <result property="tenantId" column="tenant_id"/>
+        <result property="revision" column="revision"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="id" column="id"/>
+        <result property="brigadeId" column="brigade_id"/>
+        <result property="brigadeName" column="brigade_name"/>
+        <result property="cntGe5Year" column="cnt_ge_5_year"/>
+        <result property="cnt4Years" column="cnt_4_years"/>
+        <result property="cnt3Years" column="cnt_3_years"/>
+        <result property="cnt2Years" column="cnt_2_years"/>
+        <result property="cnt1Years" column="cnt_1_years"/>
+        <result property="cntLt1Year" column="cnt_lt_1_year"/>
+    </resultMap>
+
+    <sql id="selectBlockedBootPersonnelTenureVo">
+        select tenant_id,
+               revision,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark,
+               id,
+               brigade_id,
+               brigade_name,
+               cnt_ge_5_year,
+               cnt_4_years,
+               cnt_3_years,
+               cnt_2_years,
+               cnt_1_years,
+               cnt_lt_1_year
+        from blocked_boot_personnel_tenure
+    </sql>
+
+    <select id="selectBlockedBootPersonnelTenureList" parameterType="BlockedBootPersonnelTenure"
+            resultMap="BlockedBootPersonnelTenureResult">
+        <include refid="selectBlockedBootPersonnelTenureVo"/>
+        <where>
+            <if test="tenantId != null  and tenantId != ''">and tenant_id = #{tenantId}</if>
+            <if test="revision != null ">and revision = #{revision}</if>
+            <if test="brigadeId != null ">and brigade_id = #{brigadeId}</if>
+            <if test="brigadeName != null  and brigadeName != ''">and brigade_name like concat('%', #{brigadeName},
+                '%')
+            </if>
+            <if test="cntGe5Year != null ">and cnt_ge_5_year = #{cntGe5Year}</if>
+            <if test="cnt4Years != null ">and cnt_4_years = #{cnt4Years}</if>
+            <if test="cnt3Years != null ">and cnt_3_years = #{cnt3Years}</if>
+            <if test="cnt2Years != null ">and cnt_2_years = #{cnt2Years}</if>
+            <if test="cnt1Years != null ">and cnt_1_years = #{cnt1Years}</if>
+            <if test="cntLt1Year != null ">and cnt_lt_1_year = #{cntLt1Year}</if>
+        </where>
+    </select>
+
+    <select id="selectBlockedBootPersonnelTenureById" parameterType="Long" resultMap="BlockedBootPersonnelTenureResult">
+        <include refid="selectBlockedBootPersonnelTenureVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertBlockedBootPersonnelTenure" parameterType="BlockedBootPersonnelTenure" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into blocked_boot_personnel_tenure
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="tenantId != null">tenant_id,</if>
+            <if test="revision != null">revision,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+            <if test="brigadeId != null">brigade_id,</if>
+            <if test="brigadeName != null and brigadeName != ''">brigade_name,</if>
+            <if test="cntGe5Year != null">cnt_ge_5_year,</if>
+            <if test="cnt4Years != null">cnt_4_years,</if>
+            <if test="cnt3Years != null">cnt_3_years,</if>
+            <if test="cnt2Years != null">cnt_2_years,</if>
+            <if test="cnt1Years != null">cnt_1_years,</if>
+            <if test="cntLt1Year != null">cnt_lt_1_year,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="tenantId != null">#{tenantId},</if>
+            <if test="revision != null">#{revision},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="brigadeId != null">#{brigadeId},</if>
+            <if test="brigadeName != null and brigadeName != ''">#{brigadeName},</if>
+            <if test="cntGe5Year != null">#{cntGe5Year},</if>
+            <if test="cnt4Years != null">#{cnt4Years},</if>
+            <if test="cnt3Years != null">#{cnt3Years},</if>
+            <if test="cnt2Years != null">#{cnt2Years},</if>
+            <if test="cnt1Years != null">#{cnt1Years},</if>
+            <if test="cntLt1Year != null">#{cntLt1Year},</if>
+        </trim>
+    </insert>
+
+    <update id="updateBlockedBootPersonnelTenure" parameterType="BlockedBootPersonnelTenure">
+        update blocked_boot_personnel_tenure
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="tenantId != null">tenant_id = #{tenantId},</if>
+            <if test="revision != null">revision = #{revision},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="brigadeId != null">brigade_id = #{brigadeId},</if>
+            <if test="brigadeName != null and brigadeName != ''">brigade_name = #{brigadeName},</if>
+            <if test="cntGe5Year != null">cnt_ge_5_year = #{cntGe5Year},</if>
+            <if test="cnt4Years != null">cnt_4_years = #{cnt4Years},</if>
+            <if test="cnt3Years != null">cnt_3_years = #{cnt3Years},</if>
+            <if test="cnt2Years != null">cnt_2_years = #{cnt2Years},</if>
+            <if test="cnt1Years != null">cnt_1_years = #{cnt1Years},</if>
+            <if test="cntLt1Year != null">cnt_lt_1_year = #{cntLt1Year},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBlockedBootPersonnelTenureById" parameterType="Long">
+        delete
+        from blocked_boot_personnel_tenure
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteBlockedBootPersonnelTenureByIds" parameterType="String">
+        delete from blocked_boot_personnel_tenure where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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);
+    }
+
+}

airport-item/src/main/java/com/sundot/airport/item/mapper/SeizureReportMapper.java

@@ -441,4 +441,6 @@ public interface SeizureReportMapper {
     public List<ItemLargeScreenHomePageSeizureReportSqlDto> homePageSeizureReport(BaseLargeScreenQueryParamDto dto);
 
     List<ItemLargeScreenHomePageSeizureReportSqlDto> homePageSeizureReportBrigadeId(BaseLargeScreenQueryParamDto dto);
+
+    List<ItemLargeScreenHomePageSeizureReportSqlDto> homePageSeizureReportDepartmentId(BaseLargeScreenQueryParamDto dto);
 }

airport-item/src/main/java/com/sundot/airport/item/service/SeizureDistributionService.java

@@ -256,11 +256,14 @@ public class SeizureDistributionService {
 
         // 获取该站点下的所有大队
         List<SysDept> brigades = getBrigadesByStation(dto.getInspectStationId());
+        // 获取该站点下的所有科室
+        List<SysDept> departments = getDepartmentsByStation(dto.getInspectStationId());
 
         // 构建所有分组：先添加站级，再添加大队级
         List<SysDept> allGroups = new ArrayList<>();
         allGroups.add(stationDept); // 添加站级
         allGroups.addAll(brigades); // 添加大队级
+        allGroups.addAll(departments); // 添加科室级
 
         // 获取查获数量数据
         List<SeizureLargeScreenHomePageItemDto> seizureReportList = getSeizureDataForStation(dto.getDeptId(), dto.getStartDate(), dto.getEndDate());
@@ -288,6 +291,13 @@ public class SeizureDistributionService {
             groupedQuantities.put(dept.getDeptName(), deptQuantities);
         }
 
+        // 然后处理科室级数据
+        for (SysDept dept : departments) {
+            List<SeizureLargeScreenHomePageItemDto> departmentSeizureReportList = getSeizureDataForDepartment(dept.getDeptId(), dto.getStartDate(), dto.getEndDate());
+            List<BigDecimal> deptQuantities = departmentSeizureReportList.stream().map(SeizureLargeScreenHomePageItemDto::getQuantity).filter(Objects::nonNull).collect(Collectors.toList());
+            groupedQuantities.put(dept.getDeptName(), deptQuantities);
+        }
+
         // 为每个分组计算箱线图数据
         List<GroupedBoxPlotDataDto> result = new ArrayList<>();
 
@@ -420,4 +430,44 @@ public class SeizureDistributionService {
             return lowerValue.add(upperValue.subtract(lowerValue).multiply(BigDecimal.valueOf(fraction)));
         }
     }
+
+    /**
+     * 获取指定站点下的所有科室
+     *
+     * @param stationDeptId 站点部门ID
+     * @return 大队列表
+     */
+    private List<SysDept> getDepartmentsByStation(Long stationDeptId) {
+        if (stationDeptId == null) {
+            return Collections.emptyList();
+        }
+
+        // 查询站点下的所有子部门
+        List<SysDept> childrenDepts = sysDeptService.selectChildrenDeptById(stationDeptId);
+
+        // 过滤出大队级别的部门
+        return childrenDepts.stream()
+                .filter(dept -> DeptTypeEnum.MANAGER.getCode().equals(dept.getDeptType()))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 获取指定科室的查获数据（科室级别）
+     *
+     * @param departmentId 科室ID
+     * @param startDate 开始日期
+     * @param endDate   结束日期
+     * @return 科室级别查获数据列表
+     */
+    private List<SeizureLargeScreenHomePageItemDto> getSeizureDataForDepartment(Long departmentId, Date startDate, Date endDate) {
+        if (departmentId == null) {
+            return Collections.emptyList();
+        }
+        // 创建查询参数
+        BaseLargeScreenQueryParamDto dto = new BaseLargeScreenQueryParamDto();
+        dto.setInspectDepartmentId(departmentId);
+        dto.setStartDate(startDate);
+        dto.setEndDate(DateUtils.addDays(endDate, 1));
+        return seizureReportService.getSeizureLargeScreenHomePinspectBrigadeIdList(dto);
+    }
 }

airport-item/src/main/java/com/sundot/airport/item/service/impl/ItemLargeScreenServiceImpl.java

@@ -663,6 +663,25 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
                     upperBound = boxPlotData.getUpperBound();
                 }
             }
+        } else if (dto.getInspectDepartmentId() != null) {
+            // 根据 id 获取部门信息
+            SysDept dept = sysDeptService.selectDeptById(dto.getInspectDepartmentId());
+            if (Objects.isNull(dept)) {
+                return Collections.emptyList();
+            }
+
+            // 查找匹配的分组数据
+            Optional<GroupedBoxPlotDataDto> matchedGroup = boxPlotDataList.stream()
+                    .filter(grouped -> Objects.equals(grouped.getGroupName(), dept.getDeptName()))
+                    .findFirst();
+
+            if (matchedGroup.isPresent()) {
+                BoxPlotDataDto boxPlotData = matchedGroup.get().getBoxPlotData();
+                if (Objects.nonNull(boxPlotData)) {
+                    lowerBound = boxPlotData.getLowerBound();
+                    upperBound = boxPlotData.getUpperBound();
+                }
+            }
         } else {
             GroupedBoxPlotDataDto firstGroup = boxPlotDataList.get(0);
             if (Objects.nonNull(firstGroup) && Objects.nonNull(firstGroup.getBoxPlotData())) {
@@ -681,6 +700,10 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
             // 有大队 ID，查询大队数据
             seizureReportList = seizureReportMapper.homePageSeizureReportBrigadeId(dto);
             userInfoList = sysUserService.homePageUserInfoByBrigadeId(dto.getInspectBrigadeId());
+        } else if (dto.getInspectDepartmentId() != null) {
+            // 有科室 ID，查询科室数据
+            seizureReportList = seizureReportMapper.homePageSeizureReportDepartmentId(dto);
+            userInfoList = sysUserService.homePageUserInfoByDepartmentId(dto.getInspectDepartmentId());
         } else {
             // 无大队 ID，查询全站数据
             seizureReportList = seizureReportMapper.homePageSeizureReport(dto);
@@ -704,6 +727,10 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
         for (LargeScreenHomePageUserInfoSqlDto userInfo : userInfoList) {
             BigDecimal totalQuantity = userSeizureMap.getOrDefault(userInfo.getUserId(), BigDecimal.ZERO);
 
+            if (lowerBound == null || upperBound == null) {
+                continue;
+            }
+
             // 判断是否为异常值
             if (totalQuantity.compareTo(lowerBound) < 0 || totalQuantity.compareTo(upperBound) > 0) {
                 ItemAbnormalSeizureDto abnormalDto = new ItemAbnormalSeizureDto();
@@ -759,6 +786,25 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
                     upperBound = boxPlotData.getUpperBound();
                 }
             }
+        } else if (dto.getInspectDepartmentId() != null) {
+            // 根据 id 获取部门信息
+            SysDept dept = sysDeptService.selectDeptById(dto.getInspectDepartmentId());
+            if (Objects.isNull(dept)) {
+                return result;
+            }
+
+            // 查找匹配的分组数据
+            Optional<GroupedBoxPlotDataDto> matchedGroup = boxPlotDataList.stream()
+                    .filter(grouped -> Objects.equals(grouped.getGroupName(), dept.getDeptName()))
+                    .findFirst();
+
+            if (matchedGroup.isPresent()) {
+                BoxPlotDataDto boxPlotData = matchedGroup.get().getBoxPlotData();
+                if (Objects.nonNull(boxPlotData)) {
+                    lowerBound = boxPlotData.getLowerBound();
+                    upperBound = boxPlotData.getUpperBound();
+                }
+            }
         } else {
             GroupedBoxPlotDataDto firstGroup = boxPlotDataList.get(0);
             if (Objects.nonNull(firstGroup) && Objects.nonNull(firstGroup.getBoxPlotData())) {
@@ -772,10 +818,14 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
         List<ItemLargeScreenHomePageSeizureReportSqlDto> seizureReportList;
         List<LargeScreenHomePageUserInfoSqlDto> userInfoList;
 
-        if (dto.getInspectDepartmentId() != null) {
+        if (dto.getInspectBrigadeId() != null) {
             // 有大队 ID，查询大队数据
             seizureReportList = seizureReportMapper.homePageSeizureReportBrigadeId(dto);
             userInfoList = sysUserService.homePageUserInfoByBrigadeId(dto.getInspectBrigadeId());
+        } else if (dto.getInspectDepartmentId() != null) {
+            // 有科室 ID，查询科室数据
+            seizureReportList = seizureReportMapper.homePageSeizureReportDepartmentId(dto);
+            userInfoList = sysUserService.homePageUserInfoByDepartmentId(dto.getInspectDepartmentId());
         } else {
             // 无大队 ID，查询全站数据
             seizureReportList = seizureReportMapper.homePageSeizureReport(dto);
@@ -800,6 +850,10 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
         for (LargeScreenHomePageUserInfoSqlDto userInfo : userInfoList) {
             BigDecimal totalQuantity = userSeizureMap.getOrDefault(userInfo.getUserId(), BigDecimal.ZERO);
 
+            if (lowerBound == null || upperBound == null) {
+                continue;
+            }
+
             // 判断是否为异常值
             if (totalQuantity.compareTo(upperBound) > 0) {
                 // 显著高于

airport-item/src/main/resources/mapper/item/SeizureReportMapper.xml

@@ -790,4 +790,21 @@
             and isr.inspect_brigade_id = #{inspectBrigadeId}
         </if>
     </select>
+
+    <select id="homePageSeizureReportDepartmentId"
+            resultType="com.sundot.airport.item.domain.ItemLargeScreenHomePageSeizureReportSqlDto">
+        select isr.inspect_user_id userId,
+        isr.inspect_user_name userName,
+        isi.quantity quantity
+        from item_seizure_record isr
+        left join item_seizure_items isi on isr.id = isi.record_id
+        where 1 = 1
+        and isr.process_status = 3
+        <if test="startDate != null and endDate != null">
+            AND isr.create_time BETWEEN #{startDate} AND #{endDate}
+        </if>
+        <if test="inspectDepartmentId != null">
+            and isr.inspect_department_id = #{inspectDepartmentId}
+        </if>
+    </select>
 </mapper>

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

@@ -246,4 +246,12 @@ public interface SysUserMapper {
      * @return 用户信息列表
      */
     public List<LargeScreenHomePageUserInfoSqlDto> homePageUserInfoByBrigadeId(@Param("brigadeId") Long brigadeId);
+
+    /**
+     * 首页 - 用户信息（按科室 ID 筛选）
+     *
+     * @param departmentId 科室 ID
+     * @return 用户信息列表
+     */
+    public List<LargeScreenHomePageUserInfoSqlDto> homePageUserInfoByDepartmentId(@Param("departmentId") Long departmentId);
 }

airport-system/src/main/java/com/sundot/airport/system/service/ISysUserService.java

@@ -336,4 +336,12 @@ public interface ISysUserService {
      * @return 用户信息列表
      */
     public List<LargeScreenHomePageUserInfoSqlDto> homePageUserInfoByBrigadeId(Long brigadeId);
+
+    /**
+     * 首页 - 用户信息（按科室 ID 筛选）
+     *
+     * @param departmentId 科室 ID
+     * @return 用户信息列表
+     */
+    public List<LargeScreenHomePageUserInfoSqlDto> homePageUserInfoByDepartmentId(Long departmentId);
 }

airport-system/src/main/java/com/sundot/airport/system/service/impl/SysUserServiceImpl.java

@@ -1244,4 +1244,9 @@ public class SysUserServiceImpl implements ISysUserService {
     public List<LargeScreenHomePageUserInfoSqlDto> homePageUserInfoByBrigadeId(Long brigadeId) {
         return userMapper.homePageUserInfoByBrigadeId(brigadeId);
     }
+
+    @Override
+    public List<LargeScreenHomePageUserInfoSqlDto> homePageUserInfoByDepartmentId(Long departmentId) {
+        return userMapper.homePageUserInfoByDepartmentId(departmentId);
+    }
 }

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

@@ -1158,4 +1158,29 @@
           and sr.role_key in ('banzuzhang', 'SecurityCheck')
           and sd_dd.dept_id = #{brigadeId}
     </select>
+
+    <select id="homePageUserInfoByDepartmentId"
+            resultType="com.sundot.airport.common.core.domain.LargeScreenHomePageUserInfoSqlDto">
+        select su.user_id      userId,
+               su.user_name    userName,
+               su.nick_name    nickName,
+               sd_bz.dept_id   teamId,
+               sd_bz.dept_name teamName,
+               sd_ks.dept_id   departmentId,
+               sd_ks.dept_name departmentName,
+               sd_dd.dept_id   brigadeId,
+               sd_dd.dept_name brigadeName,
+               sd_zj.dept_id   stationId,
+               sd_zj.dept_name stationName
+        from sys_user su
+                 inner join sys_user_role sur on sur.user_id = su.user_id
+                 inner join sys_role sr on sr.role_id = sur.role_id
+                 inner join sys_dept sd_bz on sd_bz.dept_id = su.dept_id
+                 inner join sys_dept sd_ks on sd_ks.dept_id = sd_bz.parent_id
+                 inner join sys_dept sd_dd on sd_dd.dept_id = sd_ks.parent_id
+                 inner join sys_dept sd_zj on sd_zj.dept_id = sd_dd.parent_id
+        where 1 = 1
+          and sr.role_key in ('banzuzhang', 'SecurityCheck')
+          and sd_ks.dept_id = #{departmentId}
+    </select>
 </mapper>