gis/xian_algorithm_new
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

统一计算逻辑以及时间转换逻辑

Browse Source
This commit is contained in:
wzy-warehouse
2026-06-12 14:53:35 +08:00
parent a07c5a1107
commit 316177c2ba
5 changed files with 215 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/repositories/dbn_repository.py
+23 -19
View File
@@ -3,9 +3,10 @@
负责从 xian_risk_factors、xian_meteorology 等表获取数据
"""
import math
from typing import Optional, List, Dict, Any
from typing import Optional, List, Dict, Any, Union
from datetime import datetime
from app.utils.db_helper import db_helper
from app.utils.time_converter import time_converter
from app.config.paths import get_logger
logger = get_logger("dbn")
@@ -166,20 +167,23 @@ class DbnRepository:
@staticmethod
def get_nearest_station_rainfall(lon: float, lat: float,
query_time: Optional[datetime] = None) -> Dict[str, Any]:
query_time: Optional[Union[datetime, str]] = None) -> Dict[str, Any]:
"""
获取最近雨量站的降雨数据
Args:
lon: 经度
lat: 纬度
query_time: 查询时间，若未提供则取当前时间
query_time: 查询时间，若未提供则取当前时间。支持datetime对象或标准时间字符串（如'2025-07-04 20:00:00'）
Returns:
降雨数据
"""
if query_time is None:
query_time = datetime.now()
# 获取时间范围（24小时窗口）
start_time, end_time = time_converter.to_db_time_range(query_time, hours=24)
# noinspection SqlNoDataSourceInspection
sql = """
@@ -190,9 +194,7 @@ class DbnRepository:
SUM(CAST(rainfall_1h AS DOUBLE PRECISION)) as total_rainfall,
COUNT(*) as record_count
FROM xian_meteorology
WHERE datetime BETWEEN
CAST(EXTRACT(EPOCH FROM (%s::timestamp - INTERVAL '24 hours')) AS BIGINT)
AND CAST(EXTRACT(EPOCH FROM %s::timestamp) AS BIGINT)
WHERE datetime BETWEEN %s AND %s
AND rainfall_1h IS NOT NULL
AND CAST(rainfall_1h AS DOUBLE PRECISION) > 0
GROUP BY lon, lat
@@ -210,7 +212,7 @@ class DbnRepository:
ORDER BY distance
LIMIT 1
"""
result = db_helper.execute_query_one(sql, (query_time, query_time, lon, lat))
result = db_helper.execute_query_one(sql, (start_time, end_time, lon, lat))
if result:
return {
@@ -231,14 +233,14 @@ class DbnRepository:
@staticmethod
def get_rainfall_data_with_duration(lon: float, lat: float,
query_time: Optional[datetime] = None) -> Dict[str, Any]:
query_time: Optional[Union[datetime, str]] = None) -> Dict[str, Any]:
"""
获取降雨数据，包括累计降雨量和持续时间
Args:
lon: 经度
lat: 纬度
query_time: 查询时间，若未提供则取当前时间
query_time: 查询时间，若未提供则取当前时间。支持datetime对象或标准时间字符串（如'2025-07-04 20:00:00'）
Returns:
降雨数据：{accum_rain, duration_hours, rain_intensity}
@@ -270,6 +272,9 @@ class DbnRepository:
station_lon = station['lon']
station_lat = station['lat']
# 获取时间范围（72小时窗口）
start_time, end_time = time_converter.to_db_time_range(query_time, hours=72)
# 查询该站点的降雨时序数据
# noinspection SqlNoDataSourceInspection
sql = """
@@ -278,12 +283,10 @@ class DbnRepository:
CAST(rainfall_1h AS DOUBLE PRECISION) as rainfall
FROM xian_meteorology
WHERE lon = %s AND lat = %s
AND datetime BETWEEN
CAST(EXTRACT(EPOCH FROM (%s::timestamp - INTERVAL '72 hours')) AS BIGINT)
AND CAST(EXTRACT(EPOCH FROM %s::timestamp) AS BIGINT)
AND datetime BETWEEN %s AND %s
ORDER BY datetime DESC
"""
results = db_helper.execute_query(sql, (station_lon, station_lat, query_time, query_time))
results = db_helper.execute_query(sql, (station_lon, station_lat, start_time, end_time))
if not results:
return {'accum_rain': 0.0, 'duration_hours': 0, 'rain_intensity': 0.0}
@@ -357,13 +360,13 @@ class DbnRepository:
@classmethod
def get_rainfall_data_batch(cls, points: List[Dict[str, Any]],
query_time: Optional[datetime] = None) -> Dict[str, Dict[str, Any]]:
query_time: Optional[Union[datetime, str]] = None) -> Dict[str, Dict[str, Any]]:
"""
批量获取多个点的降雨数据（2次DB查询替代 N×2次）
Args:
points: 预测点列表，每个含 {'id': str, 'lon': float, 'lat': float}
query_time: 查询时间
query_time: 查询时间，支持datetime对象或标准时间字符串（如'2025-07-04 20:00:00'）
Returns:
{point_id: {accum_rain, duration_hours, rain_intensity}}
@@ -394,16 +397,17 @@ class DbnRepository:
params: List[Any] = []
for slon, slat in station_keys:
params.extend([slon, slat])
params.extend([query_time, query_time])
# 获取时间范围（72小时窗口）
start_time, end_time = time_converter.to_db_time_range(query_time, hours=72)
params.extend([start_time, end_time])
# noinspection SqlNoDataSourceInspection
sql = f"""
SELECT lon, lat, datetime, CAST(rainfall_1h AS DOUBLE PRECISION) as rainfall
FROM xian_meteorology
WHERE (lon, lat) IN ({placeholders})
AND datetime BETWEEN
CAST(EXTRACT(EPOCH FROM (%s::timestamp - INTERVAL '72 hours')) AS BIGINT)
AND CAST(EXTRACT(EPOCH FROM %s::timestamp) AS BIGINT)
AND datetime BETWEEN %s AND %s
ORDER BY lon, lat, datetime DESC
"""
rows = db_helper.execute_query(sql, tuple(params))
app/repositories/rainfall_repository.py
+53 -28
View File
@@ -2,74 +2,99 @@
降雨数据仓库
负责数据库查询操作
"""
from typing import Optional, List, Dict, Any
from typing import Optional, List, Dict, Any, Union
from datetime import datetime
from app.utils.db_helper import db_helper
from app.utils.time_converter import time_converter
class RainfallRepository:
"""降雨数据仓库"""
def get_max_rainfall_id(self, query_time: datetime) -> Optional[int]:
def get_max_rainfall_id(self, query_time: Union[datetime, str]) -> Optional[int]:
"""
查询数据库中指定时间窗口内的最大ID
查询数据库中指定时间窗口内的最大ID（72小时窗口）
Args:
query_time: 查询时间
query_time: 查询时间（datetime对象或标准时间字符串，如'2025-07-04 20:00:00'）
Returns:
最大ID，如果没有数据则返回None
"""
# 获取时间范围
start_time, end_time = time_converter.to_db_time_range(query_time, hours=72)
sql = """
SELECT max(id) as max_id
FROM xian_meteorology
WHERE datetime BETWEEN (
to_char(%s::timestamp - interval '12 hours', 'YYYYMMDDHH24MISS')
)::bigint AND (
to_char(%s::timestamp, 'YYYYMMDDHH24MISS')
)::bigint
WHERE datetime BETWEEN %s AND %s
"""
result = db_helper.execute_query_one(sql, (query_time, query_time))
result = db_helper.execute_query_one(sql, (start_time, end_time))
if result and result.get('max_id'):
return int(result['max_id'])
return None
def get_rainfall_stations_data(self, query_time: datetime) -> List[Dict[str, Any]]:
def get_rainfall_stations_data(self, query_time: Union[datetime, str]) -> List[Dict[str, Any]]:
"""
查询雨量站点降雨数据
Args:
query_time: 查询时间
query_time: 查询时间（datetime对象或标准时间字符串，如'2025-07-04 20:00:00'）
Returns:
站点数据列表，每个元素包含lon, lat, rainfall
站点数据列表，每个元素包含lon, lat, rainfall, duration_hours
"""
# 获取时间范围
start_time, end_time = time_converter.to_db_time_range(query_time, hours=72)
# 查询72小时内的降雨时序数据
sql = """
SELECT
lon,
lat,
SUM(rainfall_1h::numeric) AS rainfall
datetime,
CAST(rainfall_1h AS DOUBLE PRECISION) as rainfall_1h
FROM xian_meteorology
WHERE datetime BETWEEN (
to_char(%s::timestamp - interval '12 hours', 'YYYYMMDDHH24MISS')
)::bigint AND (
to_char(%s::timestamp, 'YYYYMMDDHH24MISS')
)::bigint
GROUP BY lon, lat
WHERE datetime BETWEEN %s AND %s
ORDER BY lon, lat, datetime DESC
"""
results = db_helper.execute_query(sql, (start_time, end_time))
results = db_helper.execute_query(sql, (query_time, query_time))
if not results:
return []
# 按站点分组处理
from itertools import groupby
# 转换数据格式
station_data = []
for row in results:
if row.get('lon') and row.get('lat'):
for (lon, lat), group in groupby(results, key=lambda r: (r['lon'], r['lat'])):
accum_rain = 0.0
duration_hours = 0
consecutive_no_rain = 0
# 应用"连续3小时无雨截断"规则
for row in group:
rainfall = float(row['rainfall_1h']) if row['rainfall_1h'] else 0.0
if rainfall > 0:
accum_rain += rainfall
duration_hours += 1
consecutive_no_rain = 0
else:
consecutive_no_rain += 1
if consecutive_no_rain >= 3:
break # 连续3小时无雨，停止累加
if accum_rain > 0:
duration_hours += 1
if accum_rain > 0 or duration_hours > 0:
station_data.append({
'lon': float(row['lon']),
'lat': float(row['lat']),
'rainfall': float(row['rainfall']) if row.get('rainfall') else 0.0
'lon': float(lon),
'lat': float(lat),
'rainfall': accum_rain, # 累计降雨量
'duration_hours': duration_hours # 持续时间
})
return station_data