diff --git a/backend/app/Controllers/InstallationController.php b/backend/app/Controllers/InstallationController.php index cc1d39e..b072807 100644 --- a/backend/app/Controllers/InstallationController.php +++ b/backend/app/Controllers/InstallationController.php @@ -81,6 +81,22 @@ class InstallationController extends Controller $this->success($stats); } + /** + * 在线统计:当前在线 + 日/周/月在线用户数 + 趋势 + 分项目 + * GET /api/installations/online-stats?period=day|week|month&project_id= + */ + public function onlineStats(): void + { + $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)) { + $period = 'day'; + } + + $this->success(InstallationService::onlineStats($user, $projectId, $period)); + } + /** * 安装详情 * GET /api/installations/{id} diff --git a/backend/app/Services/InstallationService.php b/backend/app/Services/InstallationService.php index 6f6b1a2..ce3977b 100644 --- a/backend/app/Services/InstallationService.php +++ b/backend/app/Services/InstallationService.php @@ -55,6 +55,7 @@ class InstallationService $existing['id'], ] ); + self::recordOnline($projectId, $machineId); return ['install_id' => (int) $existing['id'], 'is_new' => false]; } @@ -74,9 +75,25 @@ class InstallationService ] ); + self::recordOnline($projectId, $machineId); return ['install_id' => $installId, 'is_new' => true]; } + /** + * 记录当日在线(按天去重,供日/周/月在线统计) + */ + private static function recordOnline(int $projectId, string $machineId): void + { + $db = Database::getInstance(); + $db->execute( + "INSERT INTO {$db->table('online_logs')} + (project_id, machine_id, online_date, first_seen_at, last_seen_at) + VALUES (?, ?, CURDATE(), NOW(), NOW()) + ON DUPLICATE KEY UPDATE last_seen_at = NOW()", + [$projectId, $machineId] + ); + } + /** * 仅更新在线时间(心跳) */ @@ -235,4 +252,207 @@ class InstallationService }, $projects), ]; } + + /** + * 在线统计:当前在线(5分钟内心跳)+ 按天去重的日/周/月在线用户数 + 趋势 + 分项目 + * 统计口径:「在线用户」= 有心跳的机器指纹(machine_id) + * + * @param string $period day|week|month 趋势粒度 + */ + public static function onlineStats(array $user, ?int $projectId = null, string $period = 'day'): array + { + $db = Database::getInstance(); + $scope = self::scopeLogs($user); + $where = $scope['where']; + $params = $scope['params']; + + $projWhere = ''; + $projParams = []; + if ($projectId) { + $projWhere = ' AND i.project_id = ?'; + $projParams[] = $projectId; + } + + // 当前在线:最后心跳在 5 分钟内 + $current = (int) $db->fetchColumn( + "SELECT COUNT(*) FROM {$db->table('installations')} i + WHERE i.status = 'active' + AND i.last_online_at >= DATE_SUB(NOW(), INTERVAL 5 MINUTE) + {$where}{$projWhere}", + array_merge($params, $projParams) + ); + + $logWhere = " AND i.online_date >= DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 32 DAY), '%Y-%m-%d')" . $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 + FROM {$db->table('online_logs')} i + WHERE 1=1 {$logWhere}", + array_merge($logParams, $projParams) + ); + + // 分项目:当前在线(来自 installations)+ 日/周/月(来自 online_logs) + $curRows = $db->fetchAll( + "SELECT i.project_id, COUNT(*) AS current_online + FROM {$db->table('installations')} i + WHERE i.status = 'active' + AND i.last_online_at >= DATE_SUB(NOW(), INTERVAL 5 MINUTE) + {$where}{$projWhere} + GROUP BY i.project_id", + array_merge($params, $projParams) + ); + $logRows = $db->fetchAll( + "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 + FROM {$db->table('online_logs')} i + LEFT JOIN {$db->table('projects')} p ON p.id = i.project_id + WHERE 1=1 {$logWhere} + GROUP BY i.project_id, p.name", + array_merge($logParams, $projParams) + ); + + $projects = []; + foreach ($logRows as $row) { + $pid = (int) $row['project_id']; + $projects[$pid] = [ + 'project_id' => $pid, + 'project_name' => $row['project_name'], + 'current_online' => 0, + 'today_online' => (int) $row['today_online'], + 'week_online' => (int) $row['week_online'], + 'month_online' => (int) $row['month_online'], + ]; + } + foreach ($curRows as $row) { + $pid = (int) $row['project_id']; + if (!isset($projects[$pid])) { + $name = $db->fetchColumn("SELECT name FROM {$db->table('projects')} WHERE id = ?", [$pid]); + $projects[$pid] = [ + 'project_id' => $pid, + 'project_name' => $name ?: ('项目#' . $pid), + 'current_online' => 0, + 'today_online' => 0, + 'week_online' => 0, + 'month_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']); + + // 趋势 + $trend = []; + if ($period === 'week') { + $rows = $db->fetchAll( + "SELECT YEARWEEK(i.online_date, 1) AS yw, COUNT(DISTINCT i.machine_id) AS cnt + FROM {$db->table('online_logs')} i + WHERE i.online_date >= DATE_SUB(CURDATE(), INTERVAL 84 DAY) {$projWhere} + GROUP BY yw", + $projParams + ); + $map = []; + foreach ($rows as $r) { + $map[(string) $r['yw']] = (int) $r['cnt']; + } + for ($i = 11; $i >= 0; $i--) { + $d = new \DateTime('today'); + $d->modify("-" . ($i * 7) . " days"); + $yw = (int) $d->format('oW'); + $label = $d->format('o') . '-W' . $d->format('W'); + $trend[] = ['label' => $label, 'value' => $map[(string) $yw] ?? 0]; + } + } elseif ($period === 'month') { + $rows = $db->fetchAll( + "SELECT DATE_FORMAT(i.online_date, '%Y-%m') AS ym, COUNT(DISTINCT i.machine_id) AS cnt + FROM {$db->table('online_logs')} i + WHERE i.online_date >= DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 11 MONTH), '%Y-%m-01') {$projWhere} + GROUP BY ym", + $projParams + ); + $map = []; + foreach ($rows as $r) { + $map[$r['ym']] = (int) $r['cnt']; + } + for ($i = 11; $i >= 0; $i--) { + $d = new \DateTime('today'); + $d->modify('first day of this month'); + $d->modify("-" . $i . " months"); + $ym = $d->format('Y-m'); + $trend[] = ['label' => $ym, 'value' => $map[$ym] ?? 0]; + } + } else { + $rows = $db->fetchAll( + "SELECT DATE(i.online_date) AS d, COUNT(DISTINCT i.machine_id) AS cnt + FROM {$db->table('online_logs')} i + WHERE i.online_date >= DATE_SUB(CURDATE(), INTERVAL 29 DAY) {$projWhere} + GROUP BY d", + $projParams + ); + $map = []; + foreach ($rows as $r) { + $map[$r['d']] = (int) $r['cnt']; + } + for ($i = 29; $i >= 0; $i--) { + $d = new \DateTime('today'); + $d->modify("-{$i} days"); + $key = $d->format('Y-m-d'); + $trend[] = ['label' => $d->format('m-d'), 'value' => $map[$key] ?? 0]; + } + } + + return [ + 'period' => $period, + 'current_online' => $current, + 'today_online' => (int) ($counts['today_online'] ?? 0), + 'week_online' => (int) ($counts['week_online'] ?? 0), + 'month_online' => (int) ($counts['month_online'] ?? 0), + 'trend' => $trend, + 'projects' => $projects, + ]; + } + + /** + * 在线日志数据范围(online_logs 仅有 project_id 维度;agent 按其有卡密的项目) + * 别名固定为 i,返回 {where, params} + */ + private static function scopeLogs(array $user): array + { + $db = Database::getInstance(); + $role = $user['role'] ?? ''; + + if ($role === 'admin') { + return ['where' => '', 'params' => []]; + } + + if ($role === 'project_admin') { + $projectIds = $user['project_ids'] ?? []; + if (empty($projectIds)) { + return ['where' => ' AND 1=0', 'params' => []]; + } + $placeholders = implode(',', array_fill(0, count($projectIds), '?')); + return [ + 'where' => " AND i.project_id IN ({$placeholders})", + 'params' => array_map('intval', $projectIds), + ]; + } + + // 代理:本人及下级代理有卡密的项目 + $agentIds = PermissionService::getAgentIdsUnder((int) ($user['id'] ?? 0)); + if (empty($agentIds)) { + return ['where' => ' AND 1=0', 'params' => []]; + } + $placeholders = implode(',', array_fill(0, count($agentIds), '?')); + return [ + 'where' => " AND i.project_id IN (SELECT DISTINCT c.project_id FROM {$db->table('cards')} c WHERE c.use_user_id IN ({$placeholders}))", + 'params' => array_map('intval', $agentIds), + ]; + } } diff --git a/backend/database/migrations/20261016_add_online_logs.sql b/backend/database/migrations/20261016_add_online_logs.sql new file mode 100644 index 0000000..b20dba5 --- /dev/null +++ b/backend/database/migrations/20261016_add_online_logs.sql @@ -0,0 +1,13 @@ +-- 客户端在线日志(按天去重记录每台机器在线,用于日/周/月在线统计) +CREATE TABLE IF NOT EXISTS `ca_online_logs` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `project_id` BIGINT UNSIGNED NOT NULL COMMENT '所属项目ID', + `machine_id` VARCHAR(128) NOT NULL COMMENT '机器指纹', + `online_date` DATE NOT NULL COMMENT '在线日期', + `first_seen_at` DATETIME NOT NULL COMMENT '当日首次上线时间', + `last_seen_at` DATETIME NOT NULL COMMENT '当日最后上线时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uq_proj_date_machine` (`project_id`, `online_date`, `machine_id`), + KEY `idx_online_date` (`online_date`), + KEY `idx_proj_date` (`project_id`, `online_date`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='客户端在线日志(按天去重)'; diff --git a/backend/database/schema.sql b/backend/database/schema.sql index 60a3dbe..63557a1 100644 --- a/backend/database/schema.sql +++ b/backend/database/schema.sql @@ -361,6 +361,23 @@ CREATE TABLE `ca_installations` ( KEY `idx_deleted_at` (`deleted_at`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='安装记录表'; +-- ============================================ +-- 12b. 客户端在线日志表(按天去重,供日/周/月在线统计) +-- ============================================ +DROP TABLE IF EXISTS `ca_online_logs`; +CREATE TABLE `ca_online_logs` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `project_id` BIGINT UNSIGNED NOT NULL COMMENT '所属项目ID', + `machine_id` VARCHAR(128) NOT NULL COMMENT '机器指纹', + `online_date` DATE NOT NULL COMMENT '在线日期', + `first_seen_at` DATETIME NOT NULL COMMENT '当日首次上线时间', + `last_seen_at` DATETIME NOT NULL COMMENT '当日最后上线时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uq_proj_date_machine` (`project_id`, `online_date`, `machine_id`), + KEY `idx_online_date` (`online_date`), + KEY `idx_proj_date` (`project_id`, `online_date`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='客户端在线日志(按天去重)'; + -- ============================================ -- 13. 项目版本/安装包表 -- ============================================ diff --git a/backend/routes/api.php b/backend/routes/api.php index d72f216..e26117d 100644 --- a/backend/routes/api.php +++ b/backend/routes/api.php @@ -196,6 +196,7 @@ $router->group('api', function ($router) { // 安装统计管理 (admin / project_admin / agent) $router->get('installations', [InstallationController::class, 'list']); $router->get('installations/stats', [InstallationController::class, 'stats']); + $router->get('installations/online-stats', [InstallationController::class, 'onlineStats']); $router->get('installations/export', [InstallationController::class, 'export']); $router->get('installations/{id}', [InstallationController::class, 'detail']); $router->delete('installations/{id}', [InstallationController::class, 'delete']); diff --git a/frontend/src/api/installations.js b/frontend/src/api/installations.js index 7b0a8fb..19c69fe 100644 --- a/frontend/src/api/installations.js +++ b/frontend/src/api/installations.js @@ -10,6 +10,9 @@ const installationApi = { stats(params) { return request.get('/installations/stats', { params }) }, + onlineStats(params) { + return request.get('/installations/online-stats', { params }) + }, detail(id) { return request.get(`/installations/${id}`) }, diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index fd10f62..01c3c42 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -83,6 +83,12 @@ const routes = [ component: () => import('@/views/Installations.vue'), meta: { title: '安装统计', icon: 'Download' } }, + { + path: 'online-stats', + name: 'OnlineStats', + component: () => import('@/views/OnlineStats.vue'), + meta: { title: '在线统计', icon: 'Odometer' } + }, { path: 'project-versions', name: 'ProjectVersions', diff --git a/frontend/src/views/OnlineStats.vue b/frontend/src/views/OnlineStats.vue new file mode 100644 index 0000000..a46fd62 --- /dev/null +++ b/frontend/src/views/OnlineStats.vue @@ -0,0 +1,228 @@ + + + + + diff --git a/frontend/src/views/layout/MainLayout.vue b/frontend/src/views/layout/MainLayout.vue index a7e644c..da51d4b 100644 --- a/frontend/src/views/layout/MainLayout.vue +++ b/frontend/src/views/layout/MainLayout.vue @@ -67,6 +67,10 @@ 安装统计 + + + 在线统计 + 版本推送 @@ -490,6 +494,7 @@ const parentMap = { '/cards': [{ path: '/dashboard', title: '业务管理' }], '/authorizations': [{ path: '/dashboard', title: '业务管理' }], '/installations': [{ path: '/dashboard', title: '业务管理' }], + '/online-stats': [{ path: '/dashboard', title: '业务管理' }], '/project-versions': [{ path: '/dashboard', title: '业务管理' }], '/announcements': [{ path: '/dashboard', title: '业务管理' }], '/orders': [{ path: '/dashboard', title: '订单与代理' }],