1.获取今日数据接口修改
This commit is contained in:
@@ -19,7 +19,8 @@ from ..schemas.comprehensive_data import (
|
|||||||
LinecodeRequest,
|
LinecodeRequest,
|
||||||
NYIDRequest,
|
NYIDRequest,
|
||||||
SectionByAccountRequest,
|
SectionByAccountRequest,
|
||||||
PointByAccountRequest
|
PointByAccountRequest,
|
||||||
|
TodayDataRequest
|
||||||
)
|
)
|
||||||
from ..services.daily import DailyDataService
|
from ..services.daily import DailyDataService
|
||||||
from ..services.section_data import SectionDataService
|
from ..services.section_data import SectionDataService
|
||||||
@@ -381,20 +382,27 @@ def get_settlement_by_nyid(
|
|||||||
total=0,
|
total=0,
|
||||||
data=[]
|
data=[]
|
||||||
)
|
)
|
||||||
@router.get("/get_today_data", response_model=DataResponse)
|
@router.post("/get_today_data", response_model=DataResponse)
|
||||||
def get_today_data(db: Session = Depends(get_db)):
|
def get_today_data(request: TodayDataRequest, db: Session = Depends(get_db)):
|
||||||
"""接口:直接触发调度器中的 scheduled_get_max_nyid_by_point_id 定时任务"""
|
"""接口:通过POST请求触发调度器中的 scheduled_get_max_nyid_by_point_id 定时任务"""
|
||||||
try:
|
try:
|
||||||
|
# 获取请求参数(如果需要从请求体中接收参数,可通过request获取)
|
||||||
|
# 示例:如需接收account_id,可通过 request.account_id 获取
|
||||||
|
# account_id = request.account_id # 根据根据实际需求决定是否需要
|
||||||
|
|
||||||
|
# 触发定时任务(如果需要传入参数,可在这里添加)
|
||||||
# scheduled_get_max_nyid_by_point_id()
|
# scheduled_get_max_nyid_by_point_id()
|
||||||
|
|
||||||
|
# 调用服务层获取数据
|
||||||
|
account_id = request.account_id
|
||||||
daily_service = DailyDataService()
|
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(
|
return DataResponse(
|
||||||
code=ResponseCode.SUCCESS,
|
code=ResponseCode.SUCCESS,
|
||||||
message="定时任务触发执行成功!任务已开始处理(具体结果查看系统日志)",
|
message="定时时任务触发执行成功!任务已开始处理(具体结果查看系统日志)",
|
||||||
total=1,
|
total=1 if daily_data else 0, # 根据实际数据是否存在调整total
|
||||||
data=daily_data
|
data=daily_data
|
||||||
)
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|||||||
@@ -23,6 +23,9 @@ class LevelDataImportRequest(BaseModel):
|
|||||||
# 水准数据导入请求
|
# 水准数据导入请求
|
||||||
class NYIDRequest(BaseModel):
|
class NYIDRequest(BaseModel):
|
||||||
NYID: str
|
NYID: str
|
||||||
|
# 今日数据请求
|
||||||
|
class TodayDataRequest(BaseModel):
|
||||||
|
account_id: str
|
||||||
# 沉降数据导入请求
|
# 沉降数据导入请求
|
||||||
class SettlementDataImportRequest(BaseModel):
|
class SettlementDataImportRequest(BaseModel):
|
||||||
point_id: str
|
point_id: str
|
||||||
|
|||||||
Reference in New Issue
Block a user