✨ feat(scheduler): 为多目标定时任务添加固定间隔串行执行选项

zhenxun/builtin_plugins/scheduler_admin/__init__.py

@@ -111,6 +111,14 @@ __plugin_meta__ = PluginMetadata(
                 default_value=300,
                 type=int,
             ),
+            RegisterConfig(
+                module="SchedulerManager",
+                key="DEFAULT_INTERVAL_SECONDS",
+                value=0,
+                help="为多目标定时任务设置的默认串行执行间隔秒数(大于0时生效)，用于控制任务间的固定时间间隔。",
+                default_value=0,
+                type=int,
+            ),
         ],
-    ).to_dict(),
-)
+     ).to_dict(),
+ )

zhenxun/builtin_plugins/scheduler_admin/commands.py

@@ -128,6 +128,11 @@ schedule_cmd = on_alconna(
                 Args["spread_seconds", int],
                 help_text="设置多目标执行的分散延迟(秒)",
             ),
+            Option(
+                "--fixed-interval",
+                Args["interval_seconds", int],
+                help_text="设置任务间的固定执行间隔(秒)，将强制串行",
+            ),
             Option(
                 "--permission",
                 Args["perm_level", int],

zhenxun/builtin_plugins/scheduler_admin/data_source.py

@@ -65,6 +65,7 @@ class SchedulerAdminService:
         job_name: str | None,
         jitter: int | None,
         spread: int | None,
+        interval: int | None,
         created_by: str,
     ) -> str:
         """创建或更新一个定时任务"""
@@ -77,6 +78,8 @@ class SchedulerAdminService:
             execution_options["jitter"] = jitter
         if spread is not None:
             execution_options["spread"] = spread
+        if interval is not None:
+            execution_options["interval"] = interval
 
         for target_desc in targets:
             target_type, target_id = self._resolve_target_descriptor(target_desc)

zhenxun/builtin_plugins/scheduler_admin/handlers.py

@@ -63,6 +63,7 @@ async def handle_set(
     tag_name: Match[str] = AlconnaMatch("tag_name"),
     jitter: Match[int] = AlconnaMatch("jitter_seconds"),
     spread: Match[int] = AlconnaMatch("spread_seconds"),
+    interval: Match[int] = AlconnaMatch("interval_seconds"),
     job_name: Match[str] = AlconnaMatch("job_name"),
     bot_id_to_operate: str = Depends(GetBotId),
     trigger_info: tuple[str, dict] = Depends(GetTriggerInfo),
@@ -74,6 +75,7 @@ async def handle_set(
     p_name = plugin_name.result
     jitter_val: int | None = jitter.result if jitter.available else None
     spread_val: int | None = spread.result if spread.available else None
+    interval_val: int | None = interval.result if interval.available else None
 
     is_multi_target = (
         len(target_groups) > 1
@@ -100,6 +102,14 @@ async def handle_set(
                     "SchedulerManager", "DEFAULT_SPREAD_SECONDS"
                 )
 
+        if interval_val is None:
+            if task_meta and task_meta.get("default_interval") is not None:
+                interval_val = cast(int | None, task_meta["default_interval"])
+            else:
+                interval_val = Config.get_config(
+                    "SchedulerManager", "DEFAULT_INTERVAL_SECONDS"
+                )
+
     result_message = await scheduler_admin_service.set_schedule(
         targets=target_groups,
         creator_permission_level=creator_permission_level,
@@ -111,6 +121,7 @@ async def handle_set(
         job_name=job_name.result if job_name.available else None,
         jitter=jitter_val,
         spread=spread_val,
+        interval=interval_val,
         created_by=session.user.id,
     )
     await MessageUtils.build_message(result_message).send()