From dbb9366de64e0b141551ce5079c7372efb18f112 Mon Sep 17 00:00:00 2001 From: weifashi <605403358@qq.com> Date: Thu, 28 Dec 2023 12:02:39 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Tasks/UnclaimedTaskRemindTask.php | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/app/Tasks/UnclaimedTaskRemindTask.php b/app/Tasks/UnclaimedTaskRemindTask.php index 49703f435..4f88c70a3 100644 --- a/app/Tasks/UnclaimedTaskRemindTask.php +++ b/app/Tasks/UnclaimedTaskRemindTask.php @@ -31,34 +31,34 @@ class UnclaimedTaskRemindTask extends AbstractTask return; } // - $times = explode(':',date('H:i')); - $reminderTimes = explode(':',$setting['unclaimed_task_reminder_time']); - if( !isset($times[1]) || !isset($reminderTimes[1]) || $times[0] != $reminderTimes[0]){ + $times = explode(':', date('H:i')); + $reminderTimes = explode(':', $setting['unclaimed_task_reminder_time']); + if (!isset($times[1]) || !isset($reminderTimes[1]) || $times[0] != $reminderTimes[0]) { return; } // 执行一次 - if (Cache::get("UnclaimedTaskRemindTask:His",0)) { + if (Cache::get("UnclaimedTaskRemindTask:His", 0)) { return; } - if( $times[1] >= $reminderTimes[1] - 1 && $times[1] <= $reminderTimes[1] + 1){ + if ($times[1] >= intval($reminderTimes[1]) - 1 && $times[1] <= intval($reminderTimes[1]) + 1) { // Cache::put("UnclaimedTaskRemindTask:His", date('H:i:s'), Carbon::now()->addMinutes(5)); // - Project::whereNull('deleted_at')->whereNull('archived_at')->chunk(100,function($projects) { + Project::whereNull('deleted_at')->whereNull('archived_at')->chunk(100, function ($projects) { foreach ($projects as $project) { // - $projectTasks = ProjectTask::select('project_tasks.id','project_tasks.name') + $projectTasks = ProjectTask::select('project_tasks.id', 'project_tasks.name') ->leftJoin('project_task_users', function ($query) { $query->on('project_tasks.id', '=', 'project_task_users.task_id'); }) - ->where('project_tasks.project_id',$project->id) + ->where('project_tasks.project_id', $project->id) ->whereNull('project_tasks.deleted_at') ->whereNull('project_tasks.archived_at') ->whereNull('project_task_users.id') ->limit(10) ->get(); // - if( !$projectTasks->isEmpty() ){ + if (!$projectTasks->isEmpty()) { $botUser = User::botGetOrCreate('task-alert'); if (empty($botUser)) { return; @@ -69,10 +69,10 @@ class UnclaimedTaskRemindTask extends AbstractTask } // $taskHtml = '任务待领取
'; - foreach($projectTasks as $projectTask){ + foreach ($projectTasks as $projectTask) { $taskHtml .= "id}\">#{$projectTask->name}
"; } - WebSocketDialogMsg::sendMsg(null, $project->dialog_id , 'text', [ + WebSocketDialogMsg::sendMsg(null, $project->dialog_id, 'text', [ 'text' => $taskHtml ], $botUser->userid); } @@ -83,7 +83,5 @@ class UnclaimedTaskRemindTask extends AbstractTask public function end() { - } - }