refactor:用 AdminApiList 统一后台列表类接口的响应格式

This commit is contained in:
2026-05-13 11:36:24 +08:00
parent edd863764b
commit 5d2dbdbe1d
29 changed files with 622 additions and 293 deletions

View File

@@ -4,7 +4,8 @@ namespace App\Http\Controllers\Api\V1\Admin\User;
use App\Http\Controllers\Controller;
use App\Models\AdminUser;
use App\Support\ApiResponse;
use App\Support\AdminApiList;
use App\Support\AdminUserApiPresenter;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -13,8 +14,7 @@ final class AdminUserIndexController extends Controller
{
public function __invoke(Request $request): JsonResponse
{
$perPage = min(max((int) $request->integer('per_page', 25), 1), 100);
$page = max((int) $request->integer('page', 1), 1);
$p = AdminApiList::readPaging($request);
$keyword = trim((string) $request->query('keyword', ''));
$q = AdminUser::query()
@@ -29,33 +29,8 @@ final class AdminUserIndexController extends Controller
});
}
$paginator = $q->paginate($perPage, ['*'], 'page', $page);
$paginator = $q->paginate($p['perPage'], ['*'], 'page', $p['page']);
return ApiResponse::success([
'items' => collect($paginator->items())->map(
fn (AdminUser $user): array => $this->row($user)
)->all(),
'meta' => [
'current_page' => $paginator->currentPage(),
'per_page' => $paginator->perPage(),
'total' => $paginator->total(),
'last_page' => $paginator->lastPage(),
],
]);
}
/** @return array<string, mixed> */
private function row(AdminUser $user): array
{
return [
'id' => (int) $user->id,
'username' => $user->username,
'nickname' => $user->name,
'email' => $user->email,
'status' => (int) $user->status,
'roles' => $user->adminRoleSlugs(),
'direct_permissions' => $user->directLegacyPermissionSlugs(),
'effective_permissions' => $user->adminPermissionSlugs(),
];
return AdminApiList::json($paginator, fn (AdminUser $user): array => AdminUserApiPresenter::listItem($user));
}
}