1.自动更新今日需要抓取数据
2.工况接口返回
This commit is contained in:
@@ -3,9 +3,20 @@ from apscheduler.executors.pool import ThreadPoolExecutor
|
||||
from apscheduler.jobstores.sqlalchemy import SQLAlchemyJobStore
|
||||
from apscheduler.events import EVENT_JOB_EXECUTED, EVENT_JOB_ERROR
|
||||
from ..core.config import settings
|
||||
from sqlalchemy.orm import Session
|
||||
from ..core.database import SessionLocal
|
||||
from ..core.logging_config import get_logger
|
||||
from ..models.account import Account
|
||||
# from ..services.daily import get_nyid_by_point_id
|
||||
from ..services.daily import DailyDataService
|
||||
from ..services.level_data import LevelDataService
|
||||
from ..services.checkpoint import CheckpointService
|
||||
from ..services.section_data import SectionDataService
|
||||
from ..services.account import AccountService
|
||||
from ..models.daily import DailyData
|
||||
from ..models.settlement_data import SettlementData
|
||||
from typing import List
|
||||
from ..utils.construction_monitor import ConstructionMonitorUtils
|
||||
|
||||
# 获取日志记录器
|
||||
logger = get_logger(__name__)
|
||||
@@ -70,6 +81,7 @@ class TaskScheduler:
|
||||
# 添加每天午夜12点重置today_updated字段的任务
|
||||
self.scheduler.add_job(
|
||||
reset_today_updated_task,
|
||||
scheduled_get_max_nyid_by_point_id,
|
||||
'cron',
|
||||
id='daily_reset_today_updated',
|
||||
hour=0,
|
||||
@@ -174,6 +186,7 @@ def reset_today_updated_task():
|
||||
finally:
|
||||
db.close()
|
||||
|
||||
|
||||
# 示例定时任务函数
|
||||
def example_task():
|
||||
"""示例定时任务"""
|
||||
@@ -185,4 +198,106 @@ def database_cleanup_task():
|
||||
"""数据库清理任务示例"""
|
||||
logger.info("执行数据库清理任务")
|
||||
# 这里可以添加数据库清理逻辑
|
||||
return "数据库清理完成"
|
||||
return "数据库清理完成"
|
||||
|
||||
# 每日自动写入获取最新工况信息
|
||||
def scheduled_get_max_nyid_by_point_id():
|
||||
"""定时任务:获取max NYID关联数据并批量创建DailyData记录"""
|
||||
db: Session = None
|
||||
try:
|
||||
# 初始化数据库会话(替代接口的Depends依赖)
|
||||
db = SessionLocal()
|
||||
logger.info("定时任务开始执行:获取max NYID关联数据并处理")
|
||||
# 核心新增:清空DailyData表所有数据
|
||||
delete_count = db.query(DailyData).delete()
|
||||
db.commit()
|
||||
logger.info(f"DailyData表清空完成,共删除{delete_count}条历史记录")
|
||||
|
||||
# 1. 获取沉降数据(返回 List[List[dict]])
|
||||
daily_service = DailyDataService()
|
||||
result = daily_service.get_nyid_by_point_id(db, [], 1)
|
||||
|
||||
# 2. 计算到期数据
|
||||
monitor = ConstructionMonitorUtils()
|
||||
daily_data = monitor.get_due_data(result)
|
||||
data = daily_data['data']
|
||||
error_data = daily_data['error_data']
|
||||
winters = daily_data['winter']
|
||||
logger.info(f"首次获取数据完成,共{len(result)}条记录")
|
||||
|
||||
# 3. 循环处理冬休数据,追溯历史非冬休记录
|
||||
max_num = 1
|
||||
while winters:
|
||||
max_num += 1
|
||||
# 提取冬休数据的point_id列表
|
||||
new_list = [w['point_id'] for w in winters]
|
||||
# 获取更多历史记录
|
||||
nyid_list = daily_service.get_nyid_by_point_id(db, new_list, max_num)
|
||||
w_list = monitor.get_due_data(nyid_list)
|
||||
# 更新冬休、待处理、错误数据
|
||||
winters = w_list['winter']
|
||||
data.extend(w_list['data'])
|
||||
error_data.extend(w_list['error_data'])
|
||||
|
||||
# 4. 初始化服务实例
|
||||
level_service = LevelDataService()
|
||||
checkpoint_db = CheckpointService()
|
||||
section_db = SectionDataService()
|
||||
account_service = AccountService()
|
||||
|
||||
# 5. 关联其他表数据(核心逻辑保留)
|
||||
for d in data:
|
||||
# 处理 LevelData(假设返回列表,取第一条)
|
||||
level_results = level_service.get_by_nyid(db, d['NYID'])
|
||||
level_instance = level_results[0] if isinstance(level_results, list) and level_results else level_results
|
||||
d['level_data'] = level_instance.to_dict() if level_instance else None
|
||||
|
||||
# 处理 CheckpointData(返回单实例,直接使用)
|
||||
checkpoint_instance = checkpoint_db.get_by_point_id(db, d['point_id'])
|
||||
d['checkpoint_data'] = checkpoint_instance.to_dict() if checkpoint_instance else None
|
||||
|
||||
# 处理 SectionData(根据checkpoint_data关联)
|
||||
if d['checkpoint_data']:
|
||||
section_instance = section_db.get_by_section_id(db, d['checkpoint_data']['section_id'])
|
||||
d['section_data'] = section_instance.to_dict() if section_instance else None
|
||||
else:
|
||||
d['section_data'] = None
|
||||
|
||||
# 处理 AccountData
|
||||
if d.get('section_data') and d['section_data'].get('account_id'):
|
||||
account_response = account_service.get_account(db, account_id=d['section_data']['account_id'])
|
||||
d['account_data'] = account_response.__dict__ if account_response else None
|
||||
else:
|
||||
d['account_data'] = None
|
||||
|
||||
# 6. 构造DailyData数据并批量创建
|
||||
daily_create_data = []
|
||||
for d in data:
|
||||
# 过滤无效数据(避免缺失关键字段报错)
|
||||
if all(key in d for key in ['NYID', 'point_id']) and d.get('level_data') and d.get('account_data') and d.get('section_data'):
|
||||
tem = {
|
||||
'NYID': d['NYID'],
|
||||
'point_id': d['point_id'],
|
||||
'linecode': d['level_data']['linecode'],
|
||||
'account_id': d['account_data']['account_id'],
|
||||
'section_id': d['section_data']['id']
|
||||
}
|
||||
daily_create_data.append(tem)
|
||||
|
||||
# 批量创建记录
|
||||
if daily_create_data:
|
||||
created_records = daily_service.batch_create_by_account_nyid(db, daily_create_data)
|
||||
logger.info(f"定时任务完成:成功创建{len(created_records)}条DailyData记录,共处理{len(data)}个point_id数据")
|
||||
else:
|
||||
logger.warning("定时任务完成:无有效数据可创建DailyData记录")
|
||||
|
||||
except Exception as e:
|
||||
# 异常时回滚事务
|
||||
if db:
|
||||
db.rollback()
|
||||
logger.error(f"定时任务执行失败:{str(e)}", exc_info=True)
|
||||
raise e # 抛出异常便于定时框架捕获告警
|
||||
finally:
|
||||
# 确保数据库会话关闭
|
||||
if db:
|
||||
db.close()
|
||||
Reference in New Issue
Block a user