调整格式

This commit is contained in:
wzy-warehouse
2026-06-05 15:02:01 +08:00
parent 0b694abff0
commit c9cd96cca2
3 changed files with 17 additions and 15 deletions
+1
View File
@@ -54,3 +54,4 @@ htmlcov/
# Ignore dynaconf secret files # Ignore dynaconf secret files
.secrets.* .secrets.*
/test/
+14 -14
View File
@@ -13,23 +13,23 @@ class RainfallRepository:
def get_max_rainfall_id(self, query_time: datetime) -> Optional[int]: def get_max_rainfall_id(self, query_time: datetime) -> Optional[int]:
""" """
查询数据库中指定时间窗口内的最大ID 查询数据库中指定时间窗口内的最大ID
Args: Args:
query_time: 查询时间 query_time: 查询时间
Returns: Returns:
最大ID,如果没有数据则返回None 最大ID,如果没有数据则返回None
""" """
sql = """ sql = """
SELECT max(id) as max_id SELECT max(id) as max_id
FROM xian_meteorology FROM xian_meteorology
WHERE datetime BETWEEN ( WHERE datetime BETWEEN (
to_char(timestamp %s - interval '12 hours', 'YYYYMMDDHH24MISS') to_char(%s::timestamp - interval '12 hours', 'YYYYMMDDHH24MISS')
)::bigint AND ( )::bigint AND (
to_char(timestamp %s, 'YYYYMMDDHH24MISS') to_char(%s::timestamp, 'YYYYMMDDHH24MISS')
)::bigint )::bigint
""" """
result = db_helper.execute_query_one(sql, (query_time, query_time)) result = db_helper.execute_query_one(sql, (query_time, query_time))
if result and result.get('max_id'): if result and result.get('max_id'):
@@ -39,23 +39,23 @@ class RainfallRepository:
def get_rainfall_stations_data(self, query_time: datetime) -> List[Dict[str, Any]]: def get_rainfall_stations_data(self, query_time: datetime) -> List[Dict[str, Any]]:
""" """
查询雨量站点降雨数据 查询雨量站点降雨数据
Args: Args:
query_time: 查询时间 query_time: 查询时间
Returns: Returns:
站点数据列表,每个元素包含lon, lat, rainfall 站点数据列表,每个元素包含lon, lat, rainfall
""" """
sql = """ sql = """
SELECT SELECT
lon, lon,
lat, lat,
SUM(rainfall_1h::numeric) AS rainfall SUM(rainfall_1h::numeric) AS rainfall
FROM xian_meteorology FROM xian_meteorology
WHERE datetime BETWEEN ( WHERE datetime BETWEEN (
to_char(timestamp %s - interval '12 hours', 'YYYYMMDDHH24MISS') to_char(%s::timestamp - interval '12 hours', 'YYYYMMDDHH24MISS')
)::bigint AND ( )::bigint AND (
to_char(timestamp %s, 'YYYYMMDDHH24MISS') to_char(%s::timestamp, 'YYYYMMDDHH24MISS')
)::bigint )::bigint
GROUP BY lon, lat GROUP BY lon, lat
""" """
+2 -1
View File
@@ -4,4 +4,5 @@ redis == 7.4.0
numpy == 2.4.4 numpy == 2.4.4
scipy == 1.17.1 scipy == 1.17.1
matplotlib == 3.10.0 matplotlib == 3.10.0
Pillow == 11.0.0 Pillow == 12.2.0
pyyaml == 6.0.2