admin/Xboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理jc流量显示的问题

Browse Source
This commit is contained in:
yinjianm
2026-02-26 04:06:28 +08:00
parent 2d14e22322
commit 529953d98d
6 changed files with 286 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/V1/User/StatController.php
+36 -3
View File
@@ -5,22 +5,55 @@ namespace App\Http\Controllers\V1\User;
use App\Http\Controllers\Controller;
use App\Http\Resources\TrafficLogResource;
use App\Models\StatUser;
use App\Services\StatisticalService;
use App\Services\UserOnlineService;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
class StatController extends Controller
{
public function getTrafficLog(Request $request)
{
$startDate = now()->startOfMonth()->timestamp;
$userId = (int) $request->user()->id;
$records = StatUser::query()
->where('user_id', $request->user()->id)
->with(['server:id,name'])
->where('user_id', $userId)
->where('record_at', '>=', $startDate)
->orderBy('record_at', 'DESC')
->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']) && !empty($item['node_type']))
->groupBy(fn(array $item): string => strtolower((string) $item['node_type']))
->map(fn($items): array => collect($items)
->pluck('ip')
->filter()
->unique()
->values()
->all())
->all();
}
}
app/Http/Controllers/V2/Admin/StatController.php
+42 -3
View File
@@ -3,6 +3,7 @@
namespace App\Http\Controllers\V2\Admin;
use App\Http\Controllers\Controller;
use App\Http\Resources\TrafficLogResource;
use App\Models\CommissionLog;
use App\Models\Order;
use App\Models\Server;
@@ -12,6 +13,7 @@ use App\Models\StatUser;
use App\Models\Ticket;
use App\Models\User;
use App\Services\StatisticalService;
use App\Services\UserOnlineService;
use Illuminate\Http\Request;
class StatController extends Controller
@@ -234,17 +236,54 @@ class StatController extends Controller
]);
$pageSize = $request->input('pageSize', 10);
$records = StatUser::orderBy('record_at', 'DESC')
->where('user_id', $request->input('user_id'))
$userId = (int) $request->input('user_id');
$records = StatUser::query()
->with(['server:id,name'])
->orderBy('record_at', 'DESC')
->where('user_id', $userId)
->paginate($pageSize);
$data = $records->items();
$deviceMap = $this->buildNodeDeviceMap($userId);
$data = collect($records->items())
->map(function (StatUser $record) use ($deviceMap, $request): array {
$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');
return (new TrafficLogResource($record))->toArray($request);
})
->all();
return [
'data' => $data,
'total' => $records->total(),
];
}
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']) && !empty($item['node_type']))
->groupBy(fn(array $item): string => strtolower((string) $item['node_type']))
->map(fn($items): array => collect($items)
->pluck('ip')
->filter()
->unique()
->values()
->all())
->all();
}
public function getStatRecord(Request $request)
{
return [