ivampiresp/Lae
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

改进 工单推送

Browse Source
This commit is contained in:
iVampireSP.com 2023-01-17 12:39:33 +08:00
parent 98dd634ea6
commit 286d28140b
No known key found for this signature in database
GPG Key ID: 2F7B001CA27A8132
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/Jobs/WorkOrder/PushWorkOrderJob.php
View File

@ -5,9 +5,9 @@
use App\Models\WorkOrder\WorkOrder; use App\Models\WorkOrder\WorkOrder;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Http\Client\RequestException;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
// use Illuminate\Contracts\Queue\ShouldBeUnique; // use Illuminate\Contracts\Queue\ShouldBeUnique;
@ -34,7 +34,7 @@ public function __construct()
public function handle(): void public function handle(): void
{ {
// //
(new WorkOrder)->whereIn('status', ['pending', 'error'])->with(['module', 'user', 'host', 'replies'])->chunk(100, function ($workOrders) { (new WorkOrder)->whereIn('status', ['pending'])->with(['module', 'user', 'host', 'replies'])->chunk(100, function ($workOrders) {
foreach ($workOrders as $workOrder) { foreach ($workOrders as $workOrder) {
if ($workOrder->host) { if ($workOrder->host) {
@ -45,28 +45,30 @@ public function handle(): void
if ($workOrder->status === 'error') { if ($workOrder->status === 'error') {
// 如果超过 3 次错误，使用 Redis continue;
$count = Cache::get('work_order_error_count_' . $workOrder->id, 0);
if ($count > 3) {
$workOrder->delete();
continue;
} else {
Cache::increment('work_order_error_count_' . $workOrder->id);
}
} }
$workOrder->status = 'open'; $workOrder->status = 'open';
$response = $workOrder->module->http()->post('work-orders', $workOrder->toArray());
if (!$response->successful()) { $success = false;
Log::error('推送工单失败', [
'work_order_id' => $workOrder->id, try {
'response' => $response->body(), $response = $workOrder->module->http()->retry(3, 100)->post('work-orders', $workOrder->toArray());
]);
if (!$response->successful()) {
Log::warning('推送工单失败', [
'work_order_id' => $workOrder->id,
'response' => $response->body(),
]);
$workOrder->status = 'error';
}
} catch (RequestException $e) {
Log::warning($e->getMessage());
$workOrder->status = 'error'; $workOrder->status = 'error';
} }
$workOrder->save(); $workOrder->save();
} }