diff --git a/app/Jobs/Module/WorkOrder/WorkOrder.php b/app/Jobs/Module/WorkOrder/WorkOrder.php index 55f7ff1..fed570f 100644 --- a/app/Jobs/Module/WorkOrder/WorkOrder.php +++ b/app/Jobs/Module/WorkOrder/WorkOrder.php @@ -2,7 +2,6 @@ namespace App\Jobs\Module\WorkOrder; -use App\Events\Users; use App\Models\WorkOrder\WorkOrder as WorkOrderModel; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; diff --git a/app/Models/Task.php b/app/Models/Task.php index c9679a0..a90fe4f 100644 --- a/app/Models/Task.php +++ b/app/Models/Task.php @@ -6,7 +6,6 @@ use App\Exceptions\CommonException; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; -use Illuminate\Support\Facades\Cache; use Ramsey\Uuid\Uuid; use function auth; use function broadcast; @@ -31,7 +30,7 @@ class Task extends Model protected static function boot() { parent::boot(); - static::creating(function ($model) { + static::creating(function (self $model) { // id 为 uuid $model->id = Uuid::uuid4()->toString(); @@ -54,34 +53,30 @@ protected static function boot() } $model->user_id = $model->host->user_id; - - Cache::forget('user_tasks_' . $model->user_id); } }); // created - static::created(function ($model) { + static::created(function (self $model) { $model->load('host'); broadcast(new Users($model->user_id, 'tasks.created', $model)); }); // updating - static::updating(function ($model) { + static::updating(function (self $model) { if ($model->progress == 100) { $model->status = 'done'; } }); // updated and delete - static::updated(function ($model) { - // Cache::forget('user_tasks_' . $model->user_id); - + static::updated(function (self $model) { $model->load('host'); broadcast(new Users($model->user_id, 'tasks.updated', $model)); }); - static::deleted(function ($model) { + static::deleted(function (self $model) { broadcast(new Users($model->user_id, 'tasks.deleted', $model)); }); } diff --git a/app/Notifications/WebNotification.php b/app/Notifications/WebNotification.php index 0a3fe18..4e383ed 100644 --- a/app/Notifications/WebNotification.php +++ b/app/Notifications/WebNotification.php @@ -29,16 +29,6 @@ public function __construct(array|Model $message, string $type) $this->type = $type; } - /** - * Get the notification's delivery channels. - * - * @return array - */ - public function via(): array - { - return [WebChannel::class]; - } - /** * Get the array representation of the notification. * @@ -48,4 +38,14 @@ public function toArray(): array { return $this->message; } + + /** + * Get the notification's delivery channels. + * + * @return array + */ + public function via(): array + { + return [WebChannel::class]; + } }