fix: 连续上榜改为严格N日每天上榜，缺一日都不行

backend/routes/core_stocks.py

@@ -90,73 +90,52 @@ async def active_core_stocks(days: int = Query(10, ge=1, le=30, description="交
         conn.close()
 
 
-@router.get("/consecutive", summary="连续上榜的核心股")
-async def consecutive_core_stocks(min_days: int = Query(3, ge=2, le=10, description="最小连续天数")):
-    from datetime import date as date_cls
+@router.get("/consecutive", summary="最近N日每天上榜的核心股")
+async def consecutive_core_stocks(days: int = Query(3, ge=2, le=10, description="交易日天数")):
     conn = get_connection()
     try:
-        # 最近30个有数据的交易日
         rows = conn.execute(
-            "SELECT DISTINCT trade_date FROM daily_core_stocks ORDER BY trade_date DESC LIMIT 30"
+            "SELECT DISTINCT trade_date FROM daily_core_stocks ORDER BY trade_date DESC LIMIT ?",
+            (days,)
         ).fetchall()
-        all_dates = [r["trade_date"] for r in reversed(rows)]
+        recent_dates = [r["trade_date"] for r in reversed(rows)]
 
-        if not all_dates:
-            return JSONResponse({"stocks": []}, headers=_NO_CACHE_HEADERS)
+        if len(recent_dates) < days:
+            return JSONResponse({"days": days, "stocks": []}, headers=_NO_CACHE_HEADERS)
 
-        # 查询所有上榜记录
-        placeholders = ",".join("?" * len(all_dates))
+        placeholders = ",".join("?" * len(recent_dates))
         rows = conn.execute(
             f"""SELECT trade_date, stock_code, stock_name, f3, cover_count
                 FROM daily_core_stocks
-                WHERE trade_date IN ({placeholders})
-                ORDER BY stock_code, trade_date""",
-            all_dates,
+                WHERE trade_date IN ({placeholders})""",
+            recent_dates,
         ).fetchall()
 
-        # 按股票分组，记录上榜日期
         stock_dates: dict[str, dict] = {}
         for r in rows:
             code = r["stock_code"]
             s = stock_dates.setdefault(code, {
                 "stockCode": code,
                 "stockName": r["stock_name"],
-                "dates": [],
+                "dates": set(),
                 "dailyGains": {},
             })
-            s["dates"].append(r["trade_date"])
+            s["dates"].add(r["trade_date"])
             s["dailyGains"][r["trade_date"]] = r["f3"]
 
-        # 计算连续上榜天数（从最新交易日往回数）
         results = []
         for code, s in stock_dates.items():
-            dates_list = sorted(s["dates"])
-            consecutive = 0
-            last_n = []
-            for i in range(len(dates_list) - 1, -1, -1):
-                if i == len(dates_list) - 1:
-                    consecutive = 1
-                    last_n.append(dates_list[i])
-                else:
-                    prev_idx = all_dates.index(dates_list[i + 1]) if dates_list[i + 1] in all_dates else -1
-                    curr_idx = all_dates.index(dates_list[i]) if dates_list[i] in all_dates else -1
-                    if prev_idx - curr_idx <= 2:
-                        consecutive += 1
-                        last_n.append(dates_list[i])
-                    else:
-                        break
-
-            if consecutive >= min_days:
+            if len(s["dates"]) >= days:
                 results.append({
                     "stockCode": code,
                     "stockName": s["stockName"],
-                    "consecutiveDays": consecutive,
-                    "recentDates": last_n,
-                    "dailyGains": {d: s["dailyGains"].get(d) for d in last_n},
+                    "consecutiveDays": len(s["dates"]),
+                    "recentDates": sorted(s["dates"]),
+                    "dailyGains": s["dailyGains"],
                 })
 
         results.sort(key=lambda x: -x["consecutiveDays"])
-        return JSONResponse({"stocks": results}, headers=_NO_CACHE_HEADERS)
+        return JSONResponse({"days": days, "recentDates": recent_dates, "stocks": results}, headers=_NO_CACHE_HEADERS)
     finally:
         conn.close()