refactor(database): 重构数据库配置和CRUD逻辑

移除SQLITE_DB_NAME配置,统一使用DATABASE_NAME作为数据库名称
重构CRUD基类,增加out_schema参数用于序列化输出
优化数据库表查询逻辑,支持多种数据库类型
修复序列化工具类的方法签名和实现
This commit is contained in:
zhangtao
2025-10-02 14:06:49 +08:00
parent ef7143b2ae
commit 013ba8074a
14 changed files with 256 additions and 188 deletions
@@ -8,7 +8,6 @@ from .model import JobModel, JobLogModel
from .schema import JobCreateSchema,JobUpdateSchema,JobLogCreateSchema,JobLogUpdateSchema
class JobCRUD(CRUDBase[JobModel, JobCreateSchema, JobUpdateSchema]):
"""定时任务数据层"""
@@ -62,10 +61,6 @@ class JobLogCRUD(CRUDBase[JobLogModel, JobLogCreateSchema, JobLogUpdateSchema]):
"""获取定时任务日志列表"""
return await self.list(search=search, order_by=order_by)
async def create_obj_log_crud(self, data: JobLogCreateSchema) -> Optional[JobLogModel]:
"""创建定时任务日志"""
return await self.create(data=data)
async def delete_obj_log_crud(self, ids: List[int]) -> None:
"""删除定时任务日志"""
return await self.delete(ids=ids)
@@ -35,13 +35,15 @@ class JobLogQueryParam:
def __init__(
self,
job_name: Optional[str] = Query(None, description="任务名称"),
status: Optional[bool] = Query(None, description="状态: 正常,失败"),
start_time: Optional[DateTimeStr] = Query(None, description="开始时间", example="2025-01-01 00:00:00"),
end_time: Optional[DateTimeStr] = Query(None, description="结束时间", example="2025-12-31 23:59:59"),
) -> None:
# 模糊查询字段
self.job_name = ("like", job_name)
# 精确查询字段
self.status = status
# 时间范围查询
if start_time and end_time:
self.create_time = ("between", (start_time, end_time))
@@ -168,9 +168,9 @@ class JobLogService:
'job_kwargs': '关键字参数',
'job_trigger': '任务触发器',
'job_message': '日志信息',
'status': '执行状态',
'exception_info': '异常信息',
'created_at': '创建时间',
'status': '执行状态',
'create_time': '创建时间',
}
# 复制数据并转换状态