|
|
|
@ -93,6 +93,7 @@ EXTRACT_PROMPT = """你是一名景区名称精准匹配助手。用户的问题 |
|
|
|
|
唐尧古镇 |
|
|
|
|
大慈阁 |
|
|
|
|
淮军公所博物馆 |
|
|
|
|
中国古动物馆(保定自然博物馆) |
|
|
|
|
""" |
|
|
|
|
|
|
|
|
|
# 客流查询后回答的提示词 |
|
|
|
@ -647,7 +648,9 @@ async def get_scenic_parking_data(request: Request, scenic_id: int, distance: in |
|
|
|
|
t3.park_name AS park_name, |
|
|
|
|
t3.total_count AS total_parking_spaces, |
|
|
|
|
COALESCE(t4.space, 0) AS available_spaces, |
|
|
|
|
t1.distance_value AS distance_meters |
|
|
|
|
t1.distance_value AS distance_meters, |
|
|
|
|
t3.gould_coordinate_x AS lon, |
|
|
|
|
t3.gould_coordinate_y AS lat |
|
|
|
|
FROM |
|
|
|
|
cyjcpt_bd.scenic_pack_distance t1 |
|
|
|
|
LEFT JOIN |
|
|
|
@ -690,13 +693,15 @@ async def get_scenic_parking_data(request: Request, scenic_id: int, distance: in |
|
|
|
|
# 处理结果 |
|
|
|
|
result = [] |
|
|
|
|
for row in rows: |
|
|
|
|
park_name, total_spaces, available_spaces, distance_meters = row |
|
|
|
|
park_name, total_spaces, available_spaces, distance_meters, lon, lat = row |
|
|
|
|
|
|
|
|
|
result.append({ |
|
|
|
|
"park_name": park_name, |
|
|
|
|
"total_parking_spaces": total_spaces or 0, |
|
|
|
|
"available_spaces": available_spaces or 0, |
|
|
|
|
"distance_meters": distance_meters or 0 |
|
|
|
|
"distance_meters": distance_meters or 0, |
|
|
|
|
"lon": lon or 0, |
|
|
|
|
"lat": lat or 0 |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
return result |
|
|
|
@ -848,6 +853,7 @@ MULTI_SCENIC_EXTRACT_PROMPT = """你是一名景区名称提取助手。用户 |
|
|
|
|
唐尧古镇 |
|
|
|
|
大慈阁 |
|
|
|
|
淮军公所博物馆 |
|
|
|
|
中国古动物馆(保定自然博物馆) |
|
|
|
|
""" |
|
|
|
|
|
|
|
|
|
async def extract_multi_scenic(msg) -> list: |
|
|
|
|