diff --git a/demo/frontend/src/api/analytics.js b/demo/frontend/src/api/analytics.js
new file mode 100644
index 0000000..86a421c
--- /dev/null
+++ b/demo/frontend/src/api/analytics.js
@@ -0,0 +1,27 @@
+import request from './request'
+
+// 获取日活用户趋势数据
+export const getDailyActiveUsersTrend = (year = '2024', granularity = 'monthly') => {
+ return request({
+ url: '/analytics/daily-active-users',
+ method: 'get',
+ params: { year, granularity }
+ })
+}
+
+// 获取用户活跃度概览
+export const getUserActivityOverview = () => {
+ return request({
+ url: '/analytics/user-activity-overview',
+ method: 'get'
+ })
+}
+
+// 获取用户活跃度热力图数据
+export const getUserActivityHeatmap = (year = '2024') => {
+ return request({
+ url: '/analytics/user-activity-heatmap',
+ method: 'get',
+ params: { year }
+ })
+}
diff --git a/demo/frontend/src/components/DailyActiveUsersChart.vue b/demo/frontend/src/components/DailyActiveUsersChart.vue
new file mode 100644
index 0000000..f00db85
--- /dev/null
+++ b/demo/frontend/src/components/DailyActiveUsersChart.vue
@@ -0,0 +1,398 @@
+
+
+
+
+
+
+
diff --git a/demo/frontend/src/views/Home.vue b/demo/frontend/src/views/Home.vue
index c3a61c4..c25b748 100644
--- a/demo/frontend/src/views/Home.vue
+++ b/demo/frontend/src/views/Home.vue
@@ -236,6 +236,7 @@ import { useRouter } from 'vue-router'
import { useUserStore } from '@/stores/user'
import { ElMessage } from 'element-plus'
import * as dashboardAPI from '@/api/dashboard'
+import DailyActiveUsersChart from '@/components/DailyActiveUsersChart.vue'
const router = useRouter()
const userStore = useUserStore()
diff --git a/demo/src/main/java/com/example/demo/controller/AnalyticsApiController.java b/demo/src/main/java/com/example/demo/controller/AnalyticsApiController.java
new file mode 100644
index 0000000..95f7fc7
--- /dev/null
+++ b/demo/src/main/java/com/example/demo/controller/AnalyticsApiController.java
@@ -0,0 +1,174 @@
+package com.example.demo.controller;
+
+import com.example.demo.repository.UserActivityStatsRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/api/analytics")
+@CrossOrigin(origins = "*")
+public class AnalyticsApiController {
+
+ @Autowired
+ private UserActivityStatsRepository userActivityStatsRepository;
+
+ /**
+ * 获取日活用户趋势数据
+ */
+ @GetMapping("/daily-active-users")
+ public ResponseEntity> getDailyActiveUsersTrend(
+ @RequestParam(defaultValue = "2024") String year,
+ @RequestParam(defaultValue = "monthly") String granularity) {
+ try {
+ Map response = new HashMap<>();
+
+ if ("monthly".equals(granularity)) {
+ // 按月聚合数据
+ List> monthlyData = userActivityStatsRepository.findMonthlyActiveUsers(Integer.parseInt(year));
+
+ // 确保12个月都有数据
+ List> completeData = new ArrayList<>();
+ for (int month = 1; month <= 12; month++) {
+ final int currentMonth = month;
+ Optional> monthData = monthlyData.stream()
+ .filter(data -> {
+ Object monthObj = data.get("month");
+ if (monthObj instanceof Number) {
+ return ((Number) monthObj).intValue() == currentMonth;
+ }
+ return false;
+ })
+ .findFirst();
+
+ if (monthData.isPresent()) {
+ completeData.add(monthData.get());
+ } else {
+ Map emptyMonth = new HashMap<>();
+ emptyMonth.put("month", currentMonth);
+ emptyMonth.put("dailyActiveUsers", 0);
+ emptyMonth.put("avgDailyActive", 0.0);
+ completeData.add(emptyMonth);
+ }
+ }
+
+ response.put("monthlyData", completeData);
+ } else {
+ // 按日返回数据
+ List> dailyData = userActivityStatsRepository.findDailyActiveUsersByYear(Integer.parseInt(year));
+ response.put("dailyData", dailyData);
+ }
+
+ response.put("year", year);
+ response.put("granularity", granularity);
+
+ return ResponseEntity.ok(response);
+
+ } catch (Exception e) {
+ Map error = new HashMap<>();
+ error.put("error", "获取日活用户趋势数据失败");
+ error.put("message", e.getMessage());
+ return ResponseEntity.status(500).body(error);
+ }
+ }
+
+ /**
+ * 获取用户活跃度概览
+ */
+ @GetMapping("/user-activity-overview")
+ public ResponseEntity> getUserActivityOverview() {
+ try {
+ Map response = new HashMap<>();
+
+ // 获取最新数据
+ LocalDate today = LocalDate.now();
+ LocalDate yesterday = today.minusDays(1);
+ LocalDate lastMonth = today.minusMonths(1);
+ LocalDate lastYear = today.minusYears(1);
+
+ // 今日日活
+ Integer todayDAU = userActivityStatsRepository.findDailyActiveUsersByDate(today);
+ response.put("todayDAU", todayDAU != null ? todayDAU : 0);
+
+ // 昨日日活
+ Integer yesterdayDAU = userActivityStatsRepository.findDailyActiveUsersByDate(yesterday);
+ response.put("yesterdayDAU", yesterdayDAU != null ? yesterdayDAU : 0);
+
+ // 本月平均日活
+ Double monthlyAvgDAU = userActivityStatsRepository.findAverageDailyActiveUsersByMonth(today.getYear(), today.getMonthValue());
+ response.put("monthlyAvgDAU", monthlyAvgDAU != null ? monthlyAvgDAU : 0.0);
+
+ // 上月平均日活
+ LocalDate lastMonthDate = today.minusMonths(1);
+ Double lastMonthAvgDAU = userActivityStatsRepository.findAverageDailyActiveUsersByMonth(lastMonthDate.getYear(), lastMonthDate.getMonthValue());
+ response.put("lastMonthAvgDAU", lastMonthAvgDAU != null ? lastMonthAvgDAU : 0.0);
+
+ // 年度平均日活
+ Double yearlyAvgDAU = userActivityStatsRepository.findAverageDailyActiveUsersByYear(today.getYear());
+ response.put("yearlyAvgDAU", yearlyAvgDAU != null ? yearlyAvgDAU : 0.0);
+
+ // 计算增长率
+ if (yesterdayDAU != null && yesterdayDAU > 0) {
+ double dayGrowthRate = ((todayDAU != null ? todayDAU : 0) - yesterdayDAU) / (double) yesterdayDAU * 100;
+ response.put("dayGrowthRate", Math.round(dayGrowthRate * 100.0) / 100.0);
+ } else {
+ response.put("dayGrowthRate", 0.0);
+ }
+
+ if (lastMonthAvgDAU != null && lastMonthAvgDAU > 0) {
+ double monthGrowthRate = ((monthlyAvgDAU != null ? monthlyAvgDAU : 0) - lastMonthAvgDAU) / lastMonthAvgDAU * 100;
+ response.put("monthGrowthRate", Math.round(monthGrowthRate * 100.0) / 100.0);
+ } else {
+ response.put("monthGrowthRate", 0.0);
+ }
+
+ return ResponseEntity.ok(response);
+
+ } catch (Exception e) {
+ Map error = new HashMap<>();
+ error.put("error", "获取用户活跃度概览失败");
+ error.put("message", e.getMessage());
+ return ResponseEntity.status(500).body(error);
+ }
+ }
+
+ /**
+ * 获取用户活跃度热力图数据
+ */
+ @GetMapping("/user-activity-heatmap")
+ public ResponseEntity> getUserActivityHeatmap(
+ @RequestParam(defaultValue = "2024") String year) {
+ try {
+ Map response = new HashMap<>();
+
+ // 获取全年每日数据
+ List> dailyData = userActivityStatsRepository.findDailyActiveUsersByYear(Integer.parseInt(year));
+
+ // 转换为热力图格式
+ List> heatmapData = new ArrayList<>();
+ for (Map data : dailyData) {
+ List