ivampiresp/Lae
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimize

Browse Source
This commit is contained in:
iVampireSP.com 2022-11-16 13:22:41 +08:00
parent 3f464cc35d
commit 8270284a5e
No known key found for this signature in database
GPG Key ID: 2F7B001CA27A8132
8 changed files with 47 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Api/WorkOrder/ReplyController.php → app/Http/Controllers/Api/ReplyController.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Controllers\Api\WorkOrder; namespace App\Http\Controllers\Api;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Models\WorkOrder\Reply; use App\Models\WorkOrder\Reply;
@ -13,7 +13,7 @@ class ReplyController extends Controller
/** /**
* Display a listing of the resource. * Display a listing of the resource.
* *
* @return \Illuminate\Http\Response * @return \Illuminate\Http\JsonResponse
*/ */
public function index(WorkOrder $workOrder) public function index(WorkOrder $workOrder)
{ {

13
app/Http/Controllers/Api/WorkOrder/WorkOrderController.php → app/Http/Controllers/Api/WorkOrderController.php
View File

@ -1,16 +1,17 @@
<?php <?php
namespace App\Http\Controllers\Api\WorkOrder; namespace App\Http\Controllers\Api;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Models\WorkOrder\WorkOrder; use App\Models\WorkOrder\WorkOrder;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use function auth; use function auth;
class WorkOrderController extends Controller class WorkOrderController extends Controller
{ {
// //
public function index(WorkOrder $workOrder) public function index(WorkOrder $workOrder): JsonResponse
{ {
$workOrder = $workOrder->thisUser()->with(['user', 'module', 'host'])->simplePaginate(100); $workOrder = $workOrder->thisUser()->with(['user', 'module', 'host'])->simplePaginate(100);
@ -18,6 +19,9 @@ public function index(WorkOrder $workOrder)
return $this->success($workOrder); return $this->success($workOrder);
} }
/**
* @throws \Illuminate\Validation\ValidationException
*/
public function store(Request $request) public function store(Request $request)
{ {
$this->validate($request, [ $this->validate($request, [
@ -46,7 +50,7 @@ public function store(Request $request)
return $this->success($workOrder); return $this->success($workOrder);
} }
public function show(WorkOrder $workOrder) public function show(WorkOrder $workOrder): JsonResponse
{ {
if (auth()->id() !== $workOrder->user_id) { if (auth()->id() !== $workOrder->user_id) {
return $this->notFound('无法找到对应的工单。'); return $this->notFound('无法找到对应的工单。');
@ -56,6 +60,9 @@ public function show(WorkOrder $workOrder)
return $this->success($workOrder); return $this->success($workOrder);
} }
/**
* @throws \Illuminate\Validation\ValidationException
*/
public function update(Request $request, WorkOrder $workOrder) public function update(Request $request, WorkOrder $workOrder)
{ {

23
app/Http/Controllers/Modules/Host/HostController.php → app/Http/Controllers/Modules/HostController.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Controllers\Modules\Host; namespace App\Http\Controllers\Modules;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Models\Host; use App\Models\Host;
@ -9,6 +9,7 @@
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Http\Response; use Illuminate\Http\Response;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use function auth;
// use Illuminate\Support\Facades\Log; // use Illuminate\Support\Facades\Log;
@ -17,14 +18,14 @@ class HostController extends Controller
/** /**
* Display a listing of the resource. * Display a listing of the resource.
* *
* @return Response * @return Response|null
*/ */
public function index() public function index(): ?Response
{ {
// //
// Host::all(); // Host::all();
return; return null;
} }
/** /**
@ -33,8 +34,9 @@ public function index()
* @param Request $request * @param Request $request
* *
* @return Response|JsonResponse * @return Response|JsonResponse
* @throws \Illuminate\Validation\ValidationException
*/ */
public function store(Request $request) public function store(Request $request): Response|JsonResponse
{ {
// 存储计费项目 // 存储计费项目
$this->validate($request, [ $this->validate($request, [
@ -76,7 +78,7 @@ public function store(Request $request)
* *
* @return JsonResponse * @return JsonResponse
*/ */
public function show(Host $host) public function show(Host $host): JsonResponse
{ {
return $this->success($host); return $this->success($host);
@ -92,8 +94,9 @@ public function show(Host $host)
* @param Host $host * @param Host $host
* *
* @return JsonResponse * @return JsonResponse
* @throws \Illuminate\Validation\ValidationException
*/ */
public function update(Request $request, Host $host) public function update(Request $request, Host $host): JsonResponse
{ {
// //
$this->validate($request, [ $this->validate($request, [
@ -134,16 +137,14 @@ public function update(Request $request, Host $host)
* *
* @return JsonResponse * @return JsonResponse
*/ */
public function destroy($host) public function destroy($host): JsonResponse
{ {
if ($host instanceof Host) { if ($host instanceof Host) {
$host->delete(); $host->delete();
} else { } else {
$host = Host::findOrFail($host); $host = Host::findOrFail($host);
if ($host) { $host?->delete();
$host->delete();
}
} }
return $this->deleted($host); return $this->deleted($host);

6
app/Http/Controllers/Modules/WorkOrder/ReplyController.php → app/Http/Controllers/Modules/ReplyController.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Controllers\Modules\WorkOrder; namespace App\Http\Controllers\Modules;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Models\WorkOrder\Reply; use App\Models\WorkOrder\Reply;
@ -14,7 +14,7 @@ class ReplyController extends Controller
* *
* @return JsonResponse * @return JsonResponse
*/ */
public function index(Request $request) public function index(Request $request): JsonResponse
{ {
// //
$replies = Reply::workOrderId($request->route('work_order'))->simplePaginate(10); $replies = Reply::workOrderId($request->route('work_order'))->simplePaginate(10);
@ -28,7 +28,7 @@ public function index(Request $request)
* *
* @return JsonResponse * @return JsonResponse
*/ */
public function store(Request $request) public function store(Request $request): JsonResponse
{ {
// //

10
app/Http/Controllers/Modules/Host/TaskController.php → app/Http/Controllers/Modules/TaskController.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Controllers\Modules\Host; namespace App\Http\Controllers\Modules;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Models\Task; use App\Models\Task;
@ -18,7 +18,7 @@ class TaskController extends Controller
* *
* @return Response|null * @return Response|null
*/ */
public function index(Request $request) public function index(Request $request): ?Response
{ {
// //
// $this->assignId($request); // $this->assignId($request);
@ -34,8 +34,9 @@ public function index(Request $request)
* @param Request $request * @param Request $request
* *
* @return JsonResponse * @return JsonResponse
* @throws \Illuminate\Validation\ValidationException
*/ */
public function store(Request $request) public function store(Request $request): JsonResponse
{ {
// //
$this->validate($request, [ $this->validate($request, [
@ -56,8 +57,9 @@ public function store(Request $request)
* @param Task $task * @param Task $task
* *
* @return JsonResponse * @return JsonResponse
* @throws \Illuminate\Validation\ValidationException
*/ */
public function update(Request $request, Task $task) public function update(Request $request, Task $task): JsonResponse
{ {
// //
$this->validate($request, [ $this->validate($request, [

12
app/Http/Controllers/Modules/WorkOrder/WorkOrderController.php → app/Http/Controllers/Modules/WorkOrderController.php
View File

@ -1,16 +1,17 @@
<?php <?php
namespace App\Http\Controllers\Modules\WorkOrder; namespace App\Http\Controllers\Modules;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\Remote\WorkOrderRequest; use App\Http\Requests\Remote\WorkOrderRequest;
use App\Models\WorkOrder\WorkOrder; use App\Models\WorkOrder\WorkOrder;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
class WorkOrderController extends Controller class WorkOrderController extends Controller
{ {
// //
public function index(Request $request, WorkOrder $workOrder) public function index(WorkOrder $workOrder): JsonResponse
{ {
// $work_orders = new WorkOrder(); // $work_orders = new WorkOrder();
// // if route has user // // if route has user
@ -29,12 +30,15 @@ public function index(Request $request, WorkOrder $workOrder)
// } // }
public function show(WorkOrderRequest $request, WorkOrder $workOrder) public function show(WorkOrderRequest $request, WorkOrder $workOrder): JsonResponse
{ {
return $this->success($workOrder); return $this->success($workOrder);
} }
public function update(WorkOrderRequest $request, WorkOrder $workOrder) /**
* @throws \Illuminate\Validation\ValidationException
*/
public function update(WorkOrderRequest $request, WorkOrder $workOrder): JsonResponse
{ {
$this->validate($request, [ $this->validate($request, [
'status' => 'nullable|sometimes|string|in:open,closed,on_hold,in_progress', 'status' => 'nullable|sometimes|string|in:open,closed,on_hold,in_progress',

4
routes/api.php
View File

@ -4,11 +4,11 @@
use App\Http\Controllers\Api\ForumController; use App\Http\Controllers\Api\ForumController;
use App\Http\Controllers\Api\HostController; use App\Http\Controllers\Api\HostController;
use App\Http\Controllers\Api\ModuleController; use App\Http\Controllers\Api\ModuleController;
use App\Http\Controllers\Api\ReplyController;
use App\Http\Controllers\Api\ServerController; use App\Http\Controllers\Api\ServerController;
use App\Http\Controllers\Api\TaskController; use App\Http\Controllers\Api\TaskController;
use App\Http\Controllers\Api\UserController; use App\Http\Controllers\Api\UserController;
use App\Http\Controllers\Api\WorkOrder\ReplyController; use App\Http\Controllers\Api\WorkOrderController;
use App\Http\Controllers\Api\WorkOrder\WorkOrderController;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
Route::get('user', [UserController::class, 'index']); Route::get('user', [UserController::class, 'index']);

8
routes/modules.php
View File

@ -1,12 +1,12 @@
<?php <?php
use App\Http\Controllers\Modules\BroadcastController; use App\Http\Controllers\Modules\BroadcastController;
use App\Http\Controllers\Modules\Host\HostController; use App\Http\Controllers\Modules\HostController;
use App\Http\Controllers\Modules\Host\TaskController;
use App\Http\Controllers\Modules\ModuleController; use App\Http\Controllers\Modules\ModuleController;
use App\Http\Controllers\Modules\ReplyController;
use App\Http\Controllers\Modules\TaskController;
use App\Http\Controllers\Modules\UserController; use App\Http\Controllers\Modules\UserController;
use App\Http\Controllers\Modules\WorkOrder\ReplyController; use App\Http\Controllers\Modules\WorkOrderController;
use App\Http\Controllers\Modules\WorkOrder\WorkOrderController;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
Route::get('modules', [ModuleController::class, 'index']); Route::get('modules', [ModuleController::class, 'index']);