admin/course
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 定时任务发送通知学生和教师

Browse Source
This commit is contained in:
Dai 2024-10-31 21:56:39 +08:00
parent 446178d213
commit 0b22f96c4a
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/common/service/SendMsgCronJobService.php
View File

@ -345,7 +345,7 @@ class SendMsgCronJobService
foreach ($teacher_schedule_time as $item) { foreach ($teacher_schedule_time as $item) {
$studentSchedule = $item->studentSchedule->toArray(); $studentSchedule = $item->studentSchedule->toArray();
if (empty($studentSchedule)) { if (!empty($studentSchedule)) {
CronJob::create([ CronJob::create([
'msg_type' => self::CLASS_BEGIN_NOTIFY_TEACHER, 'msg_type' => self::CLASS_BEGIN_NOTIFY_TEACHER,
'teacher_id' => $item->teacher_id, 'teacher_id' => $item->teacher_id,
@ -364,7 +364,7 @@ class SendMsgCronJobService
'send_result' => 0, 'send_result' => 0,
'send_result_msg' => '未找到课程分配的学生', 'send_result_msg' => '未找到课程分配的学生',
]); ]);
throw new Exception('未找到课程分配的学生'); // throw new Exception('未找到课程分配的学生');
} }
$student_info = []; $student_info = [];
@ -378,7 +378,7 @@ class SendMsgCronJobService
} }
$student_name = implode(',', array_column($student_info, 'student_name')); $student_name = implode(',', array_column($student_info, 'student_name'));
if (empty($student_name)) { if (!empty($student_name)) {
CronJob::create([ CronJob::create([
'msg_type' => self::CLASS_BEGIN_NOTIFY_TEACHER, 'msg_type' => self::CLASS_BEGIN_NOTIFY_TEACHER,
'teacher_id' => $item->teacher_id, 'teacher_id' => $item->teacher_id,
@ -397,7 +397,7 @@ class SendMsgCronJobService
'send_result' => 0, 'send_result' => 0,
'send_result_msg' => '未找到课程分配的学生', 'send_result_msg' => '未找到课程分配的学生',
]); ]);
throw new Exception('未找到课程分配的学生'); // throw new Exception('未找到课程分配的学生');
} }
$send_teacher_data = [ $send_teacher_data = [
@ -575,16 +575,13 @@ class SendMsgCronJobService
{ {
try { try {
$teacher_schedule_time = TeacherScheduleTime::where(['is_publish' => 1]) $teacher_schedule_time = TeacherScheduleTime::where(['is_publish' => 1])
->whereTime('start_time', '>=', date('Y-m-d H:i:s', strtotime('+10 minute'))) ->whereTime('start_time', '>=', date('Y-m-d 00:00:00', strtotime('+10 minute')))
->whereTime('start_time', '<=', date('Y-m-d H:i:s', strtotime('+11 minute'))) ->whereTime('start_time', '<=', date('Y-m-d 00:00:00', strtotime('+11 minute')))
->with(['teacherAttr', 'subject', 'studentSchedule']) ->with(['teacherAttr', 'subject', 'studentSchedule'])
->select(); ->select();
foreach ($teacher_schedule_time as $item) { foreach ($teacher_schedule_time as $item) {
if (strtotime($item['start_time']) - time() > 60) {
continue;
}
$studentSchedule = $item->studentSchedule->toArray(); $studentSchedule = $item->studentSchedule->toArray();
if (empty($studentSchedule)) { if (empty($studentSchedule)) {
@ -824,7 +821,7 @@ class SendMsgCronJobService
->findOrEmpty(); ->findOrEmpty();
$studentSchedule = $teacher_schedule_time->studentSchedule->toArray(); $studentSchedule = $teacher_schedule_time->studentSchedule->toArray();
if (empty($studentSchedule)) { if (!empty($studentSchedule)) {
CronJob::create([ CronJob::create([
'msg_type' => self::CLASS_BEGIN_NOTIFY_TEACHER, 'msg_type' => self::CLASS_BEGIN_NOTIFY_TEACHER,
'teacher_id' => $teacher_schedule_time->teacher_id, 'teacher_id' => $teacher_schedule_time->teacher_id,
@ -843,7 +840,7 @@ class SendMsgCronJobService
'send_result' => 0, 'send_result' => 0,
'send_result_msg' => '未找到课程分配的学生', 'send_result_msg' => '未找到课程分配的学生',
]); ]);
throw new Exception('未找到课程分配的学生'); // throw new Exception('未找到课程分配的学生');
} }
$student_info = []; $student_info = [];
@ -857,7 +854,7 @@ class SendMsgCronJobService
} }
$student_name = implode(',', array_column($student_info, 'student_name')); $student_name = implode(',', array_column($student_info, 'student_name'));
if (empty($student_name)) { if (!empty($student_name)) {
CronJob::create([ CronJob::create([
'msg_type' => self::CLASS_BEGIN_NOTIFY_TEACHER, 'msg_type' => self::CLASS_BEGIN_NOTIFY_TEACHER,
'teacher_id' => $teacher_schedule_time->teacher_id, 'teacher_id' => $teacher_schedule_time->teacher_id,
@ -876,7 +873,7 @@ class SendMsgCronJobService
'send_result' => 0, 'send_result' => 0,
'send_result_msg' => '未找到课程分配的学生', 'send_result_msg' => '未找到课程分配的学生',
]); ]);
throw new Exception('未找到课程分配的学生'); // throw new Exception('未找到课程分配的学生');
} }
$send_teacher_data = [ $send_teacher_data = [
@ -930,6 +927,7 @@ class SendMsgCronJobService
} catch (Exception $e) { } catch (Exception $e) {
raw_log('cron_job/send_to_teacher_before_day_field', ['msg'=>$e->getMessage()]);
return [ return [
'code' => ResponseCode::FAIL, 'code' => ResponseCode::FAIL,

2
process/Task.php
View File

@ -13,7 +13,7 @@ class Task
// 每天的7点50执行，注意这里省略了秒位 // 每天的7点50执行，注意这里省略了秒位
new Crontab('50 7 * * *', function(){ new Crontab('50 7 * * *', function(){
//上课前一天提醒教师、学生、家长 //上课前一天提醒教师、学生、家长
(new SendMsgCronJobService())->classBeginSingleMsgToTeacher(); (new SendMsgCronJobService())->classBeginMsgToTeacherBeforeDay();
}); });
// 每分钟执行一次 // 每分钟执行一次