poc/pds
1
0
Fork 1
Code Issues Pull Requests 12 Actions Packages Projects Releases Wiki Activity

Added mail logic for immediate laser stopped alert
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 17s
Details
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Successful in 14s
Details
Gemini PR Review / Gemini PR Review (pull_request) Failing after 22s
Details
Laravel Pint / pint (pull_request) Successful in 3m2s
Details
Laravel Larastan / larastan (pull_request) Failing after 7m7s
Details

Browse Source
This commit is contained in:
dhanabalan
2026-08-24 09:52:13 +05:30
parent 4a8eb8d08b
commit 8250e9083d
4 changed files with 499 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
app/Console/Commands/Scheduler.php
View File

@@ -394,11 +394,89 @@ class Scheduler extends Command
break;
}
}
//..Laser Stop Report
$laserStopReport = AlertMailRule::where('module', 'LaserStopAlert')
->where('rule_name', 'LaserStopAlertMail')
->select('plant', 'schedule_type', 'machine_id')
->distinct()
->get();
foreach ($laserStopReport as $rule) {
switch ($rule->schedule_type) {
case 'Live':
// Run every minute
\Artisan::call('send:laser-stop-report', [
'schedule_type' => $rule->schedule_type,
'plant' => $rule->plant,
'machine_id' => $rule->machine_id,
]);
break;
case 'Hourly':
if (now()->minute == 0) {
\Artisan::call('send:laser-stop-report', [
'schedule_type' => $rule->schedule_type,
'plant' => $rule->plant,
'machine_id' => $rule->machine_id,
]);
}
break;
case 'Daily':
if (now()->format('H:i') == '07:59') {
\Artisan::call('send:laser-stop-report', [
'schedule_type' => $rule->schedule_type,
'plant' => $rule->plant,
'machine_id' => $rule->machine_id,
]);
}
break;
}
}
//..Laser Stop Final Report
// $laserStopFinalReport = AlertMailRule::where('module', 'LaserStopReport')
// ->where('rule_name', 'LaserStopMail')
// ->select('plant', 'schedule_type', 'machine_id')
// ->distinct()
// ->get();
// foreach ($laserStopFinalReport as $rule) {
// switch ($rule->schedule_type) {
// case 'Live':
// // Run every minute
// \Artisan::call('send:laser-stop-consolidate-report', [
// 'schedule_type' => $rule->schedule_type,
// 'plant' => $rule->plant,
// 'machine_id' => $rule->machine_id,
// ]);
// break;
// case 'Hourly':
// if (now()->minute == 0) {
// \Artisan::call('send:laser-stop-consolidate-report', [
// 'schedule_type' => $rule->schedule_type,
// 'plant' => $rule->plant,
// 'machine_id' => $rule->machine_id,
// ]);
// }
// break;
// case 'Daily':
// if (now()->format('H:i') == '07:59') {
// \Artisan::call('send:laser-stop-consolidate-report', [
// 'schedule_type' => $rule->schedule_type,
// 'plant' => $rule->plant,
// 'machine_id' => $rule->machine_id,
// ]);
// }
// break;
// }
// }
}
/**
* Helper to call Artisan commands with parameters.
*/
*/
protected function callArtisanCommand($commandName, $rule)
{
\Artisan::call($commandName, [

113
app/Console/Commands/SendLaserStopReport.php Normal file
View File

@@ -0,0 +1,113 @@
<?php
namespace App\Console\Commands;
use App\Mail\LaserStopReportMail;
use App\Models\ClassCharacteristic;
use App\Models\Machine;
use App\Models\Plant;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Mail;
class SendLaserStopReport extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'send:laser-stop-report {schedule_type} {plant} {machine_id}';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Command description';
/**
* Execute the console command.
*/
public function handle()
{
$scheduleType = $this->argument('schedule_type');
$plantId = (int) $this->argument('plant');
$machineId = (int) $this->argument('machine_id');
$mailRules = \App\Models\AlertMailRule::where('module', 'LaserStopAlert')
->where('rule_name', 'LaserStopAlertMail')
->where('schedule_type', $scheduleType)
->where('plant', $plantId)
->where('machine_id', $machineId)
->get();
$emails = $mailRules
->pluck('email')
->filter()
->flatMap(function ($email) {
return array_map('trim', explode(',', $email));
})
->unique()
->values()
->toArray();
$ccEmails = $mailRules
->pluck('cc_emails')
->filter()
->flatMap(function ($email) {
return array_map('trim', explode(',', $email));
})
->unique()
->values()
->toArray();
$plants = $plantId == 0
? Plant::all()
: Plant::where('id', $plantId)->get();
if ($plants->isEmpty()) {
$this->error('No valid plant(s) found.');
return;
}
$plant = Plant::find($plantId);
$plantName = $plant?->name ?? $plantId;
$machine = Machine::find($machineId);
$machineName = $machine?->work_center ?? $machineId;
$records = ClassCharacteristic::where('is_stopped', 2)
->where('plant_id', $plantId)
->where('machine_id', $machineId)
->get();
if ($records->isEmpty()) {
$this->info('No laser stop records found.');
return;
}
$recordIds = $records->pluck('id');
// Send mail to mapped email IDs
Mail::to($emails)
->cc($ccEmails)
->send(
new LaserStopReportMail(
$records,
$plantId,
$machineId,
$plantName,
$machineName,
)
);
ClassCharacteristic::whereIn('id', $recordIds)
->update([
'is_stopped' => 1,
]);
$this->info('Laser stop report mail sent successfully.');
}
}

67
app/Mail/LaserStopReportMail.php Normal file
View File

@@ -0,0 +1,67 @@
<?php
namespace App\Mail;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Mail\Mailable;
use Illuminate\Mail\Mailables\Content;
use Illuminate\Mail\Mailables\Envelope;
use Illuminate\Queue\SerializesModels;
class LaserStopReportMail extends Mailable
{
use Queueable, SerializesModels;
public $records;
public $plantId;
public $machineId;
public $plantName;
public $machineName;
public function __construct($records,$plantId,$machineId, $plantName, $machineName)
{
$this->records = $records;
$this->plantId = $plantId;
$this->machineId = $machineId;
$this->plantName = $plantName;
$this->machineName = $machineName;
}
/**
* Get the message envelope.
*/
public function envelope(): Envelope
{
return new Envelope(
subject: 'Laser Stopped Alert',
);
}
/**
* Get the message content definition.
*/
public function content(): Content
{
$greeting = '<b>Dear Sir</b>';
return new Content(
view: 'mail.laser-stop-report',
with: [
'company' => 'CRI Digital Manufacturing Solutions',
'greeting' => $greeting,
'wishes' => 'Thanks & Regards,<br>CRI Digital Manufacturing Solutions',
],
);
}
/**
* Get the attachments for the message.
*
* @return array<int, \Illuminate\Mail\Mailables\Attachment>
*/
public function attachments(): array
{
return [];
}
}