From 808c6a5a6982488ba1fa5226524e305d38b028e9 Mon Sep 17 00:00:00 2001 From: yuan <964343743@qq.com> Date: Mon, 25 Aug 2025 14:32:07 +0800 Subject: [PATCH] =?UTF-8?q?refactor(job):=E4=BC=98=E5=8C=96=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=A8=A1=E5=9E=8B=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/api/v1/schemas/monitor/job_schema.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/backend/app/api/v1/schemas/monitor/job_schema.py b/backend/app/api/v1/schemas/monitor/job_schema.py index c393ccd8..515089c4 100644 --- a/backend/app/api/v1/schemas/monitor/job_schema.py +++ b/backend/app/api/v1/schemas/monitor/job_schema.py @@ -2,9 +2,6 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Optional -from datetime import datetime - -from app.core.validator import DateTimeStr from app.core.base_schema import BaseSchema @@ -12,16 +9,15 @@ class JobCreateSchema(BaseModel): """ 定时任务调度表对应pydantic模型 """ - - name: Optional[str] = Field(default=None, max_length=64, description='任务名称') + name: Optional[str] = Field(..., max_length=64, description='任务名称') func: str = Field(..., description='任务函数') trigger: str = Field(..., description='触发器:控制此作业计划的 trigger 对象') args: Optional[str] = Field(default=None, description='位置参数') kwargs: Optional[str] = Field(default=None, description='关键字参数') - coalesce: Optional[bool] = Field(default=False, description='是否合并运行:是否在多个运行时间到期时仅运行作业一次') + coalesce: Optional[bool] = Field(..., description='是否合并运行:是否在多个运行时间到期时仅运行作业一次') max_instances: Optional[int] = Field(default=1, ge=1, description='最大实例数:允许的最大并发执行实例数') - jobstore: Optional[str] = Field(default='default', max_length=64, description='任务存储') - executor: Optional[str] = Field(default='default', max_length=64, description='任务执行器:将运行此作业的执行程序的名称') + jobstore: Optional[str] = Field(..., max_length=64, description='任务存储') + executor: Optional[str] = Field(..., max_length=64, description='任务执行器:将运行此作业的执行程序的名称') trigger_args: Optional[str] = Field(default=None, description='触发器参数') start_date: Optional[str] = Field(default=None, description='开始时间') end_date: Optional[str] = Field(default=None, description='结束时间') @@ -29,14 +25,13 @@ class JobCreateSchema(BaseModel): status: Optional[bool] = Field(default=False, description='任务状态:启动,停止') message: Optional[str] = Field(default=None, max_length=500, description='日志信息') + class JobUpdateSchema(JobCreateSchema): """定时任务更新模型""" - ... id: int = Field(..., gt=0, description="ID") class JobOutSchema(JobCreateSchema, BaseSchema): """定时任务响应模型""" model_config = ConfigDict(from_attributes=True) - ... \ No newline at end of file