From 3ff9c41d18cdd20ffd73fd823759569b58f0c228 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 16 Oct 2026 16:23:55 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9C=A8=E7=BA=BF=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E5=B9=B4=E8=B6=8B=E5=8A=BF=E4=B8=8E?= =?UTF-8?q?=E6=9C=AC=E5=B9=B4=E5=9C=A8=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/InstallationController.php | 2 +- backend/app/Services/InstallationService.php | 38 +++++++++++++++---- frontend/src/views/OnlineStats.vue | 23 ++++++++--- 3 files changed, 50 insertions(+), 13 deletions(-) diff --git a/backend/app/Controllers/InstallationController.php b/backend/app/Controllers/InstallationController.php index b072807..1920d03 100644 --- a/backend/app/Controllers/InstallationController.php +++ b/backend/app/Controllers/InstallationController.php @@ -90,7 +90,7 @@ class InstallationController extends Controller $user = $this->getCurrentUser() ?: []; $projectId = !empty($_GET['project_id']) ? (int) $_GET['project_id'] : null; $period = $_GET['period'] ?? 'day'; - if (!in_array($period, ['day', 'week', 'month'], true)) { + if (!in_array($period, ['day', 'week', 'month', 'year'], true)) { $period = 'day'; } diff --git a/backend/app/Services/InstallationService.php b/backend/app/Services/InstallationService.php index ce3977b..4e20e03 100644 --- a/backend/app/Services/InstallationService.php +++ b/backend/app/Services/InstallationService.php @@ -257,7 +257,7 @@ class InstallationService * 在线统计:当前在线(5分钟内心跳)+ 按天去重的日/周/月在线用户数 + 趋势 + 分项目 * 统计口径:「在线用户」= 有心跳的机器指纹(machine_id) * - * @param string $period day|week|month 趋势粒度 + * @param string $period day|week|month|year 趋势粒度 */ public static function onlineStats(array $user, ?int $projectId = null, string $period = 'day'): array { @@ -282,21 +282,22 @@ class InstallationService array_merge($params, $projParams) ); - $logWhere = " AND i.online_date >= DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 32 DAY), '%Y-%m-%d')" . $projWhere; + $logWhere = " AND i.online_date >= DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 11 YEAR), '%Y-01-01')" . $projWhere; $logParams = $params; - // 今日 / 本周(周一起)/ 本月 去重在线机器数 + // 今日 / 本周(周一起)/ 本月 / 本年 去重在线机器数 $counts = $db->fetch( "SELECT COUNT(DISTINCT CASE WHEN i.online_date = CURDATE() THEN i.machine_id END) AS today_online, COUNT(DISTINCT CASE WHEN YEARWEEK(i.online_date, 1) = YEARWEEK(CURDATE(), 1) THEN i.machine_id END) AS week_online, - COUNT(DISTINCT CASE WHEN i.online_date >= DATE_FORMAT(CURDATE(), '%Y-%m-01') THEN i.machine_id END) AS month_online + COUNT(DISTINCT CASE WHEN i.online_date >= DATE_FORMAT(CURDATE(), '%Y-%m-01') THEN i.machine_id END) AS month_online, + COUNT(DISTINCT CASE WHEN i.online_date >= DATE_FORMAT(CURDATE(), '%Y-01-01') THEN i.machine_id END) AS year_online FROM {$db->table('online_logs')} i WHERE 1=1 {$logWhere}", array_merge($logParams, $projParams) ); - // 分项目:当前在线(来自 installations)+ 日/周/月(来自 online_logs) + // 分项目:当前在线(来自 installations)+ 日/周/月/年(来自 online_logs) $curRows = $db->fetchAll( "SELECT i.project_id, COUNT(*) AS current_online FROM {$db->table('installations')} i @@ -310,7 +311,8 @@ class InstallationService "SELECT i.project_id, p.name AS project_name, COUNT(DISTINCT CASE WHEN i.online_date = CURDATE() THEN i.machine_id END) AS today_online, COUNT(DISTINCT CASE WHEN YEARWEEK(i.online_date, 1) = YEARWEEK(CURDATE(), 1) THEN i.machine_id END) AS week_online, - COUNT(DISTINCT CASE WHEN i.online_date >= DATE_FORMAT(CURDATE(), '%Y-%m-01') THEN i.machine_id END) AS month_online + COUNT(DISTINCT CASE WHEN i.online_date >= DATE_FORMAT(CURDATE(), '%Y-%m-01') THEN i.machine_id END) AS month_online, + COUNT(DISTINCT CASE WHEN i.online_date >= DATE_FORMAT(CURDATE(), '%Y-01-01') THEN i.machine_id END) AS year_online FROM {$db->table('online_logs')} i LEFT JOIN {$db->table('projects')} p ON p.id = i.project_id WHERE 1=1 {$logWhere} @@ -328,6 +330,7 @@ class InstallationService 'today_online' => (int) $row['today_online'], 'week_online' => (int) $row['week_online'], 'month_online' => (int) $row['month_online'], + 'year_online' => (int) $row['year_online'], ]; } foreach ($curRows as $row) { @@ -341,12 +344,13 @@ class InstallationService 'today_online' => 0, 'week_online' => 0, 'month_online' => 0, + 'year_online' => 0, ]; } $projects[$pid]['current_online'] = (int) $row['current_online']; } $projects = array_values($projects); - usort($projects, static fn (array $a, array $b) => $b['month_online'] <=> $a['month_online']); + usort($projects, static fn (array $a, array $b) => $b['year_online'] <=> $a['year_online']); // 趋势 $trend = []; @@ -388,6 +392,25 @@ class InstallationService $ym = $d->format('Y-m'); $trend[] = ['label' => $ym, 'value' => $map[$ym] ?? 0]; } + } elseif ($period === 'year') { + $rows = $db->fetchAll( + "SELECT DATE_FORMAT(i.online_date, '%Y') AS y, COUNT(DISTINCT i.machine_id) AS cnt + FROM {$db->table('online_logs')} i + WHERE i.online_date >= DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 11 YEAR), '%Y-01-01') {$projWhere} + GROUP BY y", + $projParams + ); + $map = []; + foreach ($rows as $r) { + $map[$r['y']] = (int) $r['cnt']; + } + $now = new \DateTime('today'); + for ($i = 11; $i >= 0; $i--) { + $d = clone $now; + $d->modify("-{$i} years"); + $y = $d->format('Y'); + $trend[] = ['label' => $y, 'value' => $map[$y] ?? 0]; + } } else { $rows = $db->fetchAll( "SELECT DATE(i.online_date) AS d, COUNT(DISTINCT i.machine_id) AS cnt @@ -414,6 +437,7 @@ class InstallationService 'today_online' => (int) ($counts['today_online'] ?? 0), 'week_online' => (int) ($counts['week_online'] ?? 0), 'month_online' => (int) ($counts['month_online'] ?? 0), + 'year_online' => (int) ($counts['year_online'] ?? 0), 'trend' => $trend, 'projects' => $projects, ]; diff --git a/frontend/src/views/OnlineStats.vue b/frontend/src/views/OnlineStats.vue index a46fd62..9243780 100644 --- a/frontend/src/views/OnlineStats.vue +++ b/frontend/src/views/OnlineStats.vue @@ -2,7 +2,7 @@
- +
@@ -11,7 +11,7 @@
- +
@@ -20,7 +20,7 @@
- +
@@ -29,7 +29,7 @@
- +
@@ -38,6 +38,15 @@
+ +
+
+
+
{{ stats.year_online }}
+
本年在线
+
+
+
@@ -52,6 +61,7 @@ 按日(30天) 按周(12周) 按月(12月) + 按年(12年)
@@ -74,6 +84,7 @@ +
暂无在线记录(自上线后随客户端心跳累积)
@@ -82,7 +93,7 @@