From 51068dc4e1b3c175939dc790485b964eb6dfb912 Mon Sep 17 00:00:00 2001 From: whm <973418690@qq.com> Date: Sat, 1 Nov 2025 14:15:32 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9get=5Fall=5Fsection=5Fby=5F?= =?UTF-8?q?account?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/comprehensive_data.py | 5 +++-- app/services/section_data.py | 2 +- app/utils/scheduler.py | 6 +----- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/api/comprehensive_data.py b/app/api/comprehensive_data.py index 714f0f1..d336e87 100644 --- a/app/api/comprehensive_data.py +++ b/app/api/comprehensive_data.py @@ -412,11 +412,12 @@ def get_all_section_by_account(request: SectionByAccountRequest, db: Session = D account_id = request.account_id section_service = SectionDataService() result_data = section_service.get_by_account_id(db, account_id=account_id) + data_list = [item.to_dict() for item in result_data] if result_data else [] return DataResponse( code=ResponseCode.SUCCESS, message="查询成功", - total=len(result_data), - data=result_data + total=len(data_list), + data=data_list ) except Exception as e: logger.error(f"Query section data failed: {str(e)}") diff --git a/app/services/section_data.py b/app/services/section_data.py index 20bdacc..e9122c4 100644 --- a/app/services/section_data.py +++ b/app/services/section_data.py @@ -23,7 +23,7 @@ class SectionDataService(BaseService[SectionData]): def get_by_account_id(self, db: Session, account_id: str) -> Optional[SectionData]: """根据账号ID获取断面数据""" accounts = self.get_by_field(db, "account_id", account_id) - return accounts[0] if accounts else None + return accounts if accounts else None def get_by_number(self, db: Session, number: str) -> List[SectionData]: """根据桥梁墩(台)编号获取断面数据""" return self.get_by_field(db, "number", number) diff --git a/app/utils/scheduler.py b/app/utils/scheduler.py index 05c9130..7b8d6e7 100644 --- a/app/utils/scheduler.py +++ b/app/utils/scheduler.py @@ -78,7 +78,7 @@ class TaskScheduler: # 检查是否已存在每日重置任务 existing_job = self.scheduler.get_job("daily_reset_today_updated") - existing_job = self.scheduler.get_job("get_max_nyid") + # existing_job = self.scheduler.get_job("get_max_nyid") if not existing_job: # 添加每天午夜12点重置today_updated字段的任务 self.scheduler.add_job( @@ -90,10 +90,6 @@ class TaskScheduler: second=0, name='每日重置账号更新状态' ) - self.scheduler.add_job( - scheduled_get_max_nyid_by_point_id, - id='get_max_nyid', - ) logger.info("系统定时任务:每日重置账号更新状态已添加") except Exception as e: logger.error(f"设置系统定时任务失败: {e}")