合并 619b47f9: 大屏时间筛选、权限修复、接口缓存等

1. 大屏显示增加时间段筛选参数
2. 美兰正式环境抽问抽答任务管理权限修复
3. 增加接口缓存
4. 实现获取选择部门下所有的成员数据

airport-admin/src/main/java/com/sundot/airport/web/controller/exam/WeakModuleRuleController.java

@@ -41,7 +41,7 @@ public class WeakModuleRuleController extends BaseController {
      * 查询规则列表
      */
     @ApiOperation("查询规则列表")
-    @PreAuthorize("@ss.hasPermi('exam:weakModuleRule:list')")
+    @PreAuthorize("@ss.hasPermi('exam:weakModuleRule:list') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
     @GetMapping("/list")
     public TableDataInfo list() {
         startPage();
@@ -53,7 +53,7 @@ public class WeakModuleRuleController extends BaseController {
      * 获取规则详情
      */
     @ApiOperation("获取规则详情")
-    @PreAuthorize("@ss.hasPermi('exam:weakModuleRule:query')")
+    @PreAuthorize("@ss.hasPermi('exam:weakModuleRule:query') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
     @GetMapping("/{id}")
     public AjaxResult getInfo(@PathVariable Long id) {
         return success(weakModuleRuleService.getById(id));
@@ -63,7 +63,7 @@ public class WeakModuleRuleController extends BaseController {
      * 新增规则
      */
     @ApiOperation("新增规则")
-    @PreAuthorize("@ss.hasPermi('exam:weakModuleRule:add')")
+    @PreAuthorize("@ss.hasPermi('exam:weakModuleRule:add') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
     @PostMapping
     public AjaxResult add(@Validated @RequestBody WeakModuleRuleDTO dto) {
         return toAjax(weakModuleRuleService.insert(dto));
@@ -73,7 +73,7 @@ public class WeakModuleRuleController extends BaseController {
      * 修改规则
      */
     @ApiOperation("修改规则")
-    @PreAuthorize("@ss.hasPermi('exam:weakModuleRule:edit')")
+    @PreAuthorize("@ss.hasPermi('exam:weakModuleRule:edit') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody WeakModuleRuleDTO dto) {
         return toAjax(weakModuleRuleService.update(dto));
@@ -83,7 +83,7 @@ public class WeakModuleRuleController extends BaseController {
      * 删除规则
      */
     @ApiOperation("删除规则")
-    @PreAuthorize("@ss.hasPermi('exam:weakModuleRule:remove')")
+    @PreAuthorize("@ss.hasPermi('exam:weakModuleRule:remove') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
     @DeleteMapping("/{id}")
     public AjaxResult remove(@PathVariable Long id) {
         return toAjax(weakModuleRuleService.deleteById(id));
@@ -93,7 +93,7 @@ public class WeakModuleRuleController extends BaseController {
      * 启用规则
      */
     @ApiOperation("启用规则（同时只能有一个启用）")
-    @PreAuthorize("@ss.hasPermi('exam:weakModuleRule:edit')")
+    @PreAuthorize("@ss.hasPermi('exam:weakModuleRule:edit') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
     @PutMapping("/enable/{id}")
     public AjaxResult enable(@PathVariable Long id) {
         return toAjax(weakModuleRuleService.enable(id));

airport-common/src/main/java/com/sundot/airport/common/cache/StatisticsCacheConfig.java

@@ -11,6 +11,8 @@ import org.springframework.data.redis.serializer.RedisSerializationContext;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
 import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 统计缓存Redis缓存配置
@@ -19,17 +21,31 @@ import java.time.Duration;
 @EnableCaching
 public class StatisticsCacheConfig {
 
+    public static final String DASHBOARD_CACHE = "dashboardCache";
+
     @Bean
     public RedisCacheManager cacheManager(RedisConnectionFactory factory) {
-        RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig()
+        RedisCacheConfiguration defaultConfig = RedisCacheConfiguration.defaultCacheConfig()
                 .entryTtl(Duration.ofHours(6)) // 默认6小时
                 .disableCachingNullValues() // 不缓存null值
                 .computePrefixWith(cacheName -> "airport:cache:" + cacheName + ":")
                 .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
                 .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericJackson2JsonRedisSerializer()));
 
+        // dashboard缓存: 5分钟TTL
+        RedisCacheConfiguration dashboardConfig = RedisCacheConfiguration.defaultCacheConfig()
+                .entryTtl(Duration.ofMinutes(5))
+                .disableCachingNullValues()
+                .computePrefixWith(cacheName -> "airport:cache:" + cacheName + ":")
+                .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
+                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericJackson2JsonRedisSerializer()));
+
+        Map<String, RedisCacheConfiguration> cacheConfigurations = new HashMap<>();
+        cacheConfigurations.put(DASHBOARD_CACHE, dashboardConfig);
+
         return RedisCacheManager.builder(factory)
-                .cacheDefaults(config)
+                .cacheDefaults(defaultConfig)
+                .withInitialCacheConfigurations(cacheConfigurations)
                 .build();
     }
 

airport-exam/src/main/java/com/sundot/airport/exam/controller/DailyStatisticsController.java

@@ -83,7 +83,7 @@ public class DailyStatisticsController extends BaseController {
     /**
      * 手动触发薄弱模块分析更新（管理员功能）
      */
-    @PreAuthorize("@ss.hasPermi('exam:daily:statistics:update')")
+    @PreAuthorize("@ss.hasPermi('exam:daily:statistics:update') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
     @PostMapping("/update-weak-analysis/{userId}")
     public AjaxResult updateWeakAnalysis(@PathVariable Long userId) {
         try {
@@ -99,7 +99,7 @@ public class DailyStatisticsController extends BaseController {
      * 获取全局统计数据（管理员视角）
      * 统计所有用户的任务完成情况、答题正确率、部门排名等
      */
-    @PreAuthorize("@ss.hasPermi('exam:daily:statistics:admin')")
+    @PreAuthorize("@ss.hasPermi('exam:daily:statistics:admin') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
     @GetMapping("/global-statistics")
     public AjaxResult getGlobalStatistics() {
         try {

airport-exam/src/main/java/com/sundot/airport/exam/controller/DailyTaskAdminController.java

@@ -42,7 +42,7 @@ public class DailyTaskAdminController extends BaseController {
      * 查询任务列表（管理员）
      * 支持多条件筛选
      */
-    @PreAuthorize("@ss.hasPermi('exam:daily:task:admin:list')")
+    @PreAuthorize("@ss.hasPermi('exam:daily:task:admin:list') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
     @GetMapping("/list")
     public TableDataInfo list(DailyTaskAdminQueryDTO queryDTO) {
         LambdaQueryWrapper<DailyTask> wrapper = new LambdaQueryWrapper<>();
@@ -124,7 +124,7 @@ public class DailyTaskAdminController extends BaseController {
      * 查询任务详情（管理员）
      * 管理员可以查看任何用户的任务详情
      */
-    @PreAuthorize("@ss.hasPermi('exam:daily:task:admin:query')")
+    @PreAuthorize("@ss.hasPermi('exam:daily:task:admin:query') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
     @GetMapping("/{taskId}")
     public AjaxResult getTaskDetail(@PathVariable String taskId) {
         // 查询任务主记录
@@ -155,7 +155,7 @@ public class DailyTaskAdminController extends BaseController {
      * 任务统计（管理员）
      * 按状态、部门、角色等维度统计
      */
-    @PreAuthorize("@ss.hasPermi('exam:daily:task:admin:statistics')")
+    @PreAuthorize("@ss.hasPermi('exam:daily:task:admin:statistics') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
     @GetMapping("/statistics")
     public AjaxResult statistics(DailyTaskAdminQueryDTO queryDTO) {
         LambdaQueryWrapper<DailyTask> wrapper = new LambdaQueryWrapper<>();
@@ -187,7 +187,7 @@ public class DailyTaskAdminController extends BaseController {
     /**
      * 按部门统计任务完成情况
      */
-    @PreAuthorize("@ss.hasPermi('exam:daily:task:admin:statistics')")
+    @PreAuthorize("@ss.hasPermi('exam:daily:task:admin:statistics') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
     @GetMapping("/statistics/by-dept")
     public AjaxResult statisticsByDept(DailyTaskAdminQueryDTO queryDTO) {
         try {
@@ -203,7 +203,7 @@ public class DailyTaskAdminController extends BaseController {
     /**
      * 按用户统计任务完成情况
      */
-    @PreAuthorize("@ss.hasPermi('exam:daily:task:admin:statistics')")
+    @PreAuthorize("@ss.hasPermi('exam:daily:task:admin:statistics') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
     @GetMapping("/statistics/by-user")
     public AjaxResult statisticsByUser(DailyTaskAdminQueryDTO queryDTO) {
         try {
@@ -219,7 +219,7 @@ public class DailyTaskAdminController extends BaseController {
     /**
      * 删除任务（逻辑删除）
      */
-    @PreAuthorize("@ss.hasPermi('exam:daily:task:admin:remove')")
+    @PreAuthorize("@ss.hasPermi('exam:daily:task:admin:remove') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
     @Log(title = "删除每日任务", businessType = BusinessType.DELETE)
     @DeleteMapping("/{taskId}")
     public AjaxResult remove(@PathVariable String taskId) {
@@ -240,7 +240,7 @@ public class DailyTaskAdminController extends BaseController {
     /**
      * 批量删除任务（逻辑删除）
      */
-    @PreAuthorize("@ss.hasPermi('exam:daily:task:admin:remove')")
+    @PreAuthorize("@ss.hasPermi('exam:daily:task:admin:remove') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
     @Log(title = "批量删除每日任务", businessType = BusinessType.DELETE)
     @DeleteMapping("/batch/{taskIds}")
     public AjaxResult removeBatch(@PathVariable String[] taskIds) {

airport-exam/src/main/java/com/sundot/airport/exam/controller/DailyTaskExpireController.java

@@ -30,7 +30,7 @@ public class DailyTaskExpireController extends BaseController {
     /**
      * 手动触发逾期任务处理（管理员功能）
      */
-    @PreAuthorize("@ss.hasPermi('exam:daily:expire:process')")
+    @PreAuthorize("@ss.hasPermi('exam:daily:expire:process') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
     @Log(title = "手动处理逾期任务", businessType = BusinessType.UPDATE)
     @PostMapping("/process")
     public AjaxResult processExpiredTasks() {
@@ -49,7 +49,7 @@ public class DailyTaskExpireController extends BaseController {
     /**
      * 提醒用户完成逾期任务（单个）
      */
-    @PreAuthorize("@ss.hasPermi('exam:daily:expire:notify')")
+    @PreAuthorize("@ss.hasPermi('exam:daily:expire:notify') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
     @Log(title = "提醒用户完成逾期任务", businessType = BusinessType.OTHER)
     @PostMapping("/notify")
     public AjaxResult notifyExpiredTask(@Valid @RequestBody NotifyTaskDTO dto) {
@@ -76,7 +76,7 @@ public class DailyTaskExpireController extends BaseController {
     /**
      * 批量提醒用户完成逾期任务
      */
-    @PreAuthorize("@ss.hasPermi('exam:daily:expire:notify')")
+    @PreAuthorize("@ss.hasPermi('exam:daily:expire:notify') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
     @Log(title = "批量提醒用户完成逾期任务", businessType = BusinessType.OTHER)
     @PostMapping("/batch-notify")
     public AjaxResult batchNotifyExpiredTasks(@Valid @RequestBody NotifyTaskDTO dto) {

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

@@ -15,128 +15,81 @@ public class DashboardOverviewDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 今日数据
+     * 总任务数
      */
-    private PeriodStatistics today;
+    private Long totalTasks;
 
     /**
-     * 本周数据
+     * 已完成任务数
      */
-    private PeriodStatistics week;
+    private Long completedTasks;
 
     /**
-     * 本月数据
+     * 完成率
      */
-    private PeriodStatistics month;
+    private Double completionRate;
 
-    public PeriodStatistics getToday() {
-        return today;
-    }
+    /**
+     * 平均得分
+     */
+    private Double avgScore;
 
-    public void setToday(PeriodStatistics today) {
-        this.today = today;
-    }
+    /**
+     * 逾期任务数
+     */
+    private Long expiredTasks;
 
-    public PeriodStatistics getWeek() {
-        return week;
-    }
+    /**
+     * 环比增长数据
+     */
+    private GrowthData growth;
 
-    public void setWeek(PeriodStatistics week) {
-        this.week = week;
+    public Long getTotalTasks() {
+        return totalTasks;
     }
 
-    public PeriodStatistics getMonth() {
-        return month;
+    public void setTotalTasks(Long totalTasks) {
+        this.totalTasks = totalTasks;
     }
 
-    public void setMonth(PeriodStatistics month) {
-        this.month = month;
+    public Long getCompletedTasks() {
+        return completedTasks;
     }
 
-    /**
-     * 时间段统计数据
-     */
-    public static class PeriodStatistics implements Serializable {
-
-        private static final long serialVersionUID = 1L;
-
-        /**
-         * 总任务数
-         */
-        private Long totalTasks;
-
-        /**
-         * 已完成任务数
-         */
-        private Long completedTasks;
-
-        /**
-         * 完成率
-         */
-        private Double completionRate;
-
-        /**
-         * 平均得分
-         */
-        private Double avgScore;
-
-        /**
-         * 逾期任务数
-         */
-        private Long expiredTasks;
-
-        /**
-         * 环比增长数据
-         */
-        private GrowthData growth;
-
-        public Long getTotalTasks() {
-            return totalTasks;
-        }
-
-        public void setTotalTasks(Long totalTasks) {
-            this.totalTasks = totalTasks;
-        }
-
-        public Long getCompletedTasks() {
-            return completedTasks;
-        }
-
-        public void setCompletedTasks(Long completedTasks) {
-            this.completedTasks = completedTasks;
-        }
+    public void setCompletedTasks(Long completedTasks) {
+        this.completedTasks = completedTasks;
+    }
 
-        public Double getCompletionRate() {
-            return completionRate;
-        }
+    public Double getCompletionRate() {
+        return completionRate;
+    }
 
-        public void setCompletionRate(Double completionRate) {
-            this.completionRate = completionRate;
-        }
+    public void setCompletionRate(Double completionRate) {
+        this.completionRate = completionRate;
+    }
 
-        public Double getAvgScore() {
-            return avgScore;
-        }
+    public Double getAvgScore() {
+        return avgScore;
+    }
 
-        public void setAvgScore(Double avgScore) {
-            this.avgScore = avgScore;
-        }
+    public void setAvgScore(Double avgScore) {
+        this.avgScore = avgScore;
+    }
 
-        public Long getExpiredTasks() {
-            return expiredTasks;
-        }
+    public Long getExpiredTasks() {
+        return expiredTasks;
+    }
 
-        public void setExpiredTasks(Long expiredTasks) {
-            this.expiredTasks = expiredTasks;
-        }
+    public void setExpiredTasks(Long expiredTasks) {
+        this.expiredTasks = expiredTasks;
+    }
 
-        public GrowthData getGrowth() {
-            return growth;
-        }
+    public GrowthData getGrowth() {
+        return growth;
+    }
 
-        public void setGrowth(GrowthData growth) {
-            this.growth = growth;
-        }
+    public void setGrowth(GrowthData growth) {
+        this.growth = growth;
     }
 
     /**
@@ -189,9 +142,11 @@ public class DashboardOverviewDTO implements Serializable {
     @Override
     public String toString() {
         return "DashboardOverviewDTO{" +
-                "today=" + today +
-                ", week=" + week +
-                ", month=" + month +
+                "totalTasks=" + totalTasks +
+                ", completedTasks=" + completedTasks +
+                ", completionRate=" + completionRate +
+                ", avgScore=" + avgScore +
+                ", expiredTasks=" + expiredTasks +
                 '}';
     }
 }

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

@@ -1,14 +1,22 @@
 package com.sundot.airport.exam.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sundot.airport.common.cache.StatisticsCacheConfig;
 import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysRole;
+import com.sundot.airport.common.core.domain.model.LoginUser;
+import com.sundot.airport.common.enums.RoleTypeEnum;
+import com.sundot.airport.common.utils.SecurityUtils;
 import com.sundot.airport.exam.domain.DailyTask;
 import com.sundot.airport.exam.dto.*;
 import com.sundot.airport.exam.enums.DailyTaskStatusEnum;
 import com.sundot.airport.exam.mapper.DailyTaskMapper;
 import com.sundot.airport.exam.service.IDashboardService;
 import com.sundot.airport.system.mapper.SysDeptMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -33,6 +41,8 @@ import java.util.stream.Collectors;
 @Service
 public class DashboardServiceImpl implements IDashboardService {
 
+    private static final Logger log = LoggerFactory.getLogger(DashboardServiceImpl.class);
+
     @Autowired
     private DailyTaskMapper dailyTaskMapper;
 
@@ -43,39 +53,53 @@ public class DashboardServiceImpl implements IDashboardService {
     private static final DateTimeFormatter DATETIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
     @Override
+    @Cacheable(value = StatisticsCacheConfig.DASHBOARD_CACHE,
+            key = "'overview:' + T(com.sundot.airport.common.utils.SecurityUtils).getUserId() + ':' + (#query != null ? #query.toString() : 'default')")
     public DashboardOverviewDTO getOverview(DashboardQueryDTO query) {
         DashboardOverviewDTO dto = new DashboardOverviewDTO();
 
-        // 创建不带时间范围的查询条件(避免在queryTasks中重复筛选)
-        DashboardQueryDTO queryWithoutTimeRange = new DashboardQueryDTO();
-        if (query != null) {
-            queryWithoutTimeRange.setDeptIds(query.getDeptIds());
-            queryWithoutTimeRange.setRoles(query.getRoles());
-            queryWithoutTimeRange.setUserIds(query.getUserIds());
-            // 不设置timeRange,让buildPeriodStatistics来筛选
+        // 使用startDate/endDate查询，若未指定则默认今天
+        if (query == null) {
+            query = new DashboardQueryDTO();
         }
+        ensureDateRange(query);
 
-        // 查询所有任务(不带时间范围筛选)
-        List<DailyTask> allTasks = queryTasks(queryWithoutTimeRange);
+        List<DailyTask> allTasks = queryTasks(query);
+
+        dto.setTotalTasks((long) allTasks.size());
 
-        // 今日数据
-        LocalDate today = LocalDate.now();
-        dto.setToday(buildPeriodStatistics(allTasks, today, today, null));
+        long completed = allTasks.stream()
+                .filter(t -> DailyTaskStatusEnum.COMPLETED.getCode().equals(t.getDtStatus()))
+                .count();
+        dto.setCompletedTasks(completed);
 
-        // 本周数据
-        LocalDate weekStart = today.minusDays(today.getDayOfWeek().getValue() - 1);
-        LocalDate lastWeekStart = weekStart.minusWeeks(1);
-        dto.setWeek(buildPeriodStatistics(allTasks, weekStart, today, lastWeekStart));
+        double completionRate = allTasks.size() > 0
+                ? (completed * 100.0 / allTasks.size()) : 0.0;
+        dto.setCompletionRate(Math.round(completionRate * 100.0) / 100.0);
 
-        // 本月数据
-        LocalDate monthStart = today.withDayOfMonth(1);
-        LocalDate lastMonthStart = monthStart.minusMonths(1);
-        dto.setMonth(buildPeriodStatistics(allTasks, monthStart, today, lastMonthStart));
+        double avgScore = allTasks.stream()
+                .filter(t -> DailyTaskStatusEnum.COMPLETED.getCode().equals(t.getDtStatus()))
+                .filter(t -> t.getDtTotalScore() != null)
+                .mapToDouble(t -> t.getDtTotalScore().doubleValue())
+                .average()
+                .orElse(0.0);
+        dto.setAvgScore(Math.round(avgScore * 100.0) / 100.0);
+
+        long expired = allTasks.stream()
+                .filter(t -> DailyTaskStatusEnum.EXPIRED.getCode().equals(t.getDtStatus()))
+                .count();
+        dto.setExpiredTasks(expired);
+
+        // 环比增长（与相同长度的上一周期比较）
+        DashboardOverviewDTO.GrowthData growth = computeGrowth(query, allTasks);
+        dto.setGrowth(growth);
 
         return dto;
     }
 
     @Override
+    @Cacheable(value = StatisticsCacheConfig.DASHBOARD_CACHE,
+            key = "'trend:' + T(com.sundot.airport.common.utils.SecurityUtils).getUserId() + ':' + (#query != null ? #query.toString() : 'default')")
     public DashboardTrendDTO getTrend(DashboardQueryDTO query) {
         DashboardTrendDTO dto = new DashboardTrendDTO();
 
@@ -130,6 +154,8 @@ public class DashboardServiceImpl implements IDashboardService {
     }
 
     @Override
+    @Cacheable(value = StatisticsCacheConfig.DASHBOARD_CACHE,
+            key = "'deptRanking:' + T(com.sundot.airport.common.utils.SecurityUtils).getUserId() + ':' + (#query != null ? #query.toString() : 'default')")
     public List<DashboardDeptRankingDTO> getDeptRanking(DashboardQueryDTO query) {
         // 查询任务
         List<DailyTask> allTasks = queryTasks(query);
@@ -195,6 +221,8 @@ public class DashboardServiceImpl implements IDashboardService {
     }
 
     @Override
+    @Cacheable(value = StatisticsCacheConfig.DASHBOARD_CACHE,
+            key = "'roleStats:' + T(com.sundot.airport.common.utils.SecurityUtils).getUserId() + ':' + (#query != null ? #query.toString() : 'default')")
     public List<DashboardRoleStatsDTO> getRoleStats(DashboardQueryDTO query) {
         // 查询任务
         List<DailyTask> allTasks = queryTasks(query);
@@ -265,6 +293,8 @@ public class DashboardServiceImpl implements IDashboardService {
     }
 
     @Override
+    @Cacheable(value = StatisticsCacheConfig.DASHBOARD_CACHE,
+            key = "'expiredAnalysis:' + T(com.sundot.airport.common.utils.SecurityUtils).getUserId() + ':' + (#query != null ? #query.toString() : 'default')")
     public DashboardExpiredAnalysisDTO getExpiredAnalysis(DashboardQueryDTO query) {
         DashboardExpiredAnalysisDTO dto = new DashboardExpiredAnalysisDTO();
 
@@ -358,6 +388,8 @@ public class DashboardServiceImpl implements IDashboardService {
     }
 
     @Override
+    @Cacheable(value = StatisticsCacheConfig.DASHBOARD_CACHE,
+            key = "'userRanking:' + T(com.sundot.airport.common.utils.SecurityUtils).getUserId() + ':' + (#query != null ? #query.toString() : 'default')")
     public List<DashboardUserRankingDTO> getUserRanking(DashboardQueryDTO query) {
         // 查询任务
         List<DailyTask> allTasks = queryTasks(query);
@@ -438,9 +470,7 @@ public class DashboardServiceImpl implements IDashboardService {
         if (query == null) {
             query = new DashboardQueryDTO();
         }
-        if (query.getTimeRange() == null || query.getTimeRange().isEmpty()) {
-            query.setTimeRange("today");
-        }
+        ensureDateRange(query);
 
         // 查询任务
         List<DailyTask> allTasks = queryTasks(query);
@@ -567,11 +597,27 @@ public class DashboardServiceImpl implements IDashboardService {
     }
 
     @Override
+    @Cacheable(value = StatisticsCacheConfig.DASHBOARD_CACHE,
+            key = "'filterOptions:' + T(com.sundot.airport.common.utils.SecurityUtils).getUserId()")
     public FilterOptionsDTO getFilterOptions() {
         FilterOptionsDTO dto = new FilterOptionsDTO();
 
-        // 查询所有部门
-        List<SysDept> depts = sysDeptMapper.selectDeptList(new SysDept());
+        List<SysDept> depts;
+        Set<Long> permittedDeptIds = getPermittedDeptIds();
+        if (permittedDeptIds == null) {
+            // 全部数据权限，返回所有部门
+            depts = sysDeptMapper.selectDeptList(new SysDept());
+        } else if (permittedDeptIds.isEmpty()) {
+            // 无部门权限（安检员等），返回空
+            depts = Collections.emptyList();
+        } else {
+            // 有部门限制，只返回权限范围内的部门
+            List<SysDept> allDepts = sysDeptMapper.selectDeptList(new SysDept());
+            depts = allDepts.stream()
+                    .filter(d -> permittedDeptIds.contains(d.getDeptId()))
+                    .collect(Collectors.toList());
+        }
+
         List<FilterOptionsDTO.DeptOption> deptOptions = depts.stream()
                 .map(dept -> {
                     FilterOptionsDTO.DeptOption option = new FilterOptionsDTO.DeptOption();
@@ -591,22 +637,187 @@ public class DashboardServiceImpl implements IDashboardService {
     // ==================== 私有辅助方法 ====================
 
     /**
-     * 查询任务列表
+     * 确保query有日期范围，若未指定startDate/endDate且未指定timeRange，则默认今天
+     */
+    private void ensureDateRange(DashboardQueryDTO query) {
+        boolean hasDateRange = (query.getStartDate() != null && !query.getStartDate().isEmpty())
+                || (query.getEndDate() != null && !query.getEndDate().isEmpty());
+        boolean hasTimeRange = query.getTimeRange() != null && !query.getTimeRange().isEmpty();
+
+        if (!hasDateRange && !hasTimeRange) {
+            String today = LocalDate.now().format(DATE_FORMATTER);
+            query.setStartDate(today);
+            query.setEndDate(today);
+        }
+    }
+
+    /**
+     * 计算环比增长数据
+     */
+    private DashboardOverviewDTO.GrowthData computeGrowth(DashboardQueryDTO query, List<DailyTask> currentTasks) {
+        DashboardOverviewDTO.GrowthData growth = new DashboardOverviewDTO.GrowthData();
+        try {
+            LocalDate startDate = LocalDate.parse(query.getStartDate(), DATE_FORMATTER);
+            LocalDate endDate = LocalDate.parse(query.getEndDate(), DATE_FORMATTER);
+            long periodDays = ChronoUnit.DAYS.between(startDate, endDate) + 1;
+
+            // 上一周期
+            LocalDate prevEnd = startDate.minusDays(1);
+            LocalDate prevStart = prevEnd.minusDays(periodDays - 1);
+
+            DashboardQueryDTO prevQuery = new DashboardQueryDTO();
+            prevQuery.setDeptIds(query.getDeptIds());
+            prevQuery.setRoles(query.getRoles());
+            prevQuery.setUserIds(query.getUserIds());
+            prevQuery.setStartDate(prevStart.format(DATE_FORMATTER));
+            prevQuery.setEndDate(prevEnd.format(DATE_FORMATTER));
+
+            List<DailyTask> prevTasks = queryTasks(prevQuery);
+
+            // 任务数增长
+            long currentTotal = currentTasks.size();
+            long prevTotal = prevTasks.size();
+            growth.setTotalTasksGrowth(calcGrowthRate(currentTotal, prevTotal));
+
+            // 完成数增长
+            long currentCompleted = currentTasks.stream()
+                    .filter(t -> DailyTaskStatusEnum.COMPLETED.getCode().equals(t.getDtStatus())).count();
+            long prevCompleted = prevTasks.stream()
+                    .filter(t -> DailyTaskStatusEnum.COMPLETED.getCode().equals(t.getDtStatus())).count();
+            growth.setCompletedTasksGrowth(calcGrowthRate(currentCompleted, prevCompleted));
+
+            // 平均分增长
+            double currentAvg = currentTasks.stream()
+                    .filter(t -> DailyTaskStatusEnum.COMPLETED.getCode().equals(t.getDtStatus()))
+                    .filter(t -> t.getDtTotalScore() != null)
+                    .mapToDouble(t -> t.getDtTotalScore().doubleValue())
+                    .average().orElse(0.0);
+            double prevAvg = prevTasks.stream()
+                    .filter(t -> DailyTaskStatusEnum.COMPLETED.getCode().equals(t.getDtStatus()))
+                    .filter(t -> t.getDtTotalScore() != null)
+                    .mapToDouble(t -> t.getDtTotalScore().doubleValue())
+                    .average().orElse(0.0);
+            growth.setAvgScoreGrowth(calcGrowthRate((long) (currentAvg * 100), (long) (prevAvg * 100)));
+
+        } catch (Exception e) {
+            growth.setTotalTasksGrowth(0.0);
+            growth.setCompletedTasksGrowth(0.0);
+            growth.setAvgScoreGrowth(0.0);
+        }
+        return growth;
+    }
+
+    private double calcGrowthRate(long current, long previous) {
+        if (previous == 0) {
+            return current > 0 ? 100.0 : 0.0;
+        }
+        return Math.round((current - previous) * 10000.0 / previous) / 100.0;
+    }
+
+    /**
+     * 判断当前用户是否拥有全部数据权限（管理员、站长、质检科）
+     */
+    private boolean hasAllDataPermission() {
+        try {
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+            if (loginUser == null) return false;
+            // userId=1 是超级管理员
+            if (loginUser.getUserId() == 1L) return true;
+            List<SysRole> roles = loginUser.getUser().getRoles();
+            if (roles == null || roles.isEmpty()) return false;
+            List<String> roleKeys = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+            return roleKeys.contains(RoleTypeEnum.admin.getCode())
+                    || roleKeys.contains(RoleTypeEnum.test.getCode())
+                    || roleKeys.contains(RoleTypeEnum.zhijianke.getCode());
+        } catch (Exception e) {
+            log.warn("获取登录用户信息失败", e);
+            return false;
+        }
+    }
+
+    /**
+     * 获取当前用户有权限查看的部门ID集合，null 表示可查看全部
+     */
+    private Set<Long> getPermittedDeptIds() {
+        if (hasAllDataPermission()) {
+            return null; // 全部数据
+        }
+        try {
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+            Long deptId = loginUser.getDeptId();
+            List<SysRole> roles = loginUser.getUser().getRoles();
+            List<String> roleKeys = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+
+            // 科长：本科室 + 所有下级部门
+            if (roleKeys.contains(RoleTypeEnum.kezhang.getCode())) {
+                Set<Long> deptIds = new HashSet<>();
+                deptIds.add(deptId);
+                List<SysDept> children = sysDeptMapper.selectChildrenDeptById(deptId);
+                if (children != null) {
+                    children.forEach(d -> deptIds.add(d.getDeptId()));
+                }
+                return deptIds;
+            }
+            // 班组长：本班组
+            if (roleKeys.contains(RoleTypeEnum.banzuzhang.getCode())) {
+                Set<Long> deptIds = new HashSet<>();
+                deptIds.add(deptId);
+                return deptIds;
+            }
+            // 安检员或其他角色：只看自己（返回空集合，在queryTasks中走userId过滤）
+            return Collections.emptySet();
+        } catch (Exception e) {
+            log.warn("获取用户权限部门失败", e);
+            return Collections.emptySet();
+        }
+    }
+
+    /**
+     * 查询任务列表（含数据权限过滤）
      */
     private List<DailyTask> queryTasks(DashboardQueryDTO query) {
         LambdaQueryWrapper<DailyTask> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(DailyTask::getDelStatus, 0);
 
-        // 添加筛选条件
+        // ===== 数据权限过滤 =====
+        Set<Long> permittedDeptIds = getPermittedDeptIds();
+        if (permittedDeptIds != null) {
+            if (permittedDeptIds.isEmpty()) {
+                // 无部门权限，只能看自己的数据
+                try {
+                    wrapper.eq(DailyTask::getDtUserId, SecurityUtils.getUserId());
+                } catch (Exception e) {
+                    // 获取不到用户，返回空
+                    return Collections.emptyList();
+                }
+            } else {
+                wrapper.in(DailyTask::getDtDeptId, permittedDeptIds);
+            }
+        }
+        // permittedDeptIds == null 表示全部数据，不加部门过滤
+
+        // ===== 前端筛选条件 =====
         if (query != null) {
-            // 按部门筛选
+            // 按部门筛选（包含所有子部门），在权限范围内进一步缩小
             if (query.getDeptIds() != null && !query.getDeptIds().isEmpty()) {
                 String[] deptIdArray = query.getDeptIds().split(",");
-                List<Long> deptIds = Arrays.stream(deptIdArray)
-                        .map(String::trim)
-                        .map(Long::parseLong)
-                        .collect(Collectors.toList());
-                wrapper.in(DailyTask::getDtDeptId, deptIds);
+                Set<Long> selectedDeptIds = new HashSet<>();
+                for (String idStr : deptIdArray) {
+                    Long deptId = Long.parseLong(idStr.trim());
+                    selectedDeptIds.add(deptId);
+                    List<SysDept> children = sysDeptMapper.selectChildrenDeptById(deptId);
+                    if (children != null) {
+                        children.forEach(d -> selectedDeptIds.add(d.getDeptId()));
+                    }
+                }
+                // 如果有权限限制，取交集；否则直接用前端选择
+                if (permittedDeptIds != null && !permittedDeptIds.isEmpty()) {
+                    selectedDeptIds.retainAll(permittedDeptIds);
+                }
+                if (selectedDeptIds.isEmpty()) {
+                    return Collections.emptyList();
+                }
+                wrapper.in(DailyTask::getDtDeptId, selectedDeptIds);
             }
 
             // 按角色筛选
@@ -643,7 +854,6 @@ public class DashboardServiceImpl implements IDashboardService {
                 }
 
                 if (startDate != null) {
-                    // 将LocalDate转换为Date进行比较
                     Date startDateTime = Date.from(startDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
                     Date endDateTime = Date.from(endDate.plusDays(1).atStartOfDay(ZoneId.systemDefault()).toInstant());
                     wrapper.ge(DailyTask::getDtBusinessDate, startDateTime);
@@ -677,57 +887,6 @@ public class DashboardServiceImpl implements IDashboardService {
     }
 
     /**
-     * 构建时间段统计数据
-     */
-    private DashboardOverviewDTO.PeriodStatistics buildPeriodStatistics(
-            List<DailyTask> allTasks, LocalDate startDate, LocalDate endDate, LocalDate compareStartDate) {
-
-        DashboardOverviewDTO.PeriodStatistics stats = new DashboardOverviewDTO.PeriodStatistics();
-
-        // 筛选时间段内的任务
-        List<DailyTask> periodTasks = allTasks.stream()
-                .filter(t -> isDateInRange(t.getDtBusinessDate(), startDate, endDate))
-                .collect(Collectors.toList());
-
-        stats.setTotalTasks((long) periodTasks.size());
-
-        long completed = periodTasks.stream()
-                .filter(t -> DailyTaskStatusEnum.COMPLETED.getCode().equals(t.getDtStatus()))
-                .count();
-        stats.setCompletedTasks(completed);
-
-        double completionRate = periodTasks.size() > 0
-                ? (completed * 100.0 / periodTasks.size()) : 0.0;
-        stats.setCompletionRate(Math.round(completionRate * 100.0) / 100.0);
-
-        // 计算平均分
-        double avgScore = periodTasks.stream()
-                .filter(t -> DailyTaskStatusEnum.COMPLETED.getCode().equals(t.getDtStatus()))
-                .filter(t -> t.getDtTotalScore() != null)
-                .mapToDouble(t -> t.getDtTotalScore().doubleValue())
-                .average()
-                .orElse(0.0);
-        stats.setAvgScore(Math.round(avgScore * 100.0) / 100.0);
-
-        long expired = periodTasks.stream()
-                .filter(t -> DailyTaskStatusEnum.EXPIRED.getCode().equals(t.getDtStatus()))
-                .count();
-        stats.setExpiredTasks(expired);
-
-        // 计算环比增长
-        if (compareStartDate != null) {
-            DashboardOverviewDTO.GrowthData growth = new DashboardOverviewDTO.GrowthData();
-            // TODO: 实现环比计算逻辑
-            growth.setTotalTasksGrowth(0.0);
-            growth.setCompletedTasksGrowth(0.0);
-            growth.setAvgScoreGrowth(0.0);
-            stats.setGrowth(growth);
-        }
-
-        return stats;
-    }
-
-    /**
      * 判断日期是否在指定范围内
      */
     private boolean isDateInRange(Date date, LocalDate startDate, LocalDate endDate) {