查堵大屏--开发

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

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 查堵大屏Mapper接口
@@ -233,11 +234,12 @@ public interface BlockedDashboardMapper {
 
     /**
      * 查询大队开机人员证书分布(用于柱状图)
+     * 返回原始数据，由Service层按大队分组统计
      * 
      * @param queryDTO 查询参数
-     * @return 大队证书分布统计列表
+     * @return 用户和部门信息列表
      */
-    List<BlockedCertificateLevelDTO> selectBrigadeCertificateDistribution(BlockedDashboardQueryDTO queryDTO);
+    List<Map<String, Object>> selectBrigadeCertificateDistribution(BlockedDashboardQueryDTO queryDTO);
 
     /**
      * 查询两楼每日查堵走势(按大队)
@@ -357,12 +359,12 @@ public interface BlockedDashboardMapper {
     /**
      * 查询证书级别人员基数(分大队统计)
      * 数据源：用户表(sys_user) + 部门表(sys_dept)
-     * 统计大队人员里面的人员证书级别构成
+     * 返回原始数据，由Service层处理
      * 
      * @param queryDTO 查询参数（大队ID必填）
-     * @return 证书级别人员基数统计列表
+     * @return 用户和部门信息列表
      */
-    List<BlockedCertificateLevelDistributionDTO> selectBrigadePersonnelCertificateBase(BlockedDashboardQueryDTO queryDTO);
+    List<Map<String, Object>> selectBrigadePersonnelCertificateBase(BlockedDashboardQueryDTO queryDTO);
 
     /**
      * 查询查堵人员开机年限分布(用于饼图)

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

@@ -34,12 +34,13 @@ import com.sundot.airport.blocked.dto.BlockedTimePeriodLuggageStatsDTO;
 import com.sundot.airport.blocked.dto.BlockedTimePeriodStatsDTO;
 import com.sundot.airport.blocked.mapper.BlockedDashboardMapper;
 import com.sundot.airport.blocked.service.IBlockedDashboardService;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.system.mapper.SysDeptMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -53,6 +54,9 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
 
     @Autowired
     private BlockedDashboardMapper blockedDashboardMapper;
+    
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
 
     /**
      * 查询查堵总数
@@ -476,14 +480,213 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
 
     /**
      * 查询大队开机人员证书分布(用于柱状图)
+     * 通过ancestors字段找到每个用户所属的最上级大队，然后按大队分组统计
      * 
      * @param queryDTO 查询参数
      * @return 大队证书分布统计列表
      */
     @Override
     public List<BlockedCertificateLevelDTO> getBrigadeCertificateDistribution(BlockedDashboardQueryDTO queryDTO) {
-        List<BlockedCertificateLevelDTO> resultList = blockedDashboardMapper.selectBrigadeCertificateDistribution(queryDTO);
-        return resultList != null ? resultList : Collections.emptyList();
+        // 1. 从数据库获取原始数据
+        List<Map<String, Object>> rawData = blockedDashboardMapper.selectBrigadeCertificateDistribution(queryDTO);
+        
+        if (rawData == null || rawData.isEmpty()) {
+            return Collections.emptyList();
+        }
+        
+        // 2. 收集所有需要查询的部门ID（包括ancestors中的所有ID和当前dept_id）
+        Set<Long> allDeptIds = new HashSet<>();
+        for (Map<String, Object> row : rawData) {
+            String ancestors = (String) row.get("ancestors");
+            Long deptId = ((Number) row.get("dept_id")).longValue();
+            
+            if (ancestors != null && !ancestors.isEmpty()) {
+                String[] ancestorIds = ancestors.split(",");
+                for (String idStr : ancestorIds) {
+                    try {
+                        Long id = Long.parseLong(idStr.trim());
+                        if (id > 0) {
+                            allDeptIds.add(id);
+                        }
+                    } catch (NumberFormatException e) {
+                        // 忽略
+                    }
+                }
+            }
+            if (deptId != null) {
+                allDeptIds.add(deptId);
+            }
+        }
+        
+        // 3. 批量查询所有部门信息，构建大队ID映射缓存
+        Map<Long, Long> deptToBrigadeMap = buildDeptToBrigadeMap(allDeptIds);
+        
+        // 4. 在Java层按大队分组统计
+        Map<Long, BlockedCertificateLevelDTO> brigadeMap = new LinkedHashMap<>();
+        
+        for (Map<String, Object> row : rawData) {
+            String qualificationLevel = (String) row.get("qualification_level");
+            Long deptId = ((Number) row.get("dept_id")).longValue();
+            
+            // 5. 从缓存中获取大队ID
+            Long brigadeId = deptToBrigadeMap.get(deptId);
+            
+            if (brigadeId == null) {
+                continue; // 跳过无法找到大队的用户
+            }
+            
+            // 6. 获取或创建大队统计对象
+            BlockedCertificateLevelDTO stats = brigadeMap.computeIfAbsent(brigadeId, id -> {
+                BlockedCertificateLevelDTO dto = new BlockedCertificateLevelDTO();
+                dto.setBrigadeId(id);
+                dto.setSeniorCount(0);
+                dto.setMiddleCount(0);
+                dto.setJuniorCount(0);
+                dto.setTotalCount(0);
+                return dto;
+            });
+            
+            // 7. 根据证书级别统计
+            if ("LEVEL_ONE".equals(qualificationLevel) || 
+                "LEVEL_TWO".equals(qualificationLevel) || 
+                "LEVEL_THREE".equals(qualificationLevel)) {
+                stats.setSeniorCount(stats.getSeniorCount() + 1);
+            } else if ("LEVEL_FOUR".equals(qualificationLevel)) {
+                stats.setMiddleCount(stats.getMiddleCount() + 1);
+            } else if ("LEVEL_FIVE".equals(qualificationLevel)) {
+                stats.setJuniorCount(stats.getJuniorCount() + 1);
+            }
+            
+            stats.setTotalCount(stats.getTotalCount() + 1);
+        }
+        
+        // 8. 转换为列表并填充大队名称
+        List<BlockedCertificateLevelDTO> resultList = new ArrayList<>(brigadeMap.values());
+        fillBrigadeNames(resultList);
+        
+        // 9. 按总人数降序排序
+        resultList.sort((a, b) -> b.getTotalCount().compareTo(a.getTotalCount()));
+        
+        return resultList;
+    }
+    
+    /**
+     * 构建部门到大队的映射关系
+     * 遍历所有部门的ancestors，找到每个部门所属的最上级大队
+     * 
+     * @param allDeptIds 所有需要查询的部门ID集合
+     * @return 部门ID -> 大队ID 的映射
+     */
+    private Map<Long, Long> buildDeptToBrigadeMap(Set<Long> allDeptIds) {
+        if (allDeptIds == null || allDeptIds.isEmpty()) {
+            return Collections.emptyMap();
+        }
+        
+        // 1. 批量查询所有部门信息
+        List<SysDept> allDepts = sysDeptMapper.selectDeptByIdList(new ArrayList<>(allDeptIds));
+        
+        if (allDepts == null || allDepts.isEmpty()) {
+            return Collections.emptyMap();
+        }
+        
+        // 2. 构建部门ID到部门对象的映射
+        Map<Long, SysDept> deptMap = new HashMap<>();
+        for (SysDept dept : allDepts) {
+            deptMap.put(dept.getDeptId(), dept);
+        }
+        
+        // 3. 找出所有大队类型的部门ID
+        Set<Long> brigadeIds = new HashSet<>();
+        for (SysDept dept : allDepts) {
+            if ("BRIGADE".equals(dept.getDeptType())) {
+                brigadeIds.add(dept.getDeptId());
+            }
+        }
+        
+        // 4. 为每个部门找到其所属的最上级大队
+        Map<Long, Long> deptToBrigadeMap = new HashMap<>();
+        for (SysDept dept : allDepts) {
+            Long brigadeId = findBrigadeIdFromAncestors(dept.getAncestors(), dept.getDeptId(), brigadeIds);
+            if (brigadeId != null) {
+                deptToBrigadeMap.put(dept.getDeptId(), brigadeId);
+            }
+        }
+        
+        return deptToBrigadeMap;
+    }
+    
+    /**
+     * 从ancestors中找到最上级大队ID
+     * 
+     * @param ancestors 祖级列表
+     * @param currentDeptId 当前部门ID
+     * @param brigadeIds 所有大队ID集合
+     * @return 最上级大队ID，如果找不到则返回null
+     */
+    private Long findBrigadeIdFromAncestors(String ancestors, Long currentDeptId, Set<Long> brigadeIds) {
+        if (ancestors == null || ancestors.isEmpty()) {
+            return null;
+        }
+        
+        // 将ancestors分割成ID列表
+        String[] ancestorIds = ancestors.split(",");
+        
+        // 遍历祖先节点，找到第一个大队类型的部门
+        for (String ancestorIdStr : ancestorIds) {
+            try {
+                Long ancestorId = Long.parseLong(ancestorIdStr.trim());
+                if (ancestorId > 0 && brigadeIds.contains(ancestorId)) {
+                    return ancestorId;
+                }
+            } catch (NumberFormatException e) {
+                // 忽略解析错误
+            }
+        }
+        
+        // 如果祖先节点中没有找到大队，检查当前部门是否为大队
+        if (currentDeptId != null && brigadeIds.contains(currentDeptId)) {
+            return currentDeptId;
+        }
+        
+        return null;
+    }
+    
+    /**
+     * 填充大队名称（批量查询）
+     * 
+     * @param resultList 统计结果列表
+     */
+    private void fillBrigadeNames(List<BlockedCertificateLevelDTO> resultList) {
+        if (resultList == null || resultList.isEmpty()) {
+            return;
+        }
+        
+        // 收集所有大队ID
+        List<Long> brigadeIds = resultList.stream()
+                .map(BlockedCertificateLevelDTO::getBrigadeId)
+                .filter(Objects::nonNull)
+                .distinct()
+                .collect(Collectors.toList());
+        
+        if (brigadeIds.isEmpty()) {
+            return;
+        }
+        
+        // 批量查询大队信息
+        List<SysDept> brigades = sysDeptMapper.selectDeptByIdList(brigadeIds);
+        
+        // 构建大队ID到名称的映射
+        Map<Long, String> brigadeNameMap = new HashMap<>();
+        for (SysDept dept : brigades) {
+            brigadeNameMap.put(dept.getDeptId(), dept.getDeptName());
+        }
+        
+        // 填充名称
+        for (BlockedCertificateLevelDTO dto : resultList) {
+            if (dto.getBrigadeId() != null) {
+                dto.setBrigadeName(brigadeNameMap.get(dto.getBrigadeId()));
+            }
+        }
     }
 
     /**
@@ -665,31 +868,55 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
     /**
      * 查询证书级别人员基数(分大队统计)
      * 数据源：用户表(sys_user) + 部门表(sys_dept)
-     * 统计大队人员里面的人员证书级别构成
-     * 
+     * 统计指定大队及其下属所有部门的人员证书级别构成
+     *
      * @param queryDTO 查询参数（大队ID必填）
      * @return 证书级别人员基数统计列表
      */
     @Override
     public List<BlockedCertificateLevelDistributionDTO> getBrigadePersonnelCertificateBase(BlockedDashboardQueryDTO queryDTO) {
-        List<BlockedCertificateLevelDistributionDTO> resultList = blockedDashboardMapper.selectBrigadePersonnelCertificateBase(queryDTO);
-        if (resultList != null && !resultList.isEmpty()) {
-            // 计算总数
-            long totalCount = resultList.stream().mapToLong(item -> item.getCount() != null ? item.getCount() : 0).sum();
+        // 1. 从数据库获取原始数据
+        List<Map<String, Object>> rawData = blockedDashboardMapper.selectBrigadePersonnelCertificateBase(queryDTO);
+        
+        if (rawData == null || rawData.isEmpty()) {
+            return Collections.emptyList();
+        }
+        
+        // 2. 按证书级别分组统计
+        Map<String, Long> levelCountMap = new HashMap<>();
+        long totalCount = 0;
+        
+        for (Map<String, Object> row : rawData) {
+            String qualificationLevel = (String) row.get("qualification_level");
+            if (qualificationLevel != null && !qualificationLevel.isEmpty()) {
+                levelCountMap.merge(qualificationLevel, 1L, Long::sum);
+                totalCount++;
+            }
+        }
+        
+        // 3. 构建结果列表
+        List<BlockedCertificateLevelDistributionDTO> resultList = new ArrayList<>();
+        for (Map.Entry<String, Long> entry : levelCountMap.entrySet()) {
+            BlockedCertificateLevelDistributionDTO dto = new BlockedCertificateLevelDistributionDTO();
+            dto.setCertificateLevel(convertCertificateLevel(entry.getKey()));
+            dto.setCount(entry.getValue().intValue());
+            
             // 计算百分比
             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()));
-                    }
-                });
+                double percentage = Math.round(entry.getValue() * 10000.0 / totalCount) / 100.0;
+                dto.setPercentage(java.math.BigDecimal.valueOf(percentage));
             }
+            
+            resultList.add(dto);
         }
-        return resultList != null ? resultList : Collections.emptyList();
+        
+        // 4. 按数量降序排序
+        resultList.sort((a, b) -> Long.compare(
+            b.getCount() != null ? b.getCount() : 0,
+            a.getCount() != null ? a.getCount() : 0
+        ));
+        
+        return resultList;
     }
 
     /**

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

@@ -633,26 +633,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <!-- 查询大队开机人员证书分布(用于柱状图) -->
-    <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 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
+    <!-- 查询大队证书等级分布(按大队) - 返回用户和部门信息，由Java层处理 -->
+    <select id="selectBrigadeCertificateDistribution" resultType="java.util.HashMap">
+        SELECT 
+            u.user_id,
+            u.qualification_level,
+            d.dept_id,
+            d.ancestors
         FROM sys_user u
         INNER JOIN sys_dept d ON u.dept_id = d.dept_id
         WHERE u.del_flag = '0'
         AND u.status = '0'
         AND u.qualification_level IS NOT NULL
         AND u.qualification_level != ''
-        AND d.dept_type = 'BRIGADE'
         <if test="terminalId != null">
             AND d.terminal_id = #{terminalId}
         </if>
-        GROUP BY d.dept_id, d.dept_name
-        ORDER BY totalCount DESC
     </select>
 
     <!-- 查询两楼每日查堵走势(按大队) -->
@@ -932,23 +928,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY count DESC
     </select>
 
-    <!-- 查询证书级别人员基数(分大队统计) -->
-    <select id="selectBrigadePersonnelCertificateBase" resultType="com.sundot.airport.blocked.dto.BlockedCertificateLevelDistributionDTO">
+    <!-- 查询证书级别人员基数(分大队统计)-->
+    <select id="selectBrigadePersonnelCertificateBase" resultType="java.util.HashMap">
         SELECT 
-            u.qualification_level as certificateLevel,
-            COUNT(DISTINCT u.user_id) as count
+            u.user_id,
+            u.qualification_level,
+            d.dept_id,
+            d.ancestors
         FROM sys_user u
         INNER JOIN sys_dept d ON u.dept_id = d.dept_id
         WHERE u.del_flag = '0'
         AND u.status = '0'
         AND u.qualification_level IS NOT NULL
         AND u.qualification_level != ''
-        AND d.dept_type = 'BRIGADE'
         <if test="brigadeId != null">
-            AND d.dept_id = #{brigadeId}
+            AND (
+                d.dept_id = #{brigadeId}
+                OR d.ancestors LIKE CONCAT('%,', #{brigadeId}, ',%')
+                OR d.ancestors LIKE CONCAT(#{brigadeId}, ',%')
+                OR d.ancestors LIKE CONCAT('%,', #{brigadeId})
+            )
         </if>
-        GROUP BY u.qualification_level
-        ORDER BY count DESC
     </select>
 
     <!-- 查询查堵-主管分管次数分布(用于饼图) -->