1.修改推测的时间

2.修改入库逻辑

app/utils/scheduler.py

@@ -230,8 +230,7 @@ def scheduled_get_max_nyid_by_point_id(start: int = 0,end: int = 0):
         # 核心新增：清空DailyData表所有数据
         # delete_count = db.query(DailyData).delete()
         # db.commit()
-        db.execute(text(f"TRUNCATE TABLE {DailyData.__tablename__}"))
-        db.commit()  # 必须提交事务
+        
         # logger.info(f"DailyData表清空完成，共删除{delete_count}条历史记录")
 
         # 1. 获取沉降数据（返回 List[List[dict]]）
@@ -242,7 +241,6 @@ def scheduled_get_max_nyid_by_point_id(start: int = 0,end: int = 0):
         monitor = ConstructionMonitorUtils()
         daily_data = monitor.get_due_data(result,start=start,end=end)
         print(daily_data)
-        # time.sleep(10000)
         data = daily_data['data']
         error_data = daily_data['error_data']
         
@@ -257,6 +255,8 @@ def scheduled_get_max_nyid_by_point_id(start: int = 0,end: int = 0):
             print(max_num)
             # 提取冬休数据的point_id列表
             new_list = [int(w['point_id']) for w in winters]
+            if new_list == []:
+                break
             # 获取更多历史记录
             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)
@@ -319,12 +319,17 @@ def scheduled_get_max_nyid_by_point_id(start: int = 0,end: int = 0):
                 nyids.append(d['NYID'])
                 daily_create_data.append(tem)
         # 批量创建记录
+        print(daily_create_data)
         if daily_create_data:
+            db.execute(text(f"TRUNCATE TABLE {DailyData.__tablename__}"))
+            db.commit()  # 必须提交事务
             # with open('data.json', 'w', encoding='utf-8') as f:
                 # json.dump(daily_create_data, f, ensure_ascii=False, indent=4)
             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:
+            db.execute(text(f"TRUNCATE TABLE {DailyData.__tablename__}"))
+            db.commit()  # 必须提交事务
             logger.warning("定时任务完成：无有效数据可创建DailyData记录")
 
     except Exception as e: