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

producion changes

Browse Source
This commit is contained in:
Hamidreza Ranjbarpour
2026-05-23 09:28:21 +00:00
parent 4a2612837b
commit 21e9931298
15 changed files with 178 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/SendContractSmsNotification.php
View File

@@ -46,7 +46,7 @@ class SendContractSmsNotification extends Command
foreach ($contractSubItems as $key => $value) {
$message = "سلام،\n پروژه راهداری با کد یکتای {$value->unique_code} با مسئولیت شما، به مدت بیشتر از یک ماه به روزرسانی نشده است. لطفا نسبت به روز رسانی دقیق پیشرفت پروژه در سامانه اقدام نمایید.\n rms.rmto.ir";
self::sms_sender($value->operator_phone, $message);
// self::sms_sender($value->operator_phone, $message);
}
}

4
app/Enums/MissionStates.php
View File

@@ -15,11 +15,11 @@ enum MissionStates: int
public static function name(int $state): string
{
$mapArray = [
1 => 'درخواست ایجاد شد و در حال بررسی توسط واحد نقلیه است',
1 => 'درخواست ایجاد شد و در حال بررسی توسط واحد تایید کننده است',
2 => 'خودرو اختصاص داده شد و درخواست توسط واحد کنترل در حال بررسی است',
3 => 'درخواست توسط واحد کنترل تایید شد و ماموریت آغاز می شود',
4 => 'اتمام ماموریت',
5 => 'عدم تخصیص خودرو توسط واحد نقلیه و بازگشت درخواست به کارتابل کاربر',
5 => 'عدم تخصیص خودرو توسط واحد تایید کننده و بازگشت درخواست به کارتابل کاربر',
6 => 'ماموریت لغو شد',
7 => 'ماموریت بدون فرایند ثبت شد'
];

44
app/Facades/Sms/SmsClass.php
View File

@@ -12,28 +12,28 @@ class SmsClass
{
public function sendSms($mobile, $msg)
{
if (App::environment('production')) {
$client = new SoapClient("http://172.30.5.36/webservice/sms.asmx?WSDL");
$date = date('d-m-y h:i:s');
$date = str_replace(" ", "T", $date);
$result = $client->Send(
array(
'Username' => 'admin',
'Password' => 'admin141',
'ShortCode' => '1000141',
'Cellphones' => $mobile,
'Message' => $msg,
'Farsi' => true,
// 'SendDate' => $date
// 'uTopic' => false,
// 'uFlash' => false
)
);
return $result->SendResult;
}
// if (App::environment('production')) {
//
//
// $client = new SoapClient("http://172.30.5.36/webservice/sms.asmx?WSDL");
// $date = date('d-m-y h:i:s');
// $date = str_replace(" ", "T", $date);
// $result = $client->Send(
// array(
// 'Username' => 'admin',
// 'Password' => 'admin141',
// 'ShortCode' => '1000141',
// 'Cellphones' => $mobile,
// 'Message' => $msg,
// 'Farsi' => true,
// // 'SendDate' => $date
// // 'uTopic' => false,
// // 'uFlash' => false
// )
// );
//
// return $result->SendResult;
// }
// $client = new SoapClient("http://sms1000.ir/webservice/smspro.asmx?WSDL");

38
app/Http/Controllers/Api/ContractSubItemsController.php
View File

@@ -609,25 +609,25 @@ class ContractSubItemsController extends Controller
]);
}
public function sms_sender($mobile, $msg)
{
$client=new SoapClient("http://sms1000.ir/webservice/smspro.asmx?WSDL");
$result=$client->doSendSMS(
array(
'uUsername' => 'rmto',
'uPassword' => 'Rahdari8
',
'uNumber' => '1000141',
'uCellphones' => $mobile,
'uMessage' => $msg,
'uFarsi' => true,
'uTopic' => false,
'uFlash' => false
)
);
$x = $result->doSendSMSResult;
return $x;
}
// public function sms_sender($mobile, $msg)
// {
// $client=new SoapClient("http://sms1000.ir/webservice/smspro.asmx?WSDL");
// $result=$client->doSendSMS(
// array(
// 'uUsername' => 'rmto',
// 'uPassword' => 'Rahdari8
// ',
// 'uNumber' => '1000141',
// 'uCellphones' => $mobile,
// 'uMessage' => $msg,
// 'uFarsi' => true,
// 'uTopic' => false,
// 'uFlash' => false
// )
// );
// $x = $result->doSendSMSResult;
// return $x;
// }
public function get_way_id_from_nominatim($lat, $lng)
{

1
app/Http/Controllers/UserController.php
View File

@@ -434,6 +434,7 @@ class UserController extends Controller
$user->password = Hash::make($request->password);
$user->national_code = $request->national_code;
$user->station_id = $request->station_id;
$user->save();
if (auth()->user()) {

23
app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php
View File

@@ -70,19 +70,20 @@ class ControlUnitController extends Controller
'state_name' => MissionStates::name($state),
'finish_time' => $request->time,
'mission_duration' => strtotime($request->time) - strtotime($mission->start_time),
'end_km' => $request->end_km,
]);
$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']),
]);
// $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) {

9
app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php
View File

@@ -38,6 +38,15 @@ class RoadMaintenanceStationController extends Controller
));
}
public function findByCity(Request $request): JsonResponse
{
$stations = RahdariPoint::query()
->where('city_id', $request->query('city_id'))
->get();
return $this->successResponse($stations);
}
/**
* Store a newly created resource in storage.
*/

1
app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php
View File

@@ -25,6 +25,7 @@ class FinishRequest extends FormRequest
{
return [
'time' => 'required|date',
'end_km' => 'required',
];
}
}

4
app/Services/PaymentService.php
View File

@@ -27,7 +27,7 @@ class PaymentService
);
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, "http://payment.rmto.ir/acc/rest/payid/gen");
curl_setopt($ch, CURLOPT_URL, "https://payment.rmto.ir/acc/rest/payid/gen");
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_POST, true);
curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($post));
@@ -59,7 +59,7 @@ class PaymentService
);
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, "http://payment.rmto.ir/acc/rest/payid/track2/" . env("PAYMENT_USERNAME") . "/" . env("PAYMENT_PASSWORD") . "/" . $bill_code);
curl_setopt($ch, CURLOPT_URL, "https://payment.rmto.ir/acc/rest/payid/track2/" . env("PAYMENT_USERNAME") . "/" . env("PAYMENT_PASSWORD") . "/" . $bill_code);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
// curl_setopt($ch, CURLOPT_POST, true);
// curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($post));