优化抽问抽答准确率排名的执行时间：减少数据库查询次数；批量计算正确率

airport-exam/src/main/java/com/sundot/airport/exam/service/impl/AccuracyStatisticsServiceImpl.java

@@ -66,67 +66,207 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
     @Autowired
     private ISysUserService userService;
 
-    @Override
-    public AccuracyStatisticsDTO getAccuracyStatistics(AccuracyStatisticsQueryDTO query) {
-        // 获取当前用户信息（从登录信息中获取，确保包含角色信息）
-        Long currentUserId = SecurityUtils.getUserId();
-        Long currentDeptId = SecurityUtils.getDeptId();
-        SysUser currentUser = SecurityUtils.getLoginUser().getUser();
+    /**
+     * 部门数据缓存（请求级别）
+     */
+    private static class DeptCache {
+        List<SysDept> allDepts;
+        Map<Long, SysDept> deptMap;
+        Map<Long, DeptHierarchy> hierarchyMap;
+        // 按部门类型分组的部门列表
+        List<SysDept> teamDepts;
+        List<SysDept> managerDepts;
+        List<SysDept> brigadeDepts;
+        // 班组正确率缓存
+        Map<Long, BigDecimal> teamAccuracyMap;
+
+        DeptCache(List<SysDept> allDepts) {
+            this.allDepts = allDepts;
+            this.deptMap = new HashMap<>();
+            this.hierarchyMap = new HashMap<>();
+            this.teamDepts = new ArrayList<>();
+            this.managerDepts = new ArrayList<>();
+            this.brigadeDepts = new ArrayList<>();
+            this.teamAccuracyMap = new HashMap<>();
+
+            // 初始化部门Map
+            for (SysDept dept : allDepts) {
+                if ("0".equals(dept.getDelFlag())) {
+                    deptMap.put(dept.getDeptId(), dept);
+                    // 按类型分组
+                    if (StrUtil.equals(DeptType.TEAMS.getCode(), dept.getDeptType())) {
+                        teamDepts.add(dept);
+                    } else if (StrUtil.equals(DeptType.MANAGER.getCode(), dept.getDeptType())) {
+                        managerDepts.add(dept);
+                    } else if (StrUtil.equals(DeptType.BRIGADE.getCode(), dept.getDeptType())) {
+                        brigadeDepts.add(dept);
+                    }
+                }
+            }
+        }
 
-        // 调试日志
-        log.info("getAccuracyStatistics - currentUserId: {}, currentDeptId: {}", currentUserId, currentDeptId);
-        log.info("getAccuracyStatistics - currentUser: {}", currentUser != null ? currentUser.getUserName() : "null");
-        log.info("getAccuracyStatistics - currentUser.getRoles(): {}", currentUser != null ? currentUser.getRoles() : "null");
+        /**
+         * 获取部门层级（带缓存）
+         */
+        DeptHierarchy getHierarchy(Long deptId) {
+            if (deptId == null) return new DeptHierarchy();
+            return hierarchyMap.computeIfAbsent(deptId, this::computeHierarchy);
+        }
 
-        AccuracyStatisticsDTO result = new AccuracyStatisticsDTO();
+        private DeptHierarchy computeHierarchy(Long deptId) {
+            DeptHierarchy hierarchy = new DeptHierarchy();
+            SysDept dept = deptMap.get(deptId);
+            if (dept == null) return hierarchy;
 
-        // 获取用户角色
-        String roleKey = getUserRoleKey(currentUser);
-        log.info("getAccuracyStatistics - roleKey: {}", roleKey);
-        if (currentUser != null && currentUser.getRoles() != null && !currentUser.getRoles().isEmpty()) {
-            result.setUserRole(currentUser.getRoles().get(0).getRoleName());
+            String ancestors = dept.getAncestors();
+            String deptType = dept.getDeptType();
+
+            if (ancestors == null || ancestors.trim().isEmpty()) {
+                hierarchy.stationId = deptId;
+                return hierarchy;
+            }
+
+            String[] ancestorIds = ancestors.split(",");
+            if (ancestorIds.length >= 2) {
+                try { hierarchy.stationId = Long.parseLong(ancestorIds[1].trim()); } catch (NumberFormatException ignored) {}
+            }
+            if (ancestorIds.length >= 3) {
+                try { hierarchy.brigadeId = Long.parseLong(ancestorIds[2].trim()); } catch (NumberFormatException ignored) {}
+            }
+            if (ancestorIds.length >= 4) {
+                try { hierarchy.managerId = Long.parseLong(ancestorIds[3].trim()); } catch (NumberFormatException ignored) {}
+            }
+
+            if (StrUtil.equals(DeptType.STATION.getCode(), deptType)) {
+                hierarchy.stationId = deptId;
+            } else if (StrUtil.equals(DeptType.BRIGADE.getCode(), deptType)) {
+                hierarchy.brigadeId = deptId;
+            } else if (StrUtil.equals(DeptType.MANAGER.getCode(), deptType)) {
+                hierarchy.managerId = deptId;
+            } else if (StrUtil.equals(DeptType.TEAMS.getCode(), deptType)) {
+                hierarchy.teamId = deptId;
+            }
+
+            return hierarchy;
         }
+    }
 
-        // 解析时间范围
-        Date[] dateRange = parseDateRange(query);
-        Date startDate = dateRange[0];
-        Date endDate = dateRange[1];
+    /**
+     * ThreadLocal缓存，用于在同一请求中共享部门数据
+     */
+    private static final ThreadLocal<DeptCache> DEPT_CACHE = new ThreadLocal<>();
 
-        // 设置时间范围描述
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        if (startDate != null && endDate != null) {
-            result.setTimePeriod(sdf.format(startDate) + " ~ " + sdf.format(endDate));
+    /**
+     * 初始化部门缓存
+     */
+    private DeptCache initDeptCache() {
+        DeptCache cache = DEPT_CACHE.get();
+        if (cache == null) {
+            long start = System.currentTimeMillis();
+            List<SysDept> allDepts = deptService.selectDeptInfoAll(new SysDept());
+            cache = new DeptCache(allDepts);
+            DEPT_CACHE.set(cache);
+            log.info("initDeptCache: loaded {} depts in {}ms", allDepts.size(), System.currentTimeMillis() - start);
         }
+        return cache;
+    }
 
-        // 获取部门层级信息
-        DeptHierarchy hierarchy = getDeptHierarchy(currentDeptId);
+    /**
+     * 清理缓存
+     */
+    private void clearDeptCache() {
+        DEPT_CACHE.remove();
+    }
 
-        // 检查是否有待完成任务
-        checkPendingTask(result, currentUserId);
+    /**
+     * 获取当前缓存（如果存在）
+     */
+    private DeptCache getDeptCache() {
+        return DEPT_CACHE.get();
+    }
 
-        // 根据角色返回不同的数据
-        if (RoleTypeEnum.SecurityCheck.getCode().equals(roleKey)) {
-            // 安检员
-            calculateSecurityCheckData(result, currentUserId, hierarchy, startDate, endDate);
-        } else if (RoleTypeEnum.banzuzhang.getCode().equals(roleKey)) {
-            // 班组长
-            calculateTeamLeaderData(result, currentUserId, hierarchy, startDate, endDate);
-        } else if (RoleTypeEnum.kezhang.getCode().equals(roleKey)) {
-            // 主管
-            calculateManagerData(result, currentUserId, hierarchy, startDate, endDate);
-        } else if (RoleTypeEnum.jingli.getCode().equals(roleKey) || RoleTypeEnum.xingzheng.getCode().equals(roleKey)) {
-            // 大队长（经理/行政）
-            calculateBrigadeLeaderData(result, hierarchy, startDate, endDate);
-        } else if (RoleTypeEnum.test.getCode().equals(roleKey)) {
-            // 站长
-            calculateStationLeaderData(result, hierarchy, startDate, endDate);
-        } else {
-            // 其他角色：返回基本数据
-            calculatePersonalAccuracy(result, currentUserId, startDate, endDate);
-            calculateLevelAvgAccuracy(result, hierarchy, startDate, endDate);
+    @Override
+    public AccuracyStatisticsDTO getAccuracyStatistics(AccuracyStatisticsQueryDTO query) {
+        long methodStart = System.currentTimeMillis();
+        try {
+            // 初始化部门缓存（整个请求中复用）
+            initDeptCache();
+
+            // 获取当前用户信息（从登录信息中获取，确保包含角色信息）
+            Long currentUserId = SecurityUtils.getUserId();
+            Long currentDeptId = SecurityUtils.getDeptId();
+            SysUser currentUser = SecurityUtils.getLoginUser().getUser();
+
+            // 调试日志
+            log.info("getAccuracyStatistics - currentUserId: {}, currentDeptId: {}", currentUserId, currentDeptId);
+            log.info("getAccuracyStatistics - currentUser: {}", currentUser != null ? currentUser.getUserName() : "null");
+            log.info("getAccuracyStatistics - currentUser.getRoles(): {}", currentUser != null ? currentUser.getRoles() : "null");
+
+            AccuracyStatisticsDTO result = new AccuracyStatisticsDTO();
+
+            // 获取用户角色
+            String roleKey = getUserRoleKey(currentUser);
+            log.info("getAccuracyStatistics - roleKey: {}", roleKey);
+            if (currentUser != null && currentUser.getRoles() != null && !currentUser.getRoles().isEmpty()) {
+                result.setUserRole(currentUser.getRoles().get(0).getRoleName());
+            }
+
+            // 解析时间范围
+            Date[] dateRange = parseDateRange(query);
+            Date startDate = dateRange[0];
+            Date endDate = dateRange[1];
+
+            // 设置时间范围描述
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            if (startDate != null && endDate != null) {
+                result.setTimePeriod(sdf.format(startDate) + " ~ " + sdf.format(endDate));
+            }
+
+            // 获取部门层级信息（使用缓存）
+            DeptHierarchy hierarchy = getDeptHierarchyCached(currentDeptId);
+
+            // 检查是否有待完成任务
+            checkPendingTask(result, currentUserId);
+
+            // 根据角色返回不同的数据
+            if (RoleTypeEnum.SecurityCheck.getCode().equals(roleKey)) {
+                // 安检员
+                calculateSecurityCheckData(result, currentUserId, hierarchy, startDate, endDate);
+            } else if (RoleTypeEnum.banzuzhang.getCode().equals(roleKey)) {
+                // 班组长
+                calculateTeamLeaderData(result, currentUserId, hierarchy, startDate, endDate);
+            } else if (RoleTypeEnum.kezhang.getCode().equals(roleKey)) {
+                // 主管
+                calculateManagerData(result, currentUserId, hierarchy, startDate, endDate);
+            } else if (RoleTypeEnum.jingli.getCode().equals(roleKey) || RoleTypeEnum.xingzheng.getCode().equals(roleKey)) {
+                // 大队长（经理/行政）
+                calculateBrigadeLeaderData(result, hierarchy, startDate, endDate);
+            } else if (RoleTypeEnum.test.getCode().equals(roleKey)) {
+                // 站长
+                calculateStationLeaderData(result, hierarchy, startDate, endDate);
+            } else {
+                // 其他角色：返回基本数据
+                calculatePersonalAccuracy(result, currentUserId, startDate, endDate);
+                calculateLevelAvgAccuracy(result, hierarchy, startDate, endDate);
+            }
+
+            log.info("getAccuracyStatistics completed in {}ms", System.currentTimeMillis() - methodStart);
+            return result;
+        } finally {
+            // 清理缓存，避免内存泄漏
+            clearDeptCache();
         }
+    }
 
-        return result;
+    /**
+     * 获取部门层级（使用缓存）
+     */
+    private DeptHierarchy getDeptHierarchyCached(Long deptId) {
+        DeptCache cache = getDeptCache();
+        if (cache != null) {
+            return cache.getHierarchy(deptId);
+        }
+        return getDeptHierarchy(deptId);
     }
 
     /**
@@ -345,45 +485,60 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
     }
 
     /**
-     * 计算大队下所有主管的正确率
+     * 计算大队下所有主管的正确率（使用缓存和批量计算优化）
      */
     private List<TeamAccuracyInfo> calculateManagerAccuraciesUnderBrigade(Long brigadeId, Date startDate, Date endDate) {
         List<TeamAccuracyInfo> result = new ArrayList<>();
+        DeptCache cache = getDeptCache();
 
-        // 查询大队下所有主管
-        List<SysDept> allDepts = deptService.selectDeptInfoAll(new SysDept());
+        // 使用缓存的主管列表
+        List<SysDept> managerDepts = cache != null ? cache.managerDepts : getManagerDeptsFromDb();
 
-        for (SysDept dept : allDepts) {
-            if (!"0".equals(dept.getDelFlag())) {
-                continue;
-            }
-            if (!StrUtil.equals(DeptType.MANAGER.getCode(), dept.getDeptType())) {
-                continue;
-            }
+        // 收集大队下所有主管及其下属班组
+        List<SysDept> managersInBrigade = new ArrayList<>();
+        Map<Long, List<Long>> managerTeamIdsMap = new HashMap<>();
+        List<Long> allTeamIds = new ArrayList<>();
 
+        for (SysDept dept : managerDepts) {
             // 检查是否属于该大队
             if (brigadeId.equals(dept.getParentId())) {
-                TeamAccuracyInfo info = new TeamAccuracyInfo();
-                info.deptId = dept.getDeptId();
-                info.deptName = dept.getDeptName();
-
-                DeptHierarchy h = getDeptHierarchy(dept.getDeptId());
+                managersInBrigade.add(dept);
+                DeptHierarchy h = cache != null ? cache.getHierarchy(dept.getDeptId()) : getDeptHierarchy(dept.getDeptId());
                 List<Long> teamIds = getTeamIdsUnderDept(dept.getDeptId(), h);
+                managerTeamIdsMap.put(dept.getDeptId(), teamIds);
+                allTeamIds.addAll(teamIds);
+            }
+        }
 
-                if (!teamIds.isEmpty()) {
-                    long[] counts = calculateAccuracyCountsForTeams(teamIds, startDate, endDate);
-                    if (counts[1] > 0) {
-                        info.accuracy = BigDecimal.valueOf(counts[0])
-                                .multiply(BigDecimal.valueOf(100))
-                                .divide(BigDecimal.valueOf(counts[1]), 2, RoundingMode.HALF_UP);
-                    } else {
-                        info.accuracy = BigDecimal.ZERO;
-                    }
-                } else {
-                    info.accuracy = BigDecimal.ZERO;
+        // 批量计算所有班组的正确率
+        Map<Long, long[]> teamCountsMap = allTeamIds.isEmpty() ? new HashMap<>() : batchCalculateAccuracyCountsForTeams(allTeamIds, startDate, endDate);
+
+        // 为每个主管汇总正确率
+        for (SysDept dept : managersInBrigade) {
+            TeamAccuracyInfo info = new TeamAccuracyInfo();
+            info.deptId = dept.getDeptId();
+            info.deptName = dept.getDeptName();
+
+            List<Long> teamIds = managerTeamIdsMap.get(dept.getDeptId());
+            long totalCorrect = 0;
+            long totalCount = 0;
+
+            if (teamIds != null && !teamIds.isEmpty()) {
+                for (Long teamId : teamIds) {
+                    long[] counts = teamCountsMap.getOrDefault(teamId, new long[]{0, 0});
+                    totalCorrect += counts[0];
+                    totalCount += counts[1];
                 }
-                result.add(info);
             }
+
+            if (totalCount > 0) {
+                info.accuracy = BigDecimal.valueOf(totalCorrect)
+                        .multiply(BigDecimal.valueOf(100))
+                        .divide(BigDecimal.valueOf(totalCount), 2, RoundingMode.HALF_UP);
+            } else {
+                info.accuracy = BigDecimal.ZERO;
+            }
+            result.add(info);
         }
 
         // 按正确率降序排序
@@ -393,45 +548,70 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
     }
 
     /**
-     * 计算站级下所有大队的正确率
+     * 从数据库获取主管部门列表（无缓存时使用）
+     */
+    private List<SysDept> getManagerDeptsFromDb() {
+        List<SysDept> allDepts = deptService.selectDeptInfoAll(new SysDept());
+        return allDepts.stream()
+                .filter(d -> "0".equals(d.getDelFlag()) && StrUtil.equals(DeptType.MANAGER.getCode(), d.getDeptType()))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 计算站级下所有大队的正确率（使用缓存和批量计算优化）
      */
     private List<TeamAccuracyInfo> calculateBrigadeAccuraciesUnderStation(Long stationId, Date startDate, Date endDate) {
         List<TeamAccuracyInfo> result = new ArrayList<>();
 
-        // 查询站级下所有大队
-        List<SysDept> allDepts = deptService.selectDeptInfoAll(new SysDept());
+        // 使用缓存的大队列表
+        DeptCache cache = getDeptCache();
+        List<SysDept> brigadeDepts = cache != null ? cache.brigadeDepts : getBrigadeDeptsFromDb();
 
-        for (SysDept dept : allDepts) {
-            if (!"0".equals(dept.getDelFlag())) {
-                continue;
-            }
-            if (!StrUtil.equals(DeptType.BRIGADE.getCode(), dept.getDeptType())) {
-                continue;
-            }
+        // 收集站级下所有大队及其下属班组
+        List<SysDept> brigadesInStation = new ArrayList<>();
+        Map<Long, List<Long>> brigadeTeamIdsMap = new HashMap<>();
+        List<Long> allTeamIds = new ArrayList<>();
 
+        for (SysDept dept : brigadeDepts) {
             // 检查是否属于该站级
             if (stationId.equals(dept.getParentId())) {
-                TeamAccuracyInfo info = new TeamAccuracyInfo();
-                info.deptId = dept.getDeptId();
-                info.deptName = dept.getDeptName();
-
-                DeptHierarchy h = getDeptHierarchy(dept.getDeptId());
+                brigadesInStation.add(dept);
+                DeptHierarchy h = cache != null ? cache.getHierarchy(dept.getDeptId()) : getDeptHierarchy(dept.getDeptId());
                 List<Long> teamIds = getTeamIdsUnderDept(dept.getDeptId(), h);
+                brigadeTeamIdsMap.put(dept.getDeptId(), teamIds);
+                allTeamIds.addAll(teamIds);
+            }
+        }
 
-                if (!teamIds.isEmpty()) {
-                    long[] counts = calculateAccuracyCountsForTeams(teamIds, startDate, endDate);
-                    if (counts[1] > 0) {
-                        info.accuracy = BigDecimal.valueOf(counts[0])
-                                .multiply(BigDecimal.valueOf(100))
-                                .divide(BigDecimal.valueOf(counts[1]), 2, RoundingMode.HALF_UP);
-                    } else {
-                        info.accuracy = BigDecimal.ZERO;
-                    }
-                } else {
-                    info.accuracy = BigDecimal.ZERO;
+        // 批量计算所有班组的正确率
+        Map<Long, long[]> teamCountsMap = allTeamIds.isEmpty() ? new HashMap<>() : batchCalculateAccuracyCountsForTeams(allTeamIds, startDate, endDate);
+
+        // 为每个大队汇总正确率
+        for (SysDept dept : brigadesInStation) {
+            TeamAccuracyInfo info = new TeamAccuracyInfo();
+            info.deptId = dept.getDeptId();
+            info.deptName = dept.getDeptName();
+
+            List<Long> teamIds = brigadeTeamIdsMap.get(dept.getDeptId());
+            long totalCorrect = 0;
+            long totalCount = 0;
+
+            if (teamIds != null && !teamIds.isEmpty()) {
+                for (Long teamId : teamIds) {
+                    long[] counts = teamCountsMap.getOrDefault(teamId, new long[]{0, 0});
+                    totalCorrect += counts[0];
+                    totalCount += counts[1];
                 }
-                result.add(info);
             }
+
+            if (totalCount > 0) {
+                info.accuracy = BigDecimal.valueOf(totalCorrect)
+                        .multiply(BigDecimal.valueOf(100))
+                        .divide(BigDecimal.valueOf(totalCount), 2, RoundingMode.HALF_UP);
+            } else {
+                info.accuracy = BigDecimal.ZERO;
+            }
+            result.add(info);
         }
 
         // 按正确率降序排序
@@ -441,6 +621,16 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
     }
 
     /**
+     * 从数据库获取大队部门列表（无缓存时使用）
+     */
+    private List<SysDept> getBrigadeDeptsFromDb() {
+        List<SysDept> allDepts = deptService.selectDeptInfoAll(new SysDept());
+        return allDepts.stream()
+                .filter(d -> "0".equals(d.getDelFlag()) && StrUtil.equals(DeptType.BRIGADE.getCode(), d.getDeptType()))
+                .collect(Collectors.toList());
+    }
+
+    /**
      * 将班组排名转换为带大队名称的格式
      */
     private List<AccuracyStatisticsDTO.RankingItem> convertToTeamRankingItems(List<TeamAccuracyInfo> rankings, int limit, boolean fromTop, Long brigadeId) {
@@ -518,22 +708,23 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
     }
 
     /**
-     * 获取班组显示名称，格式为"大队名+班组名"，如"一大队张三班组"
+     * 获取班组显示名称，格式为"大队名+班组名"，如"一大队张三班组"（使用缓存优化）
      */
     private String getTeamDisplayNameWithBrigade(Long teamId, String teamName) {
-        SysDept teamDept = deptService.selectDeptById(teamId);
+        DeptCache cache = getDeptCache();
+        SysDept teamDept = cache != null ? cache.deptMap.get(teamId) : deptService.selectDeptById(teamId);
         if (teamDept == null) {
             return teamName;
         }
         // 获取班组所属的主管
         Long managerId = teamDept.getParentId();
         if (managerId != null) {
-            SysDept managerDept = deptService.selectDeptById(managerId);
+            SysDept managerDept = cache != null ? cache.deptMap.get(managerId) : deptService.selectDeptById(managerId);
             if (managerDept != null) {
                 // 获取主管所属的大队
                 Long brigadeId = managerDept.getParentId();
                 if (brigadeId != null) {
-                    SysDept brigadeDept = deptService.selectDeptById(brigadeId);
+                    SysDept brigadeDept = cache != null ? cache.deptMap.get(brigadeId) : deptService.selectDeptById(brigadeId);
                     if (brigadeDept != null && StrUtil.equals(DeptType.BRIGADE.getCode(), brigadeDept.getDeptType())) {
                         return brigadeDept.getDeptName() + teamName;
                     }
@@ -665,22 +856,26 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
 
     @Override
     public DailyTaskAccuracyRankingDto getAccuracyRanking(BaseLargeScreenQueryParamDto dto) {
-        DailyTaskAccuracyRankingDto result = new DailyTaskAccuracyRankingDto();
+        try {
+            // 初始化部门缓存（整个请求中复用）
+            initDeptCache();
 
-        // 获取当前用户信息
-        Long currentUserId = SecurityUtils.getUserId();
-        Long currentDeptId = SecurityUtils.getDeptId();
-        SysUser currentUser = userService.selectUserById(currentUserId);
+            DailyTaskAccuracyRankingDto result = new DailyTaskAccuracyRankingDto();
 
-        // 解析日期范围
-        Date startDate = dto.getStartDate();
-        Date endDate = dto.getEndDate();
-        if (endDate != null) {
-            endDate = DateUtils.addSeconds(DateUtils.truncate(endDate, Calendar.DAY_OF_MONTH), 86399);
-        }
+            // 获取当前用户信息
+            Long currentUserId = SecurityUtils.getUserId();
+            Long currentDeptId = SecurityUtils.getDeptId();
+            SysUser currentUser = userService.selectUserById(currentUserId);
+
+            // 解析日期范围
+            Date startDate = dto.getStartDate();
+            Date endDate = dto.getEndDate();
+            if (endDate != null) {
+                endDate = DateUtils.addSeconds(DateUtils.truncate(endDate, Calendar.DAY_OF_MONTH), 86399);
+            }
 
-        // 获取当前用户的部门层级
-        DeptHierarchy hierarchy = getDeptHierarchy(currentDeptId);
+            // 获取当前用户的部门层级（使用缓存）
+            DeptHierarchy hierarchy = getDeptHierarchyCached(currentDeptId);
 
         // 获取同级别的所有用户正确率排名
         List<UserAccuracyInfo> userRankings = calculateUserRankingsInScope(hierarchy, startDate, endDate);
@@ -723,7 +918,11 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
             result.setMedalTypeDesc(medalType.getDesc());
         }
 
-        return result;
+            return result;
+        } finally {
+            // 清理缓存，避免内存泄漏
+            clearDeptCache();
+        }
     }
 
     @Override
@@ -945,10 +1144,10 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
     }
 
     /**
-     * 计算部门平均正确率
+     * 计算部门平均正确率（使用缓存优化）
      */
     private BigDecimal calculateDeptAvgAccuracy(Long deptId, Date startDate, Date endDate) {
-        DeptHierarchy hierarchy = getDeptHierarchy(deptId);
+        DeptHierarchy hierarchy = getDeptHierarchyCached(deptId);
         List<Long> teamIds = getTeamIdsUnderDept(deptId, hierarchy);
 
         if (teamIds.isEmpty()) {
@@ -994,11 +1193,11 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
     }
 
     /**
-     * 计算用户在指定部门范围内的排名
+     * 计算用户在指定部门范围内的排名（使用缓存优化）
      * 如果用户没有答题记录，将其视为正确率0排在最后
      */
     private AccuracyStatisticsDTO.RankingInfo calculateUserRankingInDept(Long userId, Long deptId, Date startDate, Date endDate) {
-        DeptHierarchy hierarchy = getDeptHierarchy(deptId);
+        DeptHierarchy hierarchy = getDeptHierarchyCached(deptId);
         List<Long> teamIds = getTeamIdsUnderDept(deptId, hierarchy);
 
         AccuracyStatisticsDTO.RankingInfo rankingInfo = new AccuracyStatisticsDTO.RankingInfo();
@@ -1205,38 +1404,48 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
     }
 
     /**
-     * 获取部门下所有班组ID
+     * 获取部门下所有班组ID（使用缓存优化）
      */
     private List<Long> getTeamIdsUnderDept(Long deptId, DeptHierarchy hierarchy) {
         List<Long> teamIds = new ArrayList<>();
+        DeptCache cache = getDeptCache();
 
-        SysDept dept = deptService.selectDeptById(deptId);
+        // 优先使用缓存
+        SysDept dept = cache != null ? cache.deptMap.get(deptId) : deptService.selectDeptById(deptId);
         if (dept == null) {
             log.warn("getTeamIdsUnderDept: dept not found for deptId={}", deptId);
             return teamIds;
         }
 
         String deptType = dept.getDeptType();
-        log.debug("getTeamIdsUnderDept: deptId={}, deptName={}, deptType={}", deptId, dept.getDeptName(), deptType);
 
         if (StrUtil.equals(DeptType.TEAMS.getCode(), deptType)) {
             // 已经是班组，直接返回
             teamIds.add(deptId);
-            log.debug("getTeamIdsUnderDept: dept is already a team, returning [{}]", deptId);
-        } else {
-            // 查询下属所有班组
-            List<SysDept> allDepts = deptService.selectDeptInfoAll(new SysDept());
-            log.debug("getTeamIdsUnderDept: total depts count={}", allDepts.size());
+        } else if (cache != null) {
+            // 使用缓存的班组列表（性能优化核心）
+            for (SysDept d : cache.teamDepts) {
+                DeptHierarchy h = cache.getHierarchy(d.getDeptId());
+                boolean match = false;
 
-            int teamCount = 0;
-            for (SysDept d : allDepts) {
-                if (!"0".equals(d.getDelFlag())) {
-                    continue;
+                if (StrUtil.equals(DeptType.STATION.getCode(), deptType)) {
+                    match = deptId.equals(h.stationId);
+                } else if (StrUtil.equals(DeptType.BRIGADE.getCode(), deptType)) {
+                    match = deptId.equals(h.brigadeId);
+                } else if (StrUtil.equals(DeptType.MANAGER.getCode(), deptType)) {
+                    match = deptId.equals(h.managerId);
                 }
-                if (!StrUtil.equals(DeptType.TEAMS.getCode(), d.getDeptType())) {
-                    continue;
+
+                if (match) {
+                    teamIds.add(d.getDeptId());
                 }
-                teamCount++;
+            }
+        } else {
+            // 无缓存时的原始逻辑
+            List<SysDept> allDepts = deptService.selectDeptInfoAll(new SysDept());
+            for (SysDept d : allDepts) {
+                if (!"0".equals(d.getDelFlag())) continue;
+                if (!StrUtil.equals(DeptType.TEAMS.getCode(), d.getDeptType())) continue;
 
                 DeptHierarchy h = getDeptHierarchy(d.getDeptId());
                 boolean match = false;
@@ -1253,33 +1462,43 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
                     teamIds.add(d.getDeptId());
                 }
             }
-            log.debug("getTeamIdsUnderDept: found {} teams total, {} matching deptId={}", teamCount, teamIds.size(), deptId);
         }
 
         return teamIds;
     }
 
     /**
-     * 计算指定范围内所有用户的正确率排名（用于首页排名）
+     * 计算指定范围内所有用户的正确率排名（用于首页排名，使用缓存优化）
      */
     private List<UserAccuracyInfo> calculateUserRankingsInScope(DeptHierarchy hierarchy, Date startDate, Date endDate) {
         // 获取该层级下所有班组ID
         List<Long> teamIds = new ArrayList<>();
+        DeptCache cache = getDeptCache();
 
         if (hierarchy.stationId != null) {
-            // 查询站级下所有班组
-            List<SysDept> allDepts = deptService.selectDeptInfoAll(new SysDept());
-            for (SysDept dept : allDepts) {
-                if (!"0".equals(dept.getDelFlag())) {
-                    continue;
-                }
-                if (!StrUtil.equals(DeptType.TEAMS.getCode(), dept.getDeptType())) {
-                    continue;
+            // 优先使用缓存
+            if (cache != null) {
+                for (SysDept dept : cache.teamDepts) {
+                    DeptHierarchy deptHierarchy = cache.getHierarchy(dept.getDeptId());
+                    if (hierarchy.stationId.equals(deptHierarchy.stationId)) {
+                        teamIds.add(dept.getDeptId());
+                    }
                 }
+            } else {
+                // 无缓存时查询数据库
+                List<SysDept> allDepts = deptService.selectDeptInfoAll(new SysDept());
+                for (SysDept dept : allDepts) {
+                    if (!"0".equals(dept.getDelFlag())) {
+                        continue;
+                    }
+                    if (!StrUtil.equals(DeptType.TEAMS.getCode(), dept.getDeptType())) {
+                        continue;
+                    }
 
-                DeptHierarchy deptHierarchy = getDeptHierarchy(dept.getDeptId());
-                if (hierarchy.stationId.equals(deptHierarchy.stationId)) {
-                    teamIds.add(dept.getDeptId());
+                    DeptHierarchy deptHierarchy = getDeptHierarchy(dept.getDeptId());
+                    if (hierarchy.stationId.equals(deptHierarchy.stationId)) {
+                        teamIds.add(dept.getDeptId());
+                    }
                 }
             }
         }
@@ -1528,21 +1747,25 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
     }
 
     /**
-     * 计算指定部门下所有班组的正确率
+     * 计算指定部门下所有班组的正确率（批量优化版本）
      */
     private List<TeamAccuracyInfo> calculateTeamAccuraciesUnderDept(Long deptId, Date startDate, Date endDate) {
         List<TeamAccuracyInfo> result = new ArrayList<>();
+        DeptCache cache = getDeptCache();
 
-        DeptHierarchy hierarchy = getDeptHierarchy(deptId);
+        DeptHierarchy hierarchy = cache != null ? cache.getHierarchy(deptId) : getDeptHierarchy(deptId);
         List<Long> teamIds = getTeamIdsUnderDept(deptId, hierarchy);
 
         if (teamIds.isEmpty()) {
             return result;
         }
 
-        // 为每个班组计算正确率
+        // 批量计算所有班组的正确率（核心优化：一次查询代替多次查询）
+        Map<Long, long[]> teamCountsMap = batchCalculateAccuracyCountsForTeams(teamIds, startDate, endDate);
+
+        // 为每个班组设置正确率
         for (Long teamId : teamIds) {
-            SysDept teamDept = deptService.selectDeptById(teamId);
+            SysDept teamDept = cache != null ? cache.deptMap.get(teamId) : deptService.selectDeptById(teamId);
             if (teamDept == null) {
                 continue;
             }
@@ -1551,7 +1774,7 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
             info.deptId = teamId;
             info.deptName = teamDept.getDeptName();
 
-            long[] counts = calculateAccuracyCountsForTeams(Collections.singletonList(teamId), startDate, endDate);
+            long[] counts = teamCountsMap.getOrDefault(teamId, new long[]{0, 0});
             if (counts[1] > 0) {
                 info.accuracy = BigDecimal.valueOf(counts[0])
                         .multiply(BigDecimal.valueOf(100))
@@ -1569,52 +1792,127 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
     }
 
     /**
-     * 计算站级下所有主管的正确率
+     * 批量计算多个班组的正确率数量（性能优化核心方法）
+     * 一次查询所有班组的数据，然后在内存中分组统计
+     * @return Map<班组ID, long[]{正确数, 总数}>
+     */
+    private Map<Long, long[]> batchCalculateAccuracyCountsForTeams(List<Long> teamIds, Date startDate, Date endDate) {
+        Map<Long, long[]> result = new HashMap<>();
+        if (teamIds.isEmpty()) {
+            return result;
+        }
+
+        // 一次性查询所有班组的任务
+        LambdaQueryWrapper<DailyTask> taskWrapper = new LambdaQueryWrapper<>();
+        taskWrapper.in(DailyTask::getDtDeptId, teamIds);
+        taskWrapper.eq(DailyTask::getDtStatus, DailyTaskStatusEnum.COMPLETED.getCode());
+        taskWrapper.eq(DailyTask::getDelStatus, 0);
+        if (startDate != null) {
+            taskWrapper.ge(DailyTask::getDtBusinessDate, startDate);
+        }
+        if (endDate != null) {
+            taskWrapper.le(DailyTask::getDtBusinessDate, endDate);
+        }
+        List<DailyTask> tasks = dailyTaskMapper.selectList(taskWrapper);
+
+        if (tasks.isEmpty()) {
+            return result;
+        }
+
+        // 按班组分组任务
+        Map<Long, List<DailyTask>> tasksByDept = tasks.stream()
+                .filter(t -> t.getDtDeptId() != null)
+                .collect(Collectors.groupingBy(DailyTask::getDtDeptId));
+
+        // 一次性查询所有任务明细
+        List<String> allTaskIds = tasks.stream()
+                .map(DailyTask::getDtId)
+                .collect(Collectors.toList());
+
+        LambdaQueryWrapper<DailyTaskDetail> detailWrapper = new LambdaQueryWrapper<>();
+        detailWrapper.in(DailyTaskDetail::getDtdTaskId, allTaskIds);
+        detailWrapper.eq(DailyTaskDetail::getDelStatus, 0);
+        detailWrapper.isNotNull(DailyTaskDetail::getDtdIsCorrect);
+        List<DailyTaskDetail> allDetails = dailyTaskDetailMapper.selectList(detailWrapper);
+
+        // 按任务ID分组明细
+        Map<String, List<DailyTaskDetail>> detailsByTaskId = allDetails.stream()
+                .collect(Collectors.groupingBy(DailyTaskDetail::getDtdTaskId));
+
+        // 计算每个班组的统计数据
+        for (Map.Entry<Long, List<DailyTask>> entry : tasksByDept.entrySet()) {
+            Long deptId = entry.getKey();
+            List<DailyTask> deptTasks = entry.getValue();
+
+            long totalCount = 0;
+            long correctCount = 0;
+
+            for (DailyTask task : deptTasks) {
+                List<DailyTaskDetail> taskDetails = detailsByTaskId.get(task.getDtId());
+                if (taskDetails != null) {
+                    totalCount += taskDetails.size();
+                    correctCount += taskDetails.stream()
+                            .filter(d -> Boolean.TRUE.equals(d.getDtdIsCorrect()))
+                            .count();
+                }
+            }
+
+            result.put(deptId, new long[]{correctCount, totalCount});
+        }
+
+        return result;
+    }
+
+    /**
+     * 计算站级下所有主管的正确率（使用缓存和批量计算优化）
      */
     private List<TeamAccuracyInfo> calculateManagerAccuraciesUnderStation(Long stationId, Date startDate, Date endDate) {
         List<TeamAccuracyInfo> result = new ArrayList<>();
+        DeptCache cache = getDeptCache();
 
-        // 查询站级下所有主管
-        List<SysDept> allDepts = deptService.selectDeptInfoAll(new SysDept());
-        List<Long> managerIds = new ArrayList<>();
+        // 使用缓存的主管列表
+        List<SysDept> managerDepts = cache != null ? cache.managerDepts : getManagerDeptsFromDb();
 
-        for (SysDept dept : allDepts) {
-            if (!"0".equals(dept.getDelFlag())) {
-                continue;
-            }
-            if (!StrUtil.equals(DeptType.MANAGER.getCode(), dept.getDeptType())) {
-                continue;
-            }
+        // 收集站级下所有主管及其下属班组
+        List<SysDept> managersInStation = new ArrayList<>();
+        Map<Long, List<Long>> managerTeamIdsMap = new HashMap<>();
+        List<Long> allTeamIds = new ArrayList<>();
 
-            DeptHierarchy h = getDeptHierarchy(dept.getDeptId());
+        for (SysDept dept : managerDepts) {
+            DeptHierarchy h = cache != null ? cache.getHierarchy(dept.getDeptId()) : getDeptHierarchy(dept.getDeptId());
             if (stationId.equals(h.stationId)) {
-                managerIds.add(dept.getDeptId());
+                managersInStation.add(dept);
+                List<Long> teamIds = getTeamIdsUnderDept(dept.getDeptId(), h);
+                managerTeamIdsMap.put(dept.getDeptId(), teamIds);
+                allTeamIds.addAll(teamIds);
             }
         }
 
-        // 为每个主管计算正确率
-        for (Long managerId : managerIds) {
-            SysDept managerDept = deptService.selectDeptById(managerId);
-            if (managerDept == null) {
-                continue;
-            }
+        // 批量计算所有班组的正确率
+        Map<Long, long[]> teamCountsMap = allTeamIds.isEmpty() ? new HashMap<>() : batchCalculateAccuracyCountsForTeams(allTeamIds, startDate, endDate);
 
+        // 为每个主管汇总正确率
+        for (SysDept dept : managersInStation) {
             TeamAccuracyInfo info = new TeamAccuracyInfo();
-            info.deptId = managerId;
-            info.deptName = managerDept.getDeptName();
-
-            DeptHierarchy h = getDeptHierarchy(managerId);
-            List<Long> teamIds = getTeamIdsUnderDept(managerId, h);
-
-            if (!teamIds.isEmpty()) {
-                long[] counts = calculateAccuracyCountsForTeams(teamIds, startDate, endDate);
-                if (counts[1] > 0) {
-                    info.accuracy = BigDecimal.valueOf(counts[0])
-                            .multiply(BigDecimal.valueOf(100))
-                            .divide(BigDecimal.valueOf(counts[1]), 2, RoundingMode.HALF_UP);
-                } else {
-                    info.accuracy = BigDecimal.ZERO;
+            info.deptId = dept.getDeptId();
+            info.deptName = dept.getDeptName();
+
+            List<Long> teamIds = managerTeamIdsMap.get(dept.getDeptId());
+            long totalCorrect = 0;
+            long totalCount = 0;
+
+            if (teamIds != null && !teamIds.isEmpty()) {
+                for (Long teamId : teamIds) {
+                    long[] counts = teamCountsMap.getOrDefault(teamId, new long[]{0, 0});
+                    totalCorrect += counts[0];
+                    totalCount += counts[1];
                 }
+            }
+
+            if (totalCount > 0) {
+                info.accuracy = BigDecimal.valueOf(totalCorrect)
+                        .multiply(BigDecimal.valueOf(100))
+                        .divide(BigDecimal.valueOf(totalCount), 2, RoundingMode.HALF_UP);
             } else {
                 info.accuracy = BigDecimal.ZERO;
             }
@@ -1747,17 +2045,18 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
     }
 
     /**
-     * 获取主管显示名称，格式为"大队名+主管名"，如"一大队方圆主管"
+     * 获取主管显示名称，格式为"大队名+主管名"，如"一大队方圆主管"（使用缓存优化）
      */
     private String getManagerDisplayName(Long managerId, String managerName) {
-        SysDept managerDept = deptService.selectDeptById(managerId);
+        DeptCache cache = getDeptCache();
+        SysDept managerDept = cache != null ? cache.deptMap.get(managerId) : deptService.selectDeptById(managerId);
         if (managerDept == null) {
             return managerName;
         }
         // 获取主管所属大队
         Long brigadeId = managerDept.getParentId();
         if (brigadeId != null) {
-            SysDept brigadeDept = deptService.selectDeptById(brigadeId);
+            SysDept brigadeDept = cache != null ? cache.deptMap.get(brigadeId) : deptService.selectDeptById(brigadeId);
             if (brigadeDept != null && StrUtil.equals(DeptType.BRIGADE.getCode(), brigadeDept.getDeptType())) {
                 return brigadeDept.getDeptName() + managerName;
             }