1.修改冬休逻辑

2.修改沉降数据接口，多加一个aname字段

app/utils/scheduler.py

@@ -241,6 +241,7 @@ def scheduled_get_max_nyid_by_point_id(start: int = 0,end: int = 0):
         # 2. 计算到期数据
         monitor = ConstructionMonitorUtils()
         daily_data = monitor.get_due_data(result,start=start,end=end)
+        # time.sleep(10000)
         data = daily_data['data']
         error_data = daily_data['error_data']
         
@@ -249,10 +250,13 @@ def scheduled_get_max_nyid_by_point_id(start: int = 0,end: int = 0):
         
         # 3. 循环处理冬休数据，追溯历史非冬休记录
         max_num = 1
-        while winters:
+        print(f"首次获取冬休数据完成，共{len(winters)}条记录")
+        while 1:
             max_num += 1
+            print(max_num)
             # 提取冬休数据的point_id列表
-            new_list = [w['point_id'] for w in winters]
+            new_list = [int(w['point_id']) for w in winters]
+            print(new_list)
             # 获取更多历史记录
             nyid_list = daily_service.get_nyid_by_point_id(db, new_list, max_num)
             w_list = monitor.get_due_data(nyid_list,start=start,end=end)
@@ -262,14 +266,14 @@ def scheduled_get_max_nyid_by_point_id(start: int = 0,end: int = 0):
             # 过期数据一并处理
             # data.extend(w_list['error_data'])
             error_data.extend(w_list['error_data'])
-            print(w_list)
+            if  winters == []:
+                break
         data.extend(error_data)
         # 4. 初始化服务实例
         level_service = LevelDataService()
         checkpoint_db = CheckpointService()
         section_db = SectionDataService()
         account_service = AccountService()
-        print(len(data))
         # 5. 关联其他表数据（核心逻辑保留）
         for d in data:
             # 处理 LevelData（假设返回列表，取第一条）
@@ -294,7 +298,7 @@ def scheduled_get_max_nyid_by_point_id(start: int = 0,end: int = 0):
                 d['account_data'] = account_response.__dict__ if account_response else None
             else:
                 d['account_data'] = None
-        
+        print(f"一共有{len(data)}条数据{data}")
         # 6. 构造DailyData数据并批量创建
         # daily_create_data1 = set()
         daily_create_data = []