在前后端开发联调前 的提交20260223

This commit is contained in:
Neo
2026-02-23 23:02:20 +08:00
parent 254ccb1e77
commit fafc95e64c
1142 changed files with 10366960 additions and 36957 deletions

View File

@@ -0,0 +1,161 @@
- [P20260221-192034] 2026-02-21 19:20:34 +0800
- summary: CONTEXT TRANSFER: We are continuing a conversation that had gotten too long. Here is a summary: --- ## TASK 1: 前后端联调 — a…
- prompt:
```text
CONTEXT TRANSFER: We are continuing a conversation that had gotten too long. Here is a summary:
---
## TASK 1: 前后端联调 — admin-web 任务配置、提交、执行、验证
**STATUS**: in-progress
**USER QUERIES**: All queries in this conversation are continuations of the same task from previous context transfers.
**SHORT DESCRIPTION**: 前后端联调:通过 admin-web 浏览器配置 ETL 任务api_full, full_window, 2025-11-01~2026-02-20, 30天窗口切分, force-full, 40个常用任务提交执行修复发现的 BUG做回归测试和数据检验输出详细文档。
**DETAILS**:
### 已完成的步骤:
1. **端口清理和服务启动** — 前端 `pnpm dev` 在 5173后端 uvicorn 在 8000
2. **登录** — 用户手动完成
3. **浏览器 UI 配置** — 通过 Playwright 完成所有配置并提交执行
4. **任务已提交并完成** — run_uuid=4ba9d2d365ee4a858f1c4104b1942dc2, execution_id=dbf0c29a-253a-4705-a1ef-35cd71243d48
5. **执行结果**: status=success, exit_code=0, 时长 590.7s (9.8m), 15:29:20 ~ 15:39:10
6. **结果**: 10 个任务成功, 31 个任务失败(全部因 DWS_ASSISTANT_DAILY 根因级联)
### 已修复的 BUG代码已改待验证执行
`DWS_ASSISTANT_DAILY` 任务失败,根因是 `assistant_daily_task.py` 中多处字段引用错误和设计缺陷。
**修复文件**: `apps/etl/connectors/feiqiu/tasks/dws/assistant_daily_task.py`
**4 处改动**:
1. `_extract_trash_records` (约 line 163) — SQL 字段名修正:
- `assistant_service_id` → `assistant_trash_event_id`
- `trash_seconds` → `charge_minutes_raw * 60`
- `trash_time` → `create_time`
- 新增 `table_id`, `assistant_name` 字段
2. `_extract_service_records` (约 line 129) — 新增 LEFT JOIN `dwd_assistant_service_log_ex` 取 `is_trash` 字段:
```sql
LEFT JOIN dwd.dwd_assistant_service_log_ex ex
ON asl.assistant_service_id = ex.assistant_service_id
```
新增 `COALESCE(ex.is_trash, 0) AS is_trash` 到 SELECT
3. `_build_trash_index` (约 line 200) — key 从 `record.get('assistant_service_id')` 改为 `record.get('assistant_trash_event_id')`
4. `_aggregate_by_assistant_date` (约 line 280) — 废除判断从 `service_id in trash_index` 改为 `bool(record.get('is_trash', 0))`;废除时长从 `trash_index[service_id]` 改为直接用 `income_seconds`
**设计决策**: 废除表 `dwd_assistant_trash_event` 没有 `assistant_service_id` 外键,无法与服务记录 1:1 关联。改用 `_ex` 表的 `is_trash` 字段(来自上游 SaaS API做废除判断。
### 已导出的文档:
- `export/SYSTEM/LOGS/2026-02-21__dws_assistant_daily_bug_fix.md` — BUG 修复报告(详细根因分析、字段映射、修复方案)
- `export/SYSTEM/LOGS/2026-02-21__etl_run_result.md` — ETL 执行结果报告41 个任务的逐条结果、计时、失败分析)
- `export/SYSTEM/LOGS/2026-02-21__etl_run_raw.json` — 原始 API 数据
### 执行结果报告中的发现:
- 报告显示 31 个任务失败,比之前预估的 9 个多。原因是 `ODS_TABLE_USE` 之后连接恢复只是暂时的,到 `DWS_MEMBER_CONSUMPTION` 时又出现了 InFailedSqlTransaction可能是第二次事务污染。实际上成功的 10 个任务是ODS_ASSISTANT_ACCOUNT, ODS_ASSISTANT_LEDGER, ODS_ASSISTANT_ABOLISH, ODS_TABLE_USE, ODS_TABLE_FEE_DISCOUNT, ODS_TABLES, ODS_MEMBER, ODS_MEMBER_CARD, ODS_MEMBER_BALANCE, ODS_RECHARGE_SETTLE。
**NEXT STEPS**:
1. **重新提交执行** — 包含所有 31 个失败任务,验证 DWS_ASSISTANT_DAILY 修复
2. **运行 ETL Data Consistency Check** — `scripts/ops/etl_consistency_check.py`(进程 3 之前在运行,需检查状态)
3. **运行 /audit** — 修改命中 `tasks/` 高风险路径,需要审计
4. **创建计时文档** — 解析 ETL 日志提取各步骤耗时(已部分完成在执行结果报告中)
**FILEPATHS**:
- `apps/etl/connectors/feiqiu/tasks/dws/assistant_daily_task.py` — 已修复的文件
- `db/etl_feiqiu/schemas/dwd.sql` — DDL 参考dwd_assistant_trash_event 约 line 1580, dwd_assistant_service_log 约 line 1438, dwd_assistant_service_log_ex 约 line 1530
- `scripts/ops/export_bug_report.py` — BUG 报告生成脚本
- `scripts/ops/export_etl_result.py` — 执行结果报告生成脚本
- `scripts/ops/monitor_etl_run.py` — ETL 监控脚本
- `scripts/ops/_env_paths.py` — 共享路径工具
- `scripts/ops/.monitor_token` — JWT token 缓存
- `apps/backend/app/routers/execution.py` — 后端执行 API
- `.env.template` — 环境变量模板
- `export/SYSTEM/LOGS/2026-02-21__etl_run_result.md` — 执行结果报告
- `export/SYSTEM/LOGS/2026-02-21__dws_assistant_daily_bug_fix.md` — BUG 修复报告
**RUNNING PROCESSES**:
- 进程 6: `pnpm dev` in `apps/admin-web`(前端 dev server, port 5173
- 进程 3: `python scripts/ops/etl_consistency_check.py`(可能已完成或仍在运行)
- 进程 11: `python analyze_dataflow.py 2>&1` in `scripts/ops`(可能已完成或仍在运行)
- 后端 uvicorn PID 3644通过 Start-Process 启动, port 8000, 非 Kiro 管理)
**BROWSER STATE**:
- Playwright 浏览器在 http://localhost:5173/(可能需要导航回 task-manager
- JWT access_token 在 localStorage 的 `access_token` key 中
- Token 也保存在 `scripts/ops/.monitor_token`
**API 认证**:
- JWT Token: `eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxIiwic2l0ZV9pZCI6Mjc5MDY4NTQxNTQ0MzI2OSwidHlwZSI6ImFjY2VzcyIsImV4cCI6MTc3MTY3MzA3OX0.Mq2dBCPMi6FLmaoiqolUp_wz8Zc5ntCpRTsK_D7jc0E`
- 后端 API: `http://localhost:8000/api/execution/history` (GET), `/api/execution/{id}/logs` (GET)
## USER CORRECTIONS AND INSTRUCTIONS:
- 所有输出文件必须写入 `export/` 目录体系,通过 `.env` 环境变量控制路径export-paths.md 强制规范)
- 禁止硬编码绝对/相对路径,路径仅存在于 `.env` 文件中
- `scripts/ops/` 脚本通过 `_env_paths.get_output_path("变量名")` 读取输出路径
- 测试必须使用完整 `.env` 加载cwd 与正式运行一致testing-env.md 强制规范)
- 数据库使用测试库:`test_etl_feiqiu` / `test_zqyy_app`
- 所有说明性文字使用简体中文language-zh.md 强制规范)
- 脚本级任务优先编写 Python 脚本执行,避免 PowerShell 复杂逻辑
- 一次性运维脚本放 `scripts/ops/`
- 高风险路径变更需审计(`tasks/` 目录下的修改需要审计)
- 用户说"你使用浏览器,进行调试,我来帮你登录" — 表示用户愿意手动协助浏览器操作
- 用户要求"发现的bug和修正方式导出到md文档。继续监测若完成则本次执行的结果导出md文档" — 两份文档均已完成
## DWD 表结构速查:
`dwd.dwd_assistant_trash_event` 实际字段:
- `assistant_trash_event_id` BIGINT (PK), `site_id`, `table_id`, `table_area_id`, `assistant_no`, `assistant_name`, `charge_minutes_raw` INTEGER分钟, `abolish_amount`, `trash_reason`, `create_time` TIMESTAMPTZ, `tenant_id`
`dwd.dwd_assistant_service_log` 关键字段:
- `assistant_service_id` BIGINT (PK), `site_table_id`, `is_delete` INTEGER, `income_seconds` INTEGER, `start_use_time` TIMESTAMPTZ
`dwd.dwd_assistant_service_log_ex` 关键字段:
- `assistant_service_id` BIGINT (PK), `is_trash` INTEGER0=正常非0=废除)
## Files to read
- `apps/etl/connectors/feiqiu/tasks/dws/assistant_daily_task.py`
- `export/SYSTEM/LOGS/2026-02-21__etl_run_result.md`
- `export/SYSTEM/LOGS/2026-02-21__dws_assistant_daily_bug_fix.md`
- `scripts/ops/_env_paths.py`
- `scripts/ops/export_etl_result.py`
USER QUERIES(most recent first):
1. 发现的bug和修正方式导出到md文档。继续监测若完成则本次执行的结果导出md文档。
2. Output:
Command executed successfully with no output.
Exit Code: 0
3. Output:
Command executed successfully with no output.
Exit Code: 0
4. 发现的bug和修正方式导出到md文档。继续监测若完成则本次执行的结果导出md文档。
5. Output:
Hook execution failed with exit code 1.
Error output:
[AUDIT REMINDER] Pending audit detected (root-file, dir:admin-web, dir:backend, dir:db, db-schema-change). Run /audit (Manual: Run /audit hook) to sync docs & write audit artifacts. (rate limit: 15min)
Exit Code: 1
6. Output:
Command executed successfully with no output.
Exit Code: 0
7. Output:
Command executed successfully with no output.
Exit Code: 0
---
METADATA:
The previous conversation had 4 messages.
INSTRUCTIONS:
Continue working until the user query has been fully addressed. Do not ask for clarification - proceed with the work based on the context provided.
IMPORTANT: you need to read from the files to Read section