BitMaster/ProxyPanel
1
0
Fork 0
mirror of https://github.com/ProxyPanel/ProxyPanel.git synced 2026-04-11 23:19:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove 'total' & 'traffic' in dataflow database table

Browse Source
This commit is contained in:
BrettonYe
2023-07-22 16:42:37 +08:00
committed by BrettonYe
parent b5c04f34ae
commit 226e1dfdec
22 changed files with 229 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Admin/ReportController.php
View File

@@ -71,7 +71,7 @@ class ReportController extends Controller
if (isset($user)) {
// 用户当前小时在各线路消耗流量
$data['currentHourlyFlow'] = $user->dataFlowLogs()
->where('log_time', '>=', strtotime(date('Y-m-d H:00')))
->where('log_time', '>=', now()->startOfHour()->timestamp)
->groupBy('node_id')
->selectRaw('node_id, sum(u + d) as total')
->get()->toArray();
@@ -79,8 +79,8 @@ class ReportController extends Controller
// 用户今天各小时在各线路消耗流量
$data['hours'] = range(0, 23);
$data['hourlyFlow'] = $user->hourlyDataFlows()->whereNotNull('node_id')
->where('created_at', '>=', date('Y-m-d H:i:s', strtotime('-1 days')))
->selectRaw('node_id, (DATE_FORMAT(user_hourly_data_flow.created_at, "%k")) as date, total')
->whereDate('created_at', now())
->selectRaw('node_id, (DATE_FORMAT(user_hourly_data_flow.created_at, "%k")) as date, u + d as total')
->get()->transform(function ($item) {
return [
'node_id' => $item->node_id,
@@ -93,8 +93,7 @@ class ReportController extends Controller
$data['days'] = range(1, date('j'));
$data['dailyFlow'] = $user->dailyDataFlows()->whereNotNull('node_id')
->whereMonth('created_at', date('n'))
->where('total', '>', 6000000)
->selectRaw('node_id, (DATE_FORMAT(user_daily_data_flow.created_at, "%e")) as date, total')
->selectRaw('node_id, (DATE_FORMAT(user_daily_data_flow.created_at, "%e")) as date, u + d as total')
->get()->transform(function ($item) {
return [
'node_id' => $item->node_id,