7a985dddd5
## 1. PG-only 重构
- 删 app/core/db/connection.py + schema.py (MySQL 路径)
- 新 app/core/db/{orm,models,pg_bootstrap}.py — SQLAlchemy 2.x ORM 一键建表
- 16 张业务表全在 market_data schema,原生 TIMESTAMPTZ / JSONB / Float / TEXT
- requirements.txt 删 PyMySQL 路径,加 psycopg2
## 2. 同步任务扩展(3 个新 task)
- **tick_trade** (mairui hsrl/zbjy):当天逐笔交易,21:00 发布
- **moneyflow** (mairui hsstock/history/transaction):个股资金流,21:30 发布
- **longhubang** (akshare):龙虎榜聚合层 + 席位层(2 张新表)
- 长虎榜放宽 akshare 政策:仅"无替代源 + 烟测通过"场景允许
- data_eastmoney 私有 API 不需要(akshare 烟测通过)
- 3-timer 设计:
- 15:30 market-sync.service (8 base tasks via runall_once)
- 21:05 market-sync-tick.service (tick_trade)
- 21:35 market-sync-moneyflow.service (moneyflow)
- 22:00 market-sync-lhb.service (longhubang,新加)
- bin/systemd/ 新增 tick / moneyflow / lhb 各 1 对 service+timer
- bin/market_sync_*_run.sh wrapper 脚本(不做法定节假日过滤,fail-open)
## 3. stock_code 统一为带 SH/SZ/BJ 前缀
- 历史 bug:stocks.code 用 SH600519,但 kline/moneyflow/tick_trade/kline_5min
/stock_sector_map/industry 6 张表用纯 6 位 600519,跨表 JOIN 全部 0 行
- 新增 to_hermes() 工具:6位 / 9位(mairui `000001.SZ` 格式)→ 统一 SH000001
- 5 个 task 改写:用 to_hermes(code6) 写入 stock_code
- 一次性迁移 6 张表存量 154M 行(CASE WHEN 探测 + 去重 + 加前缀)
- ORM: stock_sector_map.stock_code / industry.code String(6)→String(10)
## 4. Bug 修复
- **share table stock_code 格式**:之前写 6 位不带前缀,与 stocks 不一致
→ 修 task_share_snapshot + 一次性 UPDATE 63,417 行加前缀
- **share_snapshot warning 状态错填 last_error**:
→ 加 mark_sync_warning() 走专用路径,不写 last_failure_at / last_error
- **schedule config lastRun 不同步**:
→ 加 update_job_status_for_dataset(),SyncTask.run() 完成后自动镜像
→ cli/runall 触发的 task 也能更新 schedule config
## 5. mairui UTF-8 编码修复
- 历史 bug:mairui.py:_fetch 用 latin-1 兜底解码,把所有 UTF-8 中文名
double-encoded 写入 stocks.name(如 `歌华有线` 变成 `æ\xad\x8cå\x8d\x8e...`)
- 加 _decode_response():UTF-8 → GBK → latin-1 兜底
- 一次性修复 stocks.name 5,213 行:
- 4,370 行 (encode('latin-1').decode('utf-8') 反向解码)
- 616 行 (含 fullwidth A,宽松 printable 检查)
- 820 行 (mid-character 截断,重新从 mairui 拉)
## 6. 测试
- tests/test_smoke.py: TASKS 10→11, SYNC_DEFINITIONS 10→11
- tests/test_schema_models.py: 16→18 张表,新增 longhubang_daily/seat
- pytest 11/11 passed
## 验证
- 6 张表 0 残留无前缀行
- stocks JOIN kline_stock / kline_5min / moneyflow / tick_trade / stock_sector_map:88-100% 命中
- 5,213 stocks.name 全部正确 UTF-8 中文
- pytest 11/11 passed
136 lines
5.2 KiB
Python
136 lines
5.2 KiB
Python
"""同步任务:股本快照(雪球 quote_detail)。
|
||
|
||
写入两张表:
|
||
- stocks.total_share / float_share / share_updated_at(基础信息表)
|
||
- share(独立股本时序表)
|
||
"""
|
||
from __future__ import annotations
|
||
|
||
import os
|
||
import time
|
||
from concurrent.futures import ThreadPoolExecutor, as_completed
|
||
from typing import Any
|
||
|
||
from app.core.config import settings
|
||
from app.core.db import ops as db_ops
|
||
from app.core.datasource.base import registry as ds_registry
|
||
from app.core.datasource.registry import is_source_ready
|
||
from app.core.datasource.utils import is_a_share_code, to_code6
|
||
from app.core.sync.base import SyncTask
|
||
from app.core.sync.registry import mark_sync_blocked
|
||
from app.core.utils.logging import get_logger
|
||
|
||
logger = get_logger("sync.share")
|
||
|
||
|
||
class SyncShareSnapshot(SyncTask):
|
||
dataset_id = "share_snapshot"
|
||
|
||
def _run(
|
||
self,
|
||
*,
|
||
trigger_source: str = "manual",
|
||
codes: list[str] | None = None,
|
||
max_workers: int = 10,
|
||
**kwargs,
|
||
) -> dict[str, Any]:
|
||
if not settings.xueqiu_token:
|
||
mark_sync_blocked(self.dataset_id, message="未配置 XUEQIU_TOKEN")
|
||
return {"status": "blocked", "message": "未配置 XUEQIU_TOKEN"}
|
||
|
||
xq = ds_registry.get("datasource_xueqiu")
|
||
if xq is None:
|
||
return {"status": "error", "message": "雪球数据源未注册"}
|
||
ok, reason = is_source_ready(xq.key)
|
||
if not ok:
|
||
mark_sync_blocked(self.dataset_id, message=f"雪球未就绪: {reason}")
|
||
return {"status": "blocked", "message": f"雪球未就绪: {reason}"}
|
||
|
||
if codes:
|
||
stock_codes = [to_code6(c) for c in codes]
|
||
else:
|
||
stock_codes = [c for c in db_ops.iter_stock_codes(active_only=True) if is_a_share_code(c)]
|
||
limit_raw = os.environ.get("MARKET_DATA_STOCK_LIMIT", "").strip()
|
||
if limit_raw.isdigit() and int(limit_raw) > 0:
|
||
stock_codes = stock_codes[: int(limit_raw)]
|
||
|
||
if not stock_codes:
|
||
return {"status": "error", "message": "无股票代码"}
|
||
|
||
# 跳过今日已刷过的
|
||
today = time.strftime("%Y-%m-%d")
|
||
existing = {s["code"]: s for s in db_ops.fetch_all_stocks()}
|
||
todo = []
|
||
for c6 in stock_codes:
|
||
old = existing.get(c6, {})
|
||
if str(old.get("share_updated_at", "") or "") == today and old.get("total_share", 0) > 0:
|
||
continue
|
||
todo.append(c6)
|
||
skip = len(stock_codes) - len(todo)
|
||
if not todo:
|
||
return {"status": "ok", "message": f"全部 {skip} 只已最新,跳过"}
|
||
|
||
total = len(todo)
|
||
ok_cnt = fail_cnt = 0
|
||
rows_to_share_table: list[dict] = []
|
||
t0 = time.time()
|
||
with ThreadPoolExecutor(max_workers=max_workers) as pool:
|
||
futures = {pool.submit(xq.fetch_share_snapshot, c6): c6 for c6 in todo}
|
||
for i, future in enumerate(as_completed(futures), 1):
|
||
c6 = futures[future]
|
||
try:
|
||
r = future.result()
|
||
except Exception as e:
|
||
fail_cnt += 1
|
||
logger.warning(f"[share {c6}] 异常: {e}")
|
||
continue
|
||
if r is None:
|
||
fail_cnt += 1
|
||
continue
|
||
# 写 stocks + share 表 —— 两张表 stock_code 都用 hermes(带 SH/SZ 前缀)
|
||
# 与 stocks.code 保持一致,方便 JOIN。
|
||
# 历史 bug:之前 share 表写的是裸 6 位 c6,导致 share JOIN stocks 失败。
|
||
# 一次性 UPDATE(2026-07-01)已把存量 6.3 万行加上前缀。
|
||
hermes = self._to_hermes(c6)
|
||
db_ops.update_stock_share_snapshot(
|
||
code=hermes,
|
||
total_share=r["total_share"],
|
||
float_share=r["float_share"],
|
||
trade_date=r.get("trade_date", today),
|
||
)
|
||
rows_to_share_table.append({
|
||
"stock_code": hermes,
|
||
"trade_date": r.get("trade_date", today),
|
||
"total_share": r["total_share"],
|
||
"float_share": r["float_share"],
|
||
})
|
||
ok_cnt += 1
|
||
if i % 50 == 0 or i == total:
|
||
self._progress(
|
||
message=f"股本 {i}/{total} OK:{ok_cnt} FAIL:{fail_cnt}",
|
||
current=i, total=total, current_step=c6,
|
||
)
|
||
# 批量写 share 表
|
||
if rows_to_share_table:
|
||
try:
|
||
db_ops.upsert_share(rows_to_share_table)
|
||
except Exception as e:
|
||
logger.warning(f"写 share 表失败: {e}")
|
||
|
||
elapsed = round(time.time() - t0, 1)
|
||
msg = f"股本 {ok_cnt}成 {fail_cnt}败 {skip}跳, {elapsed}s"
|
||
return {
|
||
"status": "ok" if fail_cnt == 0 else "warning",
|
||
"message": msg,
|
||
"ok": ok_cnt, "fail": fail_cnt, "skip": skip,
|
||
"elapsed_sec": elapsed,
|
||
}
|
||
|
||
@staticmethod
|
||
def _to_hermes(code6: str) -> str:
|
||
if code6.startswith(("5", "6", "9")):
|
||
return f"SH{code6}"
|
||
if code6.startswith(("4", "8")):
|
||
return f"BJ{code6}"
|
||
return f"SZ{code6}"
|