查堵大屏--开发

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

@@ -1,27 +1,6 @@
 package com.sundot.airport.web.controller.blocked;
 
-import com.sundot.airport.blocked.dto.BlockedAreaDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedBrigadeCertificateDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedBrigadeRateStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedBrigadeStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedCertificateDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyBrigadeLuggageStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyBrigadeRateStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyBrigadeStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyLuggageStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyRateStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDashboardQueryDTO;
-import com.sundot.airport.blocked.dto.BlockedDashboardResultDTO;
-import com.sundot.airport.blocked.dto.BlockedDifficultyDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedDiscriminationDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedItemDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedItemLocationDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedMissCheckReasonDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedOperatingYearsDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedRankingDTO;
-import com.sundot.airport.blocked.dto.BlockedRateResultDTO;
-import com.sundot.airport.blocked.dto.BlockedTimePeriodStatsDTO;
+import com.sundot.airport.blocked.dto.*;
 import com.sundot.airport.blocked.service.IBlockedDashboardService;
 import com.sundot.airport.common.core.controller.BaseController;
 import com.sundot.airport.common.core.domain.AjaxResult;
@@ -209,7 +188,7 @@ public class BlockedDashboardController extends BaseController {
     @ApiOperation("区域查堵数量分布")
     @GetMapping("/areaDistribution")
     public AjaxResult getAreaDistribution(BlockedDashboardQueryDTO queryDTO) {
-        BlockedAreaDistributionDTO result = blockedDashboardService.getAreaDistribution(queryDTO);
+        BlockedAreaDistributionResultDTO result = blockedDashboardService.getAreaDistribution(queryDTO);
         return success(result);
     }
 
@@ -405,7 +384,7 @@ public class BlockedDashboardController extends BaseController {
     @ApiOperation("大队开机人员证书分布")
     @GetMapping("/brigadeCertificateDistribution")
     public AjaxResult getBrigadeCertificateDistribution(BlockedDashboardQueryDTO queryDTO) {
-        List<BlockedBrigadeCertificateDistributionDTO> resultList = blockedDashboardService.getBrigadeCertificateDistribution(queryDTO);
+        List<BlockedCertificateLevelDTO> resultList = blockedDashboardService.getBrigadeCertificateDistribution(queryDTO);
         return success(resultList);
     }
 

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

@@ -4,14 +4,7 @@ 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.PutMapping;
-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 org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import com.sundot.airport.common.annotation.Log;
 import com.sundot.airport.common.core.controller.BaseController;
@@ -66,7 +59,7 @@ public class BlockedLuggageStatisticsDailyController extends BaseController
     @PreAuthorize("@ss.hasPermi('blocked:daily:import')")
     @Log(title = "每日行李过检查堵统计", businessType = BusinessType.IMPORT)
     @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+    public AjaxResult importData(MultipartFile file, @RequestParam(defaultValue = "false") boolean updateSupport) throws Exception
     {
         ExcelUtil<BlockedLuggageStatisticsDaily> util = new ExcelUtil<BlockedLuggageStatisticsDaily>(BlockedLuggageStatisticsDaily.class);
         List<BlockedLuggageStatisticsDaily> list = util.importExcel(file.getInputStream());

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

@@ -0,0 +1,50 @@
+package com.sundot.airport.blocked.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 区域查堵-查堵件数统计DTO(折线图)
+ * 
+ * @author wangxx
+ * @date 2026-04-22
+ */
+@Data
+@ApiModel("区域查堵-查堵件数统计")
+public class BlockedAreaBlockedDTO implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 大队名称
+     */
+    @ApiModelProperty("大队名称")
+    private String brigadeName;
+
+    /**
+     * T1旅检查堵件数
+     */
+    @ApiModelProperty("T1旅检查堵件数")
+    private Integer t1PassengerBlockedCount;
+
+    /**
+     * T2旅检查堵件数
+     */
+    @ApiModelProperty("T2旅检查堵件数")
+    private Integer t2PassengerBlockedCount;
+
+    /**
+     * T1行检查堵件数
+     */
+    @ApiModelProperty("T1行检查堵件数")
+    private Integer t1CargoBlockedCount;
+
+    /**
+     * T2行检查堵件数
+     */
+    @ApiModelProperty("T2行检查堵件数")
+    private Integer t2CargoBlockedCount;
+}

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

@@ -0,0 +1,39 @@
+package com.sundot.airport.blocked.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 区域查堵数据分布统计结果DTO(双轴图表)
+ * 
+ * @author wangxx
+ * @date 2026-04-22
+ */
+@Data
+@ApiModel("区域查堵数据分布统计结果")
+public class BlockedAreaDistributionResultDTO implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 大队名称列表(X轴标签)
+     */
+    @ApiModelProperty("大队名称列表")
+    private List<String> brigadeNames;
+
+    /**
+     * 过检行李数统计列表(柱状图数据)
+     */
+    @ApiModelProperty("过检行李数统计列表")
+    private List<BlockedAreaLuggageDTO> luggageDataList;
+
+    /**
+     * 查堵件数统计列表(折线图数据)
+     */
+    @ApiModelProperty("查堵件数统计列表")
+    private List<BlockedAreaBlockedDTO> blockedDataList;
+}

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

@@ -7,18 +7,24 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
- * 区域查堵数据分布统计DTO(用于双轴图表)
+ * 区域查堵-过检行李数统计DTO(柱状图)
  * 
  * @author wangxx
- * @date 2026-04-15
+ * @date 2026-04-22
  */
 @Data
-@ApiModel("区域查堵数据分布统计")
-public class BlockedAreaDistributionDTO implements Serializable {
+@ApiModel("区域查堵-过检行李数统计")
+public class BlockedAreaLuggageDTO implements Serializable {
     
     private static final long serialVersionUID = 1L;
 
     /**
+     * 大队名称
+     */
+    @ApiModelProperty("大队名称")
+    private String brigadeName;
+
+    /**
      * T1旅检过检行李数
      */
     @ApiModelProperty("T1旅检过检行李数")
@@ -41,28 +47,4 @@ public class BlockedAreaDistributionDTO implements Serializable {
      */
     @ApiModelProperty("T2行检过检行李数")
     private Integer t2CargoLuggageCount;
-
-    /**
-     * T1旅检查堵件数
-     */
-    @ApiModelProperty("T1旅检查堵件数")
-    private Integer t1PassengerBlockedCount;
-
-    /**
-     * T2旅检查堵件数
-     */
-    @ApiModelProperty("T2旅检查堵件数")
-    private Integer t2PassengerBlockedCount;
-
-    /**
-     * T1行检查堵件数
-     */
-    @ApiModelProperty("T1行检查堵件数")
-    private Integer t1CargoBlockedCount;
-
-    /**
-     * T2行检查堵件数
-     */
-    @ApiModelProperty("T2行检查堵件数")
-    private Integer t2CargoBlockedCount;
 }

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

@@ -1,68 +0,0 @@
-package com.sundot.airport.blocked.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 大队开机人员证书分布统计DTO(用于柱状图)
- * 
- * @author wangxx
- * @date 2026-04-15
- */
-@Data
-@ApiModel("大队开机人员证书分布统计")
-public class BlockedBrigadeCertificateDistributionDTO implements Serializable {
-    
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 大队名称
-     */
-    @ApiModelProperty("大队名称")
-    private String brigadeName;
-
-    /**
-     * 大队ID
-     */
-    @ApiModelProperty("大队ID")
-    private Long brigadeId;
-
-    /**
-     * 一级证书人数
-     */
-    @ApiModelProperty("一级证书人数")
-    private Integer levelOneCount;
-
-    /**
-     * 二级证书人数
-     */
-    @ApiModelProperty("二级证书人数")
-    private Integer levelTwoCount;
-
-    /**
-     * 三级证书人数
-     */
-    @ApiModelProperty("三级证书人数")
-    private Integer levelThreeCount;
-
-    /**
-     * 四级证书人数
-     */
-    @ApiModelProperty("四级证书人数")
-    private Integer levelFourCount;
-
-    /**
-     * 五级证书人数
-     */
-    @ApiModelProperty("五级证书人数")
-    private Integer levelFiveCount;
-
-    /**
-     * 总人数
-     */
-    @ApiModelProperty("总人数")
-    private Integer totalCount;
-}

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

@@ -0,0 +1,56 @@
+package com.sundot.airport.blocked.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 大队证书等级分布统计DTO(高/中/初)
+ * 
+ * @author wangxx
+ * @date 2026-04-22
+ */
+@Data
+@ApiModel("大队证书等级分布统计")
+public class BlockedCertificateLevelDTO implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 大队名称
+     */
+    @ApiModelProperty("大队名称")
+    private String brigadeName;
+
+    /**
+     * 大队ID
+     */
+    @ApiModelProperty("大队ID")
+    private Long brigadeId;
+
+    /**
+     * 高级人数（一级+二级+三级）
+     */
+    @ApiModelProperty("高级人数")
+    private Integer seniorCount;
+
+    /**
+     * 中级人数（四级）
+     */
+    @ApiModelProperty("中级人数")
+    private Integer middleCount;
+
+    /**
+     * 初级人数（五级）
+     */
+    @ApiModelProperty("初级人数")
+    private Integer juniorCount;
+
+    /**
+     * 总人数
+     */
+    @ApiModelProperty("总人数")
+    private Integer totalCount;
+}

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * 查堵排行榜统计DTO
@@ -41,4 +42,9 @@ public class BlockedRankingDTO implements Serializable {
      */
     @ApiModelProperty("统计记录总数")
     private Integer totalCount;
+    /**
+     * 百分比
+     */
+    @ApiModelProperty("百分比")
+    private BigDecimal percentage;
 }

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

@@ -1,32 +1,6 @@
 package com.sundot.airport.blocked.mapper;
 
-import com.sundot.airport.blocked.dto.BlockedAreaDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedBrigadeCertificateDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedBrigadeRateStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedBrigadeStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedCertificateDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedCertificateLevelDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyBrigadeLuggageStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyBrigadeRateStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyBrigadeStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyBrigadeTerminalLuggageStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyBrigadeTerminalRateStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyBrigadeTerminalStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyLuggageStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyRateStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDashboardQueryDTO;
-import com.sundot.airport.blocked.dto.BlockedDifficultyDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedDiscriminationDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedGenderDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedItemDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedItemLocationDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedMissCheckReasonDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedOperatingYearsDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedRankingDTO;
-import com.sundot.airport.blocked.dto.BlockedTerminalStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedTimePeriodLuggageStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedTimePeriodStatsDTO;
+import com.sundot.airport.blocked.dto.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -138,12 +112,20 @@ public interface BlockedDashboardMapper {
     List<BlockedItemDistributionDTO> selectItemDistribution(BlockedDashboardQueryDTO queryDTO);
 
     /**
-     * 查询区域查堵数据分布(用于双轴图表)
+     * 查询区域查堵数据分布-过检行李数(柱状图)
      * 
      * @param queryDTO 查询参数
-     * @return 区域查堵数据分布统计
+     * @return 过检行李数统计列表
      */
-    BlockedAreaDistributionDTO selectAreaDistribution(BlockedDashboardQueryDTO queryDTO);
+    List<BlockedAreaLuggageDTO> selectAreaLuggageDistribution(BlockedDashboardQueryDTO queryDTO);
+
+    /**
+     * 查询区域查堵数据分布-查堵件数(折线图)
+     * 
+     * @param queryDTO 查询参数
+     * @return 查堵件数统计列表
+     */
+    List<BlockedAreaBlockedDTO> selectAreaBlockedDistribution(BlockedDashboardQueryDTO queryDTO);
 
     /**
      * 查询查堵类型分布(用于分组柱状图)
@@ -255,7 +237,7 @@ public interface BlockedDashboardMapper {
      * @param queryDTO 查询参数
      * @return 大队证书分布统计列表
      */
-    List<BlockedBrigadeCertificateDistributionDTO> selectBrigadeCertificateDistribution(BlockedDashboardQueryDTO queryDTO);
+    List<BlockedCertificateLevelDTO> selectBrigadeCertificateDistribution(BlockedDashboardQueryDTO queryDTO);
 
     /**
      * 查询两楼每日查堵走势(按大队)

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

@@ -1,34 +1,6 @@
 package com.sundot.airport.blocked.service;
 
-import com.sundot.airport.blocked.dto.BlockedAreaDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedBrigadeCertificateDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedBrigadeRateStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedBrigadeStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedCertificateDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedCertificateLevelDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyBrigadeLuggageStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyBrigadeRateStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyBrigadeStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyBrigadeTerminalLuggageStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyBrigadeTerminalRateStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyBrigadeTerminalStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyLuggageStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyRateStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDailyStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedDashboardQueryDTO;
-import com.sundot.airport.blocked.dto.BlockedDashboardResultDTO;
-import com.sundot.airport.blocked.dto.BlockedDifficultyDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedDiscriminationDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedGenderDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedItemDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedItemLocationDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedMissCheckReasonDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedOperatingYearsDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedRankingDTO;
-import com.sundot.airport.blocked.dto.BlockedRateResultDTO;
-import com.sundot.airport.blocked.dto.BlockedTerminalStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedTimePeriodLuggageStatsDTO;
-import com.sundot.airport.blocked.dto.BlockedTimePeriodStatsDTO;
+import com.sundot.airport.blocked.dto.*;
 
 import java.util.List;
 
@@ -129,12 +101,12 @@ public interface IBlockedDashboardService {
     List<BlockedItemDistributionDTO> getItemDistribution(BlockedDashboardQueryDTO queryDTO);
 
     /**
-     * 查询区域查堵数据分布(用于双轴图表)
+     * 查询区域查堵数据分布(双轴图表)
      *
      * @param queryDTO 查询参数
-     * @return 区域查堵数据分布统计
+     * @return 区域查堵数据分布统计结果
      */
-    BlockedAreaDistributionDTO getAreaDistribution(BlockedDashboardQueryDTO queryDTO);
+    BlockedAreaDistributionResultDTO getAreaDistribution(BlockedDashboardQueryDTO queryDTO);
 
     /**
      * 查询查堵类型分布(用于分组柱状图)
@@ -242,11 +214,11 @@ public interface IBlockedDashboardService {
 
     /**
      * 查询大队开机人员证书分布(用于柱状图)
-     * 
+     *
      * @param queryDTO 查询参数
      * @return 大队证书分布统计列表
      */
-    List<BlockedBrigadeCertificateDistributionDTO> getBrigadeCertificateDistribution(BlockedDashboardQueryDTO queryDTO);
+    List<BlockedCertificateLevelDTO> getBrigadeCertificateDistribution(BlockedDashboardQueryDTO queryDTO);
 
     /**
      * 查询两楼每日查堵走势(按大队)

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

@@ -1,11 +1,13 @@
 package com.sundot.airport.blocked.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.sundot.airport.blocked.dto.BlockedAreaDistributionDTO;
-import com.sundot.airport.blocked.dto.BlockedBrigadeCertificateDistributionDTO;
+import com.sundot.airport.blocked.dto.BlockedAreaBlockedDTO;
+import com.sundot.airport.blocked.dto.BlockedAreaDistributionResultDTO;
+import com.sundot.airport.blocked.dto.BlockedAreaLuggageDTO;
 import com.sundot.airport.blocked.dto.BlockedBrigadeRateStatsDTO;
 import com.sundot.airport.blocked.dto.BlockedBrigadeStatsDTO;
 import com.sundot.airport.blocked.dto.BlockedCertificateDistributionDTO;
+import com.sundot.airport.blocked.dto.BlockedCertificateLevelDTO;
 import com.sundot.airport.blocked.dto.BlockedCertificateLevelDistributionDTO;
 import com.sundot.airport.blocked.dto.BlockedDailyBrigadeLuggageStatsDTO;
 import com.sundot.airport.blocked.dto.BlockedDailyBrigadeRateStatsDTO;
@@ -38,6 +40,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 查堵大屏Service业务层处理
@@ -194,18 +197,55 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
     @Override
     public List<BlockedItemDistributionDTO> getItemDistribution(BlockedDashboardQueryDTO queryDTO) {
         List<BlockedItemDistributionDTO> resultList = blockedDashboardMapper.selectItemDistribution(queryDTO);
+        if (resultList != null && !resultList.isEmpty()) {
+            // 计算总数
+            long totalCount = resultList.stream().mapToLong(item -> item.getCount() != null ? item.getCount() : 0).sum();
+            // 计算百分比
+            if (totalCount > 0) {
+                resultList.forEach(item -> {
+                    long count = item.getCount() != null ? item.getCount() : 0;
+                    double percentage = Math.round(count * 10000.0 / totalCount) / 100.0;
+                    item.setPercentage(java.math.BigDecimal.valueOf(percentage));
+                });
+            }
+        }
         return resultList != null ? resultList : Collections.emptyList();
     }
 
     /**
-     * 查询区域查堵数据分布(用于双轴图表)
+     * 查询区域查堵数据分布(双轴图表)
      * 
      * @param queryDTO 查询参数
-     * @return 区域查堵数据分布统计
+     * @return 区域查堵数据分布统计结果
      */
     @Override
-    public BlockedAreaDistributionDTO getAreaDistribution(BlockedDashboardQueryDTO queryDTO) {
-        return blockedDashboardMapper.selectAreaDistribution(queryDTO);
+    public BlockedAreaDistributionResultDTO getAreaDistribution(BlockedDashboardQueryDTO queryDTO) {
+        BlockedAreaDistributionResultDTO result = new BlockedAreaDistributionResultDTO();
+        
+        // 查询过检行李数(柱状图数据)
+        List<BlockedAreaLuggageDTO> luggageList = blockedDashboardMapper.selectAreaLuggageDistribution(queryDTO);
+        result.setLuggageDataList(luggageList != null ? luggageList : Collections.emptyList());
+        
+        // 查询查堵件数(折线图数据)
+        List<BlockedAreaBlockedDTO> blockedList = blockedDashboardMapper.selectAreaBlockedDistribution(queryDTO);
+        result.setBlockedDataList(blockedList != null ? blockedList : Collections.emptyList());
+        
+        // 提取大队名称列表
+        if (luggageList != null && !luggageList.isEmpty()) {
+            List<String> brigadeNames = luggageList.stream()
+                    .map(BlockedAreaLuggageDTO::getBrigadeName)
+                    .collect(Collectors.toList());
+            result.setBrigadeNames(brigadeNames);
+        } else if (blockedList != null && !blockedList.isEmpty()) {
+            List<String> brigadeNames = blockedList.stream()
+                    .map(BlockedAreaBlockedDTO::getBrigadeName)
+                    .collect(Collectors.toList());
+            result.setBrigadeNames(brigadeNames);
+        } else {
+            result.setBrigadeNames(Collections.emptyList());
+        }
+        
+        return result;
     }
 
     /**
@@ -343,6 +383,18 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
     @Override
     public List<BlockedItemLocationDistributionDTO> getItemLocationDistribution(BlockedDashboardQueryDTO queryDTO) {
         List<BlockedItemLocationDistributionDTO> resultList = blockedDashboardMapper.selectItemLocationDistribution(queryDTO);
+        if (resultList != null && !resultList.isEmpty()) {
+            // 计算总数
+            long totalCount = resultList.stream().mapToLong(item -> item.getCount() != null ? item.getCount() : 0).sum();
+            // 计算百分比
+            if (totalCount > 0) {
+                resultList.forEach(item -> {
+                    long count = item.getCount() != null ? item.getCount() : 0;
+                    double percentage = Math.round(count * 10000.0 / totalCount) / 100.0;
+                    item.setPercentage(java.math.BigDecimal.valueOf(percentage));
+                });
+            }
+        }
         return resultList != null ? resultList : Collections.emptyList();
     }
 
@@ -355,6 +407,18 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
     @Override
     public List<BlockedMissCheckReasonDistributionDTO> getMissCheckReasonDistribution(BlockedDashboardQueryDTO queryDTO) {
         List<BlockedMissCheckReasonDistributionDTO> resultList = blockedDashboardMapper.selectMissCheckReasonDistribution(queryDTO);
+        if (resultList != null && !resultList.isEmpty()) {
+            // 计算总数
+            long totalCount = resultList.stream().mapToLong(item -> item.getCount() != null ? item.getCount() : 0).sum();
+            // 计算百分比
+            if (totalCount > 0) {
+                resultList.forEach(item -> {
+                    long count = item.getCount() != null ? item.getCount() : 0;
+                    double percentage = Math.round(count * 10000.0 / totalCount) / 100.0;
+                    item.setPercentage(java.math.BigDecimal.valueOf(percentage));
+                });
+            }
+        }
         return resultList != null ? resultList : Collections.emptyList();
     }
 
@@ -367,6 +431,18 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
     @Override
     public List<BlockedDifficultyDistributionDTO> getDifficultyDistribution(BlockedDashboardQueryDTO queryDTO) {
         List<BlockedDifficultyDistributionDTO> resultList = blockedDashboardMapper.selectDifficultyDistribution(queryDTO);
+        if (resultList != null && !resultList.isEmpty()) {
+            // 计算总数
+            long totalCount = resultList.stream().mapToLong(item -> item.getCount() != null ? item.getCount() : 0).sum();
+            // 计算百分比
+            if (totalCount > 0) {
+                resultList.forEach(item -> {
+                    long count = item.getCount() != null ? item.getCount() : 0;
+                    double percentage = Math.round(count * 10000.0 / totalCount) / 100.0;
+                    item.setPercentage(java.math.BigDecimal.valueOf(percentage));
+                });
+            }
+        }
         return resultList != null ? resultList : Collections.emptyList();
     }
 
@@ -380,12 +456,20 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
     public List<BlockedCertificateDistributionDTO> getCertificateDistribution(BlockedDashboardQueryDTO queryDTO) {
         List<BlockedCertificateDistributionDTO> resultList = blockedDashboardMapper.selectCertificateDistribution(queryDTO);
         if (resultList != null && !resultList.isEmpty()) {
-            // 转换证书级别为中文
-            resultList.forEach(item -> {
-                if (item.getCertificateLevel() != null) {
-                    item.setCertificateLevel(convertCertificateLevel(item.getCertificateLevel()));
-                }
-            });
+            // 计算总数
+            long totalCount = resultList.stream().mapToLong(item -> item.getCount() != null ? item.getCount() : 0).sum();
+            // 计算百分比
+            if (totalCount > 0) {
+                resultList.forEach(item -> {
+                    long count = item.getCount() != null ? item.getCount() : 0;
+                    double percentage = Math.round(count * 10000.0 / totalCount) / 100.0;
+                    item.setPercentage(java.math.BigDecimal.valueOf(percentage));
+                    // 转换证书级别为中文
+                    if (item.getCertificateLevel() != null) {
+                        item.setCertificateLevel(convertCertificateLevel(item.getCertificateLevel()));
+                    }
+                });
+            }
         }
         return resultList != null ? resultList : Collections.emptyList();
     }
@@ -397,8 +481,8 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
      * @return 大队证书分布统计列表
      */
     @Override
-    public List<BlockedBrigadeCertificateDistributionDTO> getBrigadeCertificateDistribution(BlockedDashboardQueryDTO queryDTO) {
-        List<BlockedBrigadeCertificateDistributionDTO> resultList = blockedDashboardMapper.selectBrigadeCertificateDistribution(queryDTO);
+    public List<BlockedCertificateLevelDTO> getBrigadeCertificateDistribution(BlockedDashboardQueryDTO queryDTO) {
+        List<BlockedCertificateLevelDTO> resultList = blockedDashboardMapper.selectBrigadeCertificateDistribution(queryDTO);
         return resultList != null ? resultList : Collections.emptyList();
     }
 
@@ -537,6 +621,18 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
     @Override
     public List<BlockedGenderDistributionDTO> getGenderDistribution(BlockedDashboardQueryDTO queryDTO) {
         List<BlockedGenderDistributionDTO> resultList = blockedDashboardMapper.selectGenderDistribution(queryDTO);
+        if (resultList != null && !resultList.isEmpty()) {
+            // 计算总数
+            long totalCount = resultList.stream().mapToLong(item -> item.getCount() != null ? item.getCount() : 0).sum();
+            // 计算百分比
+            if (totalCount > 0) {
+                resultList.forEach(item -> {
+                    long count = item.getCount() != null ? item.getCount() : 0;
+                    double percentage = Math.round(count * 10000.0 / totalCount) / 100.0;
+                    item.setPercentage(java.math.BigDecimal.valueOf(percentage));
+                });
+            }
+        }
         return resultList != null ? resultList : Collections.emptyList();
     }
 
@@ -551,6 +647,18 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
     @Override
     public List<BlockedCertificateLevelDistributionDTO> getCertificateLevelDistribution(BlockedDashboardQueryDTO queryDTO) {
         List<BlockedCertificateLevelDistributionDTO> resultList = blockedDashboardMapper.selectCertificateLevelDistribution(queryDTO);
+        if (resultList != null && !resultList.isEmpty()) {
+            // 计算总数
+            long totalCount = resultList.stream().mapToLong(item -> item.getCount() != null ? item.getCount() : 0).sum();
+            // 计算百分比
+            if (totalCount > 0) {
+                resultList.forEach(item -> {
+                    long count = item.getCount() != null ? item.getCount() : 0;
+                    double percentage = Math.round(count * 10000.0 / totalCount) / 100.0;
+                    item.setPercentage(java.math.BigDecimal.valueOf(percentage));
+                });
+            }
+        }
         return resultList != null ? resultList : Collections.emptyList();
     }
 
@@ -566,12 +674,20 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
     public List<BlockedCertificateLevelDistributionDTO> getBrigadePersonnelCertificateBase(BlockedDashboardQueryDTO queryDTO) {
         List<BlockedCertificateLevelDistributionDTO> resultList = blockedDashboardMapper.selectBrigadePersonnelCertificateBase(queryDTO);
         if (resultList != null && !resultList.isEmpty()) {
-            // 转换证书级别为中文
-            resultList.forEach(item -> {
-                if (item.getCertificateLevel() != null) {
-                    item.setCertificateLevel(convertCertificateLevel(item.getCertificateLevel()));
-                }
-            });
+            // 计算总数
+            long totalCount = resultList.stream().mapToLong(item -> item.getCount() != null ? item.getCount() : 0).sum();
+            // 计算百分比
+            if (totalCount > 0) {
+                resultList.forEach(item -> {
+                    long count = item.getCount() != null ? item.getCount() : 0;
+                    double percentage = Math.round(count * 10000.0 / totalCount) / 100.0;
+                    item.setPercentage(java.math.BigDecimal.valueOf(percentage));
+                    // 转换证书级别为中文
+                    if (item.getCertificateLevel() != null) {
+                        item.setCertificateLevel(convertCertificateLevel(item.getCertificateLevel()));
+                    }
+                });
+            }
         }
         return resultList != null ? resultList : Collections.emptyList();
     }
@@ -587,6 +703,18 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
     @Override
     public List<BlockedRankingDTO> getSupervisorDistribution(BlockedDashboardQueryDTO queryDTO) {
         List<BlockedRankingDTO> resultList = blockedDashboardMapper.selectSupervisorDistribution(queryDTO);
+        if (resultList != null && !resultList.isEmpty()) {
+            // 计算总数
+            long totalCount = resultList.stream().mapToLong(item -> item.getTotalCount() != null ? item.getTotalCount() : 0).sum();
+            // 计算百分比
+            if (totalCount > 0) {
+                resultList.forEach(item -> {
+                    long count = item.getTotalCount() != null ? item.getTotalCount() : 0;
+                    double percentage = Math.round(count * 10000.0 / totalCount) / 100.0;
+                    item.setPercentage(java.math.BigDecimal.valueOf(percentage));
+                });
+            }
+        }
         return resultList != null ? resultList : Collections.emptyList();
     }
 
@@ -601,6 +729,18 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
     @Override
     public List<BlockedOperatingYearsDistributionDTO> getOperatingYearsDistribution(BlockedDashboardQueryDTO queryDTO) {
         List<BlockedOperatingYearsDistributionDTO> resultList = blockedDashboardMapper.selectOperatingYearsDistribution(queryDTO);
+        if (resultList != null && !resultList.isEmpty()) {
+            // 计算总数
+            long totalCount = resultList.stream().mapToLong(item -> item.getCount() != null ? item.getCount() : 0).sum();
+            // 计算百分比
+            if (totalCount > 0) {
+                resultList.forEach(item -> {
+                    long count = item.getCount() != null ? item.getCount() : 0;
+                    double percentage = Math.round(count * 10000.0 / totalCount) / 100.0;
+                    item.setPercentage(java.math.BigDecimal.valueOf(percentage));
+                });
+            }
+        }
         return resultList != null ? resultList : Collections.emptyList();
     }
 

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

@@ -296,7 +296,7 @@ public class BlockedLuggageStatisticsDailyServiceImpl implements IBlockedLuggage
      * 
      * @param blockedCount 查堵件数
      * @param luggageCount 过检行李数
-     * @return 万分率
+     * @return 万分率（保留2位小数）
      */
     private BigDecimal calculateBlockRate(Integer blockedCount, Integer luggageCount)
     {
@@ -310,7 +310,7 @@ public class BlockedLuggageStatisticsDailyServiceImpl implements IBlockedLuggage
         }
         return BigDecimal.valueOf(blockedCount)
                 .multiply(BigDecimal.valueOf(10000))
-                .divide(BigDecimal.valueOf(luggageCount), 4, RoundingMode.HALF_UP);
+                .divide(BigDecimal.valueOf(luggageCount), 2, RoundingMode.HALF_UP);
     }
 
     /**

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

@@ -186,8 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectItemDistribution" resultType="com.sundot.airport.blocked.dto.BlockedItemDistributionDTO">
         SELECT 
             miss_check_item as missCheckItem,
-            COUNT(1) as count,
-            ROUND(COUNT(1) * 100.0 / SUM(COUNT(1)) OVER(), 2) as percentage
+            COUNT(1) as count
         FROM blocked_miss_check_statistics
         WHERE del_flag = '0'
         AND miss_check_item IS NOT NULL
@@ -215,13 +214,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY count DESC
     </select>
 
-    <!-- 查询区域查堵数据分布(用于双轴图表) -->
-    <select id="selectAreaDistribution" resultType="com.sundot.airport.blocked.dto.BlockedAreaDistributionDTO">
+    <!-- 查询区域查堵数据分布-过检行李数(柱状图) -->
+    <select id="selectAreaLuggageDistribution" resultType="com.sundot.airport.blocked.dto.BlockedAreaLuggageDTO">
         SELECT 
+            brigade_name as brigadeName,
             COALESCE(SUM(t1_travel_luggage_count), 0) as t1PassengerLuggageCount,
             COALESCE(SUM(t2_travel_luggage_count), 0) as t2PassengerLuggageCount,
             COALESCE(SUM(t1_walk_luggage_count), 0) as t1CargoLuggageCount,
-            COALESCE(SUM(t2_walk_luggage_count), 0) as t2CargoLuggageCount,
+            COALESCE(SUM(t2_walk_luggage_count), 0) as t2CargoLuggageCount
+        FROM blocked_luggage_statistics_daily
+        WHERE del_flag = '0'
+        AND brigade_id IS NOT NULL
+        <if test="startTime != null and endTime != null">
+            AND stat_date &gt;= #{startTime}
+            AND stat_date &lt;= #{endTime}
+        </if>
+        <if test="brigadeId != null">
+            AND brigade_id = #{brigadeId}
+        </if>
+        GROUP BY brigade_id, brigade_name
+        ORDER BY brigade_id
+    </select>
+
+    <!-- 查询区域查堵数据分布-查堵件数(折线图) -->
+    <select id="selectAreaBlockedDistribution" resultType="com.sundot.airport.blocked.dto.BlockedAreaBlockedDTO">
+        SELECT 
+            brigade_name as brigadeName,
             COALESCE(SUM(t1_travel_blocked_count), 0) as t1PassengerBlockedCount,
             COALESCE(SUM(t2_travel_blocked_count), 0) as t2PassengerBlockedCount,
             COALESCE(SUM(t1_walk_blocked_count), 0) as t1CargoBlockedCount,
@@ -236,6 +254,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="brigadeId != null">
             AND brigade_id = #{brigadeId}
         </if>
+        GROUP BY brigade_id, brigade_name
+        ORDER BY brigade_id
     </select>
 
     <!-- 查询查堵类型分布(用于分组柱状图) -->
@@ -481,8 +501,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectItemLocationDistribution" resultType="com.sundot.airport.blocked.dto.BlockedItemLocationDistributionDTO">
         SELECT 
             item_location as itemLocation,
-            COUNT(1) as count,
-            ROUND(COUNT(1) * 100.0 / SUM(COUNT(1)) OVER(), 2) as percentage
+            COUNT(1) as count
         FROM blocked_miss_check_statistics
         WHERE del_flag = '0'
         AND item_location IS NOT NULL
@@ -517,8 +536,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectMissCheckReasonDistribution" resultType="com.sundot.airport.blocked.dto.BlockedMissCheckReasonDistributionDTO">
         SELECT 
             miss_check_reason_category as missCheckReasonCategory,
-            COUNT(1) as count,
-            ROUND(COUNT(1) * 100.0 / SUM(COUNT(1)) OVER(), 2) as percentage
+            COUNT(1) as count
         FROM blocked_miss_check_statistics
         WHERE del_flag = '0'
         AND area_id IS NOT NULL
@@ -551,8 +569,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDifficultyDistribution" resultType="com.sundot.airport.blocked.dto.BlockedDifficultyDistributionDTO">
         SELECT 
             difficulty_level as difficultyLevel,
-            COUNT(1) as count,
-            ROUND(COUNT(1) * 100.0 / SUM(COUNT(1)) OVER(), 2) as percentage
+            COUNT(1) as count
         FROM blocked_miss_check_statistics
         WHERE del_flag = '0'
         AND difficulty_level IS NOT NULL
@@ -584,8 +601,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCertificateDistribution" resultType="com.sundot.airport.blocked.dto.BlockedCertificateDistributionDTO">
         SELECT 
             u.qualification_level as certificateLevel,
-            COUNT(DISTINCT bms.reviewed_user_id) as count,
-            ROUND(COUNT(DISTINCT bms.reviewed_user_id) * 100.0 / SUM(COUNT(DISTINCT bms.reviewed_user_id)) OVER(), 2) as percentage
+            COUNT(DISTINCT bms.reviewed_user_id) as count
         FROM blocked_miss_check_statistics bms
         INNER JOIN sys_user u ON bms.reviewed_user_id = u.user_id
         WHERE bms.del_flag = '0'
@@ -617,15 +633,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <!-- 查询大队开机人员证书分布(用于柱状图) -->
-    <select id="selectBrigadeCertificateDistribution" resultType="com.sundot.airport.blocked.dto.BlockedBrigadeCertificateDistributionDTO">
+    <select id="selectBrigadeCertificateDistribution" resultType="com.sundot.airport.blocked.dto.BlockedCertificateLevelDTO">
         SELECT 
             d.dept_name as brigadeName,
             d.dept_id as brigadeId,
-            COUNT(DISTINCT CASE WHEN u.qualification_level = 'LEVEL_ONE' THEN u.user_id END) as levelOneCount,
-            COUNT(DISTINCT CASE WHEN u.qualification_level = 'LEVEL_TWO' THEN u.user_id END) as levelTwoCount,
-            COUNT(DISTINCT CASE WHEN u.qualification_level = 'LEVEL_THREE' THEN u.user_id END) as levelThreeCount,
-            COUNT(DISTINCT CASE WHEN u.qualification_level = 'LEVEL_FOUR' THEN u.user_id END) as levelFourCount,
-            COUNT(DISTINCT CASE WHEN u.qualification_level = 'LEVEL_FIVE' THEN u.user_id END) as levelFiveCount,
+            COUNT(DISTINCT CASE WHEN u.qualification_level IN ('LEVEL_ONE', 'LEVEL_TWO', 'LEVEL_THREE') THEN u.user_id END) as seniorCount,
+            COUNT(DISTINCT CASE WHEN u.qualification_level = 'LEVEL_FOUR' THEN u.user_id END) as middleCount,
+            COUNT(DISTINCT CASE WHEN u.qualification_level = 'LEVEL_FIVE' THEN u.user_id END) as juniorCount,
             COUNT(DISTINCT u.user_id) as totalCount
         FROM sys_user u
         INNER JOIN sys_dept d ON u.dept_id = d.dept_id
@@ -858,8 +872,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectGenderDistribution" resultType="com.sundot.airport.blocked.dto.BlockedGenderDistributionDTO">
         SELECT 
             gender as gender,
-            COUNT(1) as count,
-            ROUND(COUNT(1) * 100.0 / SUM(COUNT(1)) OVER(), 2) as percentage
+            COUNT(1) as count
         FROM blocked_miss_check_statistics
         WHERE del_flag = '0'
         AND gender IS NOT NULL
@@ -891,8 +904,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCertificateLevelDistribution" resultType="com.sundot.airport.blocked.dto.BlockedCertificateLevelDistributionDTO">
         SELECT 
             certificate_level as certificateLevel,
-            COUNT(1) as count,
-            ROUND(COUNT(1) * 100.0 / SUM(COUNT(1)) OVER(), 2) as percentage
+            COUNT(1) as count
         FROM blocked_miss_check_statistics
         WHERE del_flag = '0'
         AND certificate_level IS NOT NULL
@@ -924,8 +936,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBrigadePersonnelCertificateBase" resultType="com.sundot.airport.blocked.dto.BlockedCertificateLevelDistributionDTO">
         SELECT 
             u.qualification_level as certificateLevel,
-            COUNT(DISTINCT u.user_id) as count,
-            ROUND(COUNT(DISTINCT u.user_id) * 100.0 / SUM(COUNT(DISTINCT u.user_id)) OVER(), 2) as percentage
+            COUNT(DISTINCT u.user_id) as count
         FROM sys_user u
         INNER JOIN sys_dept d ON u.dept_id = d.dept_id
         WHERE u.del_flag = '0'
@@ -945,8 +956,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT 
             supervisor_name as name,
             supervisor_id as id,
-            COUNT(1) as totalCount,
-            ROUND(COUNT(1) * 100.0 / SUM(COUNT(1)) OVER(), 2) as percentage
+            COUNT(1) as totalCount
         FROM blocked_miss_check_statistics
         WHERE del_flag = '0'
         AND supervisor_name IS NOT NULL
@@ -978,8 +988,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectOperatingYearsDistribution" resultType="com.sundot.airport.blocked.dto.BlockedOperatingYearsDistributionDTO">
         SELECT 
             machine_operating_years as operatingYears,
-            COUNT(1) as count,
-            ROUND(COUNT(1) * 100.0 / SUM(COUNT(1)) OVER(), 2) as percentage
+            COUNT(1) as count
         FROM blocked_miss_check_statistics
         WHERE del_flag = '0'
         AND machine_operating_years IS NOT NULL