mirror of
https://github.com/lkddi/Xboard.git
synced 2026-04-30 16:07:24 +08:00
Combine data with node_id in api output, so its all still "one day", and fits vanilla xboard behaviour
This commit is contained in:
@@ -14,9 +14,20 @@ class StatController extends Controller
|
|||||||
public function getTrafficLog(Request $request)
|
public function getTrafficLog(Request $request)
|
||||||
{
|
{
|
||||||
$startDate = now()->startOfMonth()->timestamp;
|
$startDate = now()->startOfMonth()->timestamp;
|
||||||
|
|
||||||
|
// Aggregate per-node data back to per-day format for backward compatibility
|
||||||
$records = StatUser::query()
|
$records = StatUser::query()
|
||||||
|
->select([
|
||||||
|
'user_id',
|
||||||
|
'server_rate',
|
||||||
|
'record_at',
|
||||||
|
'record_type',
|
||||||
|
DB::raw('SUM(u) as u'),
|
||||||
|
DB::raw('SUM(d) as d'),
|
||||||
|
])
|
||||||
->where('user_id', $request->user()->id)
|
->where('user_id', $request->user()->id)
|
||||||
->where('record_at', '>=', $startDate)
|
->where('record_at', '>=', $startDate)
|
||||||
|
->groupBy(['user_id', 'server_rate', 'record_at', 'record_type'])
|
||||||
->orderBy('record_at', 'DESC')
|
->orderBy('record_at', 'DESC')
|
||||||
->get();
|
->get();
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ use App\Models\Ticket;
|
|||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
use App\Services\StatisticalService;
|
use App\Services\StatisticalService;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
class StatController extends Controller
|
class StatController extends Controller
|
||||||
{
|
{
|
||||||
@@ -234,14 +235,30 @@ class StatController extends Controller
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
$pageSize = $request->input('pageSize', 10);
|
$pageSize = $request->input('pageSize', 10);
|
||||||
$records = StatUser::orderBy('record_at', 'DESC')
|
$page = $request->input('page', 1);
|
||||||
|
|
||||||
|
// Aggregate per-node data back to per-day format for backward compatibility
|
||||||
|
$query = StatUser::query()
|
||||||
|
->select([
|
||||||
|
'user_id',
|
||||||
|
'server_rate',
|
||||||
|
'record_at',
|
||||||
|
'record_type',
|
||||||
|
DB::raw('SUM(u) as u'),
|
||||||
|
DB::raw('SUM(d) as d'),
|
||||||
|
DB::raw('MAX(created_at) as created_at'),
|
||||||
|
DB::raw('MAX(updated_at) as updated_at'),
|
||||||
|
])
|
||||||
->where('user_id', $request->input('user_id'))
|
->where('user_id', $request->input('user_id'))
|
||||||
->paginate($pageSize);
|
->groupBy(['user_id', 'server_rate', 'record_at', 'record_type'])
|
||||||
|
->orderBy('record_at', 'DESC');
|
||||||
|
|
||||||
|
$total = $query->get()->count();
|
||||||
|
$data = $query->skip(($page - 1) * $pageSize)->take($pageSize)->get();
|
||||||
|
|
||||||
$data = $records->items();
|
|
||||||
return [
|
return [
|
||||||
'data' => $data,
|
'data' => $data,
|
||||||
'total' => $records->total(),
|
'total' => $total,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user