From 0980d48fda967fa49366e7646ee21f73da620245 Mon Sep 17 00:00:00 2001 From: whm <973418690@qq.com> Date: Wed, 5 Nov 2025 12:25:27 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=8E=B7=E5=8F=96=E4=BB=8A=E6=97=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/comprehensive_data.py | 26 +++++++++++++++++--------- app/schemas/comprehensive_data.py | 3 +++ 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/app/api/comprehensive_data.py b/app/api/comprehensive_data.py index 11d245c..986b3f9 100644 --- a/app/api/comprehensive_data.py +++ b/app/api/comprehensive_data.py @@ -19,7 +19,8 @@ from ..schemas.comprehensive_data import ( LinecodeRequest, NYIDRequest, SectionByAccountRequest, - PointByAccountRequest + PointByAccountRequest, + TodayDataRequest ) from ..services.daily import DailyDataService from ..services.section_data import SectionDataService @@ -381,20 +382,27 @@ def get_settlement_by_nyid( total=0, data=[] ) -@router.get("/get_today_data", response_model=DataResponse) -def get_today_data(db: Session = Depends(get_db)): - """接口:直接触发调度器中的 scheduled_get_max_nyid_by_point_id 定时任务""" +@router.post("/get_today_data", response_model=DataResponse) +def get_today_data(request: TodayDataRequest, db: Session = Depends(get_db)): + """接口:通过POST请求触发调度器中的 scheduled_get_max_nyid_by_point_id 定时任务""" try: - - + # 获取请求参数(如果需要从请求体中接收参数,可通过request获取) + # 示例:如需接收account_id,可通过 request.account_id 获取 + # account_id = request.account_id # 根据根据实际需求决定是否需要 + + # 触发定时任务(如果需要传入参数,可在这里添加) # scheduled_get_max_nyid_by_point_id() + + # 调用服务层获取数据 + account_id = request.account_id daily_service = DailyDataService() - daily_data = daily_service.get_daily_data_by_account(db,account_id=1) + # 如需使用请求参数,可修改为 daily_service.get_daily_data_by_account(db, account_id=account_id) + daily_data = daily_service.get_daily_data_by_account(db, account_id=account_id) return DataResponse( code=ResponseCode.SUCCESS, - message="定时任务触发执行成功!任务已开始处理(具体结果查看系统日志)", - total=1, + message="定时时任务触发执行成功!任务已开始处理(具体结果查看系统日志)", + total=1 if daily_data else 0, # 根据实际数据是否存在调整total data=daily_data ) except Exception as e: diff --git a/app/schemas/comprehensive_data.py b/app/schemas/comprehensive_data.py index 1f4893b..297a193 100644 --- a/app/schemas/comprehensive_data.py +++ b/app/schemas/comprehensive_data.py @@ -23,6 +23,9 @@ class LevelDataImportRequest(BaseModel): # 水准数据导入请求 class NYIDRequest(BaseModel): NYID: str +# 今日数据请求 +class TodayDataRequest(BaseModel): + account_id: str # 沉降数据导入请求 class SettlementDataImportRequest(BaseModel): point_id: str