|
|
@@ -142,11 +142,14 @@ class DataProvider:
|
|
|
time_index = pd.date_range(start=start_time, end=end_time, freq=f"{sample_interval}s")
|
|
|
result = {"index": time_index}
|
|
|
|
|
|
+ success, empty = 0, 0
|
|
|
for i, pt in enumerate(points):
|
|
|
- logger.info(f"查询点位 [{i+1}/{len(points)}] {pt}")
|
|
|
+ if (i + 1) % 30 == 0 or (i + 1) == len(points):
|
|
|
+ logger.info(f"批量查询进度: [{i+1}/{len(points)}]")
|
|
|
raw = self.query_single_point_history(pt, start_time, end_time)
|
|
|
if raw.empty:
|
|
|
result[pt] = np.nan
|
|
|
+ empty += 1
|
|
|
else:
|
|
|
resampled = raw.resample(f"{sample_interval}s").mean()
|
|
|
resampled = resampled.reindex(
|
|
|
@@ -155,6 +158,9 @@ class DataProvider:
|
|
|
tolerance=pd.Timedelta(seconds=sample_interval),
|
|
|
)
|
|
|
result[pt] = resampled.ffill().bfill()
|
|
|
+ success += 1
|
|
|
+
|
|
|
+ logger.info(f"批量查询完成: {success} 成功, {empty} 无数据 / 共 {len(points)} 点位")
|
|
|
|
|
|
df = pd.DataFrame(result)
|
|
|
df.set_index("index", inplace=True)
|