Adjust monitor daily notification timing

pages/💸 空场防空转监控.py

@@ -104,6 +104,11 @@ def parse_show_datetime(date_str, time_str):
         return None
 
 
+def did_cross_fixed_time(previous_time, current_time, target_time):
+    target_dt = datetime.combine(current_time.date(), target_time)
+    return previous_time < target_dt <= current_time
+
+
 def extract_hall_number_raw(hall_name):
     """仅提取数字ID，用于API映射"""
     match = re.search(r'(\d+)', str(hall_name))
@@ -481,21 +486,15 @@ class PlaybackMonitor:
 
     def _run_loop(self):
         self.log("🚀 空场防空转监控服务已启动")
-        is_first_run = True
+        last_loop_time = get_beijing_now()
 
         while True:
             try:
                 now = get_beijing_now()
                 biz_date = get_business_date()
                 today_str = now.strftime("%Y-%m-%d")
-
-                if is_first_run:
-                    if now.time() >= dt_time(9, 0):
-                        self.last_daily_report_date = today_str
-                        self.log(f"🟡 首次运行，跳过当日即时通知: {today_str}")
-                    else:
-                        self.log("🟡 首次运行完成初始化，等待 09:00 后再发送每日报告")
-                    is_first_run = False
+                should_send_daily_report = did_cross_fixed_time(last_loop_time, now, dt_time(9, 0))
+                last_loop_time = now
 
                 # --- 初始化与日期变更 ---
                 need_refresh = False
@@ -524,7 +523,7 @@ class PlaybackMonitor:
                         time.sleep(300)
                         continue
 
-                if now.time() >= dt_time(9, 0) and self.last_daily_report_date != today_str and self.daily_schedule_cache is not None:
+                if should_send_daily_report and self.last_daily_report_date != today_str and self.daily_schedule_cache is not None:
                     try:
                         d_obj = datetime.strptime(biz_date, "%Y-%m-%d")
                         date_cn = f"{d_obj.year}年{d_obj.month}月{d_obj.day}日"

pages/📢 突发购票监控.py

@@ -65,6 +65,11 @@ def parse_show_datetime(date_str, time_str):
         return None
 
 
+def did_cross_fixed_time(previous_time, current_time, target_time):
+    target_dt = datetime.combine(current_time.date(), target_time)
+    return previous_time < target_dt <= current_time
+
+
 def simplify_hall_name(raw_name):
     """
     影厅名称简化
@@ -269,24 +274,18 @@ class CinemaMonitor:
 
     def _run_loop(self):
         self.log("🚀 突发购票监控服务已启动")
-        is_first_run = True
+        last_loop_time = get_beijing_now()
 
         while True:
             try:
                 now = get_beijing_now()
                 biz_date = get_business_date()
                 today_str = now.strftime("%Y-%m-%d")
+                should_send_daily_report = did_cross_fixed_time(last_loop_time, now, dt_time(9, 0))
+                last_loop_time = now
 
-                if is_first_run:
-                    if now.time() >= dt_time(9, 0):
-                        self.last_daily_report_date = today_str
-                        self.log(f"🟡 首次运行，跳过当日即时通知: {today_str}")
-                    else:
-                        self.log("🟡 首次运行完成初始化，等待 09:00 后再发送每日报告")
-                    is_first_run = False
-
-                # --- 每日健康检查 (09:00 后发送一次) ---
-                if now.time() >= dt_time(9, 0) and self.last_daily_report_date != today_str:
+                # --- 每日健康检查 (固定 09:00 发送一次) ---
+                if should_send_daily_report and self.last_daily_report_date != today_str:
                     report_date_str = now.strftime("%Y年%m月%d日")
                     self.log(f"🔔 发送每日统计报告: {today_str}")
 
@@ -496,4 +495,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main()

pages/📨 排片检查与 TMS 内容核对监控.py

@@ -96,6 +96,11 @@ def get_check_date_range(base_date=None):
     return today, end_date
 
 
+def did_cross_fixed_time(previous_time, current_time, target_time):
+    target_dt = datetime.combine(current_time.date(), target_time)
+    return previous_time < target_dt <= current_time
+
+
 def default_monitor_state():
     return {
         "last_completed_date": "",
@@ -1045,15 +1050,19 @@ class DailyTMSSummaryMonitor:
 
     def _run_loop(self):
         self.log("🕤 排片检查与 TMS 内容核对监控已启动")
+        last_loop_time = get_beijing_now()
+
         while True:
             try:
                 now = get_beijing_now()
                 today_str = now.strftime("%Y-%m-%d")
+                should_run_today = did_cross_fixed_time(last_loop_time, now, dt_time(9, 55))
+                last_loop_time = now
                 state = load_monitor_state()
                 self.last_state = state
                 today_run_time = datetime.combine(now.date(), dt_time(9, 55))
 
-                if state.get("last_completed_date") != today_str and now >= today_run_time:
+                if state.get("last_completed_date") != today_str and should_run_today:
                     self._execute_today_check()
                     time.sleep(5)
                     continue
@@ -1061,11 +1070,14 @@ class DailyTMSSummaryMonitor:
                 if state.get("last_completed_date") == today_str:
                     self.status_text = "已完成"
                     next_run_dt = datetime.combine(now.date() + timedelta(days=1), dt_time(9, 55))
+                elif now >= today_run_time:
+                    self.status_text = "等待下次固定时间"
+                    next_run_dt = datetime.combine(now.date() + timedelta(days=1), dt_time(9, 55))
                 else:
                     self.status_text = "未完成"
-                    next_run_dt = today_run_time if now < today_run_time else now
+                    next_run_dt = today_run_time
 
-                self.next_run_str = format_datetime_text(next_run_dt if next_run_dt > now else datetime.combine(now.date() + timedelta(days=1), dt_time(9, 55)))
+                self.next_run_str = format_datetime_text(next_run_dt)
                 time.sleep(30 if state.get("last_completed_date") != today_str and now < today_run_time else 60)
             except Exception as exc:
                 self.log(f"❌ 主循环异常：{exc}")