From 968d18529244cc4e775f7ceb10b502df8072d001 Mon Sep 17 00:00:00 2001 From: amirghasempoor Date: Sat, 31 May 2025 10:07:45 +0330 Subject: [PATCH] change complaint execl --- app/Console/Kernel.php | 7 +++---- .../V2/RoadObservation/PendingComplaintsExport.php | 12 ++++++------ app/Services/NikarayanService.php | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 1559d32d..f1f2d616 100755 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -26,20 +26,19 @@ class Kernel extends ConsoleKernel protected function schedule(Schedule $schedule) { $schedule->command('webservice:roadobserved') - ->everyFiveMinutes()->appendOutputTo(storage_path('logs/nikarayan.log')); + ->everyTenMinutes()->appendOutputTo(storage_path('logs/nikarayan.log')); $schedule->command('command:sendcontractsmsnotification') - // ->everyMinute()->appendOutputTo(storage_path('logs/contractSms.log')); ->dailyAt('10:00')->appendOutputTo(storage_path('logs/contractSms.log')); $schedule->command('reports:rms-summary') ->dailyAt('00:00')->appendOutputTo(storage_path('logs/report_summary.log')); $schedule->command("webservice:roadobserved --daily-mode") - ->dailyAt('00:17')->appendOutputTo(storage_path('logs/nikarayan.log')); + ->dailyAt('00:05')->appendOutputTo(storage_path('logs/nikarayan.log')); $schedule->command("webservice:roadobserved --daily-mode") - ->dailyAt('00:47')->appendOutputTo(storage_path('logs/nikarayan.log')); + ->dailyAt('00:45')->appendOutputTo(storage_path('logs/nikarayan.log')); } /** diff --git a/app/Exports/V2/RoadObservation/PendingComplaintsExport.php b/app/Exports/V2/RoadObservation/PendingComplaintsExport.php index 46e766c0..94a5b586 100644 --- a/app/Exports/V2/RoadObservation/PendingComplaintsExport.php +++ b/app/Exports/V2/RoadObservation/PendingComplaintsExport.php @@ -38,10 +38,10 @@ class PendingComplaintsExport implements FromView, ShouldAutoSize, WithEvents, W return $query->where('road_observeds.province_id', $province_id); }) ->when(($fromDate && $toDate), function ($query) use ($fromDate, $toDate) { - return $query->whereBetween('road_observeds.created_at', [$fromDate, $toDate]); + return $query->whereBetween('road_observeds.StartTime_DateTime', [$fromDate, $toDate]); }) ->selectRaw('fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms, - road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status, + road_observeds.StartTime_DateTime, rms_last_activity, rms_last_activity_fa, status, status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng') ->orderBy('status') ->orderBy('road_observeds.id', 'desc') @@ -60,10 +60,10 @@ class PendingComplaintsExport implements FromView, ShouldAutoSize, WithEvents, W ->where('rms_status', 0) ->whereNotNull('road_observeds.province_id') ->when(($fromDate && $toDate), function ($query) use ($fromDate, $toDate) { - return $query->whereBetween('road_observeds.created_at', [$fromDate, $toDate]); + return $query->whereBetween('road_observeds.StartTime_DateTime', [$fromDate, $toDate]); }) ->selectRaw('fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms, - road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status, + road_observeds.StartTime_DateTime, rms_last_activity, rms_last_activity_fa, status, status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng') ->orderBy('status') ->orderBy('road_observeds.id', 'desc') @@ -81,10 +81,10 @@ class PendingComplaintsExport implements FromView, ShouldAutoSize, WithEvents, W ->where('rms_status', 0) ->whereNotNull('edarate_shahri_id') ->when(($fromDate && $toDate), function ($query) use ($fromDate, $toDate) { - return $query->whereBetween('road_observeds.created_at', [$fromDate, $toDate]); + return $query->whereBetween('road_observeds.StartTime_DateTime', [$fromDate, $toDate]); }) ->selectRaw('fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms, - road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status, + road_observeds.StartTime_DateTime, rms_last_activity, rms_last_activity_fa, status, status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng') ->orderBy('status') ->orderBy('road_observeds.id', 'desc') diff --git a/app/Services/NikarayanService.php b/app/Services/NikarayanService.php index 702ab1d4..ba87eb8b 100644 --- a/app/Services/NikarayanService.php +++ b/app/Services/NikarayanService.php @@ -33,7 +33,7 @@ class NikarayanService $soapClient = new SoapClient($url); $result = $soapClient->UpdateInfo_RoadObservedProblems($array); - Log::channel('nikarayan')->info(json_encode($result)); + Log::channel('nikarayan')->info([json_encode($result), $roadObserved->fk_RegisteredEventMessage]); return $result; }