RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change the bundle and fix the bugs

Browse Source
This commit is contained in:
amirghasempoor
2025-06-23 10:12:08 +03:30
parent 4e463de0d3
commit 47dd5afb47
10 changed files with 138 additions and 596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
app/Http/Controllers/V3/Dashboard/RoadPatrol/DetailController.php Normal file
View File

@@ -0,0 +1,69 @@
<?php
namespace App\Http\Controllers\V3\Dashboard\RoadPatrol;
use App\Http\Controllers\Controller;
use App\Http\Traits\ApiResponse;
use App\Models\RoadObserved;
use App\Models\RoadPatrol;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class DetailController extends Controller
{
use ApiResponse;
public function map(Request $request): JsonResponse
{
$province = $request->province_id;
$edare_shahri = $request->edare_shahri_id;
$status = $request->status;
$rms_status = $request->rms_status;
if ($request->from_date && $request->date_to) {
$date_from = $request->from_date.' 00:00:00';
$date_to = $request->date_to.' 23:59:59';
} else {
$date_from = Date('Y-m-d');
$date_to = new \DateTime('tomorrow');
$date_to = $date_to->format('Y-m-d');
}
$projects = RoadObserved::query()->select(['id', 'lng', 'lat','status'])
->whereBetween('created_at', [$date_from, $date_to])
->when($province, function ($query) use ($province) {
return $query->where('province_id', '=', $province);
})
->when($rms_status, function ($query) use ($rms_status) {
if ($rms_status == 2) {
return $query->where('rms_status', '<>', 0);
} else {
return $query->where('rms_status', '=', 0);
}
})
->when($edare_shahri, function ($query) use ($edare_shahri) {
return $query->where('edarate_shahri_id', '=', $edare_shahri);
})
->when($status, function ($query) use ($status) {
return $query->where('status', '=', $status);
})
->get();
return $this->successResponse($projects);
}
public function show(RoadPatrol $roadPatrol): JsonResponse
{
return $this->successResponse($roadPatrol);
}
public function machines(RoadPatrol $roadPatrol): JsonResponse
{
return $this->successResponse($roadPatrol->cmmsMachines()->get(['cmms_machines.id', 'cmms_machines.machine_code', 'cmms_machines.car_name', 'cmms_machines.plak_number']));
}
public function rahdaran(RoadPatrol $roadPatrol): JsonResponse
{
return $this->successResponse($roadPatrol->rahdaran()->get(['rahdaran.id', 'rahdaran.name', 'rahdaran.code']));
}
}

206
app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php → app/Http/Controllers/V3/Dashboard/RoadPatrol/OperatorController.php
View File

@@ -1,10 +1,10 @@
<?php
namespace App\Http\Controllers\V3\Dashboard;
namespace App\Http\Controllers\V3\Dashboard\RoadPatrol;
use App\Enums\MissionStates;
use App\Exports\V3\RoadPatrols\OperatorCartableReport;
use App\Exports\V3\RoadPatrols\SupervisorCartableReport;
use App\Facades\Sms\Sms;
use App\Http\Controllers\Controller;
use App\Http\Requests\V3\RoadPatrol\DeleteRequest;
@@ -14,105 +14,47 @@ use App\Models\EdarateShahri;
use App\Models\InfoItem;
use App\Models\Mission;
use App\Models\RoadItemsProject;
use App\Models\RoadObserved;
use App\Models\RoadPatrol;
use App\Services\Cartables\RoadPatrol\ReportService;
use App\Services\Cartables\RoadPatrol\OperatorService;
use App\Services\NominatimService;
use Carbon\Carbon;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Gate;
use Illuminate\Support\Facades\Storage;
use Illuminate\Validation\ValidationException;
use Maatwebsite\Excel\Facades\Excel;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
class RoadPatrolProjectController extends Controller
class OperatorController extends Controller
{
use ApiResponse;
public function supervisorIndex(Request $request, ReportService $roadPatrolTableService): JsonResponse
public function index(Request $request, OperatorService $operatorService): JsonResponse
{
$data = $roadPatrolTableService->supervisorCartableReport($request);
foreach ($data['data'] as $road_patrol) {
if (Gate::allows('gate-supervise-road-item', $road_patrol)) {
$road_patrol['can_supervise'] = 1;
} else {
$road_patrol['can_supervise'] = 0;
}
}
$data = $operatorService->dataTable($request);
return response()->json($data);
}
public function delete(DeleteRequest $request, RoadPatrol $roadPatrol): JsonResponse
public function excel(Request $request, OperatorService $operatorService): BinaryFileResponse
{
if ($request->type == 1) {
DB::transaction(function () use ($roadPatrol) {
$roadPatrol->observedItems()->delete();
$roadPatrol->delete();
});
} else {
DB::transaction(function () use ($roadPatrol) {
if ($roadPatrol->observedItems) {
foreach ($roadPatrol->observedItems as $index => $observed_item) {
if ($observed_item->roadItemProject) {
$road_item = $observed_item->roadItemProject;
if ($road_item->files()->exists()) {
Storage::delete('public/'. $road_item->files[0]->path);
Storage::delete('public/'. $road_item->files[1]->path);
$road_item->files()->delete();
}
$road_item->delete();
}
$observed_item->delete();
}
}
auth()->user()->addActivityComplete(1144);
$roadPatrol->delete();
});
}
return $this->successResponse();
}
public function supervisorCartableReport(Request $request, ReportService $roadPatrolTableService): BinaryFileResponse
{
$name = 'گزارش از کارتابل ارزیابی گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
$data = $roadPatrolTableService->supervisorCartableReport($request, true);
return Excel::download(new SupervisorCartableReport($data['data']), $name);
}
public function operatorIndex(Request $request, ReportService $roadPatrolTableService): JsonResponse
{
$data = $roadPatrolTableService->operatorCartableReport($request);
return response()->json($data);
$name = 'گزارش از کارتابل عملیات گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
$data = $operatorService->dataTable($request, true);
return Excel::download(new OperatorCartableReport($data['data']), $name);
}
public function store(StoreRequest $request, NominatimService $nominatimService): JsonResponse
{
$user = auth()->user();
if ($user->edarate_ostani_id || is_null($user->city_id)) {
return $this->errorResponse('امکان ثبت فعالیت برای ادارات استانی وجود ندارد!');
}
if (is_null($user->edarate_shahri_id)) {
return $this->errorResponse('اداره شهری برای شما در سامانه ثبت نشده است!');
}
$edare_id = $user->edarate_shahri_id ?? $user->edarate_ostani_id;
$edare_name = $user->edarate_shahri_id ? $user->edarate_shahri_name : $user->edarate_ostani_name;
$road_patrol = DB::transaction(function () use ($request, $edare_id,
$edare_name, $nominatimService, $user) {
$mission = Mission::findOrFail($request->mission_id);
$road_patrol = DB::transaction(function () use (
$request, $edare_id,
$edare_name, $nominatimService, $user
) {
$mission = Mission::query()->findOrFail($request->mission_id);
if ($mission->status !== MissionStates::START_MISSION->value) {
throw ValidationException::withMessages([
@@ -249,7 +191,7 @@ class RoadPatrolProjectController extends Controller
auth()->user()->addActivityComplete(1147);
Sms::sendSms($request->officer_phone_number,
"گشت راهداری با کد یکتای $road_patrol->id در تاریخ ".verta(\Carbon\Carbon::now())->format('Y-m-d H:i:s')." با شماره شما در سامانه RMS ثبت شد. \n لینک دریافت گزارش : \n https://rms.rmto.ir/v2/road_patrols/operator/report/$road_patrol->id"
"گشت راهداری با کد یکتای $road_patrol->id در تاریخ " . verta(\Carbon\Carbon::now())->format('Y-m-d H:i:s') . " با شماره شما در سامانه RMS ثبت شد. \n لینک دریافت گزارش : \n https://rms.rmto.ir/v2/road_patrols/operator/report/$road_patrol->id"
);
return $road_patrol;
});
@@ -257,94 +199,38 @@ class RoadPatrolProjectController extends Controller
return $this->successResponse();
}
public function getReport(RoadPatrol $roadPatrol): JsonResponse
public function delete(DeleteRequest $request, RoadPatrol $roadPatrol): JsonResponse
{
$data = [
'serial_no' => $roadPatrol->id,
'province_fa' => $roadPatrol->province_fa,
'edare_name' => $roadPatrol->edare_name,
'start_time' => $roadPatrol->start_time,
'end_time' => $roadPatrol->end_time,
'officer_name' => $roadPatrol->officer_name,
'officer_plaque' => $roadPatrol->officer_plaque,
'officer_phone_number' => $roadPatrol->officer_phone_number,
'created_at' => $roadPatrol->created_at
];
$observed_items = array();
if($roadPatrol->observedItems) {
foreach ($roadPatrol->observedItems as $index => $observed_item) {
$observed_items[] = [
'item' => $observed_item->item_name,
'sub_item' => $observed_item->sub_item_name,
'local_name' => $observed_item->local_name,
'description' => $observed_item->description,
'priority_fa' => $observed_item->priority_fa,
];
}
}
$data['observed_items'] = $observed_items;
return $this->successResponse($data);
}
public function map(Request $request): JsonResponse
{
$province = $request->province_id;
$edare_shahri = $request->edare_shahri_id;
$status = $request->status;
$rms_status = $request->rms_status;
if ($request->from_date && $request->date_to) {
$date_from = $request->from_date.' 00:00:00';
$date_to = $request->date_to.' 23:59:59';
if ($request->type == 1) {
DB::transaction(function () use ($roadPatrol) {
$roadPatrol->observedItems()->delete();
$roadPatrol->delete();
});
} else {
$date_from = Date('Y-m-d');
$date_to = new \DateTime('tomorrow');
$date_to = $date_to->format('Y-m-d');
DB::transaction(function () use ($roadPatrol) {
if ($roadPatrol->observedItems) {
foreach ($roadPatrol->observedItems as $index => $observed_item) {
if ($observed_item->roadItemProject) {
$road_item = $observed_item->roadItemProject;
if ($road_item->files()->exists()) {
Storage::delete('public/' . $road_item->files[0]->path);
Storage::delete('public/' . $road_item->files[1]->path);
$road_item->files()->delete();
}
$road_item->delete();
}
$observed_item->delete();
}
}
auth()->user()->addActivityComplete(1144);
$roadPatrol->delete();
});
}
$projects = RoadObserved::query()->select(['id', 'lng', 'lat','status'])
->whereBetween('created_at', [$date_from, $date_to])
->when($province, function ($query) use ($province) {
return $query->where('province_id', '=', $province);
})
->when($rms_status, function ($query) use ($rms_status) {
if ($rms_status == 2) {
return $query->where('rms_status', '<>', 0);
} else {
return $query->where('rms_status', '=', 0);
}
})
->when($edare_shahri, function ($query) use ($edare_shahri) {
return $query->where('edarate_shahri_id', '=', $edare_shahri);
})
->when($status, function ($query) use ($status) {
return $query->where('status', '=', $status);
})
->get();
return $this->successResponse($projects);
}
public function show(RoadPatrol $roadPatrol): JsonResponse
{
return $this->successResponse($roadPatrol);
}
public function operatorCartableReport(Request $request, ReportService $roadPatrolTableService): BinaryFileResponse
{
$name = 'گزارش از کارتابل عملیات گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
$data = $roadPatrolTableService->operatorCartableReport($request, true);
return Excel::download(new OperatorCartableReport($data['data']), $name);
}
public function roadPatrolMachine(RoadPatrol $roadPatrol): JsonResponse
{
return $this->successResponse($roadPatrol->cmmsMachines()->get(['cmms_machines.id', 'cmms_machines.machine_code', 'cmms_machines.car_name', 'cmms_machines.plak_number']));
}
public function roadPatrolRahdar(RoadPatrol $roadPatrol): JsonResponse
{
return $this->successResponse($roadPatrol->rahdaran()->get(['rahdaran.id', 'rahdaran.name', 'rahdaran.code']));
return $this->successResponse();
}
}

138
app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php → app/Http/Controllers/V3/Dashboard/RoadPatrol/ReportController.php
View File

@@ -1,6 +1,6 @@
<?php
namespace App\Http\Controllers\V3\Dashboard\Reports;
namespace App\Http\Controllers\V3\Dashboard\RoadPatrol;
use App\Exports\V3\RoadPatrols\CountryActivity;
use App\Exports\V3\RoadPatrols\ProvinceActivity;
@@ -15,61 +15,9 @@ use Illuminate\Http\Request;
use Maatwebsite\Excel\Facades\Excel;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
class RoadPatrolReportController extends Controller
class ReportController extends Controller
{
use ApiResponse;
public function countryPatrolActivity(Request $request, ReportService $roadPatrolTableService): JsonResponse
{
$activities = $roadPatrolTableService->countryActivity($request);
$provinces = Province::all(['id', 'name_fa']);
return $this->successResponse([
'activities' => $activities['data'],
'provinces' => $provinces
]);
}
public function provincePatrolActivity(Request $request, ReportService $roadPatrolTableService): JsonResponse
{
$request->validate(["province_id" => "required",]);
$activities = $roadPatrolTableService->provinceActivity($request);
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
return $this->successResponse([
'activities' => $activities['data'],
'edarateShahri' => $edarateShahri,
]);
}
public function countryActivityExcel(Request $request, ReportService $roadPatrolTableService): BinaryFileResponse
{
$activities = $roadPatrolTableService->countryActivity($request);
$provinces = Province::all(['id', 'name_fa']);
$name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new CountryActivity([
'activities' => $activities,
'provinces' => $provinces,
]), $name);
}
public function provinceActivityExcel(Request $request, ReportService $roadPatrolTableService): BinaryFileResponse
{
$activities = $roadPatrolTableService->provinceActivity($request);
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
$name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new ProvinceActivity([
'activities' => $activities,
'edarateShahri' => $edarateShahri,
]), $name);
}
public function activitiesOnMap(Request $request): JsonResponse
{
$date_from = $request->from_date ? $request->from_date .' 00:00:00' : now()->startOfDay()->toDateTimeString();
@@ -91,4 +39,86 @@ class RoadPatrolReportController extends Controller
{
return $this->successResponse($roadPatrol->load(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
}
public function getReport(RoadPatrol $roadPatrol): JsonResponse
{
$data = [
'serial_no' => $roadPatrol->id,
'province_fa' => $roadPatrol->province_fa,
'edare_name' => $roadPatrol->edare_name,
'start_time' => $roadPatrol->start_time,
'end_time' => $roadPatrol->end_time,
'officer_name' => $roadPatrol->officer_name,
'officer_plaque' => $roadPatrol->officer_plaque,
'officer_phone_number' => $roadPatrol->officer_phone_number,
'created_at' => $roadPatrol->created_at
];
$observed_items = array();
if($roadPatrol->observedItems) {
foreach ($roadPatrol->observedItems as $index => $observed_item) {
$observed_items[] = [
'item' => $observed_item->item_name,
'sub_item' => $observed_item->sub_item_name,
'local_name' => $observed_item->local_name,
'description' => $observed_item->description,
'priority_fa' => $observed_item->priority_fa,
];
}
}
$data['observed_items'] = $observed_items;
return $this->successResponse($data);
}
public function countryPatrolActivity(Request $request, ReportService $reportService): JsonResponse
{
$activities = $reportService->countryActivity($request);
$provinces = Province::all(['id', 'name_fa']);
return $this->successResponse([
'activities' => $activities['data'],
'provinces' => $provinces
]);
}
public function provincePatrolActivity(Request $request, ReportService $reportService): JsonResponse
{
$request->validate(["province_id" => "required",]);
$activities = $reportService->provinceActivity($request);
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
return $this->successResponse([
'activities' => $activities['data'],
'edarateShahri' => $edarateShahri,
]);
}
public function countryActivityExcel(Request $request, ReportService $reportService): BinaryFileResponse
{
$activities = $reportService->countryActivity($request);
$provinces = Province::all(['id', 'name_fa']);
$name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new CountryActivity([
'activities' => $activities,
'provinces' => $provinces,
]), $name);
}
public function provinceActivityExcel(Request $request, ReportService $reportService): BinaryFileResponse
{
$activities = $reportService->provinceActivity($request);
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
$name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new ProvinceActivity([
'activities' => $activities,
'edarateShahri' => $edarateShahri,
]), $name);
}
}

47
app/Http/Controllers/V3/Dashboard/RoadPatrol/SupervisorController.php Normal file
View File

@@ -0,0 +1,47 @@
<?php
namespace App\Http\Controllers\V3\Dashboard\RoadPatrol;
use App\Exports\V3\RoadPatrols\SupervisorCartableReport;
use App\Http\Controllers\Controller;
use App\Http\Traits\ApiResponse;
use App\Services\Cartables\RoadPatrol\SupervisorService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Gate;
use Maatwebsite\Excel\Facades\Excel;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
use Throwable;
class SupervisorController extends Controller
{
use ApiResponse;
/**
* @throws Throwable
*/
public function index(Request $request, SupervisorService $supervisorService): JsonResponse
{
$data = $supervisorService->dataTable($request);
foreach ($data['data'] as $road_patrol) {
if (Gate::allows('gate-supervise-road-item', $road_patrol)) {
$road_patrol['can_supervise'] = 1;
} else {
$road_patrol['can_supervise'] = 0;
}
}
return response()->json($data);
}
/**
* @throws Throwable
*/
public function excel(Request $request, SupervisorService $supervisorService): BinaryFileResponse
{
$name = 'گزارش از کارتابل ارزیابی گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
$data = $supervisorService->dataTable($request, true);
return Excel::download(new SupervisorCartableReport($data['data']), $name);
}
}