Merge branch 'feature/master-homepage-20260115' into develop

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysHomePageController.java

@@ -140,7 +140,18 @@ public class SysHomePageController extends BaseController {
                 SysDept brigade = deptList.stream().filter(item -> StrUtil.equals(DeptType.BRIGADE.getCode(), item.getDeptType())).findFirst().orElse(null);
                 SysDept station = deptList.stream().filter(item -> StrUtil.equals(DeptType.STATION.getCode(), item.getDeptType())).findFirst().orElse(null);
 
-                // 添加班组、科室、大队、站点信息
+                // 支持dataSource参数：individual=个人数据，team=班组数据（默认）
+                // 仅对班组长权限生效
+                if (DataPermissionType.TEAM == dataPermission.getPermissionType() && "individual".equalsIgnoreCase(dto.getDataSource())) {
+                    // 返回班组长个人数据（类似安检员视角）
+                    SysHomePageDetailQueryParamDto userDto = new SysHomePageDetailQueryParamDto();
+                    userDto.setId(getUserId());
+                    userDto.setName(getLoginUser().getUser().getNickName());
+                    userDto.setType(HomePageQueryEnum.USER.getCode());
+                    dtoList.add(userDto);
+                }
+
+                // 添加班组、主管、大队、站点信息
                 if (ObjectUtil.isNotNull(team)) {
                     SysHomePageDetailQueryParamDto teamDto = new SysHomePageDetailQueryParamDto();
                     teamDto.setId(team.getDeptId());

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

@@ -100,4 +100,12 @@ public class BaseLargeScreenQueryParamDto implements Serializable {
      */
     @ApiModelProperty("大队id")
     private Long inspectBrigadeId;
+
+    /**
+     * 数据来源（仅班组长角色生效）
+     * individual：返回班组长个人数据
+     * team或不传：返回班组数据（默认）
+     */
+    @ApiModelProperty("数据来源：individual=个人数据，team=班组数据")
+    private String dataSource;
 }

airport-exam/src/main/java/com/sundot/airport/exam/dto/AccuracyStatisticsDTO.java

@@ -148,9 +148,9 @@ public class AccuracyStatisticsDTO implements Serializable {
     private java.util.List<RankingItem> brigadeRankingList;
 
     /**
-     * 本大队内Top班组（大队长视角）
+     * 本大队内Top主管（大队长视角）
      */
-    private java.util.List<RankingItem> topTeamsInBrigade;
+    private java.util.List<RankingItem> topKezhangInBrigade;
 
     /**
      * 站级内Top班组

airport-exam/src/main/java/com/sundot/airport/exam/dto/AccuracyStatisticsQueryDTO.java

@@ -54,4 +54,11 @@ public class AccuracyStatisticsQueryDTO implements Serializable {
      * 部门类型（STATION/BRIGADE/MANAGER/TEAMS）
      */
     private String deptType;
+
+    /**
+     * 数据来源（仅班组长角色生效）
+     * individual：返回班组长个人数据
+     * team或不传：返回班组数据（默认）
+     */
+    private String dataSource;
 }

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

@@ -233,8 +233,8 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
                 // 安检员
                 calculateSecurityCheckData(result, currentUserId, hierarchy, startDate, endDate);
             } else if (RoleTypeEnum.banzuzhang.getCode().equals(roleKey)) {
-                // 班组长
-                calculateTeamLeaderData(result, currentUserId, hierarchy, startDate, endDate);
+                // 班组长（支持dataSource参数）
+                calculateTeamLeaderData(result, currentUserId, hierarchy, startDate, endDate, query);
             } else if (RoleTypeEnum.kezhang.getCode().equals(roleKey)) {
                 // 主管
                 calculateManagerData(result, currentUserId, hierarchy, startDate, endDate);
@@ -328,10 +328,22 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
 
     /**
      * 班组长数据计算
-     * 正确率：班平均、主管平均、大队平均、站平均
-     * 排名：主管排名、大队排名、全站排名（班组排名）
+     * 支持dataSource参数：
+     * - individual：返回班组长个人数据（个人正确率、个人在各层级的排名）
+     * - team或空：返回班组数据（班组正确率、班组在各层级的排名）
      */
-    private void calculateTeamLeaderData(AccuracyStatisticsDTO result, Long userId, DeptHierarchy hierarchy, Date startDate, Date endDate) {
+    private void calculateTeamLeaderData(AccuracyStatisticsDTO result, Long userId, DeptHierarchy hierarchy, Date startDate, Date endDate, AccuracyStatisticsQueryDTO query) {
+        // 根据dataSource参数决定返回个人数据还是班组数据
+        if (query != null && "individual".equalsIgnoreCase(query.getDataSource())) {
+            // 返回班组长个人数据（类似安检员的数据）
+            log.info("班组长 {} 查询个人数据（dataSource=individual）", userId);
+            calculateSecurityCheckData(result, userId, hierarchy, startDate, endDate);
+            return;
+        }
+
+        // 默认返回班组数据（dataSource为"team"或未指定）
+        log.info("班组长 {} 查询班组数据（dataSource={}）", userId, query != null ? query.getDataSource() : "null");
+
         // 班平均、主管平均、大队平均、站平均
         if (hierarchy.teamId != null) {
             result.setTeamAvgAccuracy(calculateDeptAvgAccuracy(hierarchy.teamId, startDate, endDate));
@@ -408,7 +420,7 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
     /**
      * 大队长数据计算
      * 正确率：大队平均、站平均
-     * 本大队抽问抽答正确率前三的班组
+     * 本大队正确率前三的主管
      * 全站排名：大队排名/全站大队数总和
      */
     private void calculateBrigadeLeaderData(AccuracyStatisticsDTO result, DeptHierarchy hierarchy, Date startDate, Date endDate) {
@@ -420,12 +432,12 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
             result.setSiteAvgAccuracy(calculateDeptAvgAccuracy(hierarchy.stationId, startDate, endDate));
         }
 
-        // 本大队抽问抽答正确率前三的班组
+        // 本大队正确率前三的主管
         if (hierarchy.brigadeId != null) {
-            List<TeamAccuracyInfo> teamsInBrigade = calculateTeamAccuraciesUnderDept(hierarchy.brigadeId, startDate, endDate);
-            if (!teamsInBrigade.isEmpty()) {
-                List<AccuracyStatisticsDTO.RankingItem> topTeams = convertToTeamRankingItems(teamsInBrigade, 3, true, hierarchy.brigadeId);
-                result.setTopTeamsInBrigade(topTeams);
+            List<TeamAccuracyInfo> managersInBrigade = calculateManagerAccuraciesUnderBrigade(hierarchy.brigadeId, startDate, endDate);
+            if (!managersInBrigade.isEmpty()) {
+                List<AccuracyStatisticsDTO.RankingItem> topManagers = convertToRankingItems(managersInBrigade, 3, true);
+                result.setTopKezhangInBrigade(topManagers);
             }
         }
 
@@ -771,8 +783,8 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
             // 安检员
             calculateSecurityCheckData(result, userId, hierarchy, startDate, endDate);
         } else if (RoleTypeEnum.banzuzhang.getCode().equals(roleKey)) {
-            // 班组长
-            calculateTeamLeaderData(result, userId, hierarchy, startDate, endDate);
+            // 班组长（支持dataSource参数）
+            calculateTeamLeaderData(result, userId, hierarchy, startDate, endDate, query);
         } else if (RoleTypeEnum.kezhang.getCode().equals(roleKey)) {
             // 主管
             calculateManagerData(result, userId, hierarchy, startDate, endDate);
@@ -861,11 +873,8 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
             initDeptCache();
 
             DailyTaskAccuracyRankingDto result = new DailyTaskAccuracyRankingDto();
-
-            // 获取当前用户信息
-            Long currentUserId = SecurityUtils.getUserId();
-            Long currentDeptId = SecurityUtils.getDeptId();
-            SysUser currentUser = userService.selectUserById(currentUserId);
+            result.setTotal(0);
+            result.setRank(0);
 
             // 解析日期范围
             Date startDate = dto.getStartDate();
@@ -874,8 +883,41 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
                 endDate = DateUtils.addSeconds(DateUtils.truncate(endDate, Calendar.DAY_OF_MONTH), 86399);
             }
 
-            // 获取当前用户的部门层级（使用缓存）
-            DeptHierarchy hierarchy = getDeptHierarchyCached(currentDeptId);
+            // 处理用户排名（userId不为空时）
+            if (dto.getUserId() != null) {
+                return getUserAccuracyRanking(dto.getUserId(), startDate, endDate);
+            }
+
+            // 处理部门排名（deptId不为空时，支持dataSource参数）
+            if (dto.getDeptId() != null) {
+                return getDeptAccuracyRanking(dto.getDeptId(), dto.getDataSource(), startDate, endDate);
+            }
+
+            // 默认：获取当前用户的排名
+            Long currentUserId = SecurityUtils.getUserId();
+            return getUserAccuracyRanking(currentUserId, startDate, endDate);
+
+        } finally {
+            // 清理缓存，避免内存泄漏
+            clearDeptCache();
+        }
+    }
+
+    /**
+     * 获取用户的正确率排名
+     */
+    private DailyTaskAccuracyRankingDto getUserAccuracyRanking(Long userId, Date startDate, Date endDate) {
+        DailyTaskAccuracyRankingDto result = new DailyTaskAccuracyRankingDto();
+
+        SysUser user = userService.selectUserById(userId);
+        if (user == null) {
+            result.setTotal(0);
+            result.setRank(0);
+            return result;
+        }
+
+        // 获取用户的部门层级
+        DeptHierarchy hierarchy = getDeptHierarchyCached(user.getDeptId());
 
         // 获取同级别的所有用户正确率排名
         List<UserAccuracyInfo> userRankings = calculateUserRankingsInScope(hierarchy, startDate, endDate);
@@ -898,17 +940,25 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
         int currentUserRank = 0;
         BigDecimal currentUserAccuracy = BigDecimal.ZERO;
         for (int i = 0; i < userRankings.size(); i++) {
-            if (currentUserId.equals(userRankings.get(i).userId)) {
+            if (userId.equals(userRankings.get(i).userId)) {
                 currentUserRank = i + 1;
                 currentUserAccuracy = userRankings.get(i).accuracy;
                 break;
             }
         }
 
-        result.setId(currentUserId);
-        result.setName(currentUser != null ? currentUser.getNickName() : "");
-        result.setRank(currentUserRank);
-        result.setTotal(userRankings.size());
+        result.setId(userId);
+        result.setName(user.getNickName());
+
+        // 如果找不到当前用户，说明该用户没有答题记录，排在最后（正确率为0）
+        if (currentUserRank == 0) {
+            currentUserRank = userRankings.size() + 1;
+            result.setRank(currentUserRank);
+            result.setTotal(userRankings.size() + 1);
+        } else {
+            result.setRank(currentUserRank);
+            result.setTotal(userRankings.size());
+        }
         result.setAccuracyRate(currentUserAccuracy);
 
         // 设置奖牌类型
@@ -918,11 +968,242 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
             result.setMedalTypeDesc(medalType.getDesc());
         }
 
+        return result;
+    }
+
+    /**
+     * 获取部门的正确率排名（支持dataSource参数，适配美兰4级组织结构）
+     * dataSource=individual时：
+     *   - 班组(TEAMS)：返回班组长的个人排名
+     *   - 主管(MANAGER)：返回主管在大队中的排名
+     *   - 大队(BRIGADE)：返回大队在站级中的排名
+     *   - 站级(STATION)：返回站级数据
+     * dataSource=team或空时：返回部门排名（默认）
+     */
+    private DailyTaskAccuracyRankingDto getDeptAccuracyRanking(Long deptId, String dataSource, Date startDate, Date endDate) {
+        DailyTaskAccuracyRankingDto result = new DailyTaskAccuracyRankingDto();
+        result.setTotal(0);
+        result.setRank(0);
+
+        DeptCache cache = getDeptCache();
+        SysDept sysDept = cache != null ? cache.deptMap.get(deptId) : deptService.selectDeptById(deptId);
+        if (sysDept == null) {
+            log.warn("部门{}不存在，返回空结果", deptId);
             return result;
-        } finally {
-            // 清理缓存，避免内存泄漏
-            clearDeptCache();
         }
+
+        String deptType = sysDept.getDeptType();
+        DeptHierarchy hierarchy = getDeptHierarchyCached(deptId);
+
+        // 处理dataSource=individual的情况
+        if ("individual".equalsIgnoreCase(dataSource)) {
+            if (StrUtil.equals(DeptType.TEAMS.getCode(), deptType)) {
+                // 班组：获取班组长的个人排名
+                Long teamLeaderId = getTeamLeaderId(deptId);
+                if (teamLeaderId != null) {
+                    log.info("班组{}，dataSource=individual，返回班组长{}的个人排名", deptId, teamLeaderId);
+                    return getUserAccuracyRanking(teamLeaderId, startDate, endDate);
+                } else {
+                    log.warn("未找到班组{}的班组长，返回空结果", deptId);
+                    return result;
+                }
+            } else if (StrUtil.equals(DeptType.MANAGER.getCode(), deptType)) {
+                // 主管：返回主管在大队中的排名
+                log.info("主管{}，dataSource=individual，返回主管在大队中的排名", deptId);
+                return getManagerInBrigadeRanking(sysDept, hierarchy, startDate, endDate);
+            } else if (StrUtil.equals(DeptType.BRIGADE.getCode(), deptType)) {
+                // 大队：返回大队在站级中的排名
+                log.info("大队{}，dataSource=individual，返回大队在站级中的排名", deptId);
+                return getBrigadeInStationRanking(sysDept, hierarchy, startDate, endDate);
+            } else if (StrUtil.equals(DeptType.STATION.getCode(), deptType)) {
+                // 站级：返回站级数据
+                log.info("站级{}，dataSource=individual，返回站级数据", deptId);
+                result.setId(sysDept.getDeptId());
+                result.setName(sysDept.getDeptName());
+                BigDecimal accuracy = calculateDeptAvgAccuracy(deptId, startDate, endDate);
+                result.setAccuracyRate(accuracy);
+                result.setRank(1);
+                result.setTotal(1);
+                return result;
+            }
+        }
+
+        // 默认：返回部门排名（dataSource=team或未指定）
+        log.info("dataSource={}，返回部门排名", dataSource);
+        return getDeptDefaultRanking(sysDept, hierarchy, startDate, endDate);
+    }
+
+    /**
+     * 获取班组的班组长userId
+     */
+    private Long getTeamLeaderId(Long teamDeptId) {
+        List<SysUser> users = userService.selectUserListByRoleKeyAndDeptId(
+                Collections.singletonList(RoleTypeEnum.banzuzhang.getCode()), teamDeptId);
+        if (users != null && !users.isEmpty()) {
+            return users.get(0).getUserId();
+        }
+        return null;
+    }
+
+    /**
+     * 获取主管在大队中的排名
+     */
+    private DailyTaskAccuracyRankingDto getManagerInBrigadeRanking(SysDept managerDept, DeptHierarchy hierarchy, Date startDate, Date endDate) {
+        DailyTaskAccuracyRankingDto result = new DailyTaskAccuracyRankingDto();
+        result.setId(managerDept.getDeptId());
+        result.setName(managerDept.getDeptName());
+
+        if (hierarchy.brigadeId == null) {
+            result.setRank(1);
+            result.setTotal(1);
+            result.setAccuracyRate(calculateDeptAvgAccuracy(managerDept.getDeptId(), startDate, endDate));
+            return result;
+        }
+
+        // 获取大队下所有主管的排名
+        List<TeamAccuracyInfo> managersInBrigade = calculateManagerAccuraciesUnderBrigade(hierarchy.brigadeId, startDate, endDate);
+
+        // 设置排名列表
+        List<DailyTaskAccuracyRankingItemDto> rankingList = new ArrayList<>();
+        for (int i = 0; i < managersInBrigade.size(); i++) {
+            TeamAccuracyInfo info = managersInBrigade.get(i);
+            DailyTaskAccuracyRankingItemDto item = new DailyTaskAccuracyRankingItemDto();
+            item.setId(info.deptId);
+            item.setName(info.deptName);
+            item.setAccuracyRate(info.accuracy);
+            item.setRank(i + 1);
+            rankingList.add(item);
+        }
+        result.setRankingList(rankingList);
+
+        // 查找当前主管的排名
+        AccuracyStatisticsDTO.RankingInfo rankingInfo = findTeamRanking(managerDept.getDeptId(), managersInBrigade);
+        result.setRank(rankingInfo.getRank());
+        result.setTotal(rankingInfo.getTotal());
+
+        // 设置正确率
+        BigDecimal accuracy = calculateDeptAvgAccuracy(managerDept.getDeptId(), startDate, endDate);
+        result.setAccuracyRate(accuracy);
+
+        // 设置奖牌类型
+        if (rankingInfo.getTotal() > 0 && rankingInfo.getRank() > 0) {
+            MedalTypeEnum medalType = calculateMedalType(rankingInfo.getRank(), rankingInfo.getTotal());
+            result.setMedalType(medalType.getCode());
+            result.setMedalTypeDesc(medalType.getDesc());
+        }
+
+        return result;
+    }
+
+    /**
+     * 获取大队在站级中的排名
+     */
+    private DailyTaskAccuracyRankingDto getBrigadeInStationRanking(SysDept brigadeDept, DeptHierarchy hierarchy, Date startDate, Date endDate) {
+        DailyTaskAccuracyRankingDto result = new DailyTaskAccuracyRankingDto();
+        result.setId(brigadeDept.getDeptId());
+        result.setName(brigadeDept.getDeptName());
+
+        if (hierarchy.stationId == null) {
+            result.setRank(1);
+            result.setTotal(1);
+            result.setAccuracyRate(calculateDeptAvgAccuracy(brigadeDept.getDeptId(), startDate, endDate));
+            return result;
+        }
+
+        // 获取站级下所有大队的排名
+        List<TeamAccuracyInfo> brigadesInStation = calculateBrigadeAccuraciesUnderStation(hierarchy.stationId, startDate, endDate);
+
+        // 设置排名列表
+        List<DailyTaskAccuracyRankingItemDto> rankingList = new ArrayList<>();
+        for (int i = 0; i < brigadesInStation.size(); i++) {
+            TeamAccuracyInfo info = brigadesInStation.get(i);
+            DailyTaskAccuracyRankingItemDto item = new DailyTaskAccuracyRankingItemDto();
+            item.setId(info.deptId);
+            item.setName(info.deptName);
+            item.setAccuracyRate(info.accuracy);
+            item.setRank(i + 1);
+            rankingList.add(item);
+        }
+        result.setRankingList(rankingList);
+
+        // 查找当前大队的排名
+        AccuracyStatisticsDTO.RankingInfo rankingInfo = findTeamRanking(brigadeDept.getDeptId(), brigadesInStation);
+        result.setRank(rankingInfo.getRank());
+        result.setTotal(rankingInfo.getTotal());
+
+        // 设置正确率
+        BigDecimal accuracy = calculateDeptAvgAccuracy(brigadeDept.getDeptId(), startDate, endDate);
+        result.setAccuracyRate(accuracy);
+
+        // 设置奖牌类型
+        if (rankingInfo.getTotal() > 0 && rankingInfo.getRank() > 0) {
+            MedalTypeEnum medalType = calculateMedalType(rankingInfo.getRank(), rankingInfo.getTotal());
+            result.setMedalType(medalType.getCode());
+            result.setMedalTypeDesc(medalType.getDesc());
+        }
+
+        return result;
+    }
+
+    /**
+     * 获取部门的默认排名（班组在主管中的排名）
+     */
+    private DailyTaskAccuracyRankingDto getDeptDefaultRanking(SysDept dept, DeptHierarchy hierarchy, Date startDate, Date endDate) {
+        DailyTaskAccuracyRankingDto result = new DailyTaskAccuracyRankingDto();
+        result.setId(dept.getDeptId());
+        result.setName(dept.getDeptName());
+
+        String deptType = dept.getDeptType();
+
+        if (StrUtil.equals(DeptType.TEAMS.getCode(), deptType)) {
+            // 班组：返回班组在主管中的排名
+            if (hierarchy.managerId != null) {
+                List<TeamAccuracyInfo> teamsInManager = calculateTeamAccuraciesUnderDept(hierarchy.managerId, startDate, endDate);
+
+                // 设置排名列表
+                List<DailyTaskAccuracyRankingItemDto> rankingList = new ArrayList<>();
+                for (int i = 0; i < teamsInManager.size(); i++) {
+                    TeamAccuracyInfo info = teamsInManager.get(i);
+                    DailyTaskAccuracyRankingItemDto item = new DailyTaskAccuracyRankingItemDto();
+                    item.setId(info.deptId);
+                    item.setName(info.deptName);
+                    item.setAccuracyRate(info.accuracy);
+                    item.setRank(i + 1);
+                    rankingList.add(item);
+                }
+                result.setRankingList(rankingList);
+
+                AccuracyStatisticsDTO.RankingInfo rankingInfo = findTeamRanking(dept.getDeptId(), teamsInManager);
+                result.setRank(rankingInfo.getRank());
+                result.setTotal(rankingInfo.getTotal());
+            } else {
+                result.setRank(1);
+                result.setTotal(1);
+            }
+        } else if (StrUtil.equals(DeptType.MANAGER.getCode(), deptType)) {
+            // 主管：返回主管在大队中的排名
+            return getManagerInBrigadeRanking(dept, hierarchy, startDate, endDate);
+        } else if (StrUtil.equals(DeptType.BRIGADE.getCode(), deptType)) {
+            // 大队：返回大队在站级中的排名
+            return getBrigadeInStationRanking(dept, hierarchy, startDate, endDate);
+        } else {
+            // 站级
+            result.setRank(1);
+            result.setTotal(1);
+        }
+
+        // 设置正确率
+        BigDecimal accuracy = calculateDeptAvgAccuracy(dept.getDeptId(), startDate, endDate);
+        result.setAccuracyRate(accuracy);
+
+        // 设置奖牌类型
+        if (result.getTotal() > 0 && result.getRank() > 0) {
+            MedalTypeEnum medalType = calculateMedalType(result.getRank(), result.getTotal());
+            result.setMedalType(medalType.getCode());
+            result.setMedalTypeDesc(medalType.getDesc());
+        }
+
+        return result;
     }
 
     @Override