响应格式修改,原始数据查询修改
This commit is contained in:
193
app/api/task.py
193
app/api/task.py
@@ -1,10 +1,11 @@
|
||||
from fastapi import APIRouter, HTTPException, status
|
||||
from fastapi import APIRouter, Depends
|
||||
from typing import List
|
||||
from ..schemas.task import (
|
||||
JobResponse, AddCronJobRequest, AddIntervalJobRequest,
|
||||
AddDateJobRequest, TaskResponse
|
||||
AddDateJobRequest, TaskResponse, TaskListResponse, FunctionListResponse
|
||||
)
|
||||
from ..utils.scheduler import task_scheduler, example_task, database_cleanup_task, reset_today_updated_task
|
||||
from ..core.response_code import ResponseCode, ResponseMessage
|
||||
|
||||
router = APIRouter(prefix="/tasks", tags=["定时任务管理"])
|
||||
|
||||
@@ -20,9 +21,10 @@ def add_cron_job(request: AddCronJobRequest):
|
||||
"""添加cron定时任务"""
|
||||
try:
|
||||
if request.func_name not in AVAILABLE_FUNCTIONS:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail=f"函数 {request.func_name} 不可用"
|
||||
return TaskResponse(
|
||||
code=ResponseCode.BAD_REQUEST,
|
||||
message=f"函数 {request.func_name} 不可用",
|
||||
data=None
|
||||
)
|
||||
|
||||
func = AVAILABLE_FUNCTIONS[request.func_name]
|
||||
@@ -49,15 +51,16 @@ def add_cron_job(request: AddCronJobRequest):
|
||||
job = task_scheduler.add_cron_job(func, request.job_id, **cron_kwargs)
|
||||
|
||||
return TaskResponse(
|
||||
success=True,
|
||||
code=ResponseCode.SUCCESS,
|
||||
message=f"Cron任务 {request.job_id} 添加成功",
|
||||
data={"job_id": job.id, "next_run": str(job.next_run_time)}
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
return TaskResponse(
|
||||
success=False,
|
||||
message=f"添加Cron任务失败: {str(e)}"
|
||||
code=ResponseCode.INTERNAL_ERROR,
|
||||
message=f"添加Cron任务失败: {str(e)}",
|
||||
data=None
|
||||
)
|
||||
|
||||
@router.post("/interval", response_model=TaskResponse)
|
||||
@@ -65,9 +68,10 @@ def add_interval_job(request: AddIntervalJobRequest):
|
||||
"""添加间隔执行任务"""
|
||||
try:
|
||||
if request.func_name not in AVAILABLE_FUNCTIONS:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail=f"函数 {request.func_name} 不可用"
|
||||
return TaskResponse(
|
||||
code=ResponseCode.BAD_REQUEST,
|
||||
message=f"函数 {request.func_name} 不可用",
|
||||
data=None
|
||||
)
|
||||
|
||||
func = AVAILABLE_FUNCTIONS[request.func_name]
|
||||
@@ -86,15 +90,16 @@ def add_interval_job(request: AddIntervalJobRequest):
|
||||
job = task_scheduler.add_interval_job(func, request.job_id, **interval_kwargs)
|
||||
|
||||
return TaskResponse(
|
||||
success=True,
|
||||
code=ResponseCode.SUCCESS,
|
||||
message=f"间隔任务 {request.job_id} 添加成功",
|
||||
data={"job_id": job.id, "next_run": str(job.next_run_time)}
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
return TaskResponse(
|
||||
success=False,
|
||||
message=f"添加间隔任务失败: {str(e)}"
|
||||
code=ResponseCode.INTERNAL_ERROR,
|
||||
message=f"添加间隔任务失败: {str(e)}",
|
||||
data=None
|
||||
)
|
||||
|
||||
@router.post("/date", response_model=TaskResponse)
|
||||
@@ -102,57 +107,86 @@ def add_date_job(request: AddDateJobRequest):
|
||||
"""添加指定时间执行任务"""
|
||||
try:
|
||||
if request.func_name not in AVAILABLE_FUNCTIONS:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail=f"函数 {request.func_name} 不可用"
|
||||
return TaskResponse(
|
||||
code=ResponseCode.BAD_REQUEST,
|
||||
message=f"函数 {request.func_name} 不可用",
|
||||
data=None
|
||||
)
|
||||
|
||||
func = AVAILABLE_FUNCTIONS[request.func_name]
|
||||
job = task_scheduler.add_date_job(func, request.job_id, run_date=request.run_date)
|
||||
|
||||
return TaskResponse(
|
||||
success=True,
|
||||
code=ResponseCode.SUCCESS,
|
||||
message=f"定时任务 {request.job_id} 添加成功",
|
||||
data={"job_id": job.id, "run_date": str(job.next_run_time)}
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
return TaskResponse(
|
||||
success=False,
|
||||
message=f"添加定时任务失败: {str(e)}"
|
||||
code=ResponseCode.INTERNAL_ERROR,
|
||||
message=f"添加定时任务失败: {str(e)}",
|
||||
data=None
|
||||
)
|
||||
|
||||
@router.post("/list", response_model=List[JobResponse])
|
||||
@router.post("/list", response_model=TaskListResponse)
|
||||
def get_jobs():
|
||||
"""获取所有任务"""
|
||||
jobs = task_scheduler.get_jobs()
|
||||
result = []
|
||||
for job in jobs:
|
||||
result.append(JobResponse(
|
||||
id=job.id,
|
||||
name=job.name,
|
||||
func=str(job.func),
|
||||
trigger=str(job.trigger),
|
||||
next_run_time=job.next_run_time
|
||||
))
|
||||
return result
|
||||
try:
|
||||
jobs = task_scheduler.get_jobs()
|
||||
result = []
|
||||
for job in jobs:
|
||||
result.append(JobResponse(
|
||||
id=job.id,
|
||||
name=job.name,
|
||||
func=str(job.func),
|
||||
trigger=str(job.trigger),
|
||||
next_run_time=job.next_run_time
|
||||
))
|
||||
return TaskListResponse(
|
||||
code=ResponseCode.SUCCESS,
|
||||
message="查询成功",
|
||||
total=len(result),
|
||||
data=result
|
||||
)
|
||||
except Exception as e:
|
||||
return TaskListResponse(
|
||||
code=ResponseCode.QUERY_FAILED,
|
||||
message=f"查询任务列表失败: {str(e)}",
|
||||
total=0,
|
||||
data=[]
|
||||
)
|
||||
|
||||
@router.post("/remove", response_model=TaskResponse)
|
||||
def remove_job(request: dict):
|
||||
"""删除任务"""
|
||||
job_id = request.get("job_id")
|
||||
if not job_id:
|
||||
raise HTTPException(status_code=400, detail="job_id is required")
|
||||
success = task_scheduler.remove_job(job_id)
|
||||
if success:
|
||||
return TaskResponse(
|
||||
success=True,
|
||||
message=f"任务 {job_id} 删除成功"
|
||||
code=ResponseCode.BAD_REQUEST,
|
||||
message="job_id is required",
|
||||
data=None
|
||||
)
|
||||
else:
|
||||
|
||||
try:
|
||||
success = task_scheduler.remove_job(job_id)
|
||||
if success:
|
||||
return TaskResponse(
|
||||
code=ResponseCode.SUCCESS,
|
||||
message=f"任务 {job_id} 删除成功",
|
||||
data=None
|
||||
)
|
||||
else:
|
||||
return TaskResponse(
|
||||
code=ResponseCode.NOT_FOUND,
|
||||
message=f"任务 {job_id} 不存在",
|
||||
data=None
|
||||
)
|
||||
except Exception as e:
|
||||
return TaskResponse(
|
||||
success=False,
|
||||
message=f"删除任务 {job_id} 失败"
|
||||
code=ResponseCode.INTERNAL_ERROR,
|
||||
message=f"删除任务 {job_id} 失败: {str(e)}",
|
||||
data=None
|
||||
)
|
||||
|
||||
@router.post("/pause", response_model=TaskResponse)
|
||||
@@ -160,17 +194,31 @@ def pause_job(request: dict):
|
||||
"""暂停任务"""
|
||||
job_id = request.get("job_id")
|
||||
if not job_id:
|
||||
raise HTTPException(status_code=400, detail="job_id is required")
|
||||
success = task_scheduler.pause_job(job_id)
|
||||
if success:
|
||||
return TaskResponse(
|
||||
success=True,
|
||||
message=f"任务 {job_id} 已暂停"
|
||||
code=ResponseCode.BAD_REQUEST,
|
||||
message="job_id is required",
|
||||
data=None
|
||||
)
|
||||
else:
|
||||
|
||||
try:
|
||||
success = task_scheduler.pause_job(job_id)
|
||||
if success:
|
||||
return TaskResponse(
|
||||
code=ResponseCode.SUCCESS,
|
||||
message=f"任务 {job_id} 已暂停",
|
||||
data=None
|
||||
)
|
||||
else:
|
||||
return TaskResponse(
|
||||
code=ResponseCode.NOT_FOUND,
|
||||
message=f"任务 {job_id} 不存在",
|
||||
data=None
|
||||
)
|
||||
except Exception as e:
|
||||
return TaskResponse(
|
||||
success=False,
|
||||
message=f"暂停任务 {job_id} 失败"
|
||||
code=ResponseCode.INTERNAL_ERROR,
|
||||
message=f"暂停任务 {job_id} 失败: {str(e)}",
|
||||
data=None
|
||||
)
|
||||
|
||||
@router.post("/resume", response_model=TaskResponse)
|
||||
@@ -178,20 +226,45 @@ def resume_job(request: dict):
|
||||
"""恢复任务"""
|
||||
job_id = request.get("job_id")
|
||||
if not job_id:
|
||||
raise HTTPException(status_code=400, detail="job_id is required")
|
||||
success = task_scheduler.resume_job(job_id)
|
||||
if success:
|
||||
return TaskResponse(
|
||||
success=True,
|
||||
message=f"任务 {job_id} 已恢复"
|
||||
)
|
||||
else:
|
||||
return TaskResponse(
|
||||
success=False,
|
||||
message=f"恢复任务 {job_id} 失败"
|
||||
code=ResponseCode.BAD_REQUEST,
|
||||
message="job_id is required",
|
||||
data=None
|
||||
)
|
||||
|
||||
@router.post("/functions", response_model=List[str])
|
||||
try:
|
||||
success = task_scheduler.resume_job(job_id)
|
||||
if success:
|
||||
return TaskResponse(
|
||||
code=ResponseCode.SUCCESS,
|
||||
message=f"任务 {job_id} 已恢复",
|
||||
data=None
|
||||
)
|
||||
else:
|
||||
return TaskResponse(
|
||||
code=ResponseCode.NOT_FOUND,
|
||||
message=f"任务 {job_id} 不存在",
|
||||
data=None
|
||||
)
|
||||
except Exception as e:
|
||||
return TaskResponse(
|
||||
code=ResponseCode.INTERNAL_ERROR,
|
||||
message=f"恢复任务 {job_id} 失败: {str(e)}",
|
||||
data=None
|
||||
)
|
||||
|
||||
@router.post("/functions", response_model=FunctionListResponse)
|
||||
def get_available_functions():
|
||||
"""获取可用的任务函数列表"""
|
||||
return list(AVAILABLE_FUNCTIONS.keys())
|
||||
try:
|
||||
return FunctionListResponse(
|
||||
code=ResponseCode.SUCCESS,
|
||||
message="查询成功",
|
||||
data=list(AVAILABLE_FUNCTIONS.keys())
|
||||
)
|
||||
except Exception as e:
|
||||
return FunctionListResponse(
|
||||
code=ResponseCode.QUERY_FAILED,
|
||||
message=f"查询可用函数失败: {str(e)}",
|
||||
data=[]
|
||||
)
|
||||
Reference in New Issue
Block a user