From 5ea89c1fb347bfaada09b73942d7f64bd9a39cfd Mon Sep 17 00:00:00 2001 From: xxq250 Date: Mon, 8 Sep 2025 11:45:06 +0800 Subject: [PATCH] =?UTF-8?q?fixed=20=E7=AB=9E=E8=B5=9B=E9=80=9A=E7=9F=A5job?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/jobs/competiton_notice_job.rb | 6 +++--- app/models/message_template/competition_begin.rb | 2 +- app/models/message_template/competition_result.rb | 2 +- app/models/message_template/competition_review.rb | 2 +- config/sidekiq_cron.yml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/jobs/competiton_notice_job.rb b/app/jobs/competiton_notice_job.rb index 79e64b19b..9034076b9 100644 --- a/app/jobs/competiton_notice_job.rb +++ b/app/jobs/competiton_notice_job.rb @@ -10,7 +10,7 @@ class CompetitionNoticeJob < ApplicationJob # "竞赛通知-进入提交作品状态" def submit_work_begin Rails.logger.info "__________#{Time.now.to_s}__submit_work_begin start______________________" - competitions = CompetitionInfo.where("enroll_date >=? and enroll_date <= ? ", (Time.now - 5.minutes).strftime('%Y-%m-%d %H:%M:00'), Time.now.strftime('%Y-%m-%d %H:%M:00')) + competitions = CompetitionInfo.where("start_upload_date >=? and start_upload_date <= ? ", Time.now.strftime('%Y-%m-%d %H:%M:00'),(Time.now + 5.minutes).strftime('%Y-%m-%d %H:%M:00')) competitions.each do |c| competition_users = CompetitionUser.where(competition_info_id: c.id) competition_users.each do |team| @@ -23,7 +23,7 @@ class CompetitionNoticeJob < ApplicationJob # "竞赛通知-截止提交作品时间前3天" def submit_work_end Rails.logger.info "__________#{Time.now.to_s}__submit_work_end start______________________" - competitions = CompetitionInfo.where("upload_date >=? and upload_date <= ? ", (Time.now + 3.days - 5.minutes).strftime('%Y-%m-%d %H:%M:00'), Time.now.strftime('%Y-%m-%d %H:%M:00')) + competitions = CompetitionInfo.where("upload_date >=? and upload_date <= ? ", (Time.now - 3.days - 5.minutes).strftime('%Y-%m-%d %H:%M:00'), Time.now.strftime('%Y-%m-%d %H:%M:00')) competitions.each do |c| competition_users = CompetitionUser.where(competition_info_id: c.id) competition_users.each do |team| @@ -36,7 +36,7 @@ class CompetitionNoticeJob < ApplicationJob # "竞赛通知-报名的竞赛进入成绩公示阶段" def submit_work_result Rails.logger.info "__________#{Time.now.to_s}__submit_work_result start______________________" - competitions = CompetitionInfo.where("upload_date =? and upload_date <= ? ", Time.now.strftime('%Y-%m-%d %H:%M:00'), (Time.now + 5.minutes).strftime('%Y-%m-%d %H:%M:00')) competitions.each do |c| competition_users = CompetitionUser.where(competition_info_id: c.id) competition_users.each do |team| diff --git a/app/models/message_template/competition_begin.rb b/app/models/message_template/competition_begin.rb index 5cf8c72b0..66652018a 100644 --- a/app/models/message_template/competition_begin.rb +++ b/app/models/message_template/competition_begin.rb @@ -28,7 +28,7 @@ class MessageTemplate::CompetitionBegin < MessageTemplate # MessageTemplate::FollowedTip.get_message_content(User.where(login: 'yystopf'), User.last) def self.get_message_content(receivers, competition) - return receivers_string(receivers), sys_notice.to_s.gsub('{competition_name}', competition&.name.to_s), notification_url.to_s.gsub('{to_url}', "/competitions/#{competition.identifier}/home") + return receivers_string(receivers), sys_notice.to_s.gsub('{competition_name}', competition&.name.to_s), notification_url.to_s.gsub('{to_url}', "/competitions/#{competition.identifier}") # rescue # return '', '', '' end diff --git a/app/models/message_template/competition_result.rb b/app/models/message_template/competition_result.rb index 33dfdbc12..c42523928 100644 --- a/app/models/message_template/competition_result.rb +++ b/app/models/message_template/competition_result.rb @@ -28,7 +28,7 @@ class MessageTemplate::CompetitionResult < MessageTemplate # MessageTemplate::FollowedTip.get_message_content(User.where(login: 'yystopf'), User.last) def self.get_message_content(receivers, competition) - return receivers_string(receivers), sys_notice.gsub('{competition_name}', competition&.name.to_s), notification_url.gsub('{to_url}', "/competitions/#{competition.identifier}/home") + return receivers_string(receivers), sys_notice.gsub('{competition_name}', competition&.name.to_s), notification_url.gsub('{to_url}', "/competitions/#{competition.identifier}") rescue return '', '', '' end diff --git a/app/models/message_template/competition_review.rb b/app/models/message_template/competition_review.rb index 2e25c27e5..4531f7d52 100644 --- a/app/models/message_template/competition_review.rb +++ b/app/models/message_template/competition_review.rb @@ -28,7 +28,7 @@ class MessageTemplate::CompetitionReview < MessageTemplate # MessageTemplate::FollowedTip.get_message_content(User.where(login: 'yystopf'), User.last) def self.get_message_content(receivers, competition) - return receivers_string(receivers), sys_notice.gsub('{competition_name}', competition&.name.to_s), notification_url.gsub('{to_url}', "/competitions/#{competition.identifier}/home") + return receivers_string(receivers), sys_notice.gsub('{competition_name}', competition&.name.to_s), notification_url.gsub('{to_url}', "/competitions/#{competition.identifier}") rescue return '', '', '' end diff --git a/config/sidekiq_cron.yml b/config/sidekiq_cron.yml index c9a8a86c1..119e21b35 100644 --- a/config/sidekiq_cron.yml +++ b/config/sidekiq_cron.yml @@ -40,6 +40,6 @@ sync_competition_tzb_user: queue: default competition_notice: - cron: "*/2 * * * *" + cron: "*/5 * * * *" class: "CompetitionNoticeJob" queue: message \ No newline at end of file