Files
Xboard/app/Http/Controllers/V1/User/StatController.php
T
yinjianm dbffb0a7bd 后端流量记录排序改为更精确时间优先(避免只按 record_at 导致排序/分钟不准)
StatController.php (E:/code/php/Xboard-new/app/Http/Controllers/V1/User/StatController.php:22)
     StatController.php (E:/code/php/Xboard-new/app/Http/Controllers/V2/Admin/StatController.php:242)
  2. 流量资源新增 display_at(优先 updated_at,回退 created_at/record_at)
     TrafficLogResource.php (E:/code/php/Xboard-new/app/Http/Resources/TrafficLogResource.php:19)
     TrafficLogResource.php (E:/code/php/Xboard-new/app/Http/Resources/TrafficLogResource.php:43)
  3. 管理端前端(打包产物)流量列改为:时间/上行/下行/倍率/节点/设备/总计,时间显示 YYYY/MM/DD HH:mm
     index.js (E:/code/php/Xboard-new/public/assets/admin/assets/index.js:16)
2026-02-26 05:55:02 +08:00

76 lines
2.8 KiB
PHP

<?php
namespace App\Http\Controllers\V1\User;
use App\Http\Controllers\Controller;
use App\Http\Resources\TrafficLogResource;
use App\Models\StatUser;
use App\Services\UserOnlineService;
use Illuminate\Http\Request;
class StatController extends Controller
{
public function getTrafficLog(Request $request)
{
$startDate = now()->startOfMonth()->timestamp;
$userId = (int) $request->user()->id;
$records = StatUser::query()
->with(['server:id,name'])
->where('user_id', $userId)
->where('record_at', '>=', $startDate)
->orderByDesc('updated_at')
->orderByDesc('created_at')
->orderByDesc('record_at')
->get();
$deviceMap = $this->buildNodeDeviceMap($userId);
$records->each(function (StatUser $record) use ($deviceMap): void {
$serverType = strtolower((string) $record->server_type);
$serverId = (int) $record->server_id;
$nodeKey = $serverType !== '' && $serverId > 0 ? "{$serverType}{$serverId}" : null;
$deviceIps = $nodeKey ? ($deviceMap[$nodeKey] ?? []) : [];
$record->setAttribute('server_name', $record->server?->name);
$record->setAttribute('node_name', $record->server?->name);
$record->setAttribute('device_ips', $deviceIps);
$record->setAttribute('device_count', count($deviceIps));
$record->setAttribute('device_name', $deviceIps[0] ?? 'Unknown');
});
$data = TrafficLogResource::collection(collect($records));
return $this->success($data);
}
private function buildNodeDeviceMap(int $userId): array
{
$devices = UserOnlineService::getUserDevices($userId);
$deviceList = data_get($devices, 'devices', []);
return collect($deviceList)
->filter(fn($item): bool => is_array($item) && !empty($item['ip']))
->map(function (array $item): array {
$nodeKey = strtolower((string) ($item['node_key'] ?? ''));
if ($nodeKey === '') {
$nodeType = strtolower((string) ($item['node_type'] ?? ''));
$nodeId = (int) ($item['node_id'] ?? 0);
$nodeKey = ($nodeType !== '' && $nodeId > 0) ? "{$nodeType}{$nodeId}" : $nodeType;
}
return [
'node_key' => $nodeKey,
'ip' => (string) ($item['ip'] ?? ''),
];
})
->filter(fn(array $item): bool => $item['node_key'] !== '' && $item['ip'] !== '')
->groupBy(fn(array $item): string => $item['node_key'])
->map(fn($items): array => collect($items)
->pluck('ip')
->filter()
->unique()
->values()
->all())
->all();
}
}