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

use pint and fix code

Browse Source
This commit is contained in:
faezehzafarbakhsh
2025-11-09 15:41:29 +03:30
parent 40513d72b8
commit bb4886a9fa
6 changed files with 77 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php
View File

@@ -24,14 +24,13 @@ class PanjareVahedController extends Controller
$iv = config('harim_web_services.Harim_Info.iv');
$keyString = config('harim_web_services.Harim_Info.key');
$key = hash('sha256',$keyString, true);
$key = hash('sha256', $keyString, true);
$decrypted = openssl_decrypt($request->data,'aes-256-cbc',$key,false, $iv);
$decrypted = openssl_decrypt($request->data, 'aes-256-cbc', $key, false, $iv);
$decodedString = json_decode($decrypted);
$decodedArray = json_decode($decodedString, true);
$wkt = 'POLYGON(('.implode(',', array_map(fn ($c) => "{$c[0]} {$c[1]}", $request->primary_area['coordinates'])).'))';
$result = DB::selectOne('SELECT ST_AsText(ST_PointOnSurface(ST_GeomFromText(?, 4326))) AS point', [$wkt]);
preg_match('/POINT\(([^ ]+) ([^ ]+)\)/', $result->point, $matches);
@@ -52,34 +51,32 @@ class PanjareVahedController extends Controller
->first(['id', 'name_fa', 'province_id']);
}
$state = HarimStates::BARESI_EDARE_SHAHRESTAN->value;
$harim = Harim::query()->firstOrCreate(
[
'panjare_vahed_id' => $request->request_id
'panjare_vahed_id' => $request->request_id,
],
[
'state_id' => $state,
'state_name' => HarimStates::name($state),
'panjare_vahed_id' => $request->request_id,
'national_id' => $request->national_id,
'phone_number' => $request->phone_number,
'request_date' => $request->request_date,
'province_id' => $city->province_id,
'province_name' => $city->province()->first()->name_fa,
'city_id' => $city->id,
'city_name' => $city->name_fa,
'edareh_shahri_id' => $city->edarateShahri()->first()->id,
'requested_organization' => $request->requested_organization,
'plan_group' => $request->plan_group,
'plan_title' => $request->plan_title,
'worksheet_id' => $request->worksheet,
'response_options' => json_encode($request->response_options),
'isic' => $request->isic,
'primary_area' => json_encode($request->primary_area),
'data' => $decodedString,
'token' => $decodedArray['token'],
]);
'state_id' => HarimStates::BARESI_EDARE_SHAHRESTAN->value,
'state_name' => HarimStates::BARESI_EDARE_SHAHRESTAN->label(),
'panjare_vahed_id' => $request->request_id,
'national_id' => $request->national_id,
'phone_number' => $request->phone_number,
'request_date' => $request->request_date,
'province_id' => $city->province_id,
'province_name' => $city->province()->first()->name_fa,
'city_id' => $city->id,
'city_name' => $city->name_fa,
'edareh_shahri_id' => $city->edarateShahri()->first()->id,
'requested_organization' => $request->requested_organization,
'plan_group' => $request->plan_group,
'plan_title' => $request->plan_title,
'worksheet_id' => $request->worksheet,
'response_options' => json_encode($request->response_options),
'isic' => $request->isic,
'primary_area' => json_encode($request->primary_area),
'data' => $decodedString,
'token' => $decodedArray['token'],
]);
return response()->json([
'id' => $harim->id,
@@ -92,13 +89,11 @@ class PanjareVahedController extends Controller
public function getAccessRoad(GetAccessRoadRequest $request): JsonResponse
{
$state = HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->value;
$harim = Harim::query()->firstWhere('panjare_vahed_id', '=', $request->request_id);
$harim->update([
'state_id' => $state,
'state_name' => HarimStates::name($state),
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->value,
'state_name' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->label(),
'access_road' => json_encode($request->access_road),
'data' => $request->data['data'],
'token' => $request->data['token'],
@@ -135,13 +130,12 @@ class PanjareVahedController extends Controller
public function getFinalPolygons(GetFinalPolygonsRequest $request): JsonResponse
{
$state = HarimStates::TAEDE_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM->value;
$harim = Harim::query()->firstWhere('panjare_vahed_id', '=', $request->request_id);
$harim->update([
'state_id' => $state,
'state_name' => HarimStates::name($state),
'state_id' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM->value,
'state_name' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM->label(),
'final_area' => json_encode($request->final_area),
'final_plan' => json_encode($request->final_plan),
'data' => $request->data['data'],