add report for machines

2026-06-10 11:16:08 +03:30
parent a8b99706d0
commit 6b81075e40
10 changed files with 226 additions and 213 deletions
--- a/app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php
+++ b/app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php
@@ -39,10 +39,9 @@ class ControlUnitController extends Controller
 //                'previous_state_name' => $mission->state_name,
 //            ]);

-            $state = MissionStates::START_MISSION->value;
            $mission->update([
-                'state_id' => $state,
-                'state_name' => MissionStates::name($state),
+                'state_id' => MissionStates::START_MISSION->value,
+                'state_name' => MissionStates::START_MISSION->label(),
                'start_time' => $request->time,
                'km' => $request->km,
            ]);
@@ -63,11 +62,9 @@ class ControlUnitController extends Controller
 //                'previous_state_name' => $mission->state_name,
 //            ]);

-            $state = MissionStates::END_MISSION->value;
-
            $mission->update([
-                'state_id' => $state,
-                'state_name' => MissionStates::name($state),
+                'state_id' => MissionStates::END_MISSION->value,
+                'state_name' => MissionStates::END_MISSION->label(),
                'finish_time' => $request->time,
                'mission_duration' => strtotime($request->time) - strtotime($mission->start_time),
                'end_km' => $request->end_km,
@@ -86,10 +83,10 @@ class ControlUnitController extends Controller
 //            ]);
        });

-        if ($mission->category_id == 2) {
-            $rpc = new OperatorController;
-            $rpc->store($mission);
-        }
+//        if ($mission->category_id == 2) {
+//            $rpc = new OperatorController;
+//            $rpc->store($mission);
+//        }

 //        SendDataToFMSEvent::dispatch($mission);

--- a/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php
+++ b/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\V3\Dashboard\Mission\Report;
 use App\Exports\V3\Mission\Report\Machine\machineReport;
 use App\Http\Controllers\Controller;
 use App\Http\Traits\ApiResponse;
+use App\Models\City;
 use App\Models\Province;
 use App\Services\Cartables\Mission\Report\ReportMachineService;
 use Illuminate\Http\JsonResponse;
@@ -17,11 +18,11 @@ class ReportMachineController extends Controller
 {
    use ApiResponse;

-    public function activity(Request $request, ReportMachineService $reportMachineService): JsonResponse
+    public function countryMachinesActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
    {
        return $this->successResponse([
-            'activities' => $reportMachineService->activity($request),
-            'provinces' => Province::all(['id', 'name_fa']),
+            'activities' => $reportMachineService->countryMachinesActivity($request),
+//            'provinces' => Province::all(['id', 'name_fa']),
        ]);
    }

@@ -29,12 +30,59 @@ class ReportMachineController extends Controller
     * @throws Exception
     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
     */
-    public function excelActivity(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
+    public function countryMachinesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
    {
-        $data = $reportMachineService->activity($request);
-        $name = 'گزارش کل تردد یک ماشین '.verta()->now()->format('Y-m-d H-i').'.xlsx';
+        $data = $reportMachineService->countryMachinesActivity($request);
+        $name = 'گزارش ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';

        return Excel::download(new machineReport($data), $name);
    }

+    public function provinceMachinesActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
+    {
+        return $this->successResponse([
+            'activities' => $reportMachineService->countryMachinesActivity($request),
+//            'city' => City::query()
+//                ->where('province_id', $request->province_id)
+//                ->where(function ($query) {
+//                    $query->where('type_id', 1)
+//                        ->orWhereIn('name_fa', ['اداره ماشين‌آلات', 'اداره نقلیه']);
+//                })
+//                ->get(['id', 'name_fa'])
+        ]);
+    }
+
+    /**
+     * @throws Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
+     */
+    public function provinceMachinesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
+    {
+        $data = $reportMachineService->countryMachinesActivity($request);
+        $name = 'گزارش ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';
+
+        return Excel::download(new machineReport($data), $name);
+    }
+
+    public function countryMachineTypesActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
+    {
+        return $this->successResponse([
+            'activities' => $reportMachineService->countryMachineTypesActivity($request),
+//            'provinces' => Province::all(['id', 'name_fa']),
+        ]);
+    }
+
+    public function provinceMachineTypesActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
+    {
+        return $this->successResponse([
+            'activities' => $reportMachineService->provinceMachineTypesActivity($request),
+//            'city' => City::query()
+//                ->where('province_id', $request->province_id)
+//                ->where(function ($query) {
+//                    $query->where('type_id', 1)
+//                        ->orWhereIn('name_fa', ['اداره ماشين‌آلات', 'اداره نقلیه']);
+//                })
+//                ->get(['id', 'name_fa'])
+        ]);
+    }
 }
--- a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php
+++ b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php
@@ -17,6 +17,7 @@ use App\Http\Requests\V3\Mission\RequestPortal\UpdateRequest;
 use App\Http\Traits\ApiResponse;
 use App\Models\CMMSMachine;
 use App\Models\Mission;
+use App\Models\Rahdaran;
 use App\Models\RahdariPoint;
 use App\Models\RoadObserved;
 use App\Services\Cartables\Mission\RequestPortalService;
@@ -44,9 +45,6 @@ class RequestPortalController extends Controller
        DB::transaction(function () use ($request) {
            $user = auth()->user();

-            $state = MissionStates::REQUEST_CREATED->value;
-            $category = $request->category_id;
-
            $mission = Mission::query()->create([
                'user_id' => $user->id,
                'username' => $user->username,
@@ -56,8 +54,8 @@ class RequestPortalController extends Controller
                'city_name' => $user->city_fa ?? null,
                'edare_shahri_id' => $user->edarate_shahri_id ?? null,
                'edare_shahri_name' => $user->edarate_shahri_name ?? null,
-                'state_id' => $state,
-                'state_name' => MissionStates::name($state),
+                'state_id' => MissionStates::REQUEST_CREATED->value,
+                'state_name' => MissionStates::REQUEST_CREATED->label(),
                'requested_machines' => json_encode($request->requested_machines),
                'type' => $request->type,
                'type_fa' => MissionTypes::name($request->type),
@@ -69,12 +67,12 @@ class RequestPortalController extends Controller
                'description' => $request->description,
                'end_point' => $request->end_point,
                'area' => json_encode($request->area),
-                'category_id' => $category,
-                'category_name' => MissionCategory::name($category),
+                'category_id' => $request->category_id,
+                'category_name' => MissionCategory::name($request->category_id),
                'explanation' => $request->explanation,
                'code' => rand(100000, 999999),
                'station_id' => $user->station_id,
-                'station_name' => RahdariPoint::query()->find( $user->station_id)->name,
+                'station_name' => RahdariPoint::query()->find($user->station_id)->name,
            ]);

            $mission->rahdaran()->sync($request->rahdaran);
@@ -96,31 +94,26 @@ class RequestPortalController extends Controller
        DB::transaction(function () use ($request, $mission, $getErrorRateService) {
            $user = auth()->user();

+//            $getErrorRateService->setInputParameters($mission);
+//            $responseData = $getErrorRateService->run();
+
            $mission->update([
+//                'in_area_duration' => $responseData['timeInAreaSeconds'],
+//                'first_enter' => $responseData['firstEnter'],
+//                'last_exit' => $responseData['lastExit'],
+//                'point_number_sent' => $responseData['noOfPointsInMission'],
+//                'fms_result_code' => $responseData['resultCode'],
+//                'fms_result_message' => FMSResultCode::name($responseData['resultCode']),
                'finish_time' => now(),
                'state_id' => MissionStates::END_MISSION->value,
                'state_name' => MissionStates::name(MissionStates::END_MISSION->value),
            ]);

-            $getErrorRateService->setInputParameters($mission);
-            $responseData = $getErrorRateService->run();
-
-            $mission->update([
-                'in_area_duration' => $responseData['timeInAreaSeconds'],
-                'first_enter' => $responseData['firstEnter'],
-                'last_exit' => $responseData['lastExit'],
-                'point_number_sent' => $responseData['noOfPointsInMission'],
-                'fms_result_code' => $responseData['resultCode'],
-                'fms_result_message' => FMSResultCode::name($responseData['resultCode']),
-            ]);
-
 //            if ($mission->category_id == 2) {
 //                $rpc = new OperatorController;
 //                $rpc->store($mission);
 //            }

-            $state = MissionStates::START_MISSION->value;
-            $category = $request->category_id;
            $machine = CMMSMachine::query()->find($request->machine_id);

            $newMission = Mission::query()->create([
@@ -132,8 +125,8 @@ class RequestPortalController extends Controller
                'city_name' => $user->city_fa ?? null,
                'edare_shahri_id' => $user->edarate_shahri_id ?? null,
                'edare_shahri_name' => $user->edarate_shahri_name ?? null,
-                'state_id' => $state,
-                'state_name' => MissionStates::name($state),
+                'state_id' => MissionStates::START_MISSION->value,
+                'state_name' => MissionStates::START_MISSION->label(),
                'type' => $request->type,
                'type_fa' => MissionTypes::name($request->type),
                'zone' => $request->zone,
@@ -144,18 +137,19 @@ class RequestPortalController extends Controller
                'description' => $request->description,
                'end_point' => $request->end_point,
                'area' => json_encode($request->area),
-                'category_id' => $category,
-                'category_name' => MissionCategory::name($category),
+                'category_id' => $request->category_id,
+                'category_name' => MissionCategory::name($request->category_id),
                'explanation' => $request->explanation,
                'start_time' => now(),
                'machine_id' => $machine->id,
                'machine_code' => $machine->machine_code,
                'station_id' => $user->station_id,
                'station_name' => RahdariPoint::query()->find( $user->station_id)->name,
+                'driver_id' => $request->driver,
+                'driver_name' => Rahdaran::query()->find($request->driver)->name,
            ]);

            $newMission->rahdaran()->sync($request->rahdaran);
-            $newMission->rahdaran()->attach($request->driver, ['is_driver' => true]);
        });

        return $this->successResponse();
@@ -206,75 +200,6 @@ class RequestPortalController extends Controller
        return $this->successResponse();
    }

-    /**
-     * @throws Throwable
-     */
-    public function noProcess(NoProcessRequest $request, GetErrorRateService $getErrorRateService): JsonResponse
-    {
-        DB::transaction(function () use ($request, $getErrorRateService) {
-            $start = Carbon::parse($request->start_date);
-            $end = Carbon::parse($request->end_date);
-            $type = $start->diffInMinutes($end) > 480 ? MissionTypes::NO_PROCESS_ROZANE->value : MissionTypes::NO_PROCESS_SAATY->value;
-            $user = auth()->user();
-            $zone = $request->zone;
-            $state = MissionStates::END_MISSION->value;
-            $machine = CMMSMachine::query()->where('machine_code', '=', $request->machine_code)->first(['id', 'machine_code']);
-
-            $mission = Mission::query()->create([
-                'user_id' => $user->id,
-                'username' => $user->username,
-                'province_id' => $user->province_id,
-                'province_name' => $user->province_fa,
-                'city_id' => $user->city_id ?? null,
-                'city_name' => $user->city_fa ?? null,
-                'edare_shahri_id' => $user->edarate_shahri_id ?? null,
-                'edare_shahri_name' => $user->edarate_shahri_name ?? null,
-                'zone' => $zone,
-                'zone_fa' => MissionZones::name($zone),
-                'type' => $type,
-                'type_fa' => MissionTypes::name($type),
-                'start_date' => $request->start_date,
-                'area' => json_encode($request->area),
-                'end_date' => $request->end_date,
-                'end_point' => $request->end_point,
-                'category_id' => $request->category_id,
-                'category_name' => MissionCategory::name($request->category_id),
-                'start_time' => $request->start_date,
-                'finish_time' => $request->end_date,
-                'state_id' => $state,
-                'state_name' => MissionStates::name($state),
-                'explanation' => $request->explanation,
-                'request_date' => now(),
-                'machine_id' => $machine->id,
-                'machine_code' => $machine->machine_code,
-                'station_id' => $user->station_id,
-                'station_name' => RahdariPoint::query()->find( $user->station_id)->name,
-            ]);
-
-            $mission->rahdaran()->sync($request->rahdaran);
-            $mission->rahdaran()->attach($request->driver, ['is_driver' => true]);
-
-            $getErrorRateService->setInputParameters($mission);
-            $responseData = $getErrorRateService->run();
-
-            $mission->update([
-                'in_area_duration' => $responseData['timeInAreaSeconds'],
-                'first_enter' => $responseData['firstEnter'],
-                'last_exit' => $responseData['lastExit'],
-                'point_number_sent' => $responseData['noOfPointsInMission'],
-                'fms_result_code' => $responseData['resultCode'],
-                'fms_result_message' => FMSResultCode::name($responseData['resultCode']),
-            ]);
-
-//            if ($mission->category_id == 2) {
-//                $rpc = new OperatorController;
-//                $rpc->store($mission);
-//            }
-        });
-
-        return $this->successResponse();
-    }
-
    public function changeState(ChangeStateRequest $request, Mission $mission): JsonResponse
    {
        $mission->update([
--- a/app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php
+++ b/app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php
@@ -10,6 +10,7 @@ use App\Http\Requests\V3\Mission\TransportaionUnit\DeallocateRequest;
 use App\Http\Traits\ApiResponse;
 use App\Models\CMMSMachine;
 use App\Models\Mission;
+use App\Models\Rahdaran;
 use App\Services\Cartables\Mission\TransportationUnitService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -31,7 +32,6 @@ class TransportationUnitController extends Controller
    public function allocate(AllocateRequest $request, Mission $mission): JsonResponse
    {
        DB::transaction(function () use ($request, $mission) {
-            $mission->rahdaran()->attach($request->driver, ['is_driver' => true]);

 //            $mission->histories()->create([
 //                'user_id' => auth()->user()->id,
@@ -47,6 +47,8 @@ class TransportationUnitController extends Controller
                'state_name' => MissionStates::name($state),
                'machine_id' => $machine->id,
                'machine_code' => $machine->machine_code,
+                'driver_id' => $request->driver_id,
+                'driver_name' => Rahdaran::query()->find($request->driver)->name,
            ]);
        });

@@ -59,7 +61,6 @@ class TransportationUnitController extends Controller
    public function deallocate(DeallocateRequest $request, Mission $mission): JsonResponse
    {
        DB::transaction(function () use ($request, $mission) {
-            $mission->rahdaran()->wherePivot('is_driver', '=',  true)->detach();

 //            $mission->histories()->create([
 //                'user_id' => auth()->user()->id,
@@ -76,6 +77,8 @@ class TransportationUnitController extends Controller
                'description' => $request->description,
                'machine_id' => null,
                'machine_code' => null,
+                'driver_id' => null,
+                'driver_name' => null,
            ]);
        });

--- a/app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php
+++ b/app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php
@@ -16,6 +16,7 @@ use App\Http\Traits\ApiResponse;
 use App\Models\CMMSMachine;
 use App\Models\Mission;
 use App\Models\MissionViolation;
+use App\Models\Rahdaran;
 use App\Models\RahdariPoint;
 use App\Services\Cartables\Mission\DailyMoveMachineService;
 use Carbon\Carbon;
@@ -47,7 +48,6 @@ class ViolationManagementController extends Controller
            $type = $start->diffInMinutes($end) > 480 ? MissionTypes::NO_PROCESS_ROZANE->value : MissionTypes::NO_PROCESS_SAATY->value;
            $user = auth()->user();
            $zone = $request->zone;
-            $state = MissionStates::END_MISSION->value;
            $machine = CMMSMachine::query()->where('machine_code', '=', $violation->machine_code)->first(['id', 'machine_code']);

            $mission = Mission::query()->create([
@@ -70,8 +70,8 @@ class ViolationManagementController extends Controller
                'category_name' => MissionCategory::name($request->category_id),
                'start_time' => $request->start_date,
                'finish_time' => $request->end_date,
-                'state_id' => $state,
-                'state_name' => MissionStates::name($state),
+                'state_id' => MissionStates::END_MISSION->value,
+                'state_name' => MissionStates::END_MISSION->label(),
                'explanation' => $request->explanation,
                'request_date' => now(),
                'machine_id' => $machine->id,
@@ -79,10 +79,11 @@ class ViolationManagementController extends Controller
                'station_id' => $user->station_id,
                'station_name' => RahdariPoint::query()->find( $user->station_id)->name,
                'km' => $violation->km ?? null,
+                'driver_id' => $request->driver,
+                'driver_name' => Rahdaran::query()->find($request->driver)->name,
            ]);

            $mission->rahdaran()->sync($request->rahdaran);
-            $mission->rahdaran()->attach($request->driver, ['is_driver' => true]);

            $violation->update(['status' => 1]);

@@ -135,5 +136,4 @@ class ViolationManagementController extends Controller
        $violation->delete();
        return $this->successResponse();
    }
-
 }