重构板块资金流向:行业/概念改用独立 path,后端排序,前端不缓存直接请求
This commit is contained in:
+58
-25
@@ -1,4 +1,8 @@
|
||||
"""板块数据路由:行业板块、概念板块"""
|
||||
"""板块数据路由:行业板块、概念板块
|
||||
|
||||
注意:行业/概念必须走不同 path(/industry、/concept),不能仅靠 query 参数区分。
|
||||
上游反代/CDN 可能按 path 缓存并忽略 query,导致两个 tab 返回相同数据。
|
||||
"""
|
||||
|
||||
from fastapi import APIRouter, Query, HTTPException
|
||||
from fastapi.responses import JSONResponse
|
||||
@@ -6,34 +10,63 @@ from services import eastmoney, mootdx
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
# 行业/概念通过 query 参数区分,但上游反代/CDN 可能按 path 缓存而忽略 query,
|
||||
# 导致两个 tab 返回相同数据。显式禁止缓存,保证按 query 区分。
|
||||
# 禁止任何中间层缓存,确保每次请求都打到后端
|
||||
_NO_CACHE_HEADERS = {"Cache-Control": "no-store, no-cache, must-revalidate, max-age=0"}
|
||||
|
||||
_SORT_KEYS = {"mainNetInflow", "changePercent"}
|
||||
|
||||
@router.get("", summary="板块列表")
|
||||
async def sector_list(
|
||||
type: str = Query("industry", description="板块类型:industry=行业板块, concept=概念板块"),
|
||||
):
|
||||
if type not in ("industry", "concept"):
|
||||
raise HTTPException(status_code=400, detail="板块类型错误,仅支持 industry/concept")
|
||||
|
||||
data = await eastmoney.fetch_sector_list(type)
|
||||
def _sort_sectors(data: list[dict], sort: str, order: str) -> list[dict]:
|
||||
"""后端排序:mainNetInflow=资金流入,changePercent=涨幅%"""
|
||||
reverse = order != "asc"
|
||||
if sort == "changePercent":
|
||||
# changePercent 为 None 的排到最后(与方向无关)
|
||||
return sorted(
|
||||
data,
|
||||
key=lambda x: (x.get("changePercent") is None, -(x.get("changePercent") or 0)),
|
||||
reverse=reverse,
|
||||
)
|
||||
return sorted(data, key=lambda x: -(x.get("mainNetInflow") or 0), reverse=reverse)
|
||||
|
||||
|
||||
async def _sector_response(sector_type: str, sort: str, order: str) -> JSONResponse:
|
||||
data = await eastmoney.fetch_sector_list(sector_type)
|
||||
source = None
|
||||
if not data:
|
||||
# 降级:通达信 mootdx(不含实时资金流数据)
|
||||
md_data = await mootdx.fetch_sector_list(sector_type)
|
||||
if md_data:
|
||||
data = md_data
|
||||
source = "mootdx"
|
||||
|
||||
if data:
|
||||
return JSONResponse(
|
||||
{"data": data, "count": len(data), "type": type},
|
||||
headers=_NO_CACHE_HEADERS,
|
||||
)
|
||||
data = _sort_sectors(data, sort, order)
|
||||
|
||||
# 降级:通达信 mootdx(不含实时资金流数据)
|
||||
md_data = await mootdx.fetch_sector_list(type)
|
||||
if md_data:
|
||||
return JSONResponse(
|
||||
{"data": md_data, "count": len(md_data), "type": type, "source": "mootdx"},
|
||||
headers=_NO_CACHE_HEADERS,
|
||||
)
|
||||
payload: dict = {"data": data, "count": len(data), "type": sector_type}
|
||||
if source:
|
||||
payload["source"] = source
|
||||
return JSONResponse(payload, headers=_NO_CACHE_HEADERS)
|
||||
|
||||
return JSONResponse(
|
||||
{"data": [], "count": 0, "type": type},
|
||||
headers=_NO_CACHE_HEADERS,
|
||||
)
|
||||
|
||||
@router.get("/industry", summary="行业板块列表")
|
||||
async def sector_industry(
|
||||
sort: str = Query("mainNetInflow", description="排序字段:mainNetInflow=资金流入, changePercent=涨幅%"),
|
||||
order: str = Query("desc", description="排序方向:asc=升序, desc=降序"),
|
||||
):
|
||||
if sort not in _SORT_KEYS:
|
||||
sort = "mainNetInflow"
|
||||
if order not in ("asc", "desc"):
|
||||
order = "desc"
|
||||
return await _sector_response("industry", sort, order)
|
||||
|
||||
|
||||
@router.get("/concept", summary="概念板块列表")
|
||||
async def sector_concept(
|
||||
sort: str = Query("mainNetInflow", description="排序字段:mainNetInflow=资金流入, changePercent=涨幅%"),
|
||||
order: str = Query("desc", description="排序方向:asc=升序, desc=降序"),
|
||||
):
|
||||
if sort not in _SORT_KEYS:
|
||||
sort = "mainNetInflow"
|
||||
if order not in ("asc", "desc"):
|
||||
order = "desc"
|
||||
return await _sector_response("concept", sort, order)
|
||||
|
||||
Reference in New Issue
Block a user