add report for machines
This commit is contained in:
@@ -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([
|
||||
|
||||
Reference in New Issue
Block a user