仪表盘功能完善

2025-10-31 14:33:57 +08:00
parent 778f05daa5
commit bbe79ecffb
8 changed files with 416 additions and 20 deletions
@@ -73,6 +73,8 @@ public class DashboardServiceImpl implements DashboardService {
                    .aiServiceStats(getAiServiceStats())
                    .systemStats(getSystemStats())
                    .recentActivities(getRecentActivities())
+                    .userGrowthTrends(getUserGrowthTrends(7))
+                    .recentLogins(getRecentLogins(10))
                    .updateTime(LocalDateTime.now())
                    .build();
        } catch (Exception e) {
@@ -385,7 +387,110 @@ public class DashboardServiceImpl implements DashboardService {
                        .uptime("未知")
                        .build())
                .recentActivities(new ArrayList<>())
+                .userGrowthTrends(new ArrayList<>())
+                .recentLogins(new ArrayList<>())
                .updateTime(LocalDateTime.now())
                .build();
    }
+
+    @Override
+    public List<DashboardStatsResponse.UserGrowthTrend> getUserGrowthTrends(int days) {
+        List<DashboardStatsResponse.UserGrowthTrend> trends = new ArrayList<>();
+        
+        try {
+            LocalDate endDate = LocalDate.now();
+            LocalDate startDate = endDate.minusDays(days - 1);
+            
+            // 获取指定日期范围内每天的用户注册数据
+            for (int i = 0; i < days; i++) {
+                LocalDate currentDate = startDate.plusDays(i);
+                LocalDateTime dayStart = currentDate.atStartOfDay();
+                LocalDateTime dayEnd = dayStart.plusDays(1);
+                
+                // 统计当天新增用户数
+                Long newUsers = userService.count(new LambdaQueryWrapper<User>()
+                        .eq(User::getIsDeleted, 0)
+                        .ge(User::getCreateTime, dayStart)
+                        .lt(User::getCreateTime, dayEnd));
+                
+                // 统计截止到当天的总用户数
+                Long totalUsers = userService.count(new LambdaQueryWrapper<User>()
+                        .eq(User::getIsDeleted, 0)
+                        .lt(User::getCreateTime, dayEnd));
+                
+                trends.add(DashboardStatsResponse.UserGrowthTrend.builder()
+                        .date(currentDate.toString())
+                        .newUsers(newUsers)
+                        .totalUsers(totalUsers)
+                        .build());
+            }
+            
+        } catch (Exception e) {
+            log.error("获取用户增长趋势数据失败", e);
+        }
+        
+        return trends;
+    }
+
+    @Override
+    public List<DashboardStatsResponse.RecentLogin> getRecentLogins(int limit) {
+        List<DashboardStatsResponse.RecentLogin> recentLogins = new ArrayList<>();
+        
+        try {
+            // 获取最近活跃的用户（按最后活跃时间排序）
+            List<User> recentUsers = userService.list(new LambdaQueryWrapper<User>()
+                    .eq(User::getIsDeleted, 0)
+                    .isNotNull(User::getLastActiveTime)
+                    .orderByDesc(User::getLastActiveTime)
+                    .last("LIMIT " + limit));
+            
+            for (User user : recentUsers) {
+                String timeDescription = formatTimeDescription(user.getLastActiveTime());
+                
+                recentLogins.add(DashboardStatsResponse.RecentLogin.builder()
+                        .userId(user.getId())
+                        .username(user.getUsername())
+                        .nickname(user.getNickname())
+                        .avatar(user.getAvatar())
+                        .loginTime(user.getLastActiveTime())
+                        .timeDescription(timeDescription)
+                        .build());
+            }
+            
+        } catch (Exception e) {
+            log.error("获取最近登录用户失败", e);
+        }
+        
+        return recentLogins;
+    }
+
+    /**
+     * 格式化时间描述
+     */
+    private String formatTimeDescription(LocalDateTime dateTime) {
+        if (dateTime == null) {
+            return "未知";
+        }
+        
+        LocalDateTime now = LocalDateTime.now();
+        long minutes = java.time.Duration.between(dateTime, now).toMinutes();
+        
+        if (minutes < 1) {
+            return "刚刚";
+        } else if (minutes < 60) {
+            return minutes + "分钟前";
+        } else if (minutes < 1440) { // 24小时
+            long hours = minutes / 60;
+            return hours + "小时前";
+        } else {
+            long days = minutes / 1440;
+            if (days == 1) {
+                return "昨天";
+            } else if (days < 7) {
+                return days + "天前";
+            } else {
+                return dateTime.toLocalDate().toString();
+            }
+        }
+    }
 }