From b49501464b4b3d647f43d84edb13ccab5682c2fb Mon Sep 17 00:00:00 2001 From: "mula.liu" Date: Thu, 1 Oct 2026 16:56:21 +0800 Subject: [PATCH] =?UTF-8?q?RBAC=20=E6=88=90=E4=BD=93=E7=B3=BB=20+=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B7=A8=E5=AD=A3=E5=BA=A6=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=20+=20=E7=95=8C=E9=9D=A2=E4=B8=8E=E4=BA=A4?= =?UTF-8?q?=E4=BA=92=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1) 权限(RBAC) - 新表 role_menus / user_roles / user_sessions / audit_logs,权限从「roles.menus 一个 JSON」升级成 用户 ←→ 角色 ←→ 菜单授权三层模型;多角色取并集,同一菜单取更高级别 - 前端按 /auth/me 过滤侧栏与写操作按钮,后端 guard 按「接口路径→菜单→级别」二次校验,直接调接口绕不过去 - 会话改为服务端 token + HttpOnly Cookie(unis_session),退出/停用/改密/强制下线立即失效;启动清过期会话 - ensure_seed 防锁死(至少保留一个可管权限的启用账号),内置角色禁止删除 - 新增「权限管理」四个子页签:角色权限矩阵 / 用户 / 在线会话 / 操作日志(可按菜单、动作、时间过滤) - README 鉴权章节纠偏:原文的 X-Auth-Token / login 返回 token / localStorage 均与实现不符 2) 跨季度财务统计 - 修「认得出年份、认不出季度」的项目(如 sign_date="2024/")进了年度 KPI 却不进任何一季度, 导致同屏「合计」比年度 KPI 少一笔(2024:49 个/637.93 万 → 50 个/669.93 万) - summary() 新增 kpi.{sign,accept}_no_quarter 与 annual.unscheduled,年度合计 = 四季度 + 未分季; 前端仅在非 0 时显示「未分季」一行,不改任何业务字面量、不造数据 - 不变式:四季度 + 未分季 = 合计 = KPI 年度(下单/验收两条口径均成立),4 年 × 12 月回归自洽 3) 交互冲突与界面清理 - 花名册去掉行内编辑控件(与「编辑人员」弹窗改同一批字段 = 双入口打架,且遮住「最近更新」列),统一走弹窗 - 权限矩阵表格紧凑化,「用户/操作」列不再被固定列遮挡;设置页数据库信息改为两行事实 - 删除更新录入两处 AI 说明长句等多余解释性文案;模块③ 名称统一为「定制项目」 4) 测试与仓库 - tests/ 扩到 83 例(新增财务未分季 2 例),全部使用临时库,不碰 data/board.db - 8 个主菜单与全部子页签浏览器实测:无 console 报错、无横向溢出;清理 51 条脚本产生的僵尸会话 - 新增 .gitignore,把 __pycache__/*.pyc、data/.DS_Store 从索引移除 --- .gitignore | 13 + .workbuddy/memory/2026-10-01.md | 47 + .workbuddy/memory/MEMORY.md | 45 +- README.md | 241 +++-- app/__pycache__/__init__.cpython-313.pyc | Bin 148 -> 0 bytes app/__pycache__/ai_parser.cpython-313.pyc | Bin 20256 -> 0 bytes app/__pycache__/config.cpython-313.pyc | Bin 3227 -> 0 bytes app/__pycache__/constants.cpython-313.pyc | Bin 21760 -> 0 bytes app/__pycache__/db.cpython-313.pyc | Bin 1256 -> 0 bytes app/__pycache__/export.cpython-313.pyc | Bin 5334 -> 0 bytes app/__pycache__/main.cpython-313.pyc | Bin 4264 -> 0 bytes app/__pycache__/models.cpython-313.pyc | Bin 36791 -> 0 bytes app/__pycache__/schema_patch.cpython-313.pyc | Bin 2433 -> 0 bytes app/__pycache__/schemas.cpython-312.pyc | Bin 5335 -> 0 bytes app/__pycache__/schemas.cpython-313.pyc | Bin 8447 -> 0 bytes app/__pycache__/security.cpython-313.pyc | Bin 10837 -> 0 bytes app/audit.py | 118 +++ app/constants.py | 128 ++- app/finance.py | 264 ++++++ app/main.py | 12 +- app/models.py | 137 ++- .../__pycache__/__init__.cpython-313.pyc | Bin 156 -> 0 bytes app/routers/__pycache__/ai.cpython-313.pyc | Bin 7711 -> 0 bytes app/routers/__pycache__/auth.cpython-313.pyc | Bin 5614 -> 0 bytes app/routers/__pycache__/board.cpython-313.pyc | Bin 27723 -> 0 bytes .../__pycache__/custom.cpython-313.pyc | Bin 46166 -> 0 bytes .../__pycache__/export.cpython-313.pyc | Bin 20222 -> 0 bytes app/routers/__pycache__/focus.cpython-312.pyc | Bin 9206 -> 0 bytes app/routers/__pycache__/focus.cpython-313.pyc | Bin 8682 -> 0 bytes .../__pycache__/projects.cpython-313.pyc | Bin 24853 -> 0 bytes app/routers/__pycache__/rbac.cpython-313.pyc | Bin 11385 -> 0 bytes app/routers/__pycache__/staff.cpython-313.pyc | Bin 17188 -> 0 bytes .../__pycache__/weekly.cpython-313.pyc | Bin 17647 -> 0 bytes app/routers/ai.py | 17 +- app/routers/auth.py | 63 +- app/routers/board.py | 294 +------ app/routers/custom.py | 464 +++------- app/routers/export.py | 5 +- app/routers/focus.py | 2 +- app/routers/projects.py | 56 +- app/routers/rbac.py | 326 ++++++- app/routers/weekly.py | 15 +- app/schemas.py | 4 +- app/security.py | 227 +++-- data/.DS_Store | Bin 6148 -> 0 bytes data/board.db | Bin 409600 -> 434176 bytes pytest.ini | 3 + requirements-dev.txt | 6 + tests/conftest.py | 174 ++++ tests/test_ai_export.py | 364 ++++++++ tests/test_auth.py | 122 +++ tests/test_custom_finance.py | 276 ++++++ tests/test_periods_projects.py | 194 ++++ tests/test_rbac.py | 340 +++++++ tests/test_staff_focus_weekly.py | 197 +++++ web/app.js | 831 ++++++++++-------- web/index.html | 11 +- web/styles.css | 15 +- 58 files changed, 3776 insertions(+), 1235 deletions(-) create mode 100644 .gitignore create mode 100644 .workbuddy/memory/2026-10-01.md delete mode 100644 app/__pycache__/__init__.cpython-313.pyc delete mode 100644 app/__pycache__/ai_parser.cpython-313.pyc delete mode 100644 app/__pycache__/config.cpython-313.pyc delete mode 100644 app/__pycache__/constants.cpython-313.pyc delete mode 100644 app/__pycache__/db.cpython-313.pyc delete mode 100644 app/__pycache__/export.cpython-313.pyc delete mode 100644 app/__pycache__/main.cpython-313.pyc delete mode 100644 app/__pycache__/models.cpython-313.pyc delete mode 100644 app/__pycache__/schema_patch.cpython-313.pyc delete mode 100644 app/__pycache__/schemas.cpython-312.pyc delete mode 100644 app/__pycache__/schemas.cpython-313.pyc delete mode 100644 app/__pycache__/security.cpython-313.pyc create mode 100644 app/audit.py create mode 100644 app/finance.py delete mode 100644 app/routers/__pycache__/__init__.cpython-313.pyc delete mode 100644 app/routers/__pycache__/ai.cpython-313.pyc delete mode 100644 app/routers/__pycache__/auth.cpython-313.pyc delete mode 100644 app/routers/__pycache__/board.cpython-313.pyc delete mode 100644 app/routers/__pycache__/custom.cpython-313.pyc delete mode 100644 app/routers/__pycache__/export.cpython-313.pyc delete mode 100644 app/routers/__pycache__/focus.cpython-312.pyc delete mode 100644 app/routers/__pycache__/focus.cpython-313.pyc delete mode 100644 app/routers/__pycache__/projects.cpython-313.pyc delete mode 100644 app/routers/__pycache__/rbac.cpython-313.pyc delete mode 100644 app/routers/__pycache__/staff.cpython-313.pyc delete mode 100644 app/routers/__pycache__/weekly.cpython-313.pyc delete mode 100644 data/.DS_Store create mode 100644 pytest.ini create mode 100644 requirements-dev.txt create mode 100644 tests/conftest.py create mode 100644 tests/test_ai_export.py create mode 100644 tests/test_auth.py create mode 100644 tests/test_custom_finance.py create mode 100644 tests/test_periods_projects.py create mode 100644 tests/test_rbac.py create mode 100644 tests/test_staff_focus_weekly.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..77c8df8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +# Python +.venv/ +__pycache__/ +*.py[cod] +.pytest_cache/ + +# 本地数据库备份(仓库里已归档的历史备份不受影响) +data/*.bak +data/*.bak-* +data/exports/*.xlsx + +# 系统与编辑器 +.DS_Store diff --git a/.workbuddy/memory/2026-10-01.md b/.workbuddy/memory/2026-10-01.md new file mode 100644 index 0000000..5d8ce8b --- /dev/null +++ b/.workbuddy/memory/2026-10-01.md @@ -0,0 +1,47 @@ +# 2026-10-01 + +本轮目标(5 条):① 补表补代码做出**完整 RBAC** ② 修**跨季度财务统计** ③ 去掉冲突/不明确的交互 ④ 精简界面解释性文字 ⑤ 完整测试各模块。 +结果:83 个接口用例全绿(6.4s),8 个主菜单 + 全部子页签在浏览器实测无 console 报错、无横向溢出。 + +## ① RBAC 成体系(原来只有 `roles.menus` 一个 JSON 字段) + +- **新表**:`roles` / `role_menus`(授权矩阵,一行 = 一个菜单一个级别)/ `users` / `user_roles`(多角色)/ `user_sessions`(服务端 token)/ `audit_logs`(操作日志)。旧库用 `security.migrate_legacy_rbac()` 把 `roles.menus` JSON 迁进 `role_menus`,`users.menus` 迁进 `user_roles`。 +- **模型**:菜单 8 项 `MENUS`(board/projects/custom/focus/staff/intake/settings/rbac),级别 `ro` / `rw`,**表里没这行 = 看不到该菜单**;多角色取并集(`constants.merge_levels`,同菜单取更高级别)。 +- **两端同时管**:前端 `canR/canW/can` 过滤侧栏与写按钮;后端 `security.guard` 按 `SEGMENT_MENU`(路径首段 → 菜单)二次校验,**直接调接口绕不过去**。`/api/meta` 之类只要求登录。 +- **会话**:HttpOnly Cookie `unis_session`(`SESSION_DAYS=30`)。**只认 Cookie,不认自定义头**;退出/停用/改密/强制下线都是删 token → 立即失效。启动时 `purge_expired_sessions()` 清过期。 +- **防锁死**:`ensure_seed()` 保证系统里至少留一个 `rbac: rw` 的启用账号,没有就把「管理员」角色补给最早的用户;内置角色(管理员/部门成员/只读访客)禁止删除。 +- **界面**:新增「权限管理」四个子页签 —— 角色权限(授权矩阵)/ 用户 / 在线会话(可强制下线)/ 操作日志(按菜单+动作+时间过滤,可清空)。 +- **审计**:`app/audit.py` 统一记录写操作与登录行为(操作人/动作/菜单/接口/状态码/说明)。 +- **README 纠偏**:原文写「所有接口带 `X-Auth-Token`」「login 返回 `{token,user}`」「前端存 localStorage」,**与实现不符**,已改为 Cookie 事实。 + +## ② 跨季度财务统计:漏算「认不出季度」的项目 + +- **缺陷**:`finance.summary()` 的年度 KPI 只要求认得出**年份**,而年度任务表按**季度**分桶。像 `sign_date="2024/"`(库里确有 1 条:定制项目 id=6 郑州高新区…(AR城市云图),320000 元)这种「认得出年、认不出季」的行,**进了年度 KPI 却不进任何一季度** → 同屏「合计」比 KPI 少一笔(2024:50 个/669.93 万 vs 49 个/637.93 万)。验收侧同理(只有 `accept_year` 没有季度)。 +- **修法**:`finance.summary()` 新增 `sign_no_q` / `acc_no_q` → 输出 `kpi.sign_no_quarter` / `kpi.accept_no_quarter` 与 `annual.unscheduled`,**`annual.total` = 四个季度 + 未分季**(目标仍只累加四季)。前端只在 `unscheduled` 非 0 时才插一行「未分季」(目标/完成率显示 `—`),干净库不显示。 +- **不造假数据**:库里 `2024/` 原样保留(业务字面量不可改)。 +- **不变式**:**四季度 + 未分季 = 合计 = KPI 年度**(下单、验收两条口径都成立)。 +- **验证**:`tests/test_custom_finance.py` 加 2 例(脏数据计入年度并单列未分季 / 未分季为空不影响原合计);独立脚本跑 **2024~2027 × 12 个月 = 48 组**:季度归属正确、年度表不随所选月份漂移、合计/完成率/KPI 三者自洽。UI 实测 2024 显示未分季 1 个/32 万、合计 50 个/669.93 万;2026 无未分季行。 +- 口径唯一入口仍是 `app/finance.py`(`period_context` / `summary` / `read_annual_targets` / `is_placed` / `sign_period` / `accept_period`)。 + +## ③④ 交互冲突与界面冗余 + +- **人力资源花名册**:行内 3 个编辑控件(归属小组 / 人员归属 / 说明)与铅笔「编辑人员」弹窗**改同一批字段 = 两处入口打架**,还把「最近更新」列挤没(sticky 操作列遮挡,over=50)。→ **删掉行内控件与行内保存**,单元格改只读文本,统一走弹窗。复验 over=0 / overlap=0。 +- **权限矩阵**表格改 `tbl-tight`(左右内边距 8px)+ `.rbac-role{min-width:138px}`,「用户/操作」列不再被遮;角色名旁的「内置」标记与说明改成名称同行、说明另起行。 +- **设置页**数据库卡片改成两行事实:当前引擎 sqlite / 数据文件 `data/board.db`。 +- **删解释性长句**:更新录入两处 AI 预览页底部的「正文用你的原文,AI 只补…」整行删除;「没有取到当前周期的起止日期(刚更新过后端的话,请重启服务后刷新)」去掉括号里的碎碎念。 +- **保留**(判定为必要):删除确认里「请改用归档」的一行、直接写入/AI 整理的 radio 短注、登录页品牌语。 +- **术语统一**:模块③ 界面统一叫**定制项目**(原「定开项目」),README 里残留的 2 处「定开财务口径 / 定开财务」描述改为「定制项目」;`《定开项目.xlsx》` 是台账文件名,保留。 +- **宽台账横向滚动**(设计如此,不改):项目总览 17 列(over=622)、本周进展 16 列(over=478)都靠 `.tbl-wrap` 横向滚动,「操作」列 sticky 在右侧。实测滚到最右(scrollLeft=max)时最后一列「备注」与操作列**紧邻 gap=0**,不存在遮挡。 + +## ⑤ 测试与数据卫生 + +- `./.venv/bin/python -m pytest` → **83 passed**:`test_auth` / `test_rbac` / `test_custom_finance`(13) / `test_periods_projects` / `test_staff_focus_weekly` / `test_ai_export`;`conftest.py` 把 `DATABASE_URL` 指到临时库,**绝不碰 `data/board.db`**,每个用例重建表 + 重新补种。 +- 浏览器端逐个点 8 个主菜单与全部子页签:console 无报错,`pageOverflow=0`。 +- 清掉开发库里 **51 条脚本产生的会话**(Python-urllib / curl / testclient / UA 为空),只留 1 条真实浏览器会话,「在线会话」列表恢复可信。 +- 新增 `.gitignore`(`.venv/`、`__pycache__/`、`*.pyc`、`.pytest_cache/`、`data/*.bak*`、`.DS_Store`),并把误跟踪的 `app/**/__pycache__/*.pyc` 从索引里移除。 + +## 环境小抄(macOS) + +- 起服务:`run.sh`;健康检查 **`GET /health`**(不是 `/api/health`)。改后端要重启,改前端刷新即可。 +- 接口枚举:`/api` 是 Mount,得 `mount.app.openapi()["paths"]`,子 app 路径**不带 `/api` 前缀**。 +- 脚本登录:`http.cookiejar` + `POST /api/auth/login {username:admin,password:admin123}`,返回体是 user dict(**没有 token**),后续靠 Cookie。 diff --git a/.workbuddy/memory/MEMORY.md b/.workbuddy/memory/MEMORY.md index 4a9ac6f..8bb75f0 100644 --- a/.workbuddy/memory/MEMORY.md +++ b/.workbuddy/memory/MEMORY.md @@ -15,18 +15,20 @@ ## 关键结构 - `app/` 后端:`main.py`(入口,挂载 `/api` 子应用 + `/static`)、`models.py`、`schemas.py`、`constants.py`、`routers/{board,projects,custom,focus,weekly,staff,ai,export}.py`、`ai_parser.py`、`export.py`、`schema_patch.py`、`config.py`。 +- `app/finance.py`(定制项目财务口径**唯一入口**)、`app/audit.py`(操作日志写入)。 - `web/` 前端:`index.html` / `app.js` / `styles.css` / `icons.js`(零构建,no-cache + ETag)。 +- `tests/` + `pytest.ini` + `requirements-dev.txt`:接口级测试(83 例,`./.venv/bin/python -m pytest`),`conftest.py` 把库指到临时文件,**不碰 `data/board.db`**。 - `scripts/` 运维脚本:`init_db.py`、`import_excel.py`、`import_staff.py`、`migrate_custom.py`、`shift_year.py`、`fix_period_split.py`、`merge_project.py`、`add_entry_date.py`、**`import_custom_ledger.py`**(把《定开项目.xlsx》市场台账导入 `custom_projects`,支持 `--dry-run`/`--date`,按 项目ID→名称 匹配做 upsert + 变更比对)。 - `.workbuddy/memory/` 存每日工作日志(随仓库提交,2026-09-12 起)。 - `schema_patch.ensure_columns` 会在启动时自动给已有表补上模型里**新增的可空列**(`ALTER TABLE ... ADD COLUMN`),所以加字段只需改 `models.py`,不用写迁移脚本。 ## 业务模型 -四模块:① 工作看板(只读汇总 `/api/weekly`+`/api/focus`)② 项目管理(`projects`/`tasks`/`updates`)③ 定开项目(原「定制交付」,表 `custom_projects`/`custom_updates`)④ 每周重点工作(`weekly_focus`)。 -三支撑页:人力资源(`staff`,全系统负责人唯一来源)、更新录入、设置。 +四模块:① 工作看板(只读汇总 `/api/weekly`+`/api/focus`)② 项目管理(`projects`/`tasks`/`updates`)③ 定制项目(曾用名「定制交付」「定开项目」,表 `custom_projects`/`custom_updates`)④ 每周重点工作(`weekly_focus`)。 +四支撑页:人力资源(`staff`,全系统负责人唯一来源)、更新录入、设置、权限管理(`rbac`)。 ②③ 两套独立项目体系,共用一个花名册。 -### 定开项目的两套字段(2026-09-17 起) +### 定制项目的两套字段(2026-09-17 起) `custom_projects` 同时承载两套口径,**互不覆盖**: - **交付跟踪口径**(原有):`stage`(商务阶段)/`progress`/`revenue_amount`/`invoice_amount`/`received_amount`/`owner`(交付负责人,来自花名册) @@ -36,7 +38,7 @@ **`accept_date` vs `accept_date_real`**(2026-09-17 增):`accept_date` 存季度文本(Q1..Q4),只作展示;新增 **`accept_date_real`**(真实日期 YYYY-MM-DD)专门给「本月/本年验收」统计用。导入脚本会给「已验收 + 季度文本」的行补**当年季度末**占位(Q1→03-31…Q4→12-31),且**只在库中为空时补**,不覆盖界面手改的真日期。**统计口径(2026-09-20 定稿)**:下单看 `sign_date`(本季度/本年按日期归属);**验收看「验收时间」`accept_date`(季度文本 Q1~Q4)**——本季度验收 = `accept_date` 等于当前季度,本年验收 = 有验收时间(全部季度)。**不再用 `accept_date_real`**(它只作参考/展示,历史上有 4 条 Q3 行缺值,曾导致本季度验收少算)。 -明细表(`renderCustomList`)列顺序对齐 Excel 14 列 + 更新时间 + 操作;行内**只有「修改」**(详情靠点名称;归档按钮已按要求去掉)。**定开视图有 3 个 tab:项目明细 / 本周进展 / 年度任务**(`state.customTab`;原交付流水线 / 阶段看板 / 财务跟踪已下线)。列表在客户端按 关键字 + **项目归属** + 区域 + 状态 过滤。统计条 `.stat-row` 基于**全部已下单项目**(不随搜索/筛选变化):**已下单项目 / 合同额** + 本季度下单 + 本年新增下单 + 本季度验收 + 本年验收——**已下单 = 项目归属 ∈ {新签订单, 存量项目, 汇智直签}**(`isPlaced()` / `CUSTOM_PLACED`),**提前交付不计入下单**。「本周进展」tab(`renderCustomWeekly`)列出「更新时间」在本周(周一~周日)的项目,上方 3 张卡:**验收情况**(本周更新 ∩ 已验收)/ **本周新增项目**(按「下单时间」`sign_date` 在本周 ∩ 已下单或提前交付)/ **交付项目**(本周更新 ∩ 交付中+交付完成)。「年度任务」tab(`renderCustomAnnual`)按《年度任务.xlsx》出表:季度 + 计收目标(万元,前端常量 `CUSTOM_ANNUAL_TARGETS` = Q1 35/Q2 225/Q3 160/Q4 260)+ 回填列——**计收项目**(`accept_date` == Qn)/ **新增签单**(`isPlaced` 且 `sign_date` 在本年该季度),金额元→万元,完成率 = 计收金额 ÷ 目标。表格 `customTableHtml(rows)` 两个 tab 共用,在「项目状态」后新增**进度**列(`progress`,仅 状态=交付中 或 >0 时显示 `N%`)。项目名称搜索框**回车才查询**(`bindKeyword(id,{enter:true})`;cKeyword 定开 / pKeyword 项目已启用)。导出 Excel 列与明细表一致(15 列),跟随 归档/区域/状态/关键字 筛选。`openNewCustomDialog`(新建,更新录入页共用)字段同样对齐 Excel,提交时 `region` 由后端按 `office` 归一化(深圳→广东)。 +明细表(`renderCustomList`)列顺序对齐 Excel 14 列 + 更新时间 + 操作;行内**只有「修改」**(详情靠点名称;归档按钮已按要求去掉)。**定制项目视图有 3 个 tab:项目总览 / 本周进展 / 年度任务**(`#view-custom .ctab[data-ctab=list|weekly|annual]`)(`state.customTab`;原交付流水线 / 阶段看板 / 财务跟踪已下线)。列表在客户端按 关键字 + **项目归属** + 区域 + 状态 过滤。统计条 `.stat-row` 基于**全部已下单项目**(不随搜索/筛选变化):**已下单项目 / 合同额** + 本季度下单 + 本年新增下单 + 本季度验收 + 本年验收——**已下单 = 项目归属 ∈ {新签订单, 存量项目, 汇智直签}**(`isPlaced()` / `CUSTOM_PLACED`),**提前交付不计入下单**。「本周进展」tab(`renderCustomWeekly`)列出「更新时间」在本周(周一~周日)的项目,上方 3 张卡:**验收情况**(本周更新 ∩ 已验收)/ **本周新增项目**(按「下单时间」`sign_date` 在本周 ∩ 已下单或提前交付)/ **交付项目**(本周更新 ∩ 交付中+交付完成)。「年度任务」tab(`renderCustomAnnual`)按《年度任务.xlsx》出表:季度 + 计收目标(万元,前端常量 `CUSTOM_ANNUAL_TARGETS` = Q1 35/Q2 225/Q3 160/Q4 260)+ 回填列——**计收项目**(`accept_date` == Qn)/ **新增签单**(`isPlaced` 且 `sign_date` 在本年该季度),金额元→万元,完成率 = 计收金额 ÷ 目标。表格 `customTableHtml(rows)` 两个 tab 共用,在「项目状态」后新增**进度**列(`progress`,仅 状态=交付中 或 >0 时显示 `N%`)。项目名称搜索框**回车才查询**(`bindKeyword(id,{enter:true})`;cKeyword 定制 / pKeyword 自研已启用)。导出 Excel 列与明细表一致(15 列),跟随 归档/区域/状态/关键字 筛选。`openNewCustomDialog`(新建,更新录入页共用)字段同样对齐 Excel,提交时 `region` 由后端按 `office` 归一化(深圳→广东)。 **`update_date`(更新时间)的语义**:只在台账字段**确有变化**时才刷新(无变化不刷新)。 - **取值**:导入/初始 = 该行「下单时间」`sign_date`(2026-09-17 全量刷过);界面「修改 / 新建」提交后 = **提交时间** `YYYY-MM-DD HH:MM`(2026-09-18 起)。字段是 `String(16)`,正好放「YYYY-MM-DD HH:MM」。 @@ -45,14 +47,36 @@ 导入「市场责任人」等销售侧人名**不走花名册校验**,不要往 `staff` 里塞。 -## 登录与权限(2026-09-23 合并 main V 0.1.1 起) +## 登录与权限 / RBAC(2026-10-01 成体系) -- 全站需**登录**:未登录访问 `/api/*` 返回 **401**。默认管理员 **admin / admin123**(`app/config.py` 的 `ADMIN_PASSWORD` 默认值,可用 `.env` 覆盖);另有 `user`(部门成员)。 -- 权限模型:`roles.menus` 是 JSON(board/custom/focus/intake/projects/rbac/settings/staff,值 `rw` / `ro`);内置角色 管理员 / 部门成员 / 只读访客。代码:`app/security.py`(hashlib+hmac 手写,无新依赖)、`app/routers/auth.py`、`app/routers/rbac.py`;表 `users` / `roles` / `user_sessions`。 +- 全站需**登录**:未登录访问 `/api/*` 返回 **401**。默认管理员 **admin / admin123**(`app/config.py` 的 `ADMIN_PASSWORD`,可用 `.env` 覆盖);另有 `user`(部门成员)。 +- **三层模型**:`users` ←(`user_roles`)→ `roles` ←(`role_menus`)→ 菜单授权。`role_menus` 一行 = 一个菜单一个级别(`rw` 可编辑 / `ro` 只读),**表里没这行 = 看不到该菜单**;一个用户可挂多个角色,最终权限取**并集**(同菜单取更高级别,`constants.merge_levels` + `LEVEL_RANK`)。旧库由 `security.migrate_legacy_rbac()` 从 `roles.menus` / `users.menus` JSON 迁过来。`audit_logs` 记写操作与登录行为。 +- **两端同时管**:前端 `canR/canW/can` 过滤侧栏与写操作按钮;后端 `security.guard` 按 `SEGMENT_MENU`(接口路径首段 → 菜单)二次校验,直接调接口绕不过去。菜单 = `constants.MENUS` 八项:board / projects / custom / focus / staff / intake / settings / rbac。 +- **会话 = 服务端 token + HttpOnly Cookie `unis_session`**(`SESSION_DAYS=30`,启动时 `purge_expired_sessions()` 清过期)。**只认 Cookie,不认自定义头**;退出 / 停用 / 改密 / 强制下线都是删 token,立即失效。写脚本登录用 `http.cookiejar` + `POST /api/auth/login`,响应体是 user dict,**不含 token**。 +- **防锁死**:`ensure_seed()` 保证至少留一个 `rbac: rw` 的启用账号;内置角色(管理员 / 部门成员 / 只读访客)`is_builtin`,禁止删除。 +- **界面**:「权限管理」四个子页签 `#view-rbac .ctab[data-rbactab=roles|users|sessions|logs]`:角色权限(授权矩阵)/ 用户 / 在线会话(强制下线)/ 操作日志(菜单 + 动作 + 时间过滤,可清空)。 +- **密码**:pbkdf2(`hashlib` + `hmac` + `secrets`,标准库,**没有额外依赖**)。 -## 术语(2026-09-16 起) +## 定制项目财务口径(2026-10-01 定稿) -模块③ 的正式称呼是 **「定开项目」**(旧称「定制交付」),界面统一用「定开」:定开项目 / 定开项目明细 / 定开合同额 / 定开记录 / 定开动态 / 定开待计收。`categories` 表里也有一行分类叫「定开项目」。 +- **唯一入口 `app/finance.py`**:`period_context` / `summary` / `read_annual_targets` / `write_annual_targets` / `backfill` / `is_placed` / `sign_period` / `accept_period` / `accept_label`。路由与前端都不得自己算一遍。 +- **已下单** `is_placed` = `origin ∈ CUSTOM_PLACED_ORIGINS`(新签订单 / 存量项目 / 汇智直签);**提前交付不算下单**。 +- **下单归属**:`sign_period` = `parse_year_month(sign_date)` 再落到季度;**验收归属**:`accept_period` = (`accept_year`, `parse_quarter(accept_date)`),**刻意不看 `accept_date_real`**。 +- **年度目标**:`CUSTOM_ANNUAL_TARGETS_DEFAULT` = Q1 35 / Q2 225 / Q3 160 / Q4 260(万元),按年存 `Setting` 键 `custom_annual_targets:{年份}`。金额库内单位「元」,展示「万元」。 +- **未分季(2026-10-01 修)**:认得出年份但认不出季度的行(如 `sign_date="2024/"`)**必须计入年度**,否则同屏「合计」会比 KPI 少一笔。`summary()` 输出 `kpi.{sign,accept}_no_quarter` 与 `annual.unscheduled`,**`annual.total` = 四季度 + 未分季**(target 只累加四季)。前端仅在 `unscheduled` 非 0 时插一行「未分季」,目标/完成率显示 `—`。 +- **不变式**:**四季度 + 未分季 = 合计 = KPI 年度**(下单、验收两条口径都成立);年度表不随顶栏所选月份漂移(`current` 标记除外)。回归覆盖 4 年 × 12 月。 +- **脏数据留在库里**(如 `sign_date="2024/"` 的定制项目 id=6):不改业务字面量,靠口径容纳。 + +## 界面约定(2026-10-01) + +- **一处入口**:同一批字段只能有一个编辑入口。花名册的行内控件与「编辑人员」弹窗改同一批字段 → 已删行内控件,统一走弹窗。 +- **宽台账横向滚动是设计如此**:`.tbl-wrap{overflow-x:auto}`,「操作」列 sticky 在右。项目总览 17 列 / 本周进展 16 列都靠横向滚动,滚到最右时末列与操作列紧邻(gap=0),**不算遮挡**,别为了“消除溢出”去砍列。 +- **文案**:界面不放解释性长句;只保留删除确认里的「请改用归档」一行、直接写入/AI 整理的 radio 短注、登录页品牌语。 +- **表格紧凑**:列多时加 `tbl-tight`(左右内边距 8px)。 + +## 术语(2026-10-01 更新) + +模块③ 的界面称呼现在是 **「定制项目」**(`constants.MENUS` 里 `custom` 的标签),历史曾用名「定制交付」「定开项目」,界面与 README 已统一为「定制项目」。`categories` 表里仍有一行分类叫「定开项目」(业务数据,**不改**);`web/app.js` 里两处提到《定开项目.xlsx》的是台账文件名,保留。 **但这些字面量必须保留「定制」,改了会坏数据或逻辑**: - `"定制开发"` —— 历史 Excel 的项目容器名,是 `import_excel.py` / `migrate_custom.py` / `fix_period_split.py` / `add_entry_date.py` 里的匹配条件。 @@ -63,7 +87,8 @@ ## 约定 -- 当前开发分支:`develop-chezhiqi`(跟踪 `origin/develop-chezhiqi`;main 为发布线)。 +- 当前工作分支:`main`(`origin/develop-chezhiqi` 已并入,不再是开发线)。 +- 跑测试:`./.venv/bin/python -m pytest`(83 例,约 6.5s,用临时库)。前端语法自检:`node --check web/app.js`。 - 改代码后重启服务即可(未开 DEV 热加载)。 - 动数据库前先备份:`cp data/board.db data/board.db.bak`。 - 周期标签格式 `9月第1周`,可写 `2027年1月第1周` 显式指定年份。 diff --git a/README.md b/README.md index 8fe26a5..06897bb 100644 --- a/README.md +++ b/README.md @@ -7,11 +7,11 @@ | 模块 | 适用 | 关心什么 | 数据表 | |---|---|---|---| | **① 工作看板** | 每天进来的第一屏 | 三类工作本周期谁更新了、谁没动,点一条从一览看到详情 | 只读汇总(`/api/weekly` + `/api/focus`) | -| **② 项目管理** | NEX云桌面、AI Agent、智飞无人机平台、内部运营… | 长期重点项目的迭代执行、子任务进展、风险阻塞 | `projects` / `tasks` / `updates` | +| **② 自研产品** | NEX云桌面、AI Agent、智飞无人机平台、内部运营… | 长期重点项目的迭代执行、子任务进展、风险阻塞 | `projects` / `tasks` / `updates` | | **③ 定制项目** | 各省市客户定制子项目 | 商务阶段流转(签单→开发→交付→验收→计收)+ 按进度确认收入 | `custom_projects` / `custom_updates` | | **④ 每周重点工作** | 不值得单独建项目档案的短期活儿 | 一条就是一件事,面板里录,归在**录入周**这一周,跟到完成 | `weekly_focus` | -支撑页三个:**人力资源**(`staff`,全系统「负责人」的唯一来源)、**更新录入**(执行 / 交付记录的唯一写入口:粘贴原文 → AI 整理 → 确认写入)、**设置**(周期管理、AI 配置)。 +支撑页四个:**人力资源**(`staff`,全系统「负责人」的唯一来源)、**更新录入**(执行 / 交付记录的唯一写入口:粘贴原文 → AI 整理 → 确认写入)、**设置**(周期管理、AI 配置)、**权限管理**(角色 × 菜单授权、账号、在线会话、操作审计)。 ②③ 是**两套彼此独立的项目体系**(数据表也完全分开),共用一个**人力资源库**:项目与定制项目的「负责人」都从花名册里选,人员进出只维护一处。④ 的条目不是项目,不挂子任务与执行记录。① 只做汇总与跳转,自己不落数据。 @@ -201,13 +201,12 @@ ssh user@host 'cd /srv/unis_manager && ./deploy.sh up' | **左栏** | **三组**清单,顺序固定:① **本周工作重点**(列表,逾期的置顶)② **重点项目**(列表:`is_key` 的项目,另含本期补了执行记录的非重点项目,条目前用 ★ 区分)③ **定制项目**——**只给一个入口**「本周定制项目动态」,左栏不铺清单(100 多个项目会淹没看板),点开才在右栏列本周有动态的。组头显示条数与「几个已更新 / 几条逾期 / 本周动态几个」;每条带负责人、状态或阶段、本期摘要、风险条数,本期有记录的点亮标记 | | **右栏** | 点左栏任意一条即可联动。重点项目 → 本期执行记录 / 进度与状态(含子任务)/ 近 8 期趋势;**定制项目入口 → 本周动态总览**(顶部标签:本周新增 / 本周验收 / 有交付动态 / 合同额合计 / 本期计收,下面分「本周新增」「本周验收」「本周有变化」三段,每条带阶段、负责人、金额、本期计收与摘要),点某一条再下钻到该项目 → 交付环节五段条 / 财务跟踪四联卡 + 开票·回款行内输入 / 本期交付记录 / 更早的交付记录,改开票、回款、环节日期即时保存(改日期会自动推进商务阶段);每周重点工作 → 只读的说明与状态,要改点「修改」开抽屉 | | 工具栏 | 「负责人」筛选、「导出本周期记录」,提示里带本期项目数与定制动态数;顶栏可切周 / 月视图(月视图自动汇总该月所有周)。「列入全部在途」开关(`all_custom`)不在工具栏,挪到了右栏定制总览的头部 | -| 统计概览 | 页面最底部的折叠区(原「执行面板」,已不占主导航位):周期活跃度柱状图、分类环形图、状态分布、进度 Top10、低进度预警、风险清单,数据来自 `GET /api/stats`;加载失败也不影响看板主体 | 数据分两路:`GET /api/weekly?period_id=|year&month&owner=&all_custom=` 一次返回重点项目清单 + 定制项目清单 + 顶部 KPI(含 `custom_new` 本期新入库数、`custom_updated` 本期有交付记录数);**「本周工作重点」不在 `/api/weekly` 里**,前端并发取 `GET /api/focus` 后合并,分堆也在这一步判定(按条目的**录入周**:本周录入的 + 更早周次标了「延期」又没做完的结转条目)。 定制项目的口径:`/api/weekly` 返回**本期有交付记录**、**被标为重点**、**本周期新入库**(`is_new`:入库日期落在本周期首末日之内)、**本周期新下单**(`sign_date` 落在本周期)或**本周期已验收**(`update_date` 落在本周期且项目状态为「已验收」)的定制项目;右栏总览默认列「本周新增」「本周验收」「本周有变化」三段,其中**前两段与「定制项目 → 本周进展」的「新增项目 / 验收情况」口径完全一致**(前者按「下单时间」、后者按「更新时间 + 状态=已验收」),其余只在组头计数里出现,并在底部提示「另有 N 个在途定制项目本周没有动态」。勾选总览头部的「列入全部在途」后,后端补上处于在途阶段(商机 → 已验收)的项目,总览多出一段「其他在途项目」。头部几枚标签与「合同额合计」只加总**当前列出来的行**(同一项目同时落在两段时只算一次),勾与不勾数字会跟着清单变。 -### 2. 项目管理 +### 2. 自研产品(项目管理) 长期重点项目(`projects` + `tasks` + `updates`)。执行记录的写入逻辑没变,仍旧统一走「更新录入」。 @@ -215,15 +214,13 @@ ssh user@host 'cd /srv/unis_manager && ./deploy.sh up' |---|---| | **项目管理** | 表格展示分类、负责人、状态、进度、更新情况(标签只在详情抽屉里维护,列表不放,避免挤占名称列);**列表只读**,行内不放任何输入框和下拉,每行只有 **详情 / 修改 / 归档** 三个按钮(操作列吸附在表格右侧,横向滚动也不会被挤出可视区);负责人筛选下拉来自人力资源库;支持新建与「含归档」筛选。详情抽屉里的**周期反馈**可切「按周 / 按月」与「本周 · 近 4 周 · 近 12 周 · 全部」(按月为「本月 · 近 3 月 · 近 6 月 · 全部」),用 ‹ › 翻页看更早的周期,默认跟随顶栏选中的周期 | -> 「执行面板」不再单列模块,已折进工作看板底部的「统计概览」折叠区。 - #### 项目维护操作 | 操作 | 说明 | |---|---| -| **面板分区** | 抽屉用标准对话框式标题栏:**标题在左(下面一行副标题),基础信息的操作按钮成排在右,✕ 在最右**,按钮条嵌在标题栏里(不悬浮、不吸顶,滚动时跟着标题栏常驻)。详情档是「删除 · 归档/恢复 · 标记重点 · **修改**」,修改与新增档是「取消 · **保存/添加**」,主按钮永远在最右、危险动作在最左,按钮文字不再重复对象名(标题栏已经写了是哪个项目/条目)。附表的写入另放一处:**绿虚线 = 附表 · 更新记录**条仍留在它自己的附表标题下面,只有「+ 录一笔「某周期」执行记录 / 交付记录」,点它跳到「更新录入」并自动带上该项目与顶栏当前选中的周期。附表的写入统一走更新录入(粘贴原文 → AI 整理 → 确认写入),抽屉里不另做一套表单,避免两条路写出两份数据。基础信息的按钮在标题栏、附表的更新按钮在附表上方,两类按钮不在同一个位置混着放;编辑与新增档的报错信息显示在正文最上方;周期反馈上方的 按周/按月 + 本周/近 4 周/… 标成「查看范围(只读筛选)」,只翻看不改数据 | +| **面板分区** | 抽屉用标准对话框式标题栏:**标题在左(下面一行副标题),基础信息的操作按钮成排在右,✕ 在最右**,按钮条嵌在标题栏里(不悬浮、不吸顶,滚动时跟着标题栏常驻)。详情档是「删除 · 归档/恢复 · 标记重点 · **修改**」,修改与新增档是「取消 · **保存/添加**」,主按钮永远在最右、危险动作在最左,按钮文字不再重复对象名(标题栏已经写了是哪个项目/条目)。附表的写入只有一处入口:附表标题下的「添加执行记录」,它跳到「更新录入」并带上该项目与顶栏当前周期——抽屉里不另做一套基础信息之外的录入表单,避免两条路写出两份数据;改某一条已有记录用的是行内「修改」,走全站唯一的记录弹窗(`openUpdateDialog`,看板右栏与定制抽屉共用)。基础信息的按钮在标题栏、附表的更新按钮在附表上方,两类按钮不在同一个位置混着放;编辑与新增档的报错信息显示在正文最上方;周期反馈上方的 按周/按月 + 本周/近 4 周/… 标成「查看范围(只读筛选)」,只翻看不改数据 | | **改名** | 改名就是改基本信息:在详情面板点「修改」,表单第一行即项目名称(项目管理与定制项目同一套逻辑)。名称非空校验 + 重名检测,失败信息显示在面板正文最上方,不弹提示跑路 | -| **负责人与团队** | **多负责人只适用于重点项目**:重点项目可以指定**多个负责人**与**团队成员**,定制项目只有一个**交付负责人**(单人下拉)外加**团队成员**。人名一律从人力资源库下拉里选。**界面上负责人不分主次**:名单横向排开自动换行,每一位都带 × 可删(没有「主」标记、没有不给删的首行),「+ 添加负责人 / + 添加成员」跟在名单末尾。名单只在详情抽屉的「修改」档维护;只读处一律一排对等的小标签:重点项目的列表与详情把负责人摆成对等的一排,定制项目的列表与详情只显示一个交付负责人加团队成员标签。存储与统计口径不变:**重点项目 `owner` 字段仍是 `owners[0]`**(删掉第一位就由后一位顶上),看板、导出、人力负载与 KPI 按它归属,修改档的提示行写明了这点;重点项目**所有负责人都算命中**,定制项目按交付负责人命中;团队成员不参与该筛选 | +| **负责人与团队** | **多负责人只适用于重点项目**:重点项目可以指定**多个负责人**与**团队成员**,定制项目只有一个**交付负责人**(单人下拉)外加**团队成员**。人名一律从人力资源库下拉里选。**界面上负责人不分主次**:名单横向排开自动换行,每一位都带 × 可删(没有「主」标记、没有不给删的首行),「+ 添加负责人 / + 添加成员」跟在名单末尾。名单只在详情抽屉的「修改」档维护;只读处一律一排对等的小标签:重点项目的列表与详情把负责人摆成对等的一排,定制项目的列表与详情只显示一个交付负责人加团队成员标签。存储与统计口径不变:**重点项目 `owner` 字段仍是 `owners[0]`**(删掉第一位就由后一位顶上),看板、导出、人力负载与 KPI 按它归属;重点项目**所有负责人都算命中**,定制项目按交付负责人命中;团队成员不参与该筛选 | | **归档** | 项目从看板与列表默认视图中隐藏,数据完整保留;勾选「含归档」可查看,随时可恢复 | | **删除** | 高危操作:弹窗列出将连带删除的子任务数与执行记录数,并且必须**逐字输入项目名称**,「永久删除」按钮才会点亮。**删除后不可恢复**,仅想隐藏请用归档 | @@ -246,13 +243,16 @@ python scripts/merge_project.py --from "智空无人机平台" --to "智飞无 ### 3. 定制项目 -| 模块 | 说明 | +三个页签,都跟着顶栏周期走:**项目总览**(默认)· **本周进展** · **年度任务**。 +统计条与年度任务只认 `GET /api/custom/finance` 一个数据源,口径见「财务统计口径」。 + +| 页签 / 模块 | 说明 | |---|---| -| **交付流水线**(默认页签) | 卡头给「在库 N 个 · 重点 N 个 · 本期更新 N 个」,漏斗本身按环节给项目数与金额(页签上不再叠一条全局 KPI 带,金额与项目数按环节累计);「入库 → 签单 → 交付 → 验收 → 计收」五段漏斗,每段给项目数与金额;口径为**商务阶段 + 已录环节日期**取先到哪一步算哪一步(环节日期还没补全时由商务阶段兜底)。下方「卡点项目」列出最后一个**有日期**的环节停留超过 `CUSTOM_STEP_AGING_DAYS`(默认 45)天且尚未计收的项目,可一键「处理」跳到详情抽屉补录 | -| **阶段看板** | 按「商机 → 已签单 → 开发中 → 交付完成 → 已验收 → 已计收 → 暂停/异常」分列展示,卡片带金额、区域、开发进度、可确认收入;列头显示项目数与金额合计。卡片只是入口,点卡片开详情抽屉;卡上的 ★ 只读(重点标记在详情面板的基础信息区改),外层不做任何直接写入 | -| **财务跟踪** | 页签内一排 KPI:合同总额 / 按进度可确认收入 / 已计收 / 待计收 / 已开票 / 已回款 / 待开票 / 待回款(各带比例脚注);再往下是阶段金额分布、周期活跃度、按负责人与区域汇总、待回款排行。财务口径的汇总只在这一页出现,环节与账期一屏对齐,方便财务逐月对账 | -| **项目明细** | 表头一行给出当前列表的合同额 / 可确认 / 已计收 / 开票 / 回款合计;按入库时间倒序的**只读**总表:区域 / 负责人 / **入库 · 签单 · 交付 · 验收日期** / 阶段 / 合同额 / 进度 / 可确认 / 已计收 / **开票 / 回款**(金额列统一以「万」计)/ 备注;改数据点行尾「修改」 | -| **详情抽屉** | 分「详情 / 修改」两档:详情只读,修改才给表单(含项目名称、手动确认比例、**交付环节五个日期**、区域下拉、**开票与回款金额**)+ 收入确认卡 + 周期执行记录 + 阶段流转时间线。负责人从人力资源库里选。基础信息的动作在标题栏按钮条上(修改/保存,正文里标明不会动下面的交付记录),开票与回款金额跟着标题栏的「保存」一起提交;附表的绿虚线条(「+ 录一笔」跳更新录入 · 定制项目并带上项目与周期)留在附表标题下 | +| **项目总览** | 标题栏下一排统计条:已下单项目/合同额、本季度下单、本年新增下单、本季度验收、本年验收(金额按「万」显示,脚注项目数)。下面是按更新时间倒序的**只读**总表:项目名称 / 项目ID / 下单时间 / 项目归属 / 办事处 / 行业 / 市场下单人天 / 订单金额 / 市场责任人 / 项目状态 / 进度 / 验收时间 / 推动验收计划 / 风险值 / 更新时间;下单时间、订单金额、更新时间三列表头可点着排序。筛选只有关键字 + 归属 + 区域 + 项目状态 + 风险值。台账里认不出的写法(下单时间识别不了、已验收没填验收年度)在标题栏挂一枚提示标签,不挡事 | +| **本周进展** | 更新时间落在顶栏选中周期内的项目;统计条给「验收情况 / 新增项目 / 进行中项目」,其中新增与验收和工作看板右栏共用同一套口径(`customWeeklySections`),两处数字必然一致 | +| **年度任务** | 四个季度的计收目标(万元)与完成情况对照。完成额按「验收年度 + 验收季度」归集、下单按下单时间所在季度归集,跨年不会串;默认只读,点「编辑」才能改,改数字实时重算完成率与合计,保存走 `PUT /api/custom/annual-targets?year=` | +| **详情抽屉** | 分「详情 / 修改」两档:详情只读(基础信息 + 收入确认四联卡 + 开票 / 回款行内输入 + 交付记录 + 阶段流转时间线),修改才给表单(名称、手动确认比例、交付环节日期、区域、**验收年度 + 验收季度**成对填写、开票与回款金额)。交付负责人是单人下拉,从人力资源库里选;「添加交付记录」在交付记录区里,一个弹窗录本周期一条 | +| **归档** | 归档后不再出现在总览与统计中,历史周期记录完整保留,随时恢复 | ### 4. 每周重点工作 @@ -271,6 +271,12 @@ python scripts/merge_project.py --from "智空无人机平台" --to "智飞无 分堆口径(基准周 = 顶栏选中的那一周,一律按**录入周**算,和预计完成时间无关):录入周**等于**基准周 → **本周**;录入周**早于**基准周且「是否延期」打开且未完成 → **延期**(上周及更早没做完的活儿结转进来);状态为「已完成」→ **已完成**(交叉视图,条目仍留在自己那一周)。 「更早周次录入、没标延期又没完成」的条目不进当周视图,只在**全部**里查得到——所以每周收尾时,没做完的记得勾上「延期」,它才会结转进下周。库里不存「逾期」字段,延期是人工开关。 +### 5. 权限管理 + +`角色 × 菜单` 授权矩阵、账号与角色分配、在线会话、操作审计四个区块,一个页面四个页签。 +权限模型、内置角色与防锁死规则见「权限(RBAC)」,这里不重复。 +只有拿到 `rbac` 可编辑的账号能看到这个菜单。 + ### 人力资源库 侧栏「人力资源」,是全系统**负责人姓名的唯一来源**(`staff` 表)。 @@ -325,6 +331,33 @@ python scripts/add_entry_date.py --force # 全部重算 - 历史数据里若出现「内蒙古自治区」这类非规范写法,保存时会自动归一为「内蒙古」 - 早期从项目名推断的区域(`infer_region`)与标准列表口径一致,无需迁移 +## 权限(RBAC) + +侧栏每个菜单都是一个权限点,**授权 = 角色 × 菜单 × 级别**;账号不直接挂菜单,只挂角色。 + +| 概念 | 取值 | 说明 | +|---|---|---| +| 菜单 | `board` 工作看板 · `projects` 自研产品 · `custom` 定制项目 · `focus` 每周工作 · `staff` 人力资源 · `intake` 更新录入 · `settings` 设置 · `rbac` 权限管理 | 见 `constants.MENUS`,顺序即权限页里的列顺序 | +| 级别 | 空 = 看不到 / `ro` 只读 / `rw` 可编辑 | 没授权的菜单侧栏不出现,接口也进不去;`ro` 能看列表与详情,所有写接口一律 403 | + +- **多角色取并集、同级取高**:一个账号可挂多个角色,同一菜单只要有一个角色给了 `rw` 就是 `rw`(`constants.merge_levels`)。 +- **双端校验**:前端 `can()` / `canW()` 只负责把按钮藏起来,真正的门在接口上—— + 每个路由都挂了 `security` 的权限依赖,按路径首段映射菜单(`SEGMENT_MENU`), + 读请求要求 `ro`、写请求要求 `rw`;越权返回 403 并记一条 `audit_logs`(`action=deny`)。 + `/api/auth/*`、`/api/meta` 这类只要求登录,不看菜单,否则无法登录与自助改密。 +- **内置角色**:`管理员`(全部 `rw`)、`部门成员`(业务菜单 `rw`,设置与权限只读/无)、`只读访客`(除权限外全部 `ro`), + `is_builtin` 标记,不能删除。 +- **不会被锁死**:系统始终保证至少有一个「启用 + 权限管理可编辑」的账号; + 一个都没有时 `security.ensure_seed` 会把「管理员」角色补给最早的账号并在启动日志里提示。 +- **改权限即踢会话**:改角色授权 → 踢掉该角色下所有账号的会话;改/停账号 → 踢掉该账号的会话。 + 旧 token 不会继续带着旧权限跑。 +- **会话**:登录发 32 位随机 token,存 `user_sessions`(有效期 `SESSION_DAYS`,默认 30 天), + 只通过 `HttpOnly` Cookie `unis_session` 下发(JS 读不到,前端不存 token); + 权限管理页可查看全部在线会话并单独吊销。 +- **操作审计**:写操作与登录 / 登出 / 越权都落 `audit_logs`(谁、什么时间、哪个菜单、什么动作、返回码、IP), + 权限管理页可按菜单、动作、天数筛选。 +- 首个管理员账号来自 `.env` 的 `ADMIN_USERNAME` / `ADMIN_PASSWORD`(默认 `admin` / `admin123`,登录后请立刻改密码)。 + ## 界面设计语言 前端是零构建的原生 JS(`web/index.html` + `web/styles.css` + `web/app.js` + `web/icons.js`),设计口径固定如下,新增页面请沿用: @@ -357,6 +390,33 @@ python scripts/add_entry_date.py --force # 全部重算 导出的 xlsx 带表头样式、冻结首行、自动筛选,金额列按千分位格式;文件名含导出日期。 +## 财务统计口径 + +定制项目的金额统计全部收敛在 `app/finance.py`,页面、工作看板、导出都从它取数,**不存在第二套算法**。 + +| 口径 | 认定方式 | +|---|---| +| 已下单 | 只看项目归属:`origin ∈ {华智下单, 存量项目, 汇智直签}`;`提前交付` 不算下单 | +| 下单归属季度 / 年度 | `sign_date` 的 `YYYY-MM` 前缀;认不出年份的计入 `kpi.sign_unknown`,页面上提示补录 | +| 验收归属季度 / 年度 | **只认 `accept_year` + `accept_date`(Q1~Q4)**;`accept_date_real` 已停用,不再参与统计 | +| 未分季 | 认得出年份、认不出季度的行(`sign_date` 残缺成「2024/」、或只有 `accept_year` 没有 `accept_date`):计入年度,年度任务表里单列「未分季」一行 | +| 计收 | 累计看主档 `revenue_amount`;本周期新增看 `custom_updates.revenue_delta` 之和 | +| 金额单位 | 项目金额一律 **元**;年度计收目标一律 **万元**(`wanVal()` 录入时换算,接口按字段名区分) | + +- 统计范围跟顶栏周期走:`?period_id=` 看一周,`?year=&month=` 看一月,季度由月份自动归(`quarter_of_month`)。 + 跨季度、跨年度只以 `context.year` / `context.quarter` 为准,不会因为库里存在别的年份就串到别的季度去。 +- **年度计收目标**(`GET|PUT /api/custom/annual-targets?year=`):**存过就以库里为准**,某季度清空即 0; + 完全没配过的年份才回落到 `constants.CUSTOM_ANNUAL_TARGETS_DEFAULT`。目标值写非数字返回 400。 +- 验收年度与季度成对校验:只给其中一个 → 400,避免出现「有 Q3 没年份」这种没法归类的行。 +- **年度任务表的不变式**:`四个季度 + 未分季 = 合计 = KPI 年度`(下单、验收两条口径都成立)。 + 历史库里确实有「有年份没季度」的行,早期版本会让它们从季度表里静默消失, + 于是同一屏上「合计」比 KPI 年度少一笔;现在单列一行,既不丢数也不硬塞进某个季度。 + `annual.unscheduled` 给出笔数与金额,`kpi.sign_no_quarter` / `kpi.accept_no_quarter` 是计数。 +- **周期记录里的 `amount_delta` / `revenue_delta` 是增量,会同步落到项目主档**: + 新建记录 → 主档累加;修改记录 → 按新旧差额回补;删除记录 → 一并扣回。 + AI 写入时「parsed 给了 `amount` 绝对值就用绝对值,否则累加明细增量」,两条路只走一条,不会重复计。 +- 历史数据可疑时执行 `finance.backfill(db)`(幂等,可反复跑):按上面的口径重算验收年份与商务阶段。 + ## 收入确认口径 定制项目按**完工百分比法**确认收入: @@ -398,8 +458,14 @@ CustomProject(名称, 客户, 区域, 合同额, 阶段, 开发进度, 手动确 WeeklyFocus(工作内容, 说明, 录入周→Period, 预计完成时间, 执行状态, 是否延期, 结果反馈, 归档) Staff(姓名, 归属小组, 人员归属, 说明, 排序, 归档) # 花名册:所有「负责人 / 团队成员」下拉的唯一来源 -Category / Tag / Setting / ImportLog +Category / Tag / Setting(AI 配置、年度计收目标 custom_annual_targets:{年份}) / ImportLog(AI 整理留痕) LedgerItem(客户项目台账) # 只剩模型与 Excel 导入解析,界面无入口、接口已下线 + +# 权限(RBAC) +Role(名称, 说明, is_builtin) ── RoleMenu(菜单, 级别 ro|rw) # 授权矩阵:角色 × 菜单 +User(姓名, 账号, 口令散列+盐, 是否启用, 最近登录) ── UserRole(用户, 角色) # 多角色,权限取并集取高 +UserSession(token, 用户, 过期时间, IP, UA) # 会话,可按角色/账号吊销 +AuditLog(用户, 动作 create|update|delete|login|logout|deny, 菜单, 方法, 路径, 状态码, IP, 详情) ``` 原表映射关系: @@ -424,6 +490,19 @@ LedgerItem(客户项目台账) # 只剩模型与 Excel 导入解析,界面 - 阶段判定做了特殊处理:文本里同时出现「已计收」和「进度 60%」时判为**开发中**,计收金额由 `revenue_delta` 承载。 - 解析结果写入前始终提供**可编辑预览**,确认后才落库,并留痕到 `import_logs`。 +## 测试 + +```bash +./.venv/bin/pip install -r requirements-dev.txt -i https://pypi.tuna.tsinghua.edu.cn/simple +./.venv/bin/python -m pytest # 81 个用例,几秒钟跑完 +``` + +- 测试跑在临时库里:`tests/conftest.py` 在 import 业务模块之前就把 `DATABASE_URL` 指向临时文件,**不会碰 `data/board.db`**。 +- 每个用例重建表结构并重新补种内置角色与管理员,用例之间互不污染;`AI_API_KEY` 置空, + AI 相关用例走确定性的本地规则解析,不联网。 +- 覆盖范围:登录 / 口令 / 会话限流、RBAC 授权矩阵与越权与审计、周期与项目与执行记录、 + 定制项目财务口径(跨季度、跨年回归)、年度目标、花名册 / 每周重点 / 工作看板、AI 整理与六类 Excel 导出。 + ## 迁移到 MySQL 1. 安装驱动:`pip install pymysql cryptography` @@ -440,15 +519,21 @@ LedgerItem(客户项目台账) # 只剩模型与 Excel 导入解析,界面 ``` app/ main.py FastAPI 入口(API 挂载在 /api,静态页面在 /) - config.py 配置与 .env 加载(DATABASE_URL、AI 参数) + config.py 配置与 .env 加载(DATABASE_URL、AI 参数、SESSION_DAYS) db.py engine / Session(按 URL 自动适配方言) - models.py ORM 模型(项目 + 定制项目 + 每周重点工作 + 花名册) - constants.py 状态/阶段常量、收入确认比例、区域与阶段识别 + models.py ORM 模型(项目 + 定制项目 + 每周重点工作 + 花名册 + RBAC) + constants.py 状态/阶段常量、收入确认比例、区域与阶段识别、权限菜单目录 + security.py 口令散列、会话、权限解析与路由依赖(RBAC 的门) + audit.py 操作审计写入 + finance.py 定制项目财务口径唯一入口(下单/验收归属、年度目标、回填) + export.py xlsx 生成(表头样式、冻结、筛选、金额千分位) ai_parser.py LLM 解析 + 本地规则兜底(通用 / 定制两套) - routers/ board(周期/元数据/统计) · weekly(工作看板数据) · projects(项目管理) · - custom(定制项目) · focus(每周重点工作) · staff(人力) · ai · export -web/ index.html · styles.css · app.js(零依赖,无构建步骤) -scripts/ init_db.py · import_excel.py · migrate_custom.py · import_staff.py · add_entry_date.py · merge_project.py · shift_year.py + routers/ auth · rbac(角色/账号/会话/审计) · board(周期/元数据) · weekly(看板数据) · + projects · custom(定制项目 + 财务) · focus · staff · ai · export +web/ index.html · styles.css · app.js · icons.js(零依赖,无构建步骤) +tests/ pytest 接口测试(conftest 用临时库,绝不碰 data/board.db) +scripts/ init_db.py · import_excel.py · import_custom_ledger.py · migrate_custom.py · import_staff.py + add_entry_date.py · fix_period_split.py · merge_project.py · shift_year.py data/board.db SQLite 数据库 Dockerfile 运行镜像(依赖 + 代码,启动时自动补表/预置分类) docker-compose.yml 部署编排(./data 持久化、HOST_PORT、健康检查) @@ -458,52 +543,90 @@ deploy.sh 部署命令封装:up / update / restart / down / logs / ## API 速览 +鉴权走 **HttpOnly Cookie `unis_session`**(由 `/api/auth/login` 下发,只认 Cookie,不认自定义头); +除 `/api/auth/login` 与 `/health` 外,所有接口都要求已登录,否则 401。 +写操作(POST/PATCH/PUT/DELETE)额外要求对应菜单是 `rw`,越权返回 403 并留审计。 + ``` +# 登录与自助 +POST /api/auth/login {username,password} → 当前用户;会话 token 只写在 Set-Cookie 里 +POST /api/auth/logout 吊销当前会话 +GET /api/auth/me 当前账号 + 角色 + 菜单权限表(前端据此渲染侧栏) +PUT /api/auth/me 改自己的姓名 +POST /api/auth/password 改自己的密码(改完踢掉其它会话) + +# 权限管理 +GET /api/rbac/meta 菜单目录 + 级别字典 + 内置角色 +GET|POST /api/rbac/roles 角色清单(含授权矩阵)/ 新建角色 +PATCH|DELETE /api/rbac/roles/{id} 改名称、说明、menus({菜单: ro|rw});改授权会踢掉该角色的会话 +GET|POST /api/rbac/users 账号清单 / 新建账号(role_ids 分配角色) +PATCH|DELETE /api/rbac/users/{id} 改资料、启停、重设密码;停用即吊销会话 +POST /api/rbac/users/{id}/revoke 只吊销某个账号的全部会话 +GET /api/rbac/sessions 在线会话(用户、IP、UA、到期、token 摘要) +DELETE /api/rbac/sessions/{token} 吊销单个会话 +GET|DELETE /api/rbac/logs 操作审计 ?username=&menu=&action=&days=&limit= / DELETE 按 days 清理 + # 通用 -GET /api/meta 状态字典 / 优先级 / AI 配置状态 -GET /api/periods 周列表 + 按月聚合(含各周期记录数;today_id = 今天所在的周,顶栏默认落它) -POST /api/periods 新增周期(传 label 如「9月第1周」,年份自动接续) -DELETE /api/periods/{id} 删除空周期(有记录则拒绝) -GET /api/board?period_id=|year&month 周期汇总(页面主链路不走它,统计走 /api/stats) -GET /api/stats?period_id=|year&month -GET /api/weekly?period_id=|year&month&owner=&all_custom= 工作看板:重点项目 + 定制项目本周动态 + KPI - (custom_new 本期新入库 / custom_updated 本期有交付记录;行上带 is_new) - (左栏第一组「本周工作重点」前端另取 /api/focus 合并) -GET /api/projects (?archived=false|true|all) -POST /api/projects PATCH /api/projects/{id} DELETE /api/projects/{id} - (owners/members 传人名数组,整体替换:不传=不改,传 []=清空;owners[0] 回写 owner 列供归属统计,界面不再区分主次) -GET /api/categories POST /api/categories PATCH /api/categories/{id} DELETE /api/categories/{id} +GET /api/meta 状态字典 / 优先级 / 菜单 / AI 配置状态 +GET /api/periods 周列表 + 按月聚合(today_id = 今天所在的周,顶栏默认落它;没有会自动补建) +POST /api/periods 新增周期(传 label 如「9月第1周」,年份自动接续;重复提交返回已有的) +DELETE /api/periods/{id} 删除空周期(有记录则拒绝) +GET /api/weekly?period_id=|year&month&owner=&all_custom= + 工作看板:重点项目 + 定制项目本周动态 + KPI + (行上带 is_new / updated_this_period / idle_weeks / worst_status; + 非重点且本周无记录的默认不列出,all_custom=true 才列出在途定制; + 没有任何周期时返回全键 0 值骨架,前端不用兜底) +GET /api/projects (?archived=false|true|all&category_id=&is_key=&keyword=&owner=&period_id=|year&month) +POST /api/projects PATCH|DELETE /api/projects/{id} + (owners/members 传人名数组,整体替换:不传=不改,传 []=清空;owners[0] 回写 owner 列) +GET|POST /api/categories PATCH|DELETE /api/categories/{id} +GET|POST /api/tags DELETE /api/tags/{id} +POST /api/tasks 项目子任务 +GET /api/updates?project_id=&period_id=|year&month&limit= + 周期执行记录(月粒度含该月各周;范围内没有周期就返回空,不回落到最新周) +POST /api/updates 写入口校验:项目/周期必须存在、状态合法、正文与摘要不能都空 +PATCH|DELETE /api/updates/{id} # 定制项目 -GET /api/custom/meta 阶段字典 + 区域列表 + 交付环节(pipeline) + 卡点阈值(aging_days) -GET /api/custom/projects?stage=®ion=&keyword= -POST /api/custom/projects PATCH /api/custom/projects/{id} DELETE /api/custom/projects/{id} - (owner 是单个人名;members 传人名数组,整体替换:不传=不改,传 []=清空。不再接受 owners,多负责人只属于重点项目) -GET /api/custom/board?period_id=|year&month 阶段看板 -GET /api/custom/stats?period_id=|year&month 收入统计 -POST /api/custom/updates -POST /api/custom/ai/parse 粘贴文本 → 结构化预览 -POST /api/custom/ai/commit 确认写入 +GET /api/custom/meta 阶段字典 + 区域列表 + 交付环节(pipeline) + 卡点阈值(aging_days) +GET /api/custom/projects?stage=®ion=&keyword=&archived=&key_only=&owner= +POST /api/custom/projects PATCH|DELETE /api/custom/projects/{id} + (owner 是单个人名;members 传人名数组整体替换;不再接受 owners,多负责人只属于重点项目) +POST /api/custom/updates PATCH|DELETE /api/custom/updates/{id} + (amount_delta / revenue_delta 是增量,会自动累加/回补主档金额,见「财务统计口径」) +GET /api/custom/finance?period_id=|year&month + 财务汇总:context(年/月/季度区间) + kpi(下单、季度与年度验收、计收…) + 年度任务表 +GET|PUT /api/custom/annual-targets?year= 年度计收目标(万元)。存过就以库里为准,非数字返回 400 + +# AI 整理(两套体系各自独立;未配 Key 自动降级为本地规则解析) +POST /api/ai/parse 粘贴原文 → 结构化预览。**只读**:写了新项目名也不会建项目 +POST /api/ai/commit 确认写入:按 tasks 建子任务与执行记录(同名子任务复用),回写主档,留痕 import_logs +POST /api/custom/ai/parse 定制版预览(阶段/合同额/本期计收/本期明细) +POST /api/custom/ai/commit 定制版写入:按名称自动建档,绝对值优先、否则累加明细增量 # 每周重点工作 -GET /api/focus?archived=false|true|all&status=&keyword= 条目清单(period_id/period_label/sort_key 都是**录入周**,分堆由调用方判定) -POST /api/focus PATCH /api/focus/{id} DELETE /api/focus/{id} - 单条增改删;工作内容非空。period_id=录入周(前端传顶栏当前周, - 不传后端按今天所在的周补;due_date 只是目标日期,不改归属周) - 或直接给 period_id(必须存在);两者都不给 → 400 +GET /api/focus?archived=false|true|all&status=&keyword= + 条目清单(period_id / period_label 都是**录入周**,分堆由调用方判定) +POST /api/focus 工作内容非空;period_id=录入周(前端传顶栏当前周,不传按今天所在的周补) +PATCH|DELETE /api/focus/{id} 改 due_date 不会搬走归属周 # 人力资源库 -GET /api/staff?archived=false|true|all&group=&keyword= 花名册 + 各自工作量 + 花名册外负责人 + 小组/归属字典 -POST /api/staff PATCH /api/staff/{id} DELETE /api/staff/{id}(名下有项目时拒绝,离职请归档) +GET /api/staff?archived=false|true|all&group=&keyword= + 花名册 + 各自负载(在管/重点/定制数、定制合同额、待计收)+ 花名册外负责人 + 小组与归属字典 +POST /api/staff PATCH|DELETE /api/staff/{id} + (姓名与花名册重名返回 400;名下有项目时禁止直接删除,提示先归档,?force=true 才强制删; + 改名会把项目与定制项目上的负责人一起同步,返回值 synced 说明同步了几条) # 其他 -GET /api/settings PUT /api/settings +GET|PUT /api/settings AI 配置等(PUT 需要 settings 可编辑) -# 导出(均返回 xlsx) -GET /api/export/custom ?region=&stage=&keyword=&archived= -GET /api/export/custom-updates ?period_id=|year&month -GET /api/export/projects ?category_id=&keyword=&archived= -GET /api/export/staff ?archived=false|true|all -GET /api/export/focus ?archived=false|true|all&status=&keyword= -GET /api/export/updates ?period_id=|year&month&project_id= +# 导出(均返回 xlsx,筛选口径与页面对应) +GET /api/export/custom ?region=&origin=&status=&risk=&accept_plan=&keyword=&archived=false|true|all(末尾带合计行) +GET /api/export/custom-updates ?period_id=|year&month +GET /api/export/projects ?category_id=&keyword=&archived=false|true|all(默认 all) +GET /api/export/updates ?period_id=|year&month&project_id= +GET /api/export/staff ?archived=false|true|all +GET /api/export/focus ?archived=false|true|all&status=&keyword= + 导出与接口的差别:范围解析不出周期时导出给全量(让人把数据带走), + 接口则返回空(避免把「没数据」看成「全周期数据」) ``` diff --git a/app/__pycache__/__init__.cpython-313.pyc b/app/__pycache__/__init__.cpython-313.pyc deleted file mode 100644 index 178c3a9267b18f9459cb4299ccce24da7078030d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 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
tkG_@O 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 diff --git a/app/__pycache__/main.cpython-313.pyc b/app/__pycache__/main.cpython-313.pyc deleted file mode 100644 index 8c1b9e9f115a09f0ce1bc1a4be52a4990a0c5300..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4264 zcma)8T~Hg>6~6nYUnD^MNMH&a{2$OkavhCc<~@#+lT1{Ztqp()Ow6E)tLc zCJTG_+;h%%?ma*ETrE2sHbkGl{pRuqKz(jZvV&#i%PjvyK-T}pYJgR&Dd-6TtfU1DAv1Bfaw3cEJPwXiG7*cml82)t+MUv8(c4jVeVncdvlq0mMtt_us`QGr+}y4qM=AFdBw*r*jYi$wuu^(}7W zVKs^?3G=XTXXxTaOwJd;m4an|*dK~))C!k|zO#`lxS@ONVGVT??fO;ihIQJlTWIfF)%LH`ZX0BGp$3%eJ~8Mm18g;_f|Fm3USoRy)6P|) z0mc`2PB-9Vh+Rq~R9(^)HKFzTSYqyylX4=a5%a5(rgxt01|8?|Ga>P`5{t#<5edt{ z$$M3a%OP1y0*cPOA@P><*2R^9$%88 zM9_3;V1SrLWcf<`I^D3G&{9~AMAdj|IH3WDzoaB$scP6+zk21{)lWY7)xYlk?D-$Y zpWc~$`h)vVe)pp%znFY_|F{4C{f|f4hU!tl&`RZle%ER7+5NlE#@~7J(XXG}o*fll z@xSbU8T=D;MUTtGd{xHO8N$?ogAOSkS4Sc$R=_7MHyxJsAr)epl@7^L3_z)(jpnOq z#96!pBqT3pq(V+a6!wkgg}A*=r3fAjHA@7DCMO z0uZ~QsP3RX#*6w;t{l7J!XE;ytIQp)SI9#NwhwJ`hoI1UtJE?)B6ILt2*v6U*!#Me z5d7fy>H`-XEkby52SI`miCiBWGOh5}k0M_S(>`_&vY_4z2RJw$LN8$gqn2!pfJ&(Q zqEd879(5e2pMA&GgpSp?k0)FT#|fX5plWRpJ*;aZ3ee_klA$KdSbifVYdWz)xyK_3 z`I=5FID2?B8qn(MY7z+aX;2h_%Sv2H1aApJmGVm@}}%(+N+*FCgMt>Y%DZd!2{AB9OLyc&)D7+N%; z{Gx}>;*4`w+PN#^tW7&>XM}mDf98#}^OcABCAUZ49er5fUa|^#rbQ$OCfor)To1#S zLPwo5Le~n!9n_z#X9xgrSDt=8M~Mu*ymB?4`-1yy@2CwLpM1?fqz}h^95w@laGH*Z z`TU7vk*@9#J_4+jO&E>|hCc2BZV$W~Z6;&rpLX|q+@cw4m!ZkVFag7P3ds3R+^;I3uz-=*Dj4FY4lOr zB-gqp$ z5L5Om467+v&tjA<&E;|Gz%gpmwr0v`3xpe#b)#C1)P6PVmczqpEESiJU5ioMs=T}iy7np5!(A0@i!ee92w+EBhS>p z9R1cju)3#A)BO96yN-FQf6Vj`&ia72&gC`Cocra4dlzP}&hI-i*U&L%JNhx-xnx2n z*W0g;YYT;CnZlaC7uHNiKPjxcB|NY=#)WZt{QNET6HDb1hg|hvaL81=XhZh=+jZZo z`+h^lR-U$%kC{I+Ip&IMW=7Jc17qA{#AT2xja&=7YoVxgyk>1!v?8Wx2?-3lRDjIR zxnkc(?mv3|Qu(LK`L?rjt=~wSLSx)Q4nN*9d3fUR3_DvpTQ)~69$FK%PIgRm%rwqk zoIPcTI@d&vlWh}i)1euC2EqZTmNn7-$@Yo%8P{y#di@cYlmZAKMCU2i^@#ok-hujhO*v$b1w1_nKx#ettMz z()!`GF>4x~ge0-T&B_~<4&myH3omA+);l5Qi5BXqCjEM@17b&&q q$_b0!s#szfriIF!2K9x?Kmok-`u{X~-v8{Y33hOQ?XdMY&Ho2!?4Df! diff --git a/app/__pycache__/models.cpython-313.pyc b/app/__pycache__/models.cpython-313.pyc deleted file mode 100644 index f42c98bf63925e3eb0b3077e002dc9513a2ca99e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36791 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 diff --git a/app/__pycache__/schemas.cpython-313.pyc b/app/__pycache__/schemas.cpython-313.pyc deleted file mode 100644 index 8e0694ca03f07c49ac5494230a919bc58a74918e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8447 zcmb_h>ysQ+6`!8zc|Z33$nGYY>;_>#3A?<6CwzIS! z(p4?e4weo;I@luZWa$v3t6QX9EL{WX+7@XyOVg09YmxS_bQsc+7HKa_*F$<;i?olW zAA$7x7HL0AZ-6w@B3;GO8zH@^MLIC{(ag;kX}L0*j2q>0rD{}*m9hmkaBq1k1o+lGBR+q3<5YN7*6s%Hnd&Y@tNVm{$nPmWX%^npWLv@9ZPZHD+-@UZ#ZdP}7Y8NvsxfB0>C1G< zNG?ay%jIM&mz$^*Y9%Tsa=EY7jFPQs%jI?#g;gyT%VxO(H3Thi$>l^6LlbR8;8J{| zlSns_ULyTO28aw286pw_kvfe?tfgX4E=M*f=5t21DvG;mRntPlY3MHF?~@xhJY>Oc z8=feZinR?7SHyUB(#V?|YGs&b!YCVKrr2OiPHwRBd&~*L`q<=@pfzMd1?y>$L%xMr za{rcvHN(@}W(Vf<;f4O8>CesFHKz|PtR0!&{BB}sP9IrFub;mE-Q?;yef>h`+UdlPhj{!EWd*gI&4 zQO)nU*oP^NiWJQ|P9#CZ1xq`z9*DUTC*a##hv9Q2!MJxs%fLhkVyI*~#X2ev6B!}0 zo(T7S9hKa^J-YP-Dz{BjV?6zK+Y3{wShH|ZJX2AEUaD!S!qsR*V5up8nW>@Jx$t8@5Tn^^>u1wG$?O$eGHnF z=z<4yeKdLOAg?CE`dBy~S5i}qucVKhw3y*C44;o{b7q4UMyl&fd`^GzN z5j@^Bx*Qd^f-YbF+ek))-~R-0yuV50J;)L?|NRPJE!4gap`>DE6uX}|a4)}u%{?LPl zH4f9=g%`y=AToxiOX&fkzPl4_lXP%%)7m7{}(XZgIm;GNbNnB zzd>`YxhzSzXj>~N=>Sj!oC*;-07RUddbw~)BK1l^r;;rl;e%?bpr9js5T}BIj?{}d zClO2Xd)@3tbdh46la{qHr_wT=!-t;bv@F|?@S$f`$;d;K1TJDTfyT3Q4E%8UPB3Q+N#kg>i7o{RMzR(kb^BzyW|bmC^)&LgEyb1EP&Nh2;*> zJ{HJy%DBRv%38jNk=GsrIrrx?jqm=xe)M?bmD7#GKe}-G$b~aMufKEr(%F~l$9~*6 zHhb<5KfHKy`oinapxXJD4%B~kqH*Tem(I>KPTJZ<;kiG*(m3)={rOkx(`PT8J^aD+ zvkKCJ!9o~T>;C|iT|YSxUlnY(tD5b z>(HzmNeSbyy9;>nFfDiLE-iI=D$-?j16` zxstEZ#Gk}CY5`ncHr_f`f8mXbhmM|q_V@MQzIN`Nlkm#Qk;8x2pLW7b>|H)hD&Yrq>`ZtYJ$LjBV2NG5txp3g6#>t=7kG+MqQGt4%eIAt?M-HF+sXof$XbwV%eR3K3dBYb(eh-#`6& zF!GOt54-1q1vgB%XXGWa`)3}dbF=I0RJOBtE}+J}v3n4j55X>7yU>M6kj9>Mu3gl1 zrXScPopTAJu3el3ga>SsF-EdVLug?3Ew;~Gc61}}6 zK~oT+2AmTcyY^Ja!R^Y8lG=N`X=tu7UR;s07pDv8-Nh0m8Yl3^@>8a#+kT2F5}`M& zFbI~zJw=kndrbec4P!fOGhuiyqgiFfM5R>7IR=!8vblGWyM{TxN$(S(hAc{eG3w5q zIlTvTUhh!`r3y<1uS0;Jc9{;x*EXp8&0%KoyBj3=mniJ6Y(51;I)_blY+=8{H-(yFJ9{v z^?O6>e!l*%L$~8D?4Ei3c4ZiPWr<+|5a6d>{tW0!!z_u#EBzToU**9fA_7kol~FQ^ zazwAAMcW#26!{i^Uyqw{wS4DL6HTL5ChF;YxB=HhSGCIwbwq?Zx9CzAc5#mg?*0A9 z_0ykwH=dr?uUCelcf1Wl2k(`J@o*Wf_nub;sW2Q%QikZe1UAG^(Y%Wu zK`D`#0&%V`1ni0X3g6aL{8rCM5i> zV_uf}(|g{Q8ii)1rB*;_>6ZvM{dYp53WBuD{McntvXcVT+i1TPP#nN`rX19Gx@0{EnBMW~nhE)U!o?ZwZ=Q6QN|^yDz&}q?boCgY=bbcdc3z_(~>d%gIo6 zY7%L;AjgC_GF33j_=+WhVEH4L`UrIsv9}PpjmVuu$b<2<4xg#{EXQXGm4}a$)*`}z z=P4?&&)iQX-X64oJS(=7f2l6Q|d4i@RK&-ypWKLVPj{oOZQ_w}ClUDpgH zw2iaTrVo$inuInydnc8Ln``{q;OwfV507RHWM+$94r}R|siqH)X18BU%{)T#R5RA5 zts^-e&GiXw^=yXPS>0R{)cUD?Jeuuc$k8Sq&2CM#k4H0-M4QE?507R#qOGGkcr^R{ zS|`czXvQ=xMeX3xjQF))HMZVnETG*%W5A=C2xvD@9Xy%|bVzdUSJ%?B(SP~yVEguG1Y{`RLP^2C^1b}*J`@fUH8spatr-x+pLBeV6D4WG~qfE`|Q2X-t!PbJD9qSaRw#**eshGQ-zuV_-)f?UZ>~a9t|6LoEzweVRfVoxPxR#mVkkEfBYmf? zNGMMviO|;Y+6q&75=o+MT}5(v3Q3`DeZ`FORFYbrM$*dDNqTt($$<9;GLtuw%mRi_ z*uj#lU0E}joy<;FR2DFzVg^&DVHmH1VOm%#vt6-O$1n!Q%!o=C>taauuAF>kSJo=n z85S~&Pb9N>6Q4x?lKJRg3O|ES<SK9{x@@MiK9znIUXPZoX&pHEv0 zcj;lBDbaNnviwqh4)*L}$)d;l3i!E^zQs*S5qKo;wvn+c^UeiQjP>3QeR5`W@U`&8 zqZ7T|-wd@?J->0&H$&}T`(D=T$KU?xc>4$DXUwC6zOmb{gkHTge)N;^t_z{gGckCw z-yG_?F*fwZ_?=Vc0yA;Lt`- zhudz3J6;CNql53t6XBebv4^@l!e@UucK!0`;FYm!H@+D@OaesTeDO#JlvH$&$mh`V0{#IQDVlh;lf%%gWMj{o8f0Q%b3F@ED_`2Cm1Z{7&q zdBwbBgE@+_Gj!zK=&g?MdzZs~mnYusz|EciDE!*h@qwdIhq`_?`thZ)+d$(^SXAh> z+qlcop>yLmE&^G?7dk_)UWQ4{9`|0s1@tfTcv`l(oUP_fZuee?Ad_pt=L?;yw9@$F7|Wb$%GS@_zVC8_pBDaeS=r2rwk{^B!|c-QI@A73T0q zcg9X%3i*a2Z0I`?I&nO7>vecU4h@}|c=KZD${X_D5y=Fe2Ma41>@JtvWA`}RF0s<0 zkhBeUkKl1M3z81&2EpmETa=QfNN5pU4Wg7#R$aZl_&~kTfsIL1^W(pGC48$J z(K%cm`(8mF1hVkP0GzSVv8&Lf6$OvS;c61SYFOj=^*dvq;4B=ev)9Y;^c;fBk98l1 z4h3<;XFo{;Xp(}}46IVIO2;Y#tC?73LS->gNJ+h45cWD-=?J<|k4Ohf`g-75lbbjM zQQ|!ICQ;IOTab^Ur1IFsym#}pnhe9iN69ekgX7RR!z^Q5poO1dpTa&U4WNw7@V0957`cmC75N4Yo)^*JbF7M5 z7$KK+@P*^ICNqpxS&K8#5_><3VQQ9J6${|));Y4)x3Y6V^1Q|HDm-{B{Lxuisf-Tw zg)d$OJtFJ3@yq?7b>RGro#_qT{9x?TRr%PP7nwudZQ&2kjDZNXU4v5sg0FITgl19F zZ7r^}+A4~F$V=)i#XF0)@F2}fV&5+*-CmER+$*$7s(p4RoCRE|8H%*B03}>3*yC_I zyag|~$zHz2UN00-DQ~vB>`ekGu(z}nh(f)WI6SROTUsTP%T1c?PRBvPMwK2}0_e)% zBd&+a$9$EQ@6#>q`Znc=A@Q{3KMmP^s`t{bnnp5mx|Ju( z?yH!Lh4<8q(c~+C0OKF!9!e|a-gD46!_-18m#P>SqHh=`pQ%+vpR7#OQi1hX@X9qx zpgUJtQVqgw6kMX02sXP|?{G*u(M>!yppFQ%?W=1~yZeM-`r^S=pBDuTJN(=ZvJ|=>5lnCjxl+31E`Y+Tf;kU&#PKEo@lOcl5pQwy(*;;5z07WP*qOoakrj?Gn@80}pZ5pS2m zs;B~ipIV}a#mW{cD5)pVYm?OCZu^Q=Pyb!z^)xP7ZP7^@5G5jbKwhckvF#QPNSfVt zaktY^CmCd0VcXqoub0$9dJ(D zVi(2zZqgueqTT6{)D4a%(E1`s56ZgCxCETY7KJ1w(6jQs8)IUO`O`7m8i$K9 zJH|w1oUv6A?>asMo+PWX3N`+e5@+(N$oZSgsQ8`GgcQ?1#;k?QmCC>wx zg(I5~Iw8tS8*-KuAsW=JF%>8C-LwykNMmc9^IHIB7sCAnDj#!Cp;V>aO`bWNJok&_ zxqUVL2W}jG=kVbEU_t4>rTxdO-_7#BP#fI5>&qYS4JJF=)DJ;jB@G*9e_@#2v+vTu z-h<~4^}iT2tn+j0{`aAZF{VFYSXJ5|OsV&j@cnlYkIT!?Zk*42HebJSrSh{CEY$Ur zHJAY)fO71Ezd_@lQU-X`r;(Ccls8&x@~X7acKo{*XQU;{)7qFKc(QEpiZv{1eAKB? zNi;K$);<`tX`90r+3IHITpczLGU=V;_RR zY-dL^bIzyvioWF1apdMBn_sCIF(mo6$l7GGyl^ldm6v{KoMC{zXr88&xTg~3)3lNj z!#kZZv9fEyw8zHBI2xY{?duvAc*s=6WGdbp=W!EbQC5}!cV~#LuKL}??LrSCLP?8S zQh}FFT4m;`8y!v$FaQlJXmY_Rz*7x8SQO-k@I^aBTzFKo>xr-rZZbBz(@E^`-UXkC zKZ3L@J5ttB8{{&FIdgzBU&$WMD-7fn4r&5<&jz{YhPl!JSL)wo_hX|jLi}SDPoVoK z;0Lp&lYevfJGIMh>-W`jHv`b=!4MI$NUdPF%xssKVhSLhi;7-X;aIQ9vklPPcT)PNC& zI}*WTF;x}Q!;H4vMvpFOL>T;3L*--sY)Be0%@{ExbUoev^yx)C-k@QguV_SLIC7}l zbN2A5!|%Co~a?&{XaTWaW@QNJPJ_}iSU5#bmzyY2Rz;iXThp~Xb&hOjP|&cE=4V1 zmy0!~IeEp}A>b_7M5~fl;u3gnEl9e3C4Hl!Z`Ab7LWY^-_{H>l6esjfkN-4a12lkN zf!MaOye4{{UEH>n|6mlZD*v%nWx^~mNvoP>4KNE`^Q0LRyw=58Idp!Tv`?4~E|<~K zypHY|X~@Q1RlHZxGoY>6IO#3mMVFICnG`Ms#F+G6^y=iu3C2vGl5bCo%@Fwrb-xu0 z!&o2!BX^As-ZEFZT@cW@+&^~Z7KV}_)4l1~f&CI!^@74FMykH6%mz*K^s!l6 zgW1alb`Bj1uBwnv?S(^uz*QcI=g#MqHpNyDUmA!7q2akgj#u&Oe=vp~Z(g$wM2%kf zVKG*?R0593@fM>vw7l+#IP`1xKZ3*XIF16PO9{pl_A<4^kAL)dO?L#NCIfcOiHgXs zVV&-x=^Q~T2P*)BK$VmV4yqDpvCC!S9bJJ-Z`IeK!pi~GfPzU& zO;g;Rv}&WURvm9#!@&rq3VpOG#j20OnbDA<(>$d_cV=d4u3FU#px4SycTM3Ftm;ID zPh1&Ovu0+iGZKKAp0XI(q9wY9DvWSVDbe|3ivD%jGpIzl)MiCnRX~fWC5o3O0*0oi zKy6xd)FfPx44GP<+*>nbh13VKqRKpVB$^lAv?j(qO6fU|Lq&HA{nJx8>B(yV>L*X8 zKJ523FsPaaS7F@5Sx7u|!|W8-=-@dBzdw!(gY`#0 z37`IW3Px~y!B>=HtrVl2>j0w^y8fmY4+6e`k(aJQch0r7EA;ewh1rOZe^5V1*fef{s2O>?TD5NI5 zsG`31bwX(N5RTKLYlk>V1wO{_<}@IqArM%HTO4VCPA{IC7~UA6W!9Lz3!xWy3Kl#x z@JZ;?YoQB~tbTs0Kl)#z@bs_$a$p%f!{&@I8#0^m6 z9<5{}Z-@jfML}pFrvTCLv+4&o%ib>=s{XKYxUeKpSn_3IS`=I8`oVtV#??`)PAU^C}_$9@4#R>x&H2qjGpSDwZ9UA>$doR_>;g4 zdt1?nF|n(py`;OaV+%IR+RHl1M`q=9SGQM=7?ZoUv~TfeuN){EczSS#Kl7R28#mlH zF$8PV#y)a~jH z&xQ2i%%y?MrFcWH46Laf$+wK;%0<7Y%L+Q-aQxT@zX97zFDvk3 zYMCxbPUE*RI~^Ypzu3T)1TP>USxw6LMYJYqI`3gR-yj|ijM}`(m(P0eooZv&AFL60 zU27BqJAG6+epQLuTszz`c`aODF)KBtpnqn66u*wwNANRMsZ+q=u@;j?w9v5@@F=Fm zJl#I|m|w#i(5riFW@BV#xJJjlgc|d7>xfYZFG|2sD~z#n)K}Q~|6h?+6{WaKW7R|{ z)&SBqiQ+mwVUq1e-+4-@u|`)T`%sZxsH6DoU~jCN$eyR-HvJR0lU6F@6tX0HD`6p! zng?YM3HBC;IrQ`H(5=&uZXO+c745U{_Qcsi%!?gsgM_zyJ3|9}yc1I8vN4s@XW`R# z#xHk(87F%I05cBhR zMH@{rPjMkoH|$iH;23~Dm`*^7gk#c;p8Ysl(Zap`dH;o;mBf!q}zZ3yN* zA2e)=M49d;X7?-og)amWYy8?8xU-%(eB^NVp<&J3fM)JjhUA{qOIf{HLBpK8DY^Zd z{HyJOlsdn$ZUiRY(7xeHPSCJqVD8O@?=QT$^!=s3N)N6m`@AT)VtWL7PatKl-?$f6 z(Pp@7$biU|tJeiXB9qhiBN^ENE*0Jwle)^=%eyMuD|-rqMzgONf@5@f1CHMqerx*7 z@NQ*NNn+ITmGy`?iPAHuQ$t}^+St3E%>=E07X(eh~TA%^R2q3Inzy@H{V@jDes2od8MKw}Xr=b0zHXs&C zjwEQQ4WOAr0@o^ry1D289&3|NB0-18qM~9+dZ8`*cIU8#a%fSKi`WMHAWM{p?kUJj zBuD}YY$CWkHX7Og8Fc+Se8d${Vdn39C1Rj5khsaO-4v%8WRlg8$@CHzBrF{D9*BPy z0yc6Lt1D1RN;pW7Oci-6`u3p7<85&Ywa~ZN4AqMkEzM=g5a>C}t)f_q;^OMuZYOx! zbbClUdTOW#ODCg)9_il!K#~%E6Cy8$!}!)C02rt}2&b2r57FQkh5I}G(M#kFES?@v zx_El5u@w#U(pBK%4(gl^(StjB5hkEq!1Fq3tq4Wl#j#K5M{nG+MAF!74eolIP14(J zjb5OyV6zeArJOn3j4fmvO#l%NTj`5Qqas0Y6;h)3lGE<2-z_w^E`?t% z5V~wP!l3b!7m2ZO2)9AH*(uU1giKiUQ{-qj6|;>9r9ySa%Qp_n>I(>jnxBYR5v-PA zwF;{etT5e3lSMQ)A&YQKK~is?>M??133t7A_>x!~O>it*Cd;pOJ**Bi75KV$%P@EDJKrzDmyZ zC5|Lz_!7QV>vRgA>V7JdllP@D@7$_Wh26_f?&w_wDJ-Av4~Z$=t4{9q8AfzzKJ`5< zlbALF{|Tx1pOiI{k~3mVA2DT)BxH;vrsGR}3cfd{z{~r&Nl6Ny@!ovKlrfS%8{Z=& zj=i6tF)4h8hpB4T^e}~GtJsHnB|H0}QN^x*n4)HrAEqeSq=$MPn{+RWNm}SLK2#^N ziy!9au*vr~FpE|U%)eIfH)bZAbpL5)#hStN4|D&A;n<|_9&A%F3Hc(j|FiVOO_}Qd E1DuHs%K!iX diff --git a/app/audit.py b/app/audit.py new file mode 100644 index 0000000..cfdb10e --- /dev/null +++ b/app/audit.py @@ -0,0 +1,118 @@ +"""操作审计:谁在什么时候改了哪个菜单的数据,成功还是被拒。 + +写入口只有一个:`/api` 子应用上的 HTTP 中间件。它在每个请求结束后落一行, +所以 401/403(越权尝试)和 4xx/5xx(失败的写操作)同样留痕。 +只记写操作 + 登录/退出,GET 不落库,避免日志被列表刷新刷爆。 +业务代码可以用 `audit.note(request, "……")` 补一句说明,日志的「说明」列直接可读。 +""" +from __future__ import annotations + +from datetime import timedelta + +from fastapi import Request +from sqlalchemy.orm import Session + +from .db import SessionLocal +from .models import AuditLog, now + +# 命中这些路径前缀的 GET 也要留痕(登录相关) +TRACKED_GETS = () +# 方法 → 动作 +METHOD_ACTION = {"POST": "create", "PUT": "update", "PATCH": "update", "DELETE": "delete"} +# 特殊动作:路径以这些结尾时按语义记,不套 method 默认值 +SPECIAL_ACTION = { + "/api/auth/login": "login", + "/api/auth/logout": "logout", + "/api/auth/password": "password", +} +KEEP_DAYS = 180 # 日志保留天数,启动时清一次 + + +def client_ip(request: Request) -> str | None: + fwd = request.headers.get("x-forwarded-for") + if fwd: + return fwd.split(",")[0].strip()[:64] + return request.client.host[:64] if request.client else None + + +def action_for(path: str, method: str) -> str | None: + """返回 None 表示这个请求不进审计。""" + clean = path.rstrip("/") + if clean in SPECIAL_ACTION: + return SPECIAL_ACTION[clean] + if method in METHOD_ACTION: + return METHOD_ACTION[method] + if clean.endswith("/revoke") or clean.endswith("/purge"): + return "revoke" + return None + + +def note(request: Request, text: str | None = None, *, username: str | None = None) -> None: + """业务代码给审计日志留一句人话说明;落库由中间件完成。 + + `username` 只在拿不到登录用户时用得上(比如密码输错,操作人记的是被尝试的账号)。 + """ + try: + if text: + request.state.audit_detail = text[:255] + if username: + request.state.audit_username = username[:64] + except Exception: # 审计说明是锦上添花,不能带崩业务 + pass + + +def write(db: Session, *, user, request: Request, status: int, action: str, + menu: str | None = None, detail: str | None = None, + username: str | None = None) -> None: + db.add(AuditLog( + user_id=getattr(user, "id", None), + username=username or getattr(user, "username", None), + action=action, + menu=menu, + method=request.method, + path=request.url.path[:255], + status=status, + ip=client_ip(request), + detail=detail[:255] if detail else None, + )) + db.commit() + + +def prune(db: Session, keep_days: int = KEEP_DAYS) -> int: + q = db.query(AuditLog).filter(AuditLog.created_at < now() - timedelta(days=keep_days)) + n = q.count() + if n: + q.delete(synchronize_session=False) + db.commit() + return n + + +def audit_middleware_factory(): + """给 /api 子应用用的中间件:写完响应后补一条审计。""" + + async def audit(request: Request, call_next): + from .security import resolve_rule # 避免循环导入 + + action = action_for(request.url.path, request.method) + response = await call_next(request) + if action is None: + return response + path = request.url.path.rstrip("/") + rule = resolve_rule(path, request.method) + menu = rule[0] if rule else None + state = getattr(request, "state", None) + user = getattr(state, "user", None) + actor = getattr(state, "audit_username", None) + detail = getattr(state, "audit_detail", None) + if response.status_code >= 400: + detail = f"{detail};" if detail else "" + detail += f"HTTP {response.status_code}" + try: + with SessionLocal() as db: + write(db, user=user, request=request, status=response.status_code, + action=action, menu=menu, detail=detail, username=actor) + except Exception: # 审计绝不能把业务请求带崩 + pass + return response + + return audit diff --git a/app/constants.py b/app/constants.py index 201e856..f864191 100644 --- a/app/constants.py +++ b/app/constants.py @@ -36,6 +36,42 @@ LEDGER_CATEGORIES = [ "异常项目", ] +# -------------------------------------------------------------------------- +# 权限菜单目录(前后端共用:键是权限标识,顺序即权限管理页里的展示顺序) +# rw = 可编辑(含新增/修改/删除/导出写入口) +# ro = 只读(能看列表与详情,所有写接口一律 403) +# 没有这个菜单 = 侧栏看不到、接口也进不去 +# -------------------------------------------------------------------------- +MENUS = [ + ("board", "工作看板"), + ("projects", "自研产品"), + ("custom", "定制项目"), + ("focus", "每周工作"), + ("staff", "人力资源"), + ("intake", "更新录入"), + ("settings", "设置"), + ("rbac", "权限管理"), +] +MENU_KEYS = [k for k, _ in MENUS] +MENU_LABELS = dict(MENUS) +LEVELS = ("ro", "rw") +LEVEL_LABELS = {"rw": "可编辑", "ro": "只读", "": "无权限"} +# 多角色并集时比大小用 +LEVEL_RANK = {"": 0, "ro": 1, "rw": 2} + + +def merge_levels(*maps: dict) -> dict: + """把多张菜单权限表合成一张:同一菜单取更高级别。""" + out: dict[str, str] = {} + for m in maps: + for menu, level in (m or {}).items(): + if menu not in MENU_LABELS: + continue + if LEVEL_RANK.get(level, 0) > LEVEL_RANK.get(out.get(menu, ""), 0): + out[menu] = level + return out + + # -------------------------------------------------------------------------- # 定制项目(交付制,与平台产品类项目分开管理) # (code, 名称, 颜色, 收入确认基准比例) @@ -59,13 +95,20 @@ CUSTOM_STAGE_CODES = [c for c, _, _, _ in CUSTOM_STAGES] CUSTOM_STAGE_ORDER = {c: i for i, (c, _, _, _) in enumerate(CUSTOM_STAGES)} -def custom_revenue_ratio(stage: str, progress: float | None, manual_ratio=None) -> float: - """按阶段 + 开发进度计算收入确认比例(0~1)。""" +def custom_revenue_ratio(stage: str, progress: float | None, manual_ratio=None, + project_status: str | None = None) -> float: + """按阶段 + 开发进度计算收入确认比例(0~1)。 + + 手动比例 manual_ratio 优先;其次「退单」一律按 0 计(阶段虽落到 closed, + 但退单没有收入,不能让已关闭项目的基准比例把金额算进来)。 + """ if manual_ratio is not None: try: return max(0.0, min(1.0, float(manual_ratio))) except (TypeError, ValueError): pass + if (project_status or "").strip() == CUSTOM_NO_REVENUE_STATUS and manual_ratio is None: + return 0.0 base = CUSTOM_STAGE_MAP.get(stage, ("", "#94a3b8", 0.0))[2] if stage == "developing": p = float(progress or 0) @@ -405,3 +448,84 @@ def normalize_staff_affiliation(value: str | None) -> str | None: if a in v: return a return v + + +# -------------------------------------------------------------------------- +# 定制项目:项目状态(台账口径)→ 商务阶段(内部推导,不再单独维护) +# 界面上只有「项目状态」可编辑,商务阶段(含收入确认比例)由它推导, +# 避免出现两套状态互相打架。 +# -------------------------------------------------------------------------- +CUSTOM_STATUSES = ["待开发", "进行中", "交付完成", "已验收", "退单"] +CUSTOM_STATUS_STAGE = { + "待开发": "signed", + "进行中": "developing", + "交付完成": "delivered", + "已验收": "accepted", + "退单": "closed", +} +# 反向:AI 录入等只认阶段的入口,写回项目状态 +CUSTOM_STAGE_STATUS = { + "signed": "待开发", "developing": "进行中", "delivered": "交付完成", + "accepted": "已验收", "revenue": "已验收", "closed": "退单", + "paused": "进行中", "lead": "待开发", +} +# 退单不确认收入(阶段落到 closed,但比例按 0 处理) +CUSTOM_NO_REVENUE_STATUS = "退单" + +# 项目归属:前三项算「已下单」,提前交付是下单前状态 +CUSTOM_ORIGINS = ["华智下单", "存量项目", "汇智直签", "提前交付"] +CUSTOM_PLACED_ORIGINS = ("华智下单", "存量项目", "汇智直签") + +# 行业 / 风险值:台账里的下拉取值,前端一律从 /custom/meta 取,不再各写一份 +CUSTOM_INDUSTRIES = ["安平", "政府", "企业", "教育", "交通", "医疗", "高速", "行业", "其他"] +CUSTOM_RISKS = ["1.高风险", "2.低风险"] + + +def derive_stage(project_status: str | None, fallback: str | None = None) -> str: + """按项目状态推导商务阶段;状态没填时保留原阶段。""" + return CUSTOM_STATUS_STAGE.get((project_status or "").strip(), fallback or "signed") + + +# -------------------------------------------------------------------------- +# 年 / 季度:财务统计的时间归属只在这里判定一次(前端不再自己算季度) +# -------------------------------------------------------------------------- +def quarter_of_month(month: int) -> int: + """月份 1~12 → 季度 1~4。""" + return (int(month) - 1) // 3 + 1 + + +def parse_quarter(text) -> int | None: + """「Q3」/「q3」→ 3;其他写法一律不认(验收季度在界面上是下拉选项,脏文本不认才不会串统计)。""" + s = str(text or "").strip().upper() + if len(s) == 2 and s[0] == "Q" and s[1] in "1234": + return int(s[1]) + return None + + +def parse_year_month(text) -> tuple[int, int] | None: + """从「下单时间」这类可能带脏文本的字段里取 (年, 月);取不到月份时月份为 0。 + + 认:2026-03-31 / 2026/3/31 / 2026-3 / 2026年3月 / 2026年 / 2026。 + 「2024年3月前」这种能识别出 2024 年 3 月(前缀匹配),只用于年份归属。 + """ + import re + + s = str(text or "").strip() + if not s: + return None + m = re.search(r"(20\d{2})\s*[-/年.]\s*(\d{1,2})", s) + if m: + year, month = int(m.group(1)), int(m.group(2)) + return (year, month) if 1 <= month <= 12 else (year, 0) + m = re.search(r"(20\d{2})", s) + return (int(m.group(1)), 0) if m else None + + +def quarter_end(year: int, quarter: int) -> str: + """季度末日期(YYYY-MM-DD),用于按季度派生验收日期。""" + import calendar + import datetime + + last_month = int(quarter) * 3 + day = calendar.monthrange(int(year), last_month)[1] + return datetime.date(int(year), last_month, day).isoformat() diff --git a/app/finance.py b/app/finance.py new file mode 100644 index 0000000..6b09114 --- /dev/null +++ b/app/finance.py @@ -0,0 +1,264 @@ +"""定开项目财务口径:时间归属 + 季度 / 年度统计 + 年度计收目标。 + +历史数据有三个坑,统一在这里处理,前端只消费结果: + · `accept_date` 只写季度(Q1~Q4)没有年份,跨年就混在一起(2025Q3 和 2026Q3 + 都算「Q3」)→ 新增 `accept_year`,启动时按真实验收日期回填一次; + · `accept_date_real` 是当年导入脚本按「季度末」补的占位日期,不能当统计依据 → 停用; + · `sign_date` 存过自由文本(「2024年3月前」)→ 能识别出年份的才进年/季度口径。 + +统计周期以顶栏选中的周期为准:`period_id`(周)或 `year+month`(月), +由后端换算成所属「年份 + 季度」,切到历史周期看到的就还是那一年的数。 +""" +from __future__ import annotations + +import json +from datetime import date + +from sqlalchemy.orm import Session + +from .constants import ( + CUSTOM_ANNUAL_TARGETS_DEFAULT, + CUSTOM_PLACED_ORIGINS, + derive_stage, + parse_quarter, + parse_year_month, + quarter_end, + quarter_of_month, +) +from .models import CustomProject, Period, Setting, now + +__all__ = [ + "period_context", "accept_period", "sign_period", "accept_label", "is_placed", + "summary", "read_annual_targets", "write_annual_targets", "backfill", +] + + +# ---------------------------------------------------------------- 统计上下文 +def period_context(db: Session, period_id: int | None = None, + year: int | None = None, month: int | None = None) -> dict: + """把顶栏选中的周期换算成「年份 + 季度」,没选就取今天所在的年月。""" + label = "" + if period_id: + per = db.get(Period, period_id) + if per is not None: + year, month = per.year, per.month + label = per.full_label + if not year or not month: + today = date.today() + year = int(year) if year else today.year + month = int(month) if month else today.month + month = min(12, max(1, int(month))) + year = int(year) + q = quarter_of_month(month) + return { + "period_id": period_id, + "year": year, + "month": month, + "quarter": q, + "label": label or f"{year}年{month}月", + "quarter_label": f"{year}年Q{q}", + "quarter_start": f"{year}-{(q - 1) * 3 + 1:02d}-01", + "quarter_end": quarter_end(year, q), + } + + +# ---------------------------------------------------------------- 时间归属 +def is_placed(cp: CustomProject) -> bool: + """已下单 = 项目归属属于「华智下单 / 存量项目 / 汇智直签」。""" + return (cp.origin or "").strip() in CUSTOM_PLACED_ORIGINS + + +def sign_period(cp: CustomProject) -> tuple[int | None, int | None]: + """下单时间 → (年份, 季度);文本认不出年份时返回 (None, None)。""" + ym = parse_year_month(cp.sign_date) + if not ym: + return None, None + year, month = ym + return year, quarter_of_month(month) if month else None + + +def accept_period(cp: CustomProject) -> tuple[int | None, int | None]: + """验收时间 → (年份, 季度)。年份只认 `accept_year`(缺年度就按「未定」不计入任何年份)。 + + 刻意不看 `accept_date_real`:那是导入脚本按季度末补的占位日期, + 用它兜底会把「没填验收时间」的项目算进某一年,清掉年度也清不掉。 + 老数据的一次性补齐在 `backfill()` 里做。 + """ + return (cp.accept_year or None), parse_quarter(cp.accept_date) + + +def accept_label(cp: CustomProject) -> str: + """界面上的验收时间:「2026Q3」;缺什么显示什么,全空返回空串。""" + year, q = accept_period(cp) + if year and q: + return f"{year}Q{q}" + if q: + return f"Q{q}" + return str(year) if year else "" + + +# ---------------------------------------------------------------- 年度计收目标 +ANNUAL_TARGETS_PREFIX = "custom_annual_targets" + + +def _targets_key(year: int) -> str: + return f"{ANNUAL_TARGETS_PREFIX}:{year}" + + +def read_annual_targets(db: Session, year: int) -> dict[str, float]: + """按年取四个季度的计收目标(万元);没配过的年份用默认值。""" + row = db.get(Setting, _targets_key(year)) + # 没配过的年份用默认值;配过就以库里为准——在界面上清空某一季,读回来就得是 0 + saved = None + if row and row.value: + try: + parsed = json.loads(row.value) + saved = parsed if isinstance(parsed, dict) else None + except (TypeError, ValueError): + saved = None + if saved is None: + saved = {str(q): v for q, v in CUSTOM_ANNUAL_TARGETS_DEFAULT.items()} + targets: dict[str, float] = {} + for q in (1, 2, 3, 4): + v = saved.get(str(q)) + try: + targets[str(q)] = 0.0 if v in (None, "") else round(float(v), 2) + except (TypeError, ValueError): + targets[str(q)] = 0.0 + return targets + + +def write_annual_targets(db: Session, year: int, targets: dict) -> dict[str, float]: + clean: dict[str, float] = {} + for q in (1, 2, 3, 4): + v = (targets or {}).get(str(q)) + if v is None or v == "": + clean[str(q)] = 0.0 + continue + try: + clean[str(q)] = round(float(v), 2) + except (TypeError, ValueError): + raise ValueError(f"Q{q} 目标值不是数字") + value = json.dumps(clean, ensure_ascii=False) + row = db.get(Setting, _targets_key(year)) + if row: + row.value = value + else: + db.add(Setting(key=_targets_key(year), value=value)) + db.commit() + return clean + + +# ---------------------------------------------------------------- 统计 +def _sum(rows) -> float: + return round(sum(float(r.amount or 0) for r in rows), 2) + + +def summary(db: Session, ctx: dict) -> dict: + """定开财务汇总:KPI(当前季度 / 年度)+ 年度任务表(该年四个季度 + 未分季)。 + + 金额单位一律「元」,展示层再折算万元;目标值是「万元」。 + 「未分季」= 认得出年份、认不出季度(`sign_date` 只有「2024/」这类残缺值、 + 或只有 `accept_year` 没有 `accept_date`)的项目:它们计入年度, + 但不属于任何一季度,所以单列一行,保证「四季度 + 未分季 = 合计 = KPI 年度」。 + """ + year, q = ctx["year"], ctx["quarter"] + rows = db.query(CustomProject).filter(CustomProject.archived.is_(False)).all() + placed = [r for r in rows if is_placed(r)] + + def signed(yy, qq): + return [r for r in placed + if (sy := sign_period(r))[0] == yy and (qq is None or sy[1] == qq)] + + def accepted(yy, qq): + return [r for r in rows + if (ap := accept_period(r))[0] == yy and (qq is None or ap[1] == qq)] + + def kpi(items): + return {"count": len(items), "amount": _sum(items)} + + sign_q, sign_y = signed(year, q), signed(year, None) + acc_q, acc_y = accepted(year, q), accepted(year, None) + # 数据质量:识别不出下单年份 / 缺验收年份的项目,页面上给计数,不静默漏算 + sign_unknown = [r for r in placed if sign_period(r)[0] is None] + acc_no_year = [r for r in rows if accept_period(r)[1] and not accept_period(r)[0]] + # 有年份、无季度:计入年度,不进任何一季度 + sign_no_q = [r for r in placed if (sy := sign_period(r))[0] == year and sy[1] is None] + acc_no_q = [r for r in rows if (ap := accept_period(r))[0] == year and ap[1] is None] + + targets = read_annual_targets(db, year) + quarters = [] + for i in (1, 2, 3, 4): + acc, sgn = accepted(year, i), signed(year, i) + target = targets[str(i)] + amount = _sum(acc) + quarters.append({ + "q": i, + "target": target, # 万元 + "acc_count": len(acc), "acc_amount": amount, # 元 + "sign_count": len(sgn), "sign_amount": _sum(sgn), + "rate": round(amount / 10000 / target, 4) if target else None, + "current": i == q, + }) + return { + "context": ctx, + "kpi": { + "placed": kpi(placed), + "sign_quarter": kpi(sign_q), + "sign_year": kpi(sign_y), + "accept_quarter": kpi(acc_q), + "accept_year": kpi(acc_y), + "sign_unknown": len(sign_unknown), + "accept_no_year": len(acc_no_year), + "sign_no_quarter": len(sign_no_q), + "accept_no_quarter": len(acc_no_q), + }, + "annual": { + "year": year, + "targets": targets, + "quarters": quarters, + "unscheduled": { + "acc_count": len(acc_no_q), "acc_amount": _sum(acc_no_q), + "sign_count": len(sign_no_q), "sign_amount": _sum(sign_no_q), + }, + "total": { + "target": round(sum(t["target"] for t in quarters), 2), + "acc_count": sum(t["acc_count"] for t in quarters) + len(acc_no_q), + "acc_amount": round(sum(t["acc_amount"] for t in quarters) + _sum(acc_no_q), 2), + "sign_count": sum(t["sign_count"] for t in quarters) + len(sign_no_q), + "sign_amount": round(sum(t["sign_amount"] for t in quarters) + _sum(sign_no_q), 2), + }, + }, + "generated_at": now().isoformat(timespec="seconds"), + } + + +# ---------------------------------------------------------------- 老库回填 +def backfill(db: Session) -> list[str]: + """幂等回填:验收年份 + 由项目状态推导商务阶段。只在缺值 / 不一致时写。""" + notes: list[str] = [] + rows = db.query(CustomProject).all() + # 台账按年维护,缺年份的老行按库里出现过的最晚验收年份补(不随「今天」漂移) + known = [ym[0] for r in rows + if (ym := parse_year_month(r.accept_date_real)) and parse_quarter(r.accept_date)] + fallback = max(known) if known else None + years = stages = 0 + for r in rows: + if r.accept_year is None and parse_quarter(r.accept_date): + ym = parse_year_month(r.accept_date_real) + r.accept_year = ym[0] if ym else fallback + if r.accept_year: + years += 1 + status = (r.project_status or "").strip() + if status: + want = derive_stage(status, r.stage) + if r.stage != want: + r.stage = want + stages += 1 + if years or stages: + db.commit() + if years: + notes.append(f"已补齐定制项目验收年份 {years} 条") + if stages: + notes.append(f"已按项目状态推导商务阶段 {stages} 条") + return notes diff --git a/app/main.py b/app/main.py index 75c4fc8..f79b109 100644 --- a/app/main.py +++ b/app/main.py @@ -7,7 +7,7 @@ from fastapi.middleware.cors import CORSMiddleware from fastapi.responses import FileResponse from fastapi.staticfiles import StaticFiles -from . import config, security +from . import audit, config, finance, security from .db import Base, SessionLocal, engine from .routers import ai, auth, board, custom, export, focus, projects, rbac, staff, weekly from .schema_patch import ensure_columns @@ -17,10 +17,17 @@ _patch = ensure_columns(engine, Base.metadata) if _patch: print(f"[ok] 已补齐数据库字段:{', '.join(_patch)}") -# 内置角色 + 管理员账号(只在缺失时补,不会覆盖已改过的密码/权限) +# 权限模型升级(旧库的 roles.menus / users.role_id → role_menus / user_roles)+ 内置角色与管理员 +for _note in security.migrate_legacy_rbac(engine): + print(f"[ok] {_note}") with SessionLocal() as _db: for _note in security.ensure_seed(_db): print(f"[ok] {_note}") + security.purge_expired_sessions(_db) + audit.prune(_db) + # 定开财务口径回填(验收年份 / 由项目状态推导阶段),幂等 + for _note in finance.backfill(_db): + print(f"[ok] {_note}") # 每次进程启动换一个值;热加载重启后前端据此自动刷新 BOOT_ID = uuid.uuid4().hex @@ -36,6 +43,7 @@ app.add_middleware( # 所有 /api 接口先过 RBAC 总闸(登录 + 菜单权限),登录接口自身除外 api = FastAPI(title="DMS管理平台 API", dependencies=[Depends(security.guard)]) +api.middleware("http")(audit.audit_middleware_factory()) api.include_router(board.router, prefix="", tags=["board"]) api.include_router(projects.router, prefix="", tags=["projects"]) api.include_router(ai.router, prefix="", tags=["ai"]) diff --git a/app/models.py b/app/models.py index 74e95b1..7222ef1 100644 --- a/app/models.py +++ b/app/models.py @@ -22,6 +22,7 @@ from sqlalchemy import ( ) from sqlalchemy.orm import Mapped, mapped_column, relationship +from .constants import LEVEL_RANK, merge_levels from .db import Base @@ -208,6 +209,11 @@ class Period(Base): updates: Mapped[list["Update"]] = relationship(back_populates="period") + @property + def full_label(self) -> str: + """「2026年10月第2周」:label 只有「10月第2周」,跨年展示一律用这个。""" + return f"{self.year}年{self.month}月" + (f"第{self.week}周" if self.week else "") + def to_dict(self): return { "id": self.id, @@ -219,7 +225,7 @@ class Period(Base): "start_date": self.start_date, "end_date": self.end_date, "sort_key": self.sort_key, - "full_label": f"{self.year}年{self.month}月" + (f"第{self.week}周" if self.week else ""), + "full_label": self.full_label, } @@ -436,9 +442,11 @@ class CustomProject(Base, TimestampMixin): update_date: Mapped[str | None] = mapped_column( String(16), nullable=True, index=True ) # 更新时间 YYYY-MM-DD:该行数据最后一次变动的日期,用于按周查看变化 + # 验收年份:accept_date 只有季度(Q1~Q4),跨统计年度时必须靠它区分 2025Q3 与 2026Q3 + accept_year: Mapped[int | None] = mapped_column(Integer, nullable=True, index=True) accept_date_real: Mapped[str | None] = mapped_column( String(16), nullable=True, index=True - ) # 验收日期 YYYY-MM-DD(真实日期):与 accept_date(季度文本)区分,用于「本月/本年验收」统计 + ) # 已停用:早期导入脚本按季度末补的占位日期。验收时间统一看 accept_year + accept_date updates: Mapped[list["CustomUpdate"]] = relationship( back_populates="project", cascade="all, delete-orphan" @@ -446,8 +454,11 @@ class CustomProject(Base, TimestampMixin): def to_dict(self, with_revenue: bool = True): from .constants import custom_revenue_ratio + from .finance import accept_label - ratio = custom_revenue_ratio(self.stage, self.progress, self.manual_ratio) + ratio = custom_revenue_ratio( + self.stage, self.progress, self.manual_ratio, self.project_status + ) data = { "id": self.id, "name": self.name, @@ -484,6 +495,8 @@ class CustomProject(Base, TimestampMixin): "risk_level": self.risk_level, "update_date": self.update_date, "accept_date_real": self.accept_date_real, + "accept_year": self.accept_year, + "accept_label": accept_label(self), "update_count": len(self.updates), "updated_at": self.updated_at.isoformat(timespec="seconds") if self.updated_at else None, } @@ -620,29 +633,26 @@ class ImportLog(Base): # ---------------------------------------------------------------------- 权限 +# 三层模型:用户 ←(多对多)→ 角色 ←(一对多)→ 菜单授权 +# user_roles :一个用户可以挂多个角色,权限取并集(同一菜单取更高级别) +# role_menus :角色的菜单授权矩阵,一行 = 一个菜单一个级别(rw / ro) +# audit_logs :写操作与登录行为的审计流水 class Role(Base, TimestampMixin): - """角色 = 一组功能菜单权限。 - - menus 存 JSON 文本:{"board":"rw","projects":"ro"}, - 键是菜单标识(见 security.MENUS),值 rw=可编辑 / ro=只读;没有这个键就是看不到该菜单。 - """ + """角色 = 一组菜单授权(rw 可编辑 / ro 只读 / 没有这一行就是看不到)。""" __tablename__ = "roles" id: Mapped[int] = mapped_column(Integer, primary_key=True) name: Mapped[str] = mapped_column(String(64), unique=True, nullable=False) description: Mapped[str | None] = mapped_column(String(255), nullable=True) - menus: Mapped[str | None] = mapped_column(Text, nullable=True) is_builtin: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False) + grants: Mapped[list["RoleMenu"]] = relationship( + back_populates="role", cascade="all, delete-orphan", lazy="selectin" + ) + def menu_map(self) -> dict: - if not self.menus: - return {} - try: - data = json.loads(self.menus) - except ValueError: - return {} - return data if isinstance(data, dict) else {} + return {g.menu: g.level for g in self.grants if g.level} def to_dict(self): return { @@ -655,8 +665,27 @@ class Role(Base, TimestampMixin): } +class RoleMenu(Base): + """角色对某个菜单的授权级别。级别只有 rw / ro,表里没有这一行就是无权限。""" + + __tablename__ = "role_menus" + + role_id: Mapped[int] = mapped_column( + Integer, ForeignKey("roles.id", ondelete="CASCADE"), primary_key=True + ) + menu: Mapped[str] = mapped_column(String(32), primary_key=True) + level: Mapped[str] = mapped_column(String(8), nullable=False) + created_at: Mapped[datetime] = mapped_column(DateTime, default=now, nullable=False) + + role: Mapped["Role"] = relationship(back_populates="grants") + + class User(Base, TimestampMixin): - """登录用户。密码只存 pbkdf2 派生值 + 盐,不存明文。""" + """登录用户。密码只存 pbkdf2 派生值 + 盐,不存明文。 + + 角色是多对多:`user.roles`。`menus` 是所有角色授权的并集, + 同一个菜单被多个角色命中时取更高级别(rw > ro)。 + """ __tablename__ = "users" @@ -665,23 +694,28 @@ class User(Base, TimestampMixin): username: Mapped[str] = mapped_column(String(64), unique=True, nullable=False) password_hash: Mapped[str] = mapped_column(String(128), nullable=False) password_salt: Mapped[str] = mapped_column(String(64), nullable=False) - role_id: Mapped[int | None] = mapped_column(Integer, ForeignKey("roles.id", ondelete="SET NULL"), nullable=True) active: Mapped[bool] = mapped_column(Boolean, default=True, nullable=False) last_login_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True) - role: Mapped[Role | None] = relationship("Role", lazy="joined") + roles: Mapped[list["Role"]] = relationship( + "Role", secondary="user_roles", lazy="selectin", order_by="Role.id" + ) @property def menus(self) -> dict: - return self.role.menu_map() if self.role else {} + return merge_levels(*[r.menu_map() for r in self.roles]) + + @property + def role_names(self) -> list[str]: + return [r.name for r in self.roles] def to_dict(self): return { "id": self.id, "name": self.name, "username": self.username, - "role_id": self.role_id, - "role_name": self.role.name if self.role else None, + "role_ids": [r.id for r in self.roles], + "role_names": self.role_names, "menus": self.menus, "active": self.active, "last_login_at": self.last_login_at.isoformat(timespec="seconds") if self.last_login_at else None, @@ -689,8 +723,22 @@ class User(Base, TimestampMixin): } +class UserRole(Base): + """用户与角色的关联(多角色)。""" + + __tablename__ = "user_roles" + + user_id: Mapped[int] = mapped_column( + Integer, ForeignKey("users.id", ondelete="CASCADE"), primary_key=True + ) + role_id: Mapped[int] = mapped_column( + Integer, ForeignKey("roles.id", ondelete="CASCADE"), primary_key=True + ) + created_at: Mapped[datetime] = mapped_column(DateTime, default=now, nullable=False) + + class UserSession(Base): - """登录会话。退出登录 / 禁用用户时删掉对应 token 即可立即失效。""" + """登录会话。退出登录 / 禁用用户 / 改密时删掉对应 token 即可立即失效。""" __tablename__ = "user_sessions" @@ -698,3 +746,46 @@ class UserSession(Base): user_id: Mapped[int] = mapped_column(Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False) created_at: Mapped[datetime] = mapped_column(DateTime, default=now, nullable=False) expires_at: Mapped[datetime] = mapped_column(DateTime, nullable=False) + ip: Mapped[str | None] = mapped_column(String(64), nullable=True) + user_agent: Mapped[str | None] = mapped_column(String(128), nullable=True) + + def to_dict(self): + return { + "token_hint": self.token[:6] + "…", + "created_at": self.created_at.isoformat(timespec="seconds") if self.created_at else None, + "expires_at": self.expires_at.isoformat(timespec="seconds") if self.expires_at else None, + "ip": self.ip, + "user_agent": self.user_agent, + } + + +class AuditLog(Base): + """操作审计:所有写操作 + 登录/退出,成功失败都留痕。""" + + __tablename__ = "audit_logs" + + id: Mapped[int] = mapped_column(Integer, primary_key=True) + user_id: Mapped[int | None] = mapped_column(Integer, nullable=True, index=True) + username: Mapped[str | None] = mapped_column(String(64), nullable=True, index=True) + action: Mapped[str] = mapped_column(String(16), nullable=False, index=True) # create/update/delete/login/logout/deny + menu: Mapped[str | None] = mapped_column(String(32), nullable=True, index=True) + method: Mapped[str] = mapped_column(String(8), nullable=False) + path: Mapped[str] = mapped_column(String(255), nullable=False) + status: Mapped[int] = mapped_column(Integer, nullable=False) + ip: Mapped[str | None] = mapped_column(String(64), nullable=True) + detail: Mapped[str | None] = mapped_column(String(255), nullable=True) + created_at: Mapped[datetime] = mapped_column(DateTime, default=now, nullable=False, index=True) + + def to_dict(self): + return { + "id": self.id, + "user_id": self.user_id, + "username": self.username, + "action": self.action, + "menu": self.menu, + "method": self.method, + "path": self.path, + "status": self.status, + "detail": self.detail, + "created_at": self.created_at.isoformat(timespec="seconds") if self.created_at else None, + } diff --git a/app/routers/__pycache__/__init__.cpython-313.pyc b/app/routers/__pycache__/__init__.cpython-313.pyc deleted file mode 100644 index 8561a91a35cccdcd2443cd71c01d2c626d7410cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmey&%ge<81hX=hWP#|%AOZ#$p^VQgK*m&tbOudEzm*I{OhDdekkl<}{m|mnqGJ85 z%$&?p{qX#v?BIgLKECATGCUyV- diff --git a/app/routers/__pycache__/ai.cpython-313.pyc b/app/routers/__pycache__/ai.cpython-313.pyc deleted file mode 100644 index f0a31ae5cedf2ab2e742ac81d1533399be7ab657..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7711 zcmcIJZEPDycC+Mi`Av}`Me#$nWLuU@Cl+Hnk}TC9kz>mi6)QfjnD|bv30kCWD$`)en~#mW+-*2C+8`I-bXBA zsX-K>Fx5i(xj%{FFRalxX>O$T}1VM#^bNe6nV3lD1~{N$;55NDz>VtHos)(> ze5*PVqjr@i6VD+OL(#G<)~!Gzgg~XmsLpbq)5rAc%A^gUk+SX~&^cD8LZzsfz7@rE zDrDjtlKqdkf)}>uCse2bhPGUqm5#=+SlHX`Wzvbo1}O{NZ1GzWRfQf4=bW z!(|XN%_SyMA+xLpabrR-X5b+k-pr@)6`8q^9tR!59x`UlaH)6($2oY*`b07*8!n9J z`AZ>M)+Nu&mTXBU;_0MpQ~LzFOl5f@^cHAxXE+A>#fQhzUcbQ8dnGbgXVF4(q+w$`Gp^~bM& zboS=im9xd2eS+<%Xd5cph6LN`5)NnM!r7v8_jF%*gSoxe2FfU|MHHNpweAT}fhNsB zZdfs)QB7rG+yp;G<$tBP#Su-#&p4y&;Rp_BAXvh$s@7Rn5l#p5L`YRlQ}GtSK-E-U zO=W9iP>tqQibb4$1dOWGq7JoJd2c6F68=}Ub*2XEW4b7Wi0TIT!7Md;37kGkRII8g za1`w0t(t&OR@Y<514pvQIVMI&{WT!;EK*Oz8DoYR6Enu>b@T!CKwt3bm8uC5KCGh? zP6Bj31D>Tjm{t<#ly}H5Boo)nhQSvh42~G#5P7tbM>}~Caq&cvi5ZiI zo8dz?X)$9znS&qyPw<#RpF6fLU~xxhaYyIMWwCp(*gYsXUYR-}?duWuy$pZT(b?B# zUc27Ea6)X_Q*7GviM`|Jo~i!N13MPOAA}`SooMnEO}_iS=4s=s?GJ5B(fhuw(~QzR zDw!-&op<)TGv9q|Wr9qRZk+0$+qvdIbq%v)Gh+*ZrD4Ibd+Nj*gIo=g%PYA9QoZl~ zuJBy<{E@mP_rkO%@+^p=PXK57*;wGwP_J_1+ zodn0#f?hxz4dz!PQnCg$QdO@BBhCOnCT37wzzHe|k!(bZX0_c07+(!%0(91J9h=a^ zs5EUdZ~U5hlR960Cf3YaqKzuAEALJA(Qcg8c*5H4p?U_~$~W0TyTw-HdDafVOJ9X{ zwa40f&mfcld9!wKiH=P;j-ml|Mdi)b^;p6AQc>czs#;9rb_tYi zn{$&hZL;PW{Nc7`S$B^fR@K%PEyDtBp`u|GSLLnl3-h(5<59Ww6sH@W zC7pH9;AsH6h4m^HK`t&P^@It?KVl}ao`+Z>(A^p{aI}veZB_22|mr@H<_>HU%{(vx?e5$(uvG5#|Al>H^|9ck<TMIJP0ZHC_MThEwiOKK93W8CF|rN_S9n8@Wzy@A zV`7&w10@hB+R5e=m!C*s*g!V$Ih@X7k_%&!kYjS)R9K3M(qp3Iq#~0^-Xc_o_mQ==Qa_^FI6{_Fc}&bsHW2CZvOb-BTc*mHB~65&Fq$XF zQZmEJqm(0(x?*|LZvza`7yf6Udz&YT_pSB!9KnT`?{4c999?%!U6Q?SW40*RJEr>Y zTU}+aeS%~EUDN&tcF*j&nRB9j+X9~Imu&U3k(tQcWx>`g+IBAOn>sEzoKq*hv^wwE z>ZQi5^OJ>1$=fuaE~F(-Q1rAGJ*|=_Fdr#I7On`Mkkk;I|4!jMOBSKwImzvx?=AE$ zToT;vqWi$|A;>D{1BJjs|6=4uWa+Zd6c(F0SM~|6F41*(wN>&4=f?_TOWuzHHv`MB z2-|wZZAVt4g7+oSd-BdPDY$*{;EjXJFABkM;l-6RQbUv2u(Q~(Q>ypR?J#QLv)6g@U%fH4;>VoyF_Ql z^3iF-J#X`pLG-rG^iRJmc^c-A7mhEqy?09V>|Z)3x_gW6Ucr5Eb$E63uKTFy9=^j( zAA8`epEnguA9~(%eCBE_ct4~U>u%I7ci-;4)m!v+{!Q-huKeYdJI9LMCk5BQXRf9~ z@VzZ-Mr3#Ww*`58_Zovsmp_`kIk`#~8&A#A5@2Hr%v|oejdTI=b;|}q+LxlDyQApt z5Zo__?sIqCKc{}?`{o&*>%1>b=n``I;7uH;huCWifOkB>4l2 z4L2GyNk0Fg;f7%$E%w^QU zIjOmA@tqs*Ea!yg{e|4BPx7~j{!q~$lDu2yCkhjf{dSjQx^JxsfyzQTvQ#Z}&koHD zE$kI-TON0##`d*dWOBSad3ADbw_w~-G=}a4Tb8`bmg2VkLhwZ~*t1Ga8$U7mB%@t{ z+9eu;MPpF%H!qoBt7+pk#{-&qxBqJYJ(H_Sk-b|$;6-oSJ>Zt*1Itp^s-fsREV+F1 zO@$^^yX;1@<=1*Mlsi1gV0?Gr>cAfiLan6E4TTa?AQ9ZHpN3u#+9pfK>q zgSQ%s?!AwVG^vx&2Ie>a#URfkuMW0o**To>Zzoy?1=l9pD z)2n-Ki1U>guZI{<4TVf4Z?5=glM?UZ=da*FpiQQeDSlKojHls$DNt-5A20c98lQt% z#a~0n&0OYX3TwsnlD9R2wDG@)v05jZrdqX+kWI(=$jpw8Tg~Y zo1UVz?JnK+n}4;oDGKn9+x>lqX*iA&M@T_Q38#~mG?#06r)3EKVW8A4CoK@e$^$Zk zQ@K3mCLO0s|2HU)hv-sBBE_HzK6R87+%}97c0fde3yHROXp3x#$1mgodnz8s$F_nL0D3=47&SroEq*97WBrM$yh@5UArO;TCpy?p& zlOInV#uG3_EQMc!$C{p^s9&J%zeLtAQD+f#LjNK1{Q@<9h7SE3I`kQO?mx`+-w#eP zzh>-|bFBsGOz#G-2B${^%KvG&YvrwvzxNgLP|OoO(goIZ&|B+JVa^Iv;M2VaR=t1S x{1y5ZRRRjG=}33&l8%4{t_G$f0@Wz_gSWa@x;{Sg71B}d1ex!#4tmN7{ud_7RuKRI diff --git a/app/routers/__pycache__/auth.cpython-313.pyc b/app/routers/__pycache__/auth.cpython-313.pyc deleted file mode 100644 index 0e3f8da683ecd03966b48c07f40e3785c98a83c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5614 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 diff --git a/app/routers/__pycache__/board.cpython-313.pyc b/app/routers/__pycache__/board.cpython-313.pyc deleted file mode 100644 index 3e1626cc2e27854aa187b4e21f30f6281311b1dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27723 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 diff --git a/app/routers/__pycache__/custom.cpython-313.pyc b/app/routers/__pycache__/custom.cpython-313.pyc deleted file mode 100644 index b15675079813bc5640c2c99dedc9eb953d5efa31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 46166 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

?>ckW*shCd;gVx{f}4%P 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 K(!@=7*#19mT(w^S diff --git a/app/routers/__pycache__/export.cpython-313.pyc b/app/routers/__pycache__/export.cpython-313.pyc deleted file mode 100644 index 257e635526c6e739e629633a3716b0ba1eb285b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20222 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 diff --git a/app/routers/__pycache__/focus.cpython-312.pyc b/app/routers/__pycache__/focus.cpython-312.pyc deleted file mode 100644 index 0e9843953ab051553b92dee1f548e5c1667cb1c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9206 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 QM?sb%J@b$?O0nhs2M82M761SM diff --git a/app/routers/__pycache__/focus.cpython-313.pyc b/app/routers/__pycache__/focus.cpython-313.pyc deleted file mode 100644 index a620997e731408b2f00c72936167822c94ff5a0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8682 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 SL64TLK|Kq9P(X{?>i+ diff --git a/app/routers/__pycache__/projects.cpython-313.pyc b/app/routers/__pycache__/projects.cpython-313.pyc deleted file mode 100644 index ccb59281bfb56bad9b742a798acb5ce28b3e945d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24853 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 diff --git a/app/routers/__pycache__/staff.cpython-313.pyc b/app/routers/__pycache__/staff.cpython-313.pyc deleted file mode 100644 index 077361072182dfd0606824e37b7e3ab7b4e8822b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17188 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 diff --git a/app/routers/__pycache__/weekly.cpython-313.pyc b/app/routers/__pycache__/weekly.cpython-313.pyc deleted file mode 100644 index 7eba17591343c0cbaff25e60e1b7784ad766ac49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17647 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 diff --git a/app/routers/ai.py b/app/routers/ai.py index b555b8a..dde97f0 100644 --- a/app/routers/ai.py +++ b/app/routers/ai.py @@ -13,7 +13,9 @@ from ..schemas import AICommitIn, AIParseIn router = APIRouter() -def _resolve_project(db: Session, project_id: int | None, project_name: str | None) -> Project | None: +def _resolve_project(db: Session, project_id: int | None, project_name: str | None, + *, create: bool = False) -> Project | None: + """按 id 或名称取项目。只有确认写入时才允许按名称新建,预览整理不碰库。""" if project_id: p = db.get(Project, project_id) if not p: @@ -21,7 +23,7 @@ def _resolve_project(db: Session, project_id: int | None, project_name: str | No return p if project_name: p = db.query(Project).filter(Project.name == project_name).one_or_none() - if not p: + if not p and create: p = Project(name=project_name) db.add(p) db.flush() @@ -31,8 +33,11 @@ def _resolve_project(db: Session, project_id: int | None, project_name: str | No @router.post("/ai/parse") def ai_parse(payload: AIParseIn, db: Session = Depends(get_db)): + """整理预览:只读。写了新项目名也不会建项目,确认写入时才建。""" project = _resolve_project(db, payload.project_id, payload.project_name) period = db.get(Period, payload.period_id) if payload.period_id else None + if payload.period_id and not period: + raise HTTPException(404, "周期不存在") parsed, mode, error = ai_parser.parse( payload.raw_text, @@ -55,7 +60,7 @@ def ai_parse(payload: AIParseIn, db: Session = Depends(get_db)): @router.post("/ai/commit") def ai_commit(payload: AICommitIn, db: Session = Depends(get_db)): - project = _resolve_project(db, payload.project_id, payload.project_name) + project = _resolve_project(db, payload.project_id, payload.project_name, create=True) if not project: raise HTTPException(400, "缺少项目信息") period = db.get(Period, payload.period_id) @@ -136,9 +141,3 @@ def ai_commit(payload: AICommitIn, db: Session = Depends(get_db)): "project": project.to_dict(), "created": [u.to_dict() for u in created], } - - -@router.get("/ai/logs") -def ai_logs(limit: int = 20, db: Session = Depends(get_db)): - rows = db.query(ImportLog).order_by(ImportLog.id.desc()).limit(limit).all() - return [r.to_dict() for r in rows] diff --git a/app/routers/auth.py b/app/routers/auth.py index 4b6bae0..6242353 100644 --- a/app/routers/auth.py +++ b/app/routers/auth.py @@ -1,25 +1,68 @@ -"""登录 / 退出 / 当前用户 / 用户自己的设置(昵称、密码)。""" +"""登录 / 退出 / 当前用户 / 自己的设置(昵称、密码)。 + +登录失败按「账号 + IP」限流:连错 5 次锁 5 分钟,成功一次即清零。 +进程内计数,重启即复位——防的是脚本撞库,不追求分布式精确。 +""" from __future__ import annotations +import time +from collections import defaultdict, deque + from fastapi import APIRouter, Depends, HTTPException, Request, Response from sqlalchemy.orm import Session -from .. import config, security +from .. import audit, config, security from ..db import get_db from ..models import User from ..schemas import LoginIn, PasswordIn, ProfileIn router = APIRouter() +MAX_FAILS = 5 +LOCK_SECONDS = 300 +_failures: dict[str, deque] = defaultdict(deque) + + +def _throttle_key(request: Request, username: str) -> str: + return f"{audit.client_ip(request) or '?'}|{username}" + + +def _check_lock(key: str) -> None: + now = time.time() + hits = _failures[key] + while hits and now - hits[0] > LOCK_SECONDS: + hits.popleft() + if len(hits) >= MAX_FAILS: + wait = int(LOCK_SECONDS - (now - hits[0])) + 1 + raise HTTPException(status_code=429, detail=f"密码连续输错 {MAX_FAILS} 次,请 {wait} 秒后再试") + + +def _mark_fail(key: str) -> None: + _failures[key].append(time.time()) + + +def _clear_fail(key: str) -> None: + _failures.pop(key, None) + @router.post("/auth/login") -def login(body: LoginIn, response: Response, db: Session = Depends(get_db)): - user = db.query(User).filter(User.username == (body.username or "").strip()).one_or_none() +def login(body: LoginIn, request: Request, response: Response, db: Session = Depends(get_db)): + username = (body.username or "").strip() + key = _throttle_key(request, username) + _check_lock(key) + user = db.query(User).filter(User.username == username).one_or_none() if user is None or not security.verify_password(body.password or "", user.password_hash, user.password_salt): + _mark_fail(key) + audit.note(request, f"登录失败:{username}", username=username or None) raise HTTPException(status_code=401, detail="用户名或密码不正确") if not user.active: + audit.note(request, f"账号已停用:{username}", username=username or None) raise HTTPException(status_code=403, detail="该账号已被停用,请联系管理员") - token = security.start_session(db, user) + _clear_fail(key) + token = security.start_session( + db, user, ip=audit.client_ip(request), user_agent=request.headers.get("user-agent") + ) + request.state.user = user response.set_cookie( security.SESSION_COOKIE, token, max_age=config.SESSION_DAYS * 86400, @@ -32,6 +75,7 @@ def login(body: LoginIn, response: Response, db: Session = Depends(get_db)): def logout(request: Request, response: Response, db: Session = Depends(get_db)): token = request.cookies.get(security.SESSION_COOKIE) if token: + request.state.user = security.user_from_token(db, token) db.query(security.UserSession).filter(security.UserSession.token == token).delete() db.commit() response.delete_cookie(security.SESSION_COOKIE, path="/") @@ -61,12 +105,11 @@ def change_password(body: PasswordIn, request: Request, response: Response, new = (body.new_password or "").strip() if len(new) < 6: raise HTTPException(status_code=400, detail="新密码至少 6 位") + if new == (body.old_password or ""): + raise HTTPException(status_code=400, detail="新密码不能与原密码相同") user.password_hash, user.password_salt = security.hash_password(new) + audit.note(request, "修改自己的密码") # 改密后其余设备全部下线,只保留当前这次登录 keep = request.cookies.get(security.SESSION_COOKIE) - query = db.query(security.UserSession).filter(security.UserSession.user_id == user.id) - if keep: - query = query.filter(security.UserSession.token != keep) - query.delete(synchronize_session=False) - db.commit() + security.revoke_all(db, user.id, keep_token=keep) return {"ok": True} diff --git a/app/routers/board.py b/app/routers/board.py index 95ed04d..fdc984f 100644 --- a/app/routers/board.py +++ b/app/routers/board.py @@ -1,10 +1,9 @@ from __future__ import annotations -from collections import defaultdict from datetime import date from typing import Iterable -from fastapi import APIRouter, Depends, HTTPException, Query +from fastapi import APIRouter, Depends, HTTPException from pydantic import BaseModel from sqlalchemy import func from sqlalchemy.orm import Session @@ -12,7 +11,7 @@ from sqlalchemy.orm import Session from .. import constants from ..constants import parse_period_label from ..db import get_db -from ..models import Period, Project, Task, Update +from ..models import Period, Project, Update router = APIRouter() @@ -204,292 +203,3 @@ def meta(db: Session = Depends(get_db)): "has_key": bool((s.get("ai_api_key") or "").strip()), }, } - - -# ---------------------------------------------------------------- 看板 -@router.get("/board") -def board( - period_id: int | None = None, - year: int | None = None, - month: int | None = None, - category_id: int | None = None, - key_only: bool = False, - keyword: str | None = None, - idle: str = Query("key", pattern="^(none|key|all)$"), - db: Session = Depends(get_db), -): - period_ids = resolve_period_ids(db, period_id, year, month) - if not period_ids: - return {"period_ids": [], "periods": [], "rows": [], "stats": None} - - periods = ( - db.query(Period).filter(Period.id.in_(period_ids)).order_by(Period.sort_key).all() - ) - - q = db.query(Project).filter(Project.archived.is_(False)) - if category_id: - q = q.filter(Project.category_id == category_id) - if key_only: - q = q.filter(Project.is_key.is_(True)) - if keyword: - q = q.filter(Project.name.contains(keyword)) - projects = q.order_by(Project.is_key.desc(), Project.sort_order, Project.id).all() - - ups = ( - db.query(Update) - .filter(Update.period_id.in_(period_ids)) - .order_by(Update.id) - .all() - ) - by_project: dict[int, list[Update]] = defaultdict(list) - for u in ups: - by_project[u.project_id].append(u) - - tasks = ( - db.query(Task) - .filter(Task.project_id.in_([p.id for p in projects])) - .order_by(Task.sort_order, Task.id) - .all() - ) - tasks_by_project: dict[int, list[Task]] = defaultdict(list) - for t in tasks: - tasks_by_project[t.project_id].append(t) - - rows = [] - for p in projects: - items = by_project.get(p.id, []) - if not items: - if idle == "none" or (idle == "key" and not p.is_key): - continue - - task_cards = [] - used_task_ids = set() - for t in tasks_by_project.get(p.id, []): - t_ups = [u for u in items if u.task_id == t.id] - for u in t_ups: - used_task_ids.add(u.id) - task_cards.append( - { - "task": t.to_dict(), - "updates": [u.to_dict() for u in t_ups], - } - ) - other_ups = [u for u in items if u.id not in used_task_ids] - - progresses = [u.progress for u in items if u.progress is not None] - if progresses: - progress, progress_known = round(max(progresses), 1), True - else: - progress, progress_known = round(p.progress or 0, 1), bool(items) - status = worst_status([u.status for u in items]) if items else p.status - - rows.append( - { - "project": p.to_dict(), - "progress": progress, - "progress_known": progress_known, - "status": status, - "update_count": len(items), - "summary": next((u.summary for u in items if u.summary), None) - or (items[-1].content or "")[:80] - if items - else None, - "has_update": bool(items), - "risks": [u.risk for u in items if u.risk], - "task_cards": task_cards, - "other_updates": [u.to_dict() for u in other_ups], - "updates": [u.to_dict() for u in items], - } - ) - - rows.sort( - key=lambda r: ( - not r["project"]["is_key"], - r["status"] != "blocked", - r["status"] != "at_risk", - not r["has_update"], - -(r["progress"] or 0), - ) - ) - - return { - "period_ids": period_ids, - "periods": [p.to_dict() for p in periods], - "rows": rows, - "stats": _quick_stats(db, period_ids, rows), - } - - -def _quick_stats(db: Session, period_ids: list[int], rows: list[dict]) -> dict: - updates = db.query(Update).filter(Update.period_id.in_(period_ids)).all() - by_status: dict[str, int] = defaultdict(int) - for u in updates: - by_status[u.status] += 1 - active = [r for r in rows if r["has_update"]] - progresses = [r["progress"] for r in active if r["progress"]] - return { - "project_total": len(rows), - "project_active": len(active), - "project_idle": len(rows) - len(active), - "key_total": sum(1 for r in rows if r["project"]["is_key"]), - "key_updated": sum(1 for r in active if r["project"]["is_key"]), - "update_count": len(updates), - "avg_progress": round(sum(progresses) / len(progresses), 1) if progresses else 0, - "status_counts": {k: by_status.get(k, 0) for k, _, _ in constants.STATUSES}, - } - - -# ---------------------------------------------------------------- 统计面板 -@router.get("/stats") -def stats( - period_id: int | None = None, - year: int | None = None, - month: int | None = None, - db: Session = Depends(get_db), -): - period_ids = resolve_period_ids(db, period_id, year, month) - periods = ( - db.query(Period).filter(Period.id.in_(period_ids)).order_by(Period.sort_key).all() - if period_ids - else [] - ) - scope_label = ( - "、".join(p.label for p in periods[:3]) + ("…" if len(periods) > 3 else "") - if periods - else (f"{year}年{month}月" if year and month else "—") - ) - - updates = ( - db.query(Update).filter(Update.period_id.in_(period_ids)).all() if period_ids else [] - ) - projects = db.query(Project).filter(Project.archived.is_(False)).all() - - # 全量:每个周期的更新量 / 覆盖项目数 / 平均进度(趋势图) - trend_rows = ( - db.query( - Period.id, - Period.label, - Period.sort_key, - Period.year, - Period.month, - Period.week, - func.count(Update.id), - ) - .outerjoin(Update, Update.period_id == Period.id) - .group_by(Period.id) - .order_by(Period.sort_key) - .all() - ) - trend = [ - { - "period_id": r[0], - "label": r[1], - "sort_key": r[2], - "year": r[3], - "month": r[4], - "week": r[5], - "update_count": r[6], - } - for r in trend_rows - ] - - # 分类分布 - cat_counter: dict[int, int] = defaultdict(int) - for p in projects: - cat_counter[p.category_id or 0] += 1 - cat_names = {} - for p in projects: - if p.category_id: - cat_names[p.category_id] = (p.category.name, p.category.color) - category_dist = [] - for cid, cnt in sorted(cat_counter.items(), key=lambda x: -x[1]): - name, color = cat_names.get(cid, ("未分类", "#94a3b8")) - category_dist.append({"id": cid, "name": name, "color": color, "count": cnt}) - - # 状态分布(本周期) - status_dist = [] - for code, name, color in constants.STATUSES: - status_dist.append( - { - "code": code, - "name": name, - "color": color, - "count": sum(1 for u in updates if u.status == code), - } - ) - - # 风险清单 - risks = [ - u.to_dict(with_project=True) - for u in updates - if u.status in constants.NEGATIVE_STATUS or (u.risk or "").strip() - ] - - # 重点工作未更新 - updated_ids = {u.project_id for u in updates} - idle_key = [ - p.to_dict() for p in projects if p.is_key and p.id not in updated_ids - ] - - # 进度排行 - prog_rows = [] - for p in projects: - p_ups = [u for u in updates if u.project_id == p.id] - prs = [u.progress for u in p_ups if u.progress is not None] - prog = max(prs) if prs else p.progress - prog_rows.append( - { - "id": p.id, - "name": p.name, - "progress": round(prog or 0, 1), - "is_key": p.is_key, - "status": worst_status([u.status for u in p_ups]) if p_ups else p.status, - "color": (p.category.color if p.category else "#2563eb"), - "estimated": not prs, - } - ) - prog_rows.sort(key=lambda x: (-x["progress"], x["name"])) - top_progress = [r for r in prog_rows if r["id"] in updated_ids][:10] or prog_rows[:10] - low_progress = [ - r - for r in prog_rows - if r["progress"] < 30 and r["status"] not in ("done",) and r["id"] in updated_ids - ][:8] - - recent = ( - db.query(Update) - .filter(Update.period_id.in_(period_ids)) - .order_by(Update.id.desc()) - .limit(10) - .all() - if period_ids - else [] - ) - - covered_prog = [p["progress"] for p in prog_rows if p["id"] in updated_ids] - return { - "scope_label": scope_label, - "period_ids": period_ids, - "kpi": { - "project_total": len(projects), - "key_total": sum(1 for p in projects if p.is_key), - "update_count": len(updates), - "covered_projects": len(updated_ids), - "risk_count": len(risks), - # 风险 / 阻塞分开计数:at_risk=风险、blocked=阻塞 - "at_risk_count": sum(1 for u in updates if u.status == "at_risk"), - "blocked_count": sum(1 for u in updates if u.status == "blocked"), - # 平均进度只统计本周期有更新的项目,避免历史一次性事项拉低数值 - "avg_progress": round(sum(covered_prog) / len(covered_prog), 1) - if covered_prog - else 0, - }, - "trend": trend[-14:], - "category_dist": category_dist, - "status_dist": status_dist, - "risks": risks, - "idle_key": idle_key, - "top_progress": top_progress, - "low_progress": low_progress, - "recent_updates": [u.to_dict(with_project=True) for u in recent], - } diff --git a/app/routers/custom.py b/app/routers/custom.py index f0c39e4..c35f3e6 100644 --- a/app/routers/custom.py +++ b/app/routers/custom.py @@ -1,31 +1,38 @@ """定制项目 API(独立于通用项目体系)。 -关注:商务阶段流转 与 按进度确认收入。 +三条口径要记住: + · **项目状态**(待开发/进行中/交付完成/已验收/退单)是界面上唯一可编辑的状态, + 商务阶段 `stage`(含收入确认比例)由它推导,不再单独维护; + · 财务统计(下单 / 验收按年按季度)统一走 `app/finance.py`,本文件不自己算季度; + · 周期记录里的 `amount_delta`(本期新增下单)与 `revenue_delta`(本期新增计收) + 都是增量:写入时累加进项目台账,改了就按差额回补,删了就扣回。 """ from __future__ import annotations import json -from collections import defaultdict -from datetime import date, datetime, timedelta +from datetime import date, datetime from fastapi import APIRouter, Depends, HTTPException, Query from pydantic import BaseModel -from sqlalchemy import func from sqlalchemy.orm import Session -from .. import ai_parser +from .. import ai_parser, finance from ..constants import ( - CUSTOM_ANNUAL_TARGETS_DEFAULT, + CUSTOM_INDUSTRIES, + CUSTOM_ORIGINS, CUSTOM_PIPELINE, - CUSTOM_STAGES, - CUSTOM_STAGE_MAP, - CUSTOM_STAGE_ORDER, + CUSTOM_STAGE_STATUS, + CUSTOM_STATUSES, CUSTOM_STEP_AGING_DAYS, - custom_revenue_ratio, + CUSTOM_PLACED_ORIGINS, + CUSTOM_RISKS, + CUSTOM_STAGES, + derive_stage, normalize_region, + parse_quarter, ) from ..db import get_db -from ..models import CustomProject, CustomUpdate, ImportLog, Period, Setting, set_people +from ..models import CustomProject, CustomUpdate, ImportLog, Period, set_people from .board import resolve_period_ids router = APIRouter() @@ -61,7 +68,7 @@ class CustomProjectIn(BaseModel): project_status: str | None = None accept_plan: str | None = None risk_level: str | None = None - accept_date_real: str | None = None # 验收日期(真实日期,区别于 accept_date 季度文本) + accept_year: int | None = None # 验收年度(accept_date 只有季度,跨年靠它区分) class CustomParseIn(BaseModel): @@ -82,24 +89,37 @@ class CustomCommitIn(BaseModel): model: str | None = None -def _ratio(cp: CustomProject) -> float: - return custom_revenue_ratio(cp.stage, cp.progress, cp.manual_ratio) +def _sync_stage(cp: CustomProject, stage_hint: str | None = None) -> None: + """把项目状态翻译成商务阶段(唯一的写入口,别处不要再直接改 stage)。 + + 只给了阶段、没给状态的入口(AI 录入 / 老接口)先反推出状态,保证台账上只有一个状态字段。 + """ + status = (cp.project_status or "").strip() + if not status and stage_hint: + status = CUSTOM_STAGE_STATUS.get(stage_hint, "") + cp.project_status = status or None + if status and status not in CUSTOM_STATUSES: + raise HTTPException(400, f"项目状态「{status}」不在取值范围内") + cp.stage = derive_stage(status, cp.stage) -# 环节日期字段 → 该环节对应的阶段 -_STEP_DATE_STAGE = {field: stage for _k, _n, field, stage, _c in CUSTOM_PIPELINE} +def _sync_accept(cp: CustomProject, payload: dict) -> None: + """验收时间 = 年度 + 季度 一对,要填就两个都填,清空就一起清空。 - -def _advance_stage(cp: CustomProject, payload: dict): - """补录了某个环节的日期,就把商务阶段推进到那一环(只进不退,暂停/关闭不动)。""" - if cp.stage in ("paused", "closed"): + 只留季度没年度正是「跨季度统计串年」的根源,所以宁可报错也不猜年份。 + """ + if "accept_date" not in payload and "accept_year" not in payload: return - target = cp.stage - for field, stage in _STEP_DATE_STAGE.items(): - if field in payload and str(payload.get(field) or "").strip(): - if CUSTOM_STAGE_ORDER.get(stage, 0) > CUSTOM_STAGE_ORDER.get(target, 0): - target = stage - cp.stage = target + quarter = parse_quarter(cp.accept_date) + if not quarter: + if cp.accept_year: + raise HTTPException(400, "验收时间要填完整:选了年度就别留季度为空") + cp.accept_date = None + cp.accept_year = None + return + cp.accept_date = f"Q{quarter}" + if not cp.accept_year: + raise HTTPException(400, "验收时间要填完整:请先选验收年度") def _entry_key(cp: CustomProject) -> str: @@ -122,11 +142,16 @@ def _sort_by_update(projects): return sorted(projects, key=key, reverse=True) -def _week_range(today: date | None = None) -> tuple[date, date]: - """当前自然周(周一~周日)。""" - t = today or date.today() - start = t - timedelta(days=t.weekday()) - return start, start + timedelta(days=6) +def _add_delta(cp: CustomProject, field: str, delta) -> None: + """本期新增量累加进项目台账(下单金额 / 计收金额同一套口径)。""" + if delta: + setattr(cp, field, max(0.0, float(getattr(cp, field) or 0.0) + float(delta))) + + +def _rebase_delta(cp: CustomProject, field: str, prev, new) -> None: + """把「本期新增量」改成另一个值:主档按差额回补,保证台账始终等于各期之和。""" + if prev or new: + setattr(cp, field, max(0.0, float(getattr(cp, field) or 0.0) - float(prev or 0) + float(new or 0))) def _unique_name(db: Session, name: str, exclude_id: int | None = None): @@ -138,67 +163,28 @@ def _unique_name(db: Session, name: str, exclude_id: int | None = None): raise HTTPException(400, f"已存在同名定制项目「{name}」,请换个名称") -# ---------------------------------------------------------------- 元信息 # ---------------------------------------------------------------- 年度计收目标 -# 目标值按「年 + 季度」存在 settings 里(一页一套),没配过就用《年度任务.xlsx》的默认值。 -ANNUAL_TARGETS_PREFIX = "custom_annual_targets" - - -def _annual_targets_key(year: int) -> str: - return f"{ANNUAL_TARGETS_PREFIX}:{year}" - - -def read_annual_targets(db: Session, year: int) -> dict[str, float]: - row = db.get(Setting, _annual_targets_key(year)) - targets = dict(CUSTOM_ANNUAL_TARGETS_DEFAULT) - if row and row.value: - try: - saved = json.loads(row.value) - except (TypeError, ValueError): - saved = {} - for q in (1, 2, 3, 4): - v = saved.get(str(q)) - if v is not None and v != "": - try: - targets[q] = float(v) - except (TypeError, ValueError): - pass - return {str(q): targets[q] for q in (1, 2, 3, 4)} +# 目标值按「年」存在 settings 里(一年一套),读写口径都在 finance 里。 class AnnualTargetsIn(BaseModel): year: int - targets: dict[str, float | None] + targets: dict # 值交给 finance 校验:非数字要报「Q几 目标值不是数字」,不是 422 @router.get("/custom/annual-targets") def get_annual_targets(year: int | None = None, db: Session = Depends(get_db)): y = year or date.today().year - return {"year": y, "targets": read_annual_targets(db, y)} + return {"year": y, "targets": finance.read_annual_targets(db, y)} @router.put("/custom/annual-targets") def put_annual_targets(payload: AnnualTargetsIn, db: Session = Depends(get_db)): - y = payload.year - targets = dict(CUSTOM_ANNUAL_TARGETS_DEFAULT) - for q in (1, 2, 3, 4): - v = payload.targets.get(str(q)) - if v is None or v == "": - targets[q] = 0.0 - continue - try: - targets[q] = float(v) - except (TypeError, ValueError): - raise HTTPException(400, f"Q{q} 目标值不是数字") - value = json.dumps({str(q): targets[q] for q in (1, 2, 3, 4)}, ensure_ascii=False) - key = _annual_targets_key(y) - row = db.get(Setting, key) - if row: - row.value = value - else: - db.add(Setting(key=key, value=value)) - db.commit() - return {"year": y, "targets": {str(q): targets[q] for q in (1, 2, 3, 4)}} + try: + targets = finance.write_annual_targets(db, payload.year, payload.targets) + except ValueError as exc: + raise HTTPException(400, str(exc)) + return {"year": payload.year, "targets": targets} @router.get("/custom/meta") @@ -229,8 +215,13 @@ def custom_meta(db: Session = Depends(get_db)): for k, n, f, st, col in CUSTOM_PIPELINE ], "aging_days": CUSTOM_STEP_AGING_DAYS, - # 年度计收目标(万元):默认取《年度任务.xlsx》,页面改过则以库里的值为准 - "annual_targets": {"year": date.today().year, "targets": read_annual_targets(db, date.today().year)}, + # 下拉选项的唯一来源:前端不再各写一份,避免前后端取值不一致 + "statuses": CUSTOM_STATUSES, + "origins": CUSTOM_ORIGINS, + # 「已下单」的归属取值:财务口径与前端「已下单」筛选共用同一份 + "placed_origins": list(CUSTOM_PLACED_ORIGINS), + "industries": CUSTOM_INDUSTRIES, + "risks": CUSTOM_RISKS, } @@ -281,6 +272,8 @@ def create_custom_project(payload: CustomProjectIn, db: Session = Depends(get_db _unique_name(db, name) cp = CustomProject(**data, source="manual") set_people(cp, None, payload.members) + _sync_stage(cp, stage_hint=payload.stage) + _sync_accept(cp, {"accept_date": cp.accept_date, "accept_year": cp.accept_year}) db.add(cp) db.commit() db.refresh(cp) @@ -321,14 +314,15 @@ def patch_custom_project(cid: int, payload: dict, db: Session = Depends(get_db)) cp = db.get(CustomProject, cid) if not cp: raise HTTPException(404, "定制项目不存在") + # 商务阶段 stage 不在白名单里:它由 project_status 推导,接口层面改不了 allowed = ( - "name", "customer", "region", "amount", "stage", "progress", "manual_ratio", + "name", "customer", "region", "amount", "progress", "manual_ratio", "revenue_amount", "invoice_amount", "received_amount", "owner", - "entry_date", "sign_date", "deliver_date", "accept_date", "revenue_date", - "remark", "is_key", "archived", "period_id", + "entry_date", "sign_date", "deliver_date", "accept_date", "accept_year", + "revenue_date", "remark", "is_key", "archived", "period_id", # 市场/销售侧台账字段 "origin", "project_code", "office", "industry", "man_days", - "market_owner", "project_status", "accept_plan", "risk_level", "accept_date_real", + "market_owner", "project_status", "accept_plan", "risk_level", ) payload = payload or {} if "name" in payload: @@ -348,7 +342,8 @@ def patch_custom_project(cid: int, payload: dict, db: Session = Depends(get_db)) setattr(cp, k, v) # 团队成员:名单型字段,整体替换(不传即不改);负责人只有单人,走上面的 owner set_people(cp, None, payload.get("members")) - _advance_stage(cp, payload) + _sync_stage(cp) + _sync_accept(cp, payload) # 「更新时间」= 本次提交时间:台账字段有变化时刷新,便于按周查看最新改动 if changed: cp.update_date = datetime.now().strftime("%Y-%m-%d %H:%M") @@ -369,250 +364,43 @@ def delete_custom_project(cid: int, db: Session = Depends(get_db)): return {"ok": True, "name": name, "deleted_updates": n_upd} -# ---------------------------------------------------------------- 按周删除 -def _week_filtered(db: Session): - """本周(周一~周日)有「更新时间」的定制项目。""" - start, end = _week_range() - rows = ( - db.query(CustomProject) - .filter( - CustomProject.update_date.isnot(None), - CustomProject.update_date >= start.isoformat(), - CustomProject.update_date <= end.isoformat(), - ) - .all() - ) - return start, end, rows - - -@router.get("/custom/weekly-preview") -def weekly_preview(db: Session = Depends(get_db)): - """本周有更新的项目清单(供「删除本周更新」二次确认)。""" - start, end, rows = _week_filtered(db) - return { - "start": start.isoformat(), - "end": end.isoformat(), - "count": len(rows), - "amount": round(sum(r.amount or 0 for r in rows), 2), - "names": [r.name for r in rows[:60]], - } - - -@router.post("/custom/purge-week") -def purge_week(db: Session = Depends(get_db)): - """删除本周(周一~周日)更新的定制项目,连带其记录。破坏性操作,前端须二次确认。""" - start, end, rows = _week_filtered(db) - names = [r.name for r in rows] - for r in rows: - db.delete(r) # custom_updates 走 relationship cascade="all, delete-orphan" - db.commit() - return { - "deleted": len(names), - "start": start.isoformat(), - "end": end.isoformat(), - "names": names, - } - - -# ---------------------------------------------------------------- 阶段看板 -@router.get("/custom/board") -def custom_board( +# ---------------------------------------------------------------- 财务统计 +@router.get("/custom/finance") +def custom_finance( period_id: int | None = None, year: int | None = None, month: int | None = None, - region: str | None = None, - keyword: str | None = None, db: Session = Depends(get_db), ): - period_ids = resolve_period_ids(db, period_id, year, month) - periods = ( - db.query(Period).filter(Period.id.in_(period_ids)).order_by(Period.sort_key).all() - if period_ids - else [] - ) + """定开财务汇总:KPI + 年度任务表。 - q = db.query(CustomProject).filter(CustomProject.archived.is_(False)) - if region: - q = q.filter(CustomProject.region == region) - if keyword: - q = q.filter(CustomProject.name.contains(keyword)) - projects = _sort_by_entry(q.all()) - - # 本期有记录的项目 - ups = ( - db.query(CustomUpdate) - .filter(CustomUpdate.period_id.in_(period_ids)) - .all() - if period_ids - else [] - ) - by_project: dict[int, list[CustomUpdate]] = defaultdict(list) - for u in ups: - by_project[u.custom_project_id].append(u) - updated_ids = set(by_project.keys()) - - columns = [] - for code, name, color, _base in CUSTOM_STAGES: - bucket = _sort_by_entry([c for c in projects if c.stage == code]) - columns.append( - { - "code": code, - "name": name, - "color": color, - "count": len(bucket), - "amount": round(sum(c.amount or 0 for c in bucket), 2), - "projects": [c.to_dict() for c in bucket], - "updated_count": sum(1 for c in bucket if c.id in updated_ids), - } - ) - - return { - "period_ids": period_ids, - "periods": [p.to_dict() for p in periods], - "columns": columns, - "updated_ids": sorted(updated_ids), - } - - -# ---------------------------------------------------------------- 收入统计 -@router.get("/custom/stats") -def custom_stats( - period_id: int | None = None, - year: int | None = None, - month: int | None = None, - region: str | None = None, - keyword: str | None = None, - archived: str = Query("false", pattern="^(true|false|all)$"), - db: Session = Depends(get_db), -): - period_ids = resolve_period_ids(db, period_id, year, month) - periods = ( - db.query(Period).filter(Period.id.in_(period_ids)).order_by(Period.sort_key).all() - if period_ids - else [] - ) - scope_label = ( - "、".join(p.label for p in periods[:3]) + ("…" if len(periods) > 3 else "") - if periods - else (f"{year}年{month}月" if year and month else "—") - ) - - pq = db.query(CustomProject) - if archived == "false": - pq = pq.filter(CustomProject.archived.is_(False)) - elif archived == "true": - pq = pq.filter(CustomProject.archived.is_(True)) - if region: - pq = pq.filter(CustomProject.region == region) - if keyword: - pq = pq.filter(CustomProject.name.contains(keyword)) - projects = pq.all() - - amount_total = sum(c.amount or 0 for c in projects) - revenue_total = sum(c.revenue_amount or 0 for c in projects) - confirmed_total = sum((c.amount or 0) * _ratio(c) for c in projects) - invoice_total = sum(c.invoice_amount or 0 for c in projects) - received_total = sum(c.received_amount or 0 for c in projects) - - # 按阶段 - stage_agg: dict[str, dict] = { - c: {"code": c, "name": n, "color": col, "count": 0, "amount": 0.0, "confirmed": 0.0} - for c, n, col, _ in CUSTOM_STAGES - } - for c in projects: - agg = stage_agg.setdefault( - c.stage, - {"code": c.stage, "name": c.stage, "color": "#94a3b8", "count": 0, "amount": 0.0, "confirmed": 0.0}, - ) - agg["count"] += 1 - agg["amount"] += c.amount or 0 - agg["confirmed"] += (c.amount or 0) * _ratio(c) - - # 按区域 - region_agg: dict[str, dict] = defaultdict(lambda: {"count": 0, "amount": 0.0, "confirmed": 0.0, "revenue": 0.0}) - for c in projects: - r = region_agg[c.region or "未标注"] - r["count"] += 1 - r["amount"] += c.amount or 0 - r["confirmed"] += (c.amount or 0) * _ratio(c) - r["revenue"] += c.revenue_amount or 0 - - by_region = [ - {"name": k, **{kk: round(vv, 2) for kk, vv in v.items() if kk != "count"}, "count": v["count"]} - for k, v in sorted(region_agg.items(), key=lambda x: -x[1]["amount"]) - ] - - # 各周期:更新项目数 / 新增计收 - trend_rows = ( - db.query( - Period.id, Period.label, Period.sort_key, Period.year, Period.month, Period.week, - func.count(CustomUpdate.id), - ) - .outerjoin(CustomUpdate, CustomUpdate.period_id == Period.id) - .group_by(Period.id) - .order_by(Period.sort_key) - .all() - ) - trend = [ - { - "period_id": r[0], "label": r[1], "sort_key": r[2], "year": r[3], - "month": r[4], "week": r[5], "update_count": r[6], - } - for r in trend_rows - ] - - ups_in_scope = ( - db.query(CustomUpdate).filter(CustomUpdate.period_id.in_(period_ids)).all() if period_ids else [] - ) - period_revenue = sum(u.revenue_delta or 0 for u in ups_in_scope) - period_amount = sum(u.amount_delta or 0 for u in ups_in_scope) - - top = sorted(projects, key=lambda c: -(c.amount or 0))[:12] - recently_stage_changed = sorted( - [c for c in projects if c.period_id in period_ids], - key=lambda c: CUSTOM_STAGE_ORDER.get(c.stage, 99), - )[:10] - - return { - "scope_label": scope_label, - "period_ids": period_ids, - "kpi": { - "project_count": len(projects), - "key_count": sum(1 for c in projects if c.is_key), - "amount_total": round(amount_total, 2), - "revenue_total": round(revenue_total, 2), - "confirmed_total": round(confirmed_total, 2), - "pending_total": round(max(0.0, confirmed_total - revenue_total), 2), - "progress_rate": round(confirmed_total / amount_total * 100, 1) if amount_total else 0, - "revenue_rate": round(revenue_total / amount_total * 100, 1) if amount_total else 0, - "invoice_total": round(invoice_total, 2), - "received_total": round(received_total, 2), - "pending_invoice": round(max(0.0, amount_total - invoice_total), 2), - "pending_received": round(max(0.0, amount_total - received_total), 2), - "received_rate": round(received_total / amount_total * 100, 1) if amount_total else 0, - "period_revenue": round(period_revenue, 2), - "period_amount": round(period_amount, 2), - "period_updated": len({u.custom_project_id for u in ups_in_scope}), - }, - "by_stage": [stage_agg[c] for c, _, _, _ in CUSTOM_STAGES if stage_agg[c]["count"]], - "by_region": by_region, - "trend": trend[-14:], - "top_projects": [c.to_dict() for c in top], - "recent_changes": [c.to_dict() for c in recently_stage_changed], - "recent_updates": [u.to_dict() for u in sorted(ups_in_scope, key=lambda x: -x.id)[:10]], - } + 统计周期跟着顶栏走(period_id = 周,year+month = 月,都不传 = 今天), + 年份 / 季度由后端判定,前端只负责摆数字,切到历史周期也只看那一年。 + """ + ctx = finance.period_context(db, period_id=period_id, year=year, month=month) + return finance.summary(db, ctx) # ---------------------------------------------------------------- 执行记录 @router.post("/custom/updates") def create_custom_update(payload: dict, db: Session = Depends(get_db)): - cp = db.get(CustomProject, payload.get("custom_project_id")) + payload = payload or {} + cid, pid = payload.get("custom_project_id"), payload.get("period_id") + cp = db.get(CustomProject, cid) if cid else None if not cp: raise HTTPException(404, "定制项目不存在") + if not pid or not db.get(Period, pid): + raise HTTPException(400, "请选择记录所属周期") + # 先把项目状态 / 进度按本次记录更新,再取推导出的阶段存进记录,历史轨迹才对得上 + if payload.get("project_status") is not None: + cp.project_status = (payload["project_status"] or "").strip() or None + if payload.get("progress") is not None: + cp.progress = float(payload["progress"]) + _sync_stage(cp, stage_hint=payload.get("stage")) u = CustomUpdate( custom_project_id=payload["custom_project_id"], period_id=payload["period_id"], - stage=payload.get("stage") or cp.stage, + stage=cp.stage, content=payload.get("content"), summary=payload.get("summary"), progress=payload.get("progress"), @@ -626,12 +414,8 @@ def create_custom_update(payload: dict, db: Session = Depends(get_db)): model=payload.get("model"), ) db.add(u) - if payload.get("progress") is not None: - cp.progress = float(payload["progress"]) - if payload.get("stage"): - cp.stage = payload["stage"] - if payload.get("revenue_delta"): - cp.revenue_amount = (cp.revenue_amount or 0) + float(payload["revenue_delta"]) + _add_delta(cp, "amount", payload.get("amount_delta")) + _add_delta(cp, "revenue_amount", payload.get("revenue_delta")) cp.period_id = payload["period_id"] db.commit() db.refresh(u) @@ -642,14 +426,15 @@ def create_custom_update(payload: dict, db: Session = Depends(get_db)): def patch_custom_update(uid: int, payload: dict, db: Session = Depends(get_db)): """修改单条定制周期记录。 - 金额/计收是「本期新增量」,改了要按差额回补项目累计值;进度与阶段直接覆盖项目档案。 + 金额/计收是「本期新增量」,改了要按差额回补项目累计值;进度与项目状态覆盖项目档案 + (商务阶段跟着项目状态走,不单独改)。 """ u = db.get(CustomUpdate, uid) if not u: raise HTTPException(404, "记录不存在") cp = db.get(CustomProject, u.custom_project_id) - prev_revenue = u.revenue_delta or 0.0 - for k in ("content", "summary", "risk", "next_step", "owner", "stage"): + prev_revenue, prev_amount = u.revenue_delta or 0.0, u.amount_delta or 0.0 + for k in ("content", "summary", "risk", "next_step", "owner"): if k in payload: setattr(u, k, payload[k] or None) for k in ("progress", "amount_delta", "revenue_delta"): @@ -659,14 +444,21 @@ def patch_custom_update(uid: int, payload: dict, db: Session = Depends(get_db)): if "period_id" in payload: if not payload["period_id"]: raise HTTPException(400, "周期不能为空") + if not db.get(Period, int(payload["period_id"])): + raise HTTPException(404, "周期不存在,请重新选择周期") u.period_id = int(payload["period_id"]) if payload.get("progress") is not None and cp: cp.progress = float(payload["progress"]) - if payload.get("stage") and cp: - cp.stage = payload["stage"] - # 「本期新增计收」是增量:改了就按差额回补项目累计计收,保持台账对得上 + if cp and ("project_status" in payload or payload.get("stage")): + if "project_status" in payload: + cp.project_status = (payload["project_status"] or "").strip() or None + _sync_stage(cp, stage_hint=payload.get("stage")) + u.stage = cp.stage # 记录里的阶段与档案保持一致 + # 「本期新增」都是增量:改了就按差额回补主档,保持台账与各期记录对得上 if cp and "revenue_delta" in payload: - cp.revenue_amount = max(0.0, (cp.revenue_amount or 0.0) - prev_revenue + (u.revenue_delta or 0.0)) + _rebase_delta(cp, "revenue_amount", prev_revenue, u.revenue_delta) + if cp and "amount_delta" in payload: + _rebase_delta(cp, "amount", prev_amount, u.amount_delta) db.commit() db.refresh(u) return u.to_dict() @@ -677,10 +469,11 @@ def delete_custom_update(uid: int, db: Session = Depends(get_db)): u = db.get(CustomUpdate, uid) if not u: raise HTTPException(404, "记录不存在") - # 「本期新增计收」是加进项目累计值的增量,删记录要一并扣回,否则台账对不上 + # 「本期新增」是加进项目累计值的增量,删记录要一并扣回,否则台账对不上 cp = db.get(CustomProject, u.custom_project_id) - if cp and u.revenue_delta: - cp.revenue_amount = max(0.0, (cp.revenue_amount or 0.0) - float(u.revenue_delta)) + if cp: + _rebase_delta(cp, "revenue_amount", u.revenue_delta, 0) + _rebase_delta(cp, "amount", u.amount_delta, 0) db.delete(u) db.commit() return {"ok": True} @@ -764,17 +557,20 @@ def custom_ai_commit(payload: CustomCommitIn, db: Session = Depends(get_db)): db.add(u) created.append(u) - # 回写项目主档 - if p.get("stage"): - cp.stage = p["stage"] + # 回写项目主档:AI 识别出的是阶段,落到台账上写的是项目状态 + _sync_stage(cp, stage_hint=p.get("stage")) if p.get("progress") is not None: cp.progress = float(p["progress"]) + add_amount = sum(float(it.get("amount_delta") or 0) for it in items) + add_revenue = sum(float(it.get("revenue_delta") or 0) for it in items) if p.get("amount") is not None: cp.amount = float(p["amount"]) + elif add_amount: + cp.amount = max(0.0, float(cp.amount or 0.0) + add_amount) if p.get("revenue_amount") is not None: cp.revenue_amount = float(p["revenue_amount"]) - elif p.get("revenue_delta"): - cp.revenue_amount = (cp.revenue_amount or 0) + float(p["revenue_delta"]) + elif add_revenue: + cp.revenue_amount = max(0.0, float(cp.revenue_amount or 0.0) + add_revenue) if p.get("summary"): cp.remark = p["summary"] cp.period_id = period.id diff --git a/app/routers/export.py b/app/routers/export.py index 088a7f4..d111f3b 100644 --- a/app/routers/export.py +++ b/app/routers/export.py @@ -1,6 +1,6 @@ """数据导出(Excel / xlsx)。 -提供四类导出,均可带上页面当前的筛选条件: +提供六类导出,均可带上页面当前的筛选条件: - /export/custom 定制项目明细 - /export/custom-updates 定制项目周期记录 - /export/projects 常规项目管理 @@ -14,6 +14,7 @@ from fastapi import APIRouter, Depends, Query from fastapi.responses import Response from sqlalchemy.orm import Session +from .. import finance from ..constants import CUSTOM_STAGE_MAP, STATUS_MAP from ..db import get_db from ..export import build_xlsx, xlsx_response @@ -93,7 +94,7 @@ def export_custom( c.amount if c.amount is not None else "", c.market_owner or "", c.project_status or "", - c.accept_date or "", + finance.accept_label(c), c.accept_plan or "", c.risk_level or "", (c.remark or "").replace("\n", " "), diff --git a/app/routers/focus.py b/app/routers/focus.py index 4d78a12..a42be46 100644 --- a/app/routers/focus.py +++ b/app/routers/focus.py @@ -146,4 +146,4 @@ def delete_focus(fid: int, db: Session = Depends(get_db)): content = item.content db.delete(item) db.commit() - return {"id": fid, "content": content} + return {"ok": True, "id": fid, "content": content} # 与其它删除接口保持一致 diff --git a/app/routers/projects.py b/app/routers/projects.py index 5cebb72..1f78dd3 100644 --- a/app/routers/projects.py +++ b/app/routers/projects.py @@ -18,6 +18,7 @@ from ..models import ( people_like, set_people, ) +from .. import constants from ..schemas import ( CategoryIn, ProjectIn, @@ -317,14 +318,20 @@ def delete_tag(tid: int, db: Session = Depends(get_db)): def list_updates( project_id: int | None = None, period_id: int | None = None, + year: int | None = None, + month: int | None = None, limit: int = Query(50, le=500), db: Session = Depends(get_db), ): + """执行记录。周期口径与项目清单一致:period_id 或 year+month(月粒度含该月各周)。""" q = db.query(Update) if project_id: q = q.filter(Update.project_id == project_id) - if period_id: - q = q.filter(Update.period_id == period_id) + if period_id or (year and month): + ids = resolve_period_ids(db, period_id, year, month) + if not ids: # 该周期/该月还没有任何周 + return [] + q = q.filter(Update.period_id.in_(ids)) rows = q.order_by(Update.id.desc()).limit(limit).all() return [u.to_dict(with_project=True) for u in rows] @@ -344,9 +351,13 @@ def create_update(payload: UpdateIn, db: Session = Depends(get_db)): db.add(t) db.flush() data["task_id"] = t.id + p = _require_project(db, payload.project_id) + _require_period(db, payload.period_id) + _check_status(payload.status) + if not (payload.content or "").strip() and not (payload.summary or "").strip(): + raise HTTPException(400, "请填写执行情况内容") u = Update(**data) db.add(u) - p = db.get(Project, payload.project_id) if p and data.get("progress") is not None: p.progress = float(data["progress"]) db.commit() @@ -354,6 +365,25 @@ def create_update(payload: UpdateIn, db: Session = Depends(get_db)): return u.to_dict() +def _require_project(db: Session, pid: int) -> Project: + p = db.get(Project, pid) + if not p: + raise HTTPException(404, "项目不存在") + return p + + +def _require_period(db: Session, period_id: int) -> Period: + p = db.get(Period, period_id) + if not p: + raise HTTPException(404, "周期不存在,请重新选择周期") + return p + + +def _check_status(status: str | None): + if status and status not in constants.STATUS_CODES: + raise HTTPException(400, "状态不认识:" + status) + + @router.patch("/updates/{uid}") def patch_update(uid: int, payload: UpdatePatch, db: Session = Depends(get_db)): """修改单条执行记录;改了进度就同步项目档案,与新建时的口径一致。""" @@ -373,8 +403,11 @@ def patch_update(uid: int, payload: UpdatePatch, db: Session = Depends(get_db)): db.add(t) db.flush() data["task_id"] = t.id - if "period_id" in data and not data["period_id"]: - raise HTTPException(400, "周期不能为空") + if "period_id" in data: + if not data["period_id"]: + raise HTTPException(400, "周期不能为空") + _require_period(db, data["period_id"]) + _check_status(data.get("status")) for k, v in data.items(): setattr(u, k, v) if data.get("progress") is not None: @@ -398,7 +431,18 @@ def delete_update(uid: int, db: Session = Depends(get_db)): @router.post("/tasks") def create_task(payload: dict, db: Session = Depends(get_db)): - t = Task(project_id=payload["project_id"], name=payload["name"]) + """新增子任务。同名子任务直接复用,避免任务列表里出现重复条目。""" + pid = payload.get("project_id") + project = db.get(Project, pid) if pid else None + if project is None: + raise HTTPException(404, "项目不存在") + name = str(payload.get("name") or "").strip() + if not name: + raise HTTPException(400, "子任务名称不能为空") + existed = db.query(Task).filter(Task.project_id == project.id, Task.name == name).one_or_none() + if existed: + return existed.to_dict() + t = Task(project_id=project.id, name=name) db.add(t) db.commit() db.refresh(t) diff --git a/app/routers/rbac.py b/app/routers/rbac.py index eaba248..5ebdb44 100644 --- a/app/routers/rbac.py +++ b/app/routers/rbac.py @@ -1,57 +1,138 @@ -"""权限管理:角色(菜单权限矩阵)与用户(分配角色 / 启停 / 重置密码)。 +"""权限管理:角色(菜单授权矩阵)、用户(挂角色 / 启停 / 重置密码)、在线会话、操作日志。 -只有拿到「权限管理」菜单授权的用户能进(写操作还要 rw),由 security.guard 拦。 +进入这一页需要「权限管理」授权,写操作还要 rw,由 security.guard 拦。 +两条自我保护规则: + · 内置「管理员」角色永远保留权限管理授权,也删不掉; + · 不让最后一个可管理权限的账号被停用 / 删除 / 降权。 """ from __future__ import annotations -from fastapi import APIRouter, Depends, HTTPException +from fastapi import APIRouter, Depends, HTTPException, Query, Request from sqlalchemy.orm import Session -from .. import security +from .. import audit, security +from ..constants import LEVELS, LEVEL_RANK, MENU_KEYS, MENU_LABELS, LEVEL_LABELS, merge_levels from ..db import get_db -from ..models import Role, User +from ..models import AuditLog, Role, RoleMenu, User, UserRole, UserSession from ..schemas import RoleIn, RolePatch, UserIn, UserPatch router = APIRouter() +ADMIN_ROLE = "管理员" + +def _role_menus(db: Session, role_id: int) -> dict[str, str]: + return {g.menu: g.level for g in db.query(RoleMenu).filter(RoleMenu.role_id == role_id).all()} + + +def _set_role_menus(db: Session, role: Role, menus: dict) -> None: + """整体替换角色的菜单授权(矩阵里改一格也是整行覆盖)。""" + clean = security.normalize_menus(menus) + if role.is_builtin and role.name == ADMIN_ROLE: + clean["rbac"] = "rw" # 管理员不能被自己关在门外 + # 逐条 ORM 删除后再插:批量 delete() 会把旧对象留在 identity map 里, + # 主键相同时 SQLAlchemy 会告警,甚至让随后的读取拿到改之前的旧级别 + for row in db.query(RoleMenu).filter(RoleMenu.role_id == role.id).all(): + db.delete(row) + db.flush() + for menu, level in clean.items(): + db.add(RoleMenu(role_id=role.id, menu=menu, level=level)) + db.commit() + + +def _set_user_roles(db: Session, user: User, role_ids: list[int]) -> None: + ids = sorted({int(r) for r in role_ids if r}) + for rid in ids: + if db.get(Role, rid) is None: + raise HTTPException(status_code=400, detail="角色不存在") + # 同 _set_role_menus:先 ORM 删除再插入,避免主键冲突的旧对象残留在 identity map + for row in db.query(UserRole).filter(UserRole.user_id == user.id).all(): + db.delete(row) + db.flush() + for rid in ids: + db.add(UserRole(user_id=user.id, role_id=rid)) + db.commit() + + +def _menus_of_role_ids(db: Session, role_ids) -> dict[str, str]: + """预判:这几个角色挂上去之后用户会拿到什么权限(用于改角色前的自我保护判断)。""" + maps = [] + for rid in {int(r) for r in role_ids if r}: + role = db.get(Role, rid) + if role is not None: + maps.append(_role_menus(db, role.id)) + return merge_levels(*maps) + + +def _rbac_managers(db: Session, exclude_id: int | None = None) -> int: + """还有几个可用账号拥有「权限管理 · 可编辑」。""" + n = 0 + for u in db.query(User).filter(User.active.is_(True)).all(): + if exclude_id is not None and u.id == exclude_id: + continue + if u.menus.get("rbac") == "rw": + n += 1 + return n + + +def _effective_role_ids(user: User, role_ids) -> list[int]: + """没传角色 = 保持原样;传了 = 整体替换。""" + return [int(r) for r in role_ids] if role_ids is not None else [r.id for r in user.roles] + + +# ---------------------------------------------------------------------- 元信息 @router.get("/rbac/meta") def meta(): return { - "menus": [{"key": k, "label": v} for k, v in security.MENUS], - "levels": [{"value": "rw", "label": "可编辑"}, {"value": "ro", "label": "只读"}, - {"value": "", "label": "无权限"}], + "menus": [{"key": k, "label": v} for k, v in + [(k, MENU_LABELS[k]) for k in MENU_KEYS]], + "levels": [{"value": v, "label": LEVEL_LABELS[v]} for v in ("rw", "ro", "")], + "actions": [ + {"value": "create", "label": "新增"}, + {"value": "update", "label": "修改"}, + {"value": "delete", "label": "删除"}, + {"value": "login", "label": "登录"}, + {"value": "logout", "label": "退出"}, + {"value": "password", "label": "改密码"}, + {"value": "revoke", "label": "下线"}, + ], } # ---------------------------------------------------------------------- 角色 @router.get("/rbac/roles") def list_roles(db: Session = Depends(get_db)): - roles = db.query(Role).order_by(Role.id).all() + users = db.query(User).all() + counts: dict[int, int] = {} + for u in users: + for r in u.roles: + counts[r.id] = counts.get(r.id, 0) + 1 out = [] - for r in roles: + for r in db.query(Role).order_by(Role.id).all(): d = r.to_dict() - d["user_count"] = db.query(User).filter(User.role_id == r.id).count() + d["user_count"] = counts.get(r.id, 0) out.append(d) return out @router.post("/rbac/roles") -def create_role(body: RoleIn, db: Session = Depends(get_db)): +def create_role(body: RoleIn, request: Request, db: Session = Depends(get_db)): name = (body.name or "").strip() if not name: raise HTTPException(status_code=400, detail="角色名不能为空") if db.query(Role).filter(Role.name == name).count(): raise HTTPException(status_code=400, detail=f"角色「{name}」已存在") role = Role(name=name[:64], description=(body.description or "").strip() or None, - menus=security.menus_json(body.menus)) + is_builtin=False) db.add(role) db.commit() + _set_role_menus(db, role, body.menus) + audit.note(request, f"新建角色「{role.name}」") return role.to_dict() @router.patch("/rbac/roles/{rid}") -def update_role(rid: int, body: RolePatch, db: Session = Depends(get_db)): +def update_role(rid: int, body: RolePatch, request: Request, db: Session = Depends(get_db)): role = db.get(Role, rid) if role is None: raise HTTPException(status_code=404, detail="角色不存在") @@ -59,42 +140,68 @@ def update_role(rid: int, body: RolePatch, db: Session = Depends(get_db)): name = body.name.strip() if not name: raise HTTPException(status_code=400, detail="角色名不能为空") - dup = db.query(Role).filter(Role.name == name, Role.id != rid).count() - if dup: + if db.query(Role).filter(Role.name == name, Role.id != rid).count(): raise HTTPException(status_code=400, detail=f"角色「{name}」已存在") + if role.is_builtin and role.name == ADMIN_ROLE and name != ADMIN_ROLE: + raise HTTPException(status_code=400, detail="内置「管理员」角色不能改名") role.name = name[:64] if body.description is not None: role.description = body.description.strip() or None - if body.menus is not None: - role.menus = security.menus_json(body.menus) db.commit() + if body.menus is not None: + before = _role_menus(db, rid) + _set_role_menus(db, role, body.menus) + db.expire(role) + if before != _role_menus(db, rid): + _kick_role_users(db, rid) # 权限变了,让他们重新登录取新权限 + audit.note(request, f"调整角色「{role.name}」的菜单授权,已下线该角色下的用户") + else: + audit.note(request, f"修改角色「{role.name}」") + else: + audit.note(request, f"修改角色「{role.name}」") return role.to_dict() +def _kick_role_users(db: Session, rid: int) -> None: + for uid in [u.id for u in db.query(User).all() + if any(r.id == rid for r in u.roles)]: + security.revoke_all(db, uid) + + @router.delete("/rbac/roles/{rid}") -def delete_role(rid: int, me: User = Depends(security.current_user), db: Session = Depends(get_db)): +def delete_role(rid: int, request: Request, me: User = Depends(security.current_user), + db: Session = Depends(get_db)): role = db.get(Role, rid) if role is None: raise HTTPException(status_code=404, detail="角色不存在") if role.is_builtin: - raise HTTPException(status_code=400, detail="内置角色不能删除,可以改它的菜单权限") - if me.role_id == rid: + raise HTTPException(status_code=400, detail="内置角色不能删除,可以改它的菜单授权") + if any(r.id == rid for r in me.roles): raise HTTPException(status_code=400, detail="不能删除自己正在使用的角色") - if db.query(User).filter(User.role_id == rid).count(): + if db.query(UserRole).filter(UserRole.role_id == rid).count(): raise HTTPException(status_code=400, detail="该角色下还有用户,请先给他们换角色") - db.delete(role) + db.delete(role) # Role.grants 是 delete-orphan,菜单授权行跟着一起删 db.commit() + audit.note(request, f"删除角色「{role.name}」") return {"ok": True} # ---------------------------------------------------------------------- 用户 @router.get("/rbac/users") def list_users(db: Session = Depends(get_db)): - return [u.to_dict() for u in db.query(User).order_by(User.id).all()] + online = {} + for s in db.query(UserSession).all(): + online[s.user_id] = online.get(s.user_id, 0) + 1 + out = [] + for u in db.query(User).order_by(User.id).all(): + d = u.to_dict() + d["online"] = online.get(u.id, 0) + out.append(d) + return out @router.post("/rbac/users") -def create_user(body: UserIn, db: Session = Depends(get_db)): +def create_user(body: UserIn, request: Request, db: Session = Depends(get_db)): name = (body.name or "").strip() username = (body.username or "").strip() password = (body.password or "").strip() @@ -104,58 +211,183 @@ def create_user(body: UserIn, db: Session = Depends(get_db)): raise HTTPException(status_code=400, detail="初始密码至少 6 位") if db.query(User).filter(User.username == username).count(): raise HTTPException(status_code=400, detail=f"登录账号「{username}」已存在") + role_ids = body.role_ids or _default_role_ids(db) + if not role_ids: + raise HTTPException(status_code=400, detail="至少要给账号挂一个角色") pw_hash, salt = security.hash_password(password) - user = User(name=name[:64], username=username[:64], password_hash=pw_hash, password_salt=salt, - role_id=body.role_id, active=bool(body.active)) + user = User(name=name[:64], username=username[:64], password_hash=pw_hash, + password_salt=salt, active=bool(body.active)) db.add(user) db.commit() + _set_user_roles(db, user, role_ids) + audit.note(request, f"新建账号 {user.username}({user.name})") return user.to_dict() +def _default_role_ids(db: Session) -> list[int]: + role = db.query(Role).filter(Role.name == "部门成员").one_or_none() + return [role.id] if role else [] + + @router.patch("/rbac/users/{uid}") -def update_user(uid: int, body: UserPatch, me: User = Depends(security.current_user), - db: Session = Depends(get_db)): +def update_user(uid: int, body: UserPatch, request: Request, + me: User = Depends(security.current_user), db: Session = Depends(get_db)): user = db.get(User, uid) if user is None: raise HTTPException(status_code=404, detail="用户不存在") + + # 先把所有校验跑完再落库:否则角色/密码改了一半时后面报 400,库里已经是新值了 + name = None if body.name is not None: name = body.name.strip() if not name: raise HTTPException(status_code=400, detail="姓名不能为空") + new_ids: list[int] | None = None + if body.role_ids is not None: + ids = _effective_role_ids(user, body.role_ids) + if sorted(ids) != sorted(r.id for r in user.roles): + if user.id == me.id: + raise HTTPException(status_code=400, detail="不能修改自己的角色") + after = _menus_of_role_ids(db, ids) + if user.menus.get("rbac") == "rw" and after.get("rbac") != "rw" \ + and not _rbac_managers(db, exclude_id=user.id): + raise HTTPException(status_code=400, detail="系统里要保留一个可管理权限的账号") + new_ids = ids + password = (body.password or "").strip() + if password and len(password) < 6: + raise HTTPException(status_code=400, detail="新密码至少 6 位") + if body.active is not None and user.id == me.id and not body.active: + raise HTTPException(status_code=400, detail="不能停用自己的账号") + if body.active is False and user.menus.get("rbac") == "rw" \ + and not _rbac_managers(db, exclude_id=user.id): + raise HTTPException(status_code=400, detail="系统里要保留一个可管理权限的账号") + + changed_role = False + if name: user.name = name[:64] - if body.role_id is not None and body.role_id != user.role_id: - if db.get(Role, body.role_id) is None: - raise HTTPException(status_code=400, detail="角色不存在") - if user.id == me.id: - raise HTTPException(status_code=400, detail="不能修改自己的角色") - user.role_id = body.role_id - security.revoke_all(db, user.id) # 权限变了,强制重新登录 - if body.password is not None and body.password.strip(): - if len(body.password.strip()) < 6: - raise HTTPException(status_code=400, detail="新密码至少 6 位") - user.password_hash, user.password_salt = security.hash_password(body.password.strip()) - security.revoke_all(db, user.id) + if new_ids is not None: + _set_user_roles(db, user, new_ids) + changed_role = True + if password: + user.password_hash, user.password_salt = security.hash_password(password) + security.revoke_all(db, user.id) # 改密即下线,旧 token 立即失效 if body.active is not None: - if user.id == me.id and not body.active: - raise HTTPException(status_code=400, detail="不能停用自己的账号") user.active = bool(body.active) if not user.active: security.revoke_all(db, user.id) db.commit() + if changed_role: + security.revoke_all(db, user.id) # 权限变了,强制重新登录 + db.expire(user) + what = [] + if name: + what.append("改名") + if new_ids is not None: + what.append("改角色") + if password: + what.append("重置密码") + if body.active is not None: + what.append("启用" if body.active else "停用") + audit.note(request, f"修改账号 {user.username}" + (f":{'、'.join(what)}" if what else "")) return user.to_dict() @router.delete("/rbac/users/{uid}") -def delete_user(uid: int, me: User = Depends(security.current_user), db: Session = Depends(get_db)): +def delete_user(uid: int, request: Request, me: User = Depends(security.current_user), + db: Session = Depends(get_db)): user = db.get(User, uid) if user is None: raise HTTPException(status_code=404, detail="用户不存在") if user.id == me.id: raise HTTPException(status_code=400, detail="不能删除自己,可以换一个角色或让别人删") - remaining = db.query(User).filter(User.active.is_(True), User.id != uid).count() - if not remaining: + username = user.username + if not db.query(User).filter(User.active.is_(True), User.id != uid).count(): raise HTTPException(status_code=400, detail="至少要保留一个可用账号") + if user.active and user.menus.get("rbac") == "rw" and not _rbac_managers(db, exclude_id=user.id): + raise HTTPException(status_code=400, detail="系统里要保留一个可管理权限的账号") security.revoke_all(db, user.id) - db.delete(user) + db.delete(user) # user_roles 是 secondary 关联,删用户时 SQLAlchemy 自己会清 db.commit() + audit.note(request, f"删除账号 {username}") return {"ok": True} + + +@router.post("/rbac/users/{uid}/revoke") +def revoke_user_sessions(uid: int, request: Request, db: Session = Depends(get_db)): + user = db.get(User, uid) + if user is None: + raise HTTPException(status_code=404, detail="用户不存在") + security.revoke_all(db, uid) + audit.note(request, f"强制下线 {user.username}") + return {"ok": True, "revoked": True} + + +# ---------------------------------------------------------------------- 在线会话 +@router.get("/rbac/sessions") +def list_sessions(db: Session = Depends(get_db)): + users = {u.id: u for u in db.query(User).all()} + out = [] + for s in db.query(UserSession).order_by(UserSession.created_at.desc()).all(): + u = users.get(s.user_id) + if u is None: + continue + d = s.to_dict() + d["token"] = s.token # 下线要用真实 token,列表里只展示 token_hint + d.update({"user_id": u.id, "name": u.name, "username": u.username}) + out.append(d) + return out + + +@router.delete("/rbac/sessions/{token}") +def revoke_session(token: str, request: Request, db: Session = Depends(get_db)): + sess = db.get(UserSession, token) + if sess is None: + raise HTTPException(status_code=404, detail="会话不存在或已失效") + target = db.get(User, sess.user_id) + db.delete(sess) + db.commit() + audit.note(request, f"下线一个登录会话:{target.username if target else '已删除的账号'}") + return {"ok": True} + + +# ---------------------------------------------------------------------- 操作日志 +@router.get("/rbac/logs") +def list_logs( + username: str | None = None, + menu: str | None = None, + action: str | None = None, + days: int = Query(30, ge=1, le=365), + limit: int = Query(200, ge=1, le=1000), + offset: int = Query(0, ge=0), + db: Session = Depends(get_db), +): + from datetime import timedelta + + from ..models import now as _now + + q = db.query(AuditLog).filter(AuditLog.created_at >= _now() - timedelta(days=days)) + if username: + q = q.filter(AuditLog.username == username) + if menu: + q = q.filter(AuditLog.menu == menu) + if action: + q = q.filter(AuditLog.action == action) + total = q.count() + rows = q.order_by(AuditLog.id.desc()).offset(offset).limit(limit).all() + return {"total": total, "items": [r.to_dict() for r in rows]} + + +@router.delete("/rbac/logs") +def clear_logs(days: int = Query(0, ge=0), db: Session = Depends(get_db)): + """清空操作日志;days > 0 时只清 N 天以前的。""" + from datetime import timedelta + + from ..models import now as _now + + q = db.query(AuditLog) + if days > 0: + q = q.filter(AuditLog.created_at < _now() - timedelta(days=days)) + n = q.count() + q.delete(synchronize_session=False) + db.commit() + return {"ok": True, "deleted": n} diff --git a/app/routers/weekly.py b/app/routers/weekly.py index 78e1766..4f481cb 100644 --- a/app/routers/weekly.py +++ b/app/routers/weekly.py @@ -22,6 +22,16 @@ from .board import resolve_period_ids, worst_status router = APIRouter() +def empty_kpi() -> dict: + """空周期的 KPI 骨架:键与统计结果保持一致,前端不用防 undefined。""" + return { + "key_total": 0, "key_updated": 0, "key_idle": 0, "project_listed": 0, + "update_count": 0, "custom_total": 0, "custom_new": 0, "custom_updated": 0, + "custom_amount": 0.0, "amount_delta": 0.0, "revenue_delta": 0.0, + "risk_count": 0, "at_risk_count": 0, "blocked_count": 0, + } + + @router.get("/weekly") def weekly( period_id: int | None = None, @@ -33,7 +43,8 @@ def weekly( ): period_ids = resolve_period_ids(db, period_id, year, month) if not period_ids: - return {"periods": [], "projects": [], "custom": [], "kpi": {}} + # 选中的年月还没有任何一周:给同样的结构 + 全 0 指标,而不是空对象 + return {"periods": [], "projects": [], "custom": [], "kpi": empty_kpi()} periods = db.query(Period).filter(Period.id.in_(period_ids)).order_by(Period.sort_key).all() scope_sort = max(p.sort_key for p in periods) @@ -186,6 +197,7 @@ def weekly( at_risk = sum(1 for r in project_rows for u in r["updates"] if u["status"] == "at_risk") blocked = sum(1 for r in project_rows for u in r["updates"] if u["status"] == "blocked") kpi = { + **empty_kpi(), "key_total": key_all, "key_updated": sum(1 for r in project_rows if r["is_key"] and r["has_update"]), "key_idle": sum(1 for r in project_rows if r["is_key"] and not r["has_update"]), @@ -201,6 +213,7 @@ def weekly( "at_risk_count": at_risk, "blocked_count": blocked, } + assert set(kpi) == set(empty_kpi()) # 两种返回结构的键必须一致 return { "periods": [p.to_dict() for p in periods], "projects": project_rows, diff --git a/app/schemas.py b/app/schemas.py index 14487eb..a1d8a01 100644 --- a/app/schemas.py +++ b/app/schemas.py @@ -173,12 +173,12 @@ class UserIn(BaseModel): name: str username: str password: str - role_id: int | None = None + role_ids: list[int] = Field(default_factory=list) # 可挂多个角色,权限取并集 active: bool = True class UserPatch(BaseModel): name: str | None = None - role_id: int | None = None + role_ids: list[int] | None = None # 不传即不改;传空数组即清空(该用户将没有任何权限) active: bool | None = None password: str | None = None # 管理员重置密码,不需要旧密码 diff --git a/app/security.py b/app/security.py index 7327af6..715e91a 100644 --- a/app/security.py +++ b/app/security.py @@ -1,10 +1,14 @@ """登录与权限(RBAC)。 -角色 = 一组功能菜单权限(rw 可编辑 / ro 只读 / 没配就是看不到),用户挂一个角色。 -菜单权限同时管两端: - · 前端按 /auth/me 返回的 menus 过滤侧边栏菜单、隐藏写操作按钮; - · 后端用 guard 依赖按「请求路径 -> 菜单」做二次校验,直接调接口也绕不过去。 -会话是服务端 token(HttpOnly Cookie),退出登录 / 禁用用户时删 token 立即失效。 +三层模型:**用户 ←(多对多)→ 角色 ←(一对多)→ 菜单授权** + · `role_menus` 存授权矩阵:一行 = 一个菜单一个级别,`rw` 可编辑 / `ro` 只读, + 表里没有这一行就是看不到该菜单; + · 一个用户可以挂多个角色,最终权限取并集(同一菜单取更高级别); + · 菜单权限同时管两端:前端按 `/auth/me` 返回的 menus 过滤侧栏与写操作按钮, + 后端 `guard` 按「请求路径 → 菜单 → 级别」二次校验,直接调接口也绕不过去; + · 所有写操作与登录行为写进 `audit_logs`,在「权限管理 → 操作日志」里查。 + +会话是服务端 token(HttpOnly Cookie),退出登录 / 停用 / 改密 / 强制下线都是删 token,立即失效。 密码只存 pbkdf2 派生值,用标准库,不引额外依赖。 """ from __future__ import annotations @@ -16,36 +20,36 @@ import secrets from datetime import datetime, timedelta from fastapi import Depends, HTTPException, Request +from sqlalchemy import inspect, text from sqlalchemy.orm import Session from . import config +from .constants import ( + LEVEL_LABELS, + LEVEL_RANK, + LEVELS, + MENUS, + MENU_KEYS, + MENU_LABELS, + merge_levels, +) from .db import get_db -from .models import Role, User, UserSession, now +from .models import Role, RoleMenu, User, UserRole, UserSession, now SESSION_COOKIE = "unis_session" PBKDF2_ROUNDS = 120_000 -# 功能菜单:键是前后端共用的权限标识,顺序即权限管理页里的展示顺序 -MENUS = [ - ("board", "工作看板"), - ("projects", "自研产品"), - ("custom", "定制项目"), - ("focus", "每周工作"), - ("staff", "人力资源"), - ("intake", "更新录入"), - ("settings", "设置"), - ("rbac", "权限管理"), +__all__ = [ + "MENUS", "MENU_KEYS", "MENU_LABELS", "LEVELS", "LEVEL_LABELS", + "SESSION_COOKIE", "normalize_menus", "menus_json", "hash_password", "verify_password", + "start_session", "revoke_all", "user_from_token", "current_user", "guard", + "resolve_rule", "ensure_seed", "migrate_legacy_rbac", "level_of", ] -MENU_KEYS = [k for k, _ in MENUS] -MENU_LABELS = dict(MENUS) -LEVELS = ("ro", "rw") # 接口路径首段 -> 菜单。没列出来的(/meta 等)只要求登录,不看菜单。 SEGMENT_MENU = { "focus": "focus", "weekly": "board", - "board": "board", - "stats": "board", "projects": "projects", "categories": "projects", "tags": "projects", @@ -69,11 +73,12 @@ EXPORT_MENU = { } +# ------------------------------------------------------------------ 权限表 def normalize_menus(raw) -> dict: """清洗前端传来的权限表:只留已知菜单 + 合法级别。""" out: dict[str, str] = {} for key, value in (raw or {}).items(): - if key in MENU_KEYS and value in LEVELS: + if key in MENU_LABELS and value in LEVELS: out[key] = value return out @@ -82,36 +87,62 @@ def menus_json(menus: dict) -> str: return json.dumps(normalize_menus(menus), ensure_ascii=False, sort_keys=True) +def level_of(user: User | None, menu: str) -> str: + if user is None: + return "" + return user.menus.get(menu, "") + + # ------------------------------------------------------------------ 密码 def hash_password(password: str) -> tuple[str, str]: salt = secrets.token_hex(16) - digest = hashlib.pbkdf2_hmac("sha256", password.encode("utf-8"), bytes.fromhex(salt), PBKDF2_ROUNDS) + digest = hashlib.pbkdf2_hmac("sha256", password.encode(), bytes.fromhex(salt), PBKDF2_ROUNDS) return digest.hex(), salt def verify_password(password: str, password_hash: str, salt: str) -> bool: try: - digest = hashlib.pbkdf2_hmac("sha256", password.encode("utf-8"), bytes.fromhex(salt), PBKDF2_ROUNDS) + digest = hashlib.pbkdf2_hmac( + "sha256", (password or "").encode(), bytes.fromhex(salt), PBKDF2_ROUNDS + ) except ValueError: return False return hmac.compare_digest(digest.hex(), password_hash) # ------------------------------------------------------------------ 会话 -def start_session(db: Session, user: User) -> str: +def _clip(value: str | None, size: int) -> str | None: + return value[:size] if value else None + + +def start_session(db: Session, user: User, ip: str | None = None, + user_agent: str | None = None) -> str: token = secrets.token_urlsafe(32) db.add(UserSession(token=token, user_id=user.id, - expires_at=now() + timedelta(days=config.SESSION_DAYS))) + expires_at=now() + timedelta(days=config.SESSION_DAYS), + ip=_clip(ip, 64), user_agent=_clip(user_agent, 128))) user.last_login_at = now() db.commit() return token -def revoke_all(db: Session, user_id: int) -> None: - db.query(UserSession).filter(UserSession.user_id == user_id).delete(synchronize_session=False) +def revoke_all(db: Session, user_id: int, keep_token: str | None = None) -> None: + q = db.query(UserSession).filter(UserSession.user_id == user_id) + if keep_token: + q = q.filter(UserSession.token != keep_token) + q.delete(synchronize_session=False) db.commit() +def purge_expired_sessions(db: Session) -> int: + q = db.query(UserSession).filter(UserSession.expires_at < now()) + n = q.count() + if n: + q.delete(synchronize_session=False) + db.commit() + return n + + def user_from_token(db: Session, token: str | None) -> User | None: if not token: return None @@ -124,6 +155,100 @@ def user_from_token(db: Session, token: str | None) -> User | None: return user +# ------------------------------------------------------------------ 旧库升级 +def migrate_legacy_rbac(engine) -> list[str]: + """把旧版的 roles.menus(JSON) / users.role_id 迁到 role_menus / user_roles。 + + 幂等:目标表里已经有数据就跳过。老库升级后第一次启动自动完成。 + """ + notes: list[str] = [] + insp = inspect(engine) + tables = set(insp.get_table_names()) + if "roles" not in tables or "users" not in tables: + return notes + with engine.begin() as conn: + cols = {c["name"] for c in insp.get_columns("roles")} + if "menus" in cols and "role_menus" in tables: + filled = conn.execute(text("SELECT COUNT(*) FROM role_menus")).scalar() or 0 + if not filled: + rows = conn.execute(text("SELECT id, menus FROM roles")).all() + moved = 0 + for rid, raw in rows: + if not raw: + continue + try: + data = json.loads(raw) + except ValueError: + continue + for menu, level in normalize_menus(data).items(): + conn.execute( + text("INSERT INTO role_menus(role_id, menu, level, created_at) " + "VALUES(:r,:m,:l,:c)"), + {"r": rid, "m": menu, "l": level, "c": now()}, + ) + moved += 1 + if moved: + notes.append(f"角色菜单授权已迁到 role_menus({moved} 条)") + if "role_id" in {c["name"] for c in insp.get_columns("users")} and "user_roles" in tables: + filled = conn.execute(text("SELECT COUNT(*) FROM user_roles")).scalar() or 0 + if not filled: + rows = conn.execute( + text("SELECT id, role_id FROM users WHERE role_id IS NOT NULL") + ).all() + for uid, rid in rows: + conn.execute( + text("INSERT INTO user_roles(user_id, role_id, created_at) VALUES(:u,:r,:c)"), + {"u": uid, "r": rid, "c": now()}, + ) + if rows: + notes.append(f"用户角色已迁到 user_roles({len(rows)} 条)") + return notes + + +# ------------------------------------------------------------------ 内置数据 +BUILTIN_ROLES = [ + ("管理员", "全部菜单可编辑,含设置与权限管理", {k: "rw" for k in MENU_KEYS}, True), + ("部门成员", "业务菜单可编辑,不能改设置与权限", + {k: "rw" for k in MENU_KEYS if k not in ("settings", "rbac")}, True), + ("只读访客", "只能查看,不能修改任何数据", + {k: "ro" for k in MENU_KEYS if k != "rbac"}, True), +] + + +def ensure_seed(db: Session) -> list[str]: + """首次启动(或升级后)补内置角色与管理员账号,返回新建的提示项。""" + notes: list[str] = [] + for name, desc, menus, builtin in BUILTIN_ROLES: + role = db.query(Role).filter(Role.name == name).one_or_none() + if role is None: + role = Role(name=name, description=desc, is_builtin=builtin) + db.add(role) + db.flush() + notes.append(f"已创建内置角色「{name}」") + if not db.query(RoleMenu).filter(RoleMenu.role_id == role.id).count(): + for menu, level in normalize_menus(menus).items(): + db.add(RoleMenu(role_id=role.id, menu=menu, level=level)) + admin_role = db.query(Role).filter(Role.name == "管理员").one() + if not db.query(User).count(): + pw_hash, salt = hash_password(config.ADMIN_PASSWORD) + user = User(name=config.ADMIN_USERNAME, username=config.ADMIN_USERNAME, + password_hash=pw_hash, password_salt=salt, active=True) + db.add(user) + db.flush() + db.add(UserRole(user_id=user.id, role_id=admin_role.id)) + notes.append(f"已创建管理员账号 {config.ADMIN_USERNAME}(请尽快在用户设置里改密码)") + else: + # 保证系统里至少有一个能管权限的账号,不会出现把自己锁在门外的情况 + guarded = [u for u in db.query(User).filter(User.active.is_(True)).all() + if u.menus.get("rbac") == "rw"] + if not guarded: + first = db.query(User).order_by(User.id).first() + db.add(UserRole(user_id=first.id, role_id=admin_role.id)) + notes.append(f"已把「管理员」角色补给 {first.username},避免没人能管权限") + db.commit() + return notes + + # ------------------------------------------------------------------ 依赖 READ_METHODS = ("GET", "HEAD", "OPTIONS") @@ -145,51 +270,21 @@ def resolve_rule(path: str, method: str): return menu, method not in READ_METHODS -def ensure_seed(db: Session) -> list[str]: - """首次启动(或升级后)补内置角色与管理员账号,返回新建的提示项。""" - notes: list[str] = [] - presets = [ - ("管理员", "全部菜单可编辑,含设置与权限管理", - {k: "rw" for k in MENU_KEYS}, True), - ("部门成员", "业务菜单可编辑,不能改设置与权限", - {k: "rw" for k in MENU_KEYS if k not in ("settings", "rbac")}, True), - ("只读访客", "只能查看,不能修改任何数据", - {k: "ro" for k in MENU_KEYS if k != "rbac"}, True), - ] - role_map: dict[str, Role] = {r.name: r for r in db.query(Role).all()} - for name, desc, menus, builtin in presets: - role = role_map.get(name) - if role is None: - role = Role(name=name, description=desc, menus=menus_json(menus), is_builtin=builtin) - db.add(role) - db.flush() - role_map[name] = role - notes.append(f"已创建内置角色「{name}」") - if not db.query(User).count(): - pw_hash, salt = hash_password(config.ADMIN_PASSWORD) - db.add(User(name=config.ADMIN_USERNAME, username=config.ADMIN_USERNAME, - password_hash=pw_hash, password_salt=salt, - role_id=role_map["管理员"].id, active=True)) - db.commit() - notes.append(f"已创建管理员账号 {config.ADMIN_USERNAME}(请尽快在用户设置里改密码)") - db.commit() - return notes - - def guard(request: Request, db: Session = Depends(get_db)) -> User | None: """挂在 /api 子应用上的总闸:先验登录,再按菜单权限放行。""" path = request.url.path if path.rstrip("/") == "/api/auth/login": return None user = user_from_token(db, request.cookies.get(SESSION_COOKIE)) + request.state.user = user if user is None: raise HTTPException(status_code=401, detail="登录已失效,请重新登录") if path.startswith("/api/rbac/"): # 权限管理自身必须显式授权,普通用户即使能读别的菜单也不能碰 if "rbac" not in user.menus: - raise HTTPException(status_code=403, detail="没有「权限管理」的访问权限") + raise HTTPException(status_code=403, detail=f"没有「{MENU_LABELS['rbac']}」的访问权限") if request.method not in READ_METHODS and user.menus.get("rbac") != "rw": - raise HTTPException(status_code=403, detail="「权限管理」是只读权限,不能修改") + raise HTTPException(status_code=403, detail=f"「{MENU_LABELS['rbac']}」是只读权限,不能修改") return user rule = resolve_rule(path, request.method) if rule is None: @@ -207,4 +302,14 @@ def current_user(request: Request, db: Session = Depends(get_db)) -> User: user = user_from_token(db, request.cookies.get(SESSION_COOKIE)) if user is None: raise HTTPException(status_code=401, detail="请先登录") + request.state.user = user return user + + +def require_level(menu: str, level: str = "rw"): + """给个别高危接口用的显式授权依赖(除菜单写权限外还要求指定菜单可编辑)。""" + def dep(user: User = Depends(current_user)) -> User: + if LEVEL_RANK.get(user.menus.get(menu, ""), 0) < LEVEL_RANK.get(level, 0): + raise HTTPException(status_code=403, detail=f"需要「{MENU_LABELS.get(menu, menu)}」的可编辑权限") + return user + return dep diff --git a/data/.DS_Store b/data/.DS_Store deleted file mode 100644 index bfd61a5d9fb151c6c3905f100fc3aaefc2e522da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 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 delta 50238 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.0 +httpx>=0.27 +openpyxl>=3.1 diff --git a/tests/conftest.py b/tests/conftest.py new file mode 100644 index 0000000..24a8dab --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,174 @@ +"""接口测试公共夹具。 + +两条硬规矩: + 1. **绝不碰 data/board.db**:在 import 业务模块之前把 DATABASE_URL 指到临时库里 + (`app.db` 在 import 时建 engine,`app.main` 在 import 时建表 + 补内置角色,晚一步就来不及了); + 2. **每个用例一个干净库**:清表重建 + 重新补种内置角色/管理员,用例之间不互相污染 + (权限类用例会故意停用账号、改角色,没有隔离就没法稳定断言)。 +""" +from __future__ import annotations + +import os +import sys +import tempfile +from pathlib import Path + +import pytest +from fastapi.testclient import TestClient + +ROOT = Path(__file__).resolve().parent.parent +if str(ROOT) not in sys.path: + sys.path.insert(0, str(ROOT)) + +_TMP_DIR = tempfile.mkdtemp(prefix="unis-dms-test-") +os.environ["DATABASE_URL"] = f"sqlite:///{_TMP_DIR}/test.db" +os.environ["ADMIN_USERNAME"] = "admin" +os.environ["ADMIN_PASSWORD"] = "admin123" +os.environ["AI_API_KEY"] = "" # 不配 Key:/ai 走本地规则解析,测试不联网 + +from app import security # noqa: E402 +from app.db import Base, SessionLocal, engine # noqa: E402 +from app.main import app # noqa: E402 +from app.routers import auth as auth_router # noqa: E402 + +ADMIN_USER = "admin" +ADMIN_PASS = "admin123" +DEFAULT_PW = "pw123456" + + +@pytest.fixture(autouse=True) +def clean_db(): + """每个用例重建表结构 + 补种内置数据,并清掉登录失败计数(限流是进程内的)。""" + Base.metadata.drop_all(bind=engine) + Base.metadata.create_all(bind=engine) + engine.dispose() # 丢掉连接池里的旧连接,避免 SQLite 结构缓存 + with SessionLocal() as db: + security.ensure_seed(db) + auth_router._failures.clear() + yield + + +@pytest.fixture() +def client(clean_db): + """未登录的裸客户端。""" + with TestClient(app) as c: + yield c + + +@pytest.fixture() +def db(clean_db): + """直接操作数据库(造脏数据、绕开接口校验用)。""" + with SessionLocal() as s: + yield s + + +class Harness: + """一组顺手的小工具:建角色/建账号/登录/造业务数据,测试里只写断言。""" + + def __init__(self): + self.app = app + self.anon = TestClient(app) + self.admin = self.login(ADMIN_USER, ADMIN_PASS) + + # ------------------------------------------------------------- 账号 + def login(self, username: str, password: str | None = None) -> TestClient: + # 内置管理员用 seed 密码,其它测试账号统一用默认初始密码 + password = password or (ADMIN_PASS if username == ADMIN_USER else DEFAULT_PW) + c = TestClient(self.app) + r = c.post("/api/auth/login", json={"username": username, "password": password}) + assert r.status_code == 200, f"登录失败 {username}: {r.status_code} {r.text}" + return c + + def roles(self) -> dict[str, dict]: + return {x["name"]: x for x in self.admin.get("/api/rbac/roles").json()} + + def role(self, name: str, menus: dict | None = None, **kw) -> dict: + body = {"name": name, "menus": menus or {}} + body.update(kw) + r = self.admin.post("/api/rbac/roles", json=body) + assert r.status_code == 200, r.text + return r.json() + + def user(self, username: str, *, name: str | None = None, password: str = DEFAULT_PW, + menus: dict | None = None, role_ids: list[int] | None = None, + active: bool = True) -> dict: + """建账号。给了 menus 就先建一个同名角色挂上去;不给角色则走后端默认「部门成员」。""" + ids = role_ids + if menus is not None: + ids = [self.role(f"角色-{username}", menus)["id"]] + body = {"name": name or username, "username": username, "password": password, + "active": active} + if ids is not None: + body["role_ids"] = ids + r = self.admin.post("/api/rbac/users", json=body) + assert r.status_code == 200, r.text + return r.json() + + def user_client(self, username: str, **kw) -> TestClient: + """建账号并登录,直接返回带会话的客户端。""" + password = kw.get("password", DEFAULT_PW) + self.user(username, password=password, **{k: v for k, v in kw.items() if k != "password"}) + return self.login(username, password) + + # ------------------------------------------------------------- 周期 + def periods(self) -> dict: + r = self.admin.get("/api/periods") + assert r.status_code == 200, r.text + return r.json() + + def period(self, year: int, month: int, week: int = 1) -> dict: + r = self.admin.post("/api/periods", json={"year": year, "month": month, "week": week}) + assert r.status_code == 200, r.text + return r.json()["period"] + + @property + def today_period_id(self) -> int: + data = self.periods() + pid = data["today_id"] + assert pid, "今天所在的周应当自动建出来" + return pid + + # ------------------------------------------------------------- 业务数据 + def project(self, name: str, **kw) -> dict: + r = self.admin.post("/api/projects", json={"name": name, **kw}) + assert r.status_code == 200, r.text + return r.json() + + def category(self, name: str, **kw) -> dict: + r = self.admin.post("/api/categories", json={"name": name, **kw}) + assert r.status_code == 200, r.text + return r.json() + + def custom(self, name: str, **kw) -> dict: + r = self.admin.post("/api/custom/projects", json={"name": name, **kw}) + assert r.status_code == 200, r.text + return r.json() + + def custom_update(self, custom_project_id: int, period_id: int, **kw) -> dict: + r = self.admin.post("/api/custom/updates", + json={"custom_project_id": custom_project_id, + "period_id": period_id, **kw}) + assert r.status_code == 200, r.text + return r.json() + + def update(self, project_id: int, period_id: int, **kw) -> dict: + body = {"project_id": project_id, "period_id": period_id, + "content": kw.pop("content", "推进中"), **kw} + r = self.admin.post("/api/updates", json=body) + assert r.status_code == 200, r.text + return r.json() + + def staff(self, name: str, **kw) -> dict: + r = self.admin.post("/api/staff", json={"name": name, **kw}) + assert r.status_code == 200, r.text + return r.json() + + def focus(self, content: str, **kw) -> dict: + r = self.admin.post("/api/focus", json={"content": content, **kw}) + assert r.status_code == 200, r.text + return r.json() + + +@pytest.fixture() +def h(clean_db) -> Harness: + return Harness() diff --git a/tests/test_ai_export.py b/tests/test_ai_export.py new file mode 100644 index 0000000..f44bd9c --- /dev/null +++ b/tests/test_ai_export.py @@ -0,0 +1,364 @@ +"""AI 整理与 Excel 导出的接口测试。 + +AI 一律走本地规则解析(conftest 把 AI_API_KEY 置空),断言的都是确定性行为,不联网。 +导出只验三件事:能下载、文件确实是 xlsx、表头与筛选口径跟页面一致。 +""" +from __future__ import annotations + +import io + +from openpyxl import load_workbook + +from app.db import SessionLocal +from app.models import CustomProject, CustomUpdate, ImportLog, Task, Update + +RAW = """1、需求评审完成 +2、开发进度 60% +3、接口联调延期,等待对方提供文档 +下一步:完成联调 +""" + +CUSTOM_RAW = """1、合同金额 150,000 元,开发进度 60% +2、已计收 50,000 +""" + + +# ---------------------------------------------------------------- 小工具 +def _parse(h, **kw): + return h.admin.post("/api/ai/parse", json={"raw_text": RAW, "use_ai": False, **kw}) + + +def _commit(h, **kw): + body = {"raw_text": RAW, "mode": "rule", "parsed": {}} + body.update(kw) + return h.admin.post("/api/ai/commit", json=body) + + +def _sheet(resp): + """把响应当 xlsx 打开,返回 (工作表名, 全部行)。""" + assert resp.status_code == 200, resp.text + assert "spreadsheetml.sheet" in resp.headers["content-type"], resp.headers + assert resp.content[:4] == b"PK\x03\x04" # xlsx 就是 zip 包 + wb = load_workbook(io.BytesIO(resp.content)) + rows = [list(r) for r in wb.active.iter_rows(values_only=True)] + # build_xlsx 固定前两行是标题 + 导出时间,第 3 行才是表头 + assert rows[1][0] and str(rows[1][0]).startswith("导出时间"), rows[:2] + return wb.active.title, rows + + +# ================================================================== 常规项目:AI 整理 +def test_规则解析出摘要状态风险与子任务(h): + r = _parse(h) + assert r.status_code == 200, r.text + data = r.json() + assert data["mode"] == "rule" and data["error"] is None + assert "未配置大模型" in (data["warning"] or "") # 没配 Key 要说清楚现在用的是本地规则 + + p = data["parsed"] + assert set(p) == {"summary", "progress", "status", "risks", "next_steps", "tasks"} + assert p["summary"] == "需求评审完成" + assert p["progress"] == 60 # 取原文里出现的百分比 + assert p["status"] == "at_risk" # 子任务里有延期 → 整体按最差状态报 + assert p["risks"] and "延期" in p["risks"][0] + assert p["next_steps"] and "下一步" in p["next_steps"][0] + assert [t["status"] for t in p["tasks"]] == ["done", "in_progress", "at_risk"] + assert all(t["content"] and t["name"] for t in p["tasks"]) + + +def test_预览是只动的整理不会顺手建项目(h): + r = _parse(h, project_name="只想预览的项目") + assert r.status_code == 200, r.text + assert r.json()["project"] is None # 预览不认得这个名字 + names = [x["name"] for x in h.admin.get("/api/projects").json()] + assert "只想预览的项目" not in names # 也不许偷偷建出来 + + p = h.project("已有项目") + r = _parse(h, project_name=p["name"]) + assert r.json()["project"]["id"] == p["id"] # 同名能认出来 + assert r.json()["period"] is None + + +def test_预览校验项目与周期是否存在(h): + r = _parse(h, project_id=987654) + assert r.status_code == 404 and "项目" in r.json()["detail"] + r = _parse(h, period_id=987654) + assert r.status_code == 404 and "周期" in r.json()["detail"] + r = _parse(h, period_id=h.today_period_id) + assert r.status_code == 200 and r.json()["period"]["id"] == h.today_period_id + + +def test_确认写入按子任务落库并复用同名子任务(h): + p = h.project("AI落地项目") + period = h.today_period_id + parsed = { + "summary": "三条进展", "progress": 60, "status": "at_risk", + "risks": ["文档延期"], "next_steps": ["完成联调"], + "tasks": [ + {"name": "开发", "content": "开发完成 60%", "progress": 60, "status": "in_progress"}, + {"name": "联调", "content": "等对方文档", "progress": 0, "status": "at_risk", "risk": "文档未到"}, + ], + } + r = _commit(h, project_id=p["id"], period_id=period, parsed=parsed) + assert r.status_code == 200, r.text + out = r.json() + assert out["ok"] and len(out["created"]) == 2 + by_task = {u["task_name"]: u for u in out["created"]} + assert set(by_task) == {"开发", "联调"} + assert by_task["开发"]["risk"] == "文档延期" # 整体风险落在第一条上 + assert by_task["开发"]["next_step"] == "完成联调" + assert by_task["联调"]["risk"] == "文档未到" # 子任务自己的风险优先 + assert all(u["period_id"] == period for u in out["created"]) + + # 主档回写,时间线也按这一周聚合出来 + detail = h.admin.get(f"/api/projects/{p['id']}").json() + assert detail["project"]["progress"] == 60 and detail["project"]["status"] == "at_risk" + assert [t["status"] for t in detail["timeline"]] == ["at_risk"] + assert len(detail["timeline"][0]["updates"]) == 2 + + # 同名子任务复用,不重复建;新记录追加不覆盖旧的 + r2 = _commit(h, project_id=p["id"], period_id=period, + parsed={"tasks": [{"name": "开发", "content": "又推进了一点"}]}) + assert r2.status_code == 200 and len(r2.json()["created"]) == 1 + with SessionLocal() as s: + assert s.query(Task).filter(Task.project_id == p["id"]).count() == 2 + assert s.query(Update).filter(Update.project_id == p["id"]).count() == 3 + assert s.query(ImportLog).filter(ImportLog.project_id == p["id"]).count() == 2 + + +def test_确认写入没有子任务时只落一条(h): + p = h.project("单条AI项目") + r = _commit(h, project_name=p["name"], period_id=h.today_period_id, + mode="ai", model="deepseek-chat", + parsed={"summary": "整体推进", "progress": 40, "status": "in_progress", + "risks": ["人手不足", "接口不稳"], "next_steps": ["补齐测试"], "tasks": []}) + assert r.status_code == 200, r.text + created = r.json()["created"] + assert len(created) == 1 + u = created[0] + assert u["content"] == RAW # 原文整段留档 + assert u["risk"] == "人手不足;接口不稳" + assert u["next_step"] == "补齐测试" + assert u["source"] == "ai" and u["model"] == "deepseek-chat" + assert len(h.admin.get("/api/projects").json()) == 1 # 按同名找到已有项目,没有新建 + + with SessionLocal() as s: + log = s.query(ImportLog).one() + assert log.mode == "ai" and log.model == "deepseek-chat" + assert log.raw_input == RAW and "整体推进" in log.parsed_json + + +def test_确认写入缺少项目或周期会报错(h): + r = _commit(h, period_id=h.today_period_id, parsed={}) + assert r.status_code == 400 and "项目" in r.json()["detail"] + + p = h.project("要有周期") + r = _commit(h, project_id=p["id"], period_id=987654, parsed={}) + assert r.status_code == 404 and "周期" in r.json()["detail"] + + +# ================================================================== 定制项目:AI 整理 +def _custom_parse(h, **kw): + return h.admin.post("/api/custom/ai/parse", + json={"raw_text": CUSTOM_RAW, "use_ai": False, **kw}) + + +def test_定制规则解析出阶段金额与本期计收(h): + r = _custom_parse(h) + assert r.status_code == 200, r.text + data = r.json() + assert data["mode"] == "rule" and "未配置大模型" in (data["warning"] or "") + p = data["parsed"] + assert p["stage"] == "developing" # 有「开发进度 60%」→ 在制,不算验收 + assert p["progress"] == 60 + assert p["amount"] == 150000.0 # 「金额 150,000 元」 + assert p["revenue_amount"] is None # 没写累计计收就别编 + assert p["revenue_delta"] == 50000.0 # 「已计收 50,000」算本期新增 + assert len(p["updates"]) == 2 + assert p["updates"][1]["revenue_delta"] == 50000.0 + assert p["summary"].startswith("合同金额") + + +def test_定制预览校验项目是否存在(h): + r = _custom_parse(h, custom_project_id=987654) + assert r.status_code == 404 and "定制项目" in r.json()["detail"] + + c = h.custom("预览用的定制单", stage="developing") + r = _custom_parse(h, custom_project_id=c["id"], period_id=h.today_period_id) + assert r.status_code == 200 + assert r.json()["project"]["id"] == c["id"] + assert r.json()["period"]["id"] == h.today_period_id + + +def test_定制确认写入自动建档并按口径记账(h): + period = h.today_period_id + r = h.admin.post("/api/custom/ai/commit", json={ + "raw_text": CUSTOM_RAW, "project_name": "AI新建的定制单", "mode": "rule", "period_id": period, + "parsed": {"stage": "developing", "progress": 60, "amount": 150000, "summary": "开发中", + "updates": [{"content": "开发进度 60%", "progress": 60, + "stage": "developing", "revenue_delta": 50000}]}, + }) + assert r.status_code == 200, r.text + out = r.json() + cp = out["project"] + assert cp["name"] == "AI新建的定制单" and len(out["created"]) == 1 + assert cp["amount"] == 150000.0 # parsed.amount 是绝对值,直接落主档 + assert cp["revenue_amount"] == 50000.0 # 计收走增量累加 + assert cp["progress"] == 60 and cp["stage"] == "developing" + assert cp["remark"] == "开发中" and cp["period_id"] == period + assert out["created"][0]["amount_delta"] is None + + # 第二条记录只给增量:主档在现有金额上累加,不覆盖 + r2 = h.admin.post("/api/custom/ai/commit", json={ + "raw_text": "追加下单", "custom_project_id": cp["id"], "mode": "rule", "period_id": period, + "parsed": {"updates": [{"content": "追加下单", "amount_delta": 30000}]}, + }) + assert r2.status_code == 200, r2.text + cp2 = r2.json()["project"] + assert cp2["amount"] == 180000.0 and cp2["revenue_amount"] == 50000.0 + assert cp2["id"] == cp["id"] + + with SessionLocal() as s: + assert s.query(CustomUpdate).filter(CustomUpdate.custom_project_id == cp["id"]).count() == 2 + logs = s.query(ImportLog).all() + assert len(logs) == 2 and all(l.project_id is None for l in logs) + assert str(cp["id"]) in logs[0].parsed_json + + +def test_定制确认写入缺少项目或周期会报错(h): + r = h.admin.post("/api/custom/ai/commit", + json={"raw_text": "随便写点", "period_id": h.today_period_id, "parsed": {}}) + assert r.status_code == 400 and "项目" in r.json()["detail"] + + r = h.admin.post("/api/custom/ai/commit", + json={"raw_text": "随便写点", "project_name": "临时建的项目", + "period_id": 987654, "parsed": {}}) + assert r.status_code == 404 and "周期" in r.json()["detail"] + names = [x["name"] for x in h.admin.get("/api/custom/projects", + params={"archived": "all"}).json()] + assert "临时建的项目" not in names # 报错就什么都不留 + + +# ================================================================== 导出 +def _seed(h): + """每类数据各来一条,导出用例共用。""" + period = h.today_period_id + p = h.project("导出-常规项目", is_key=True, owners=["张三"]) + h.update(p["id"], period, content="推进中", status="at_risk", risk="等客户确认") + # 主档金额不预先填,全靠周期记录里的增量累加出来(这才是页面上的录入口径) + c = h.custom("导出-定制单", origin="华智下单", man_days=12, + sign_date="2026-01-05", accept_date="Q1", accept_year=2026, + project_status="进行中", region="华东", owner="张三") + h.custom_update(c["id"], period, content="开发中", progress=50, + amount_delta=120000, revenue_delta=20000) + h.staff("张三", group="AI产品组", affiliation="汇智") + h.focus("导出-重点事项", due_date="2026-10-09", delayed=True, status="in_progress") + return period + + +def test_六类导出都是可用的xlsx(h): + _seed(h) + checks = { + "/api/export/custom": (["项目归属", "订单金额(元)", "验收时间"], "定制项目明细"), + "/api/export/custom-updates": (["周期", "本期新增下单(元)", "本期新增计收(元)"], "定制项目记录"), + "/api/export/projects": (["项目名称", "执行记录数", "最近更新周期"], "项目管理"), + "/api/export/updates": (["周期", "执行情况", "状态"], "周期执行记录"), + "/api/export/staff": (["姓名", "定制合同额(元)", "定制待计收(元)"], "人力资源库"), + "/api/export/focus": (["工作内容", "录入周", "是否延期"], "每周重点工作"), + } + for url, (cols, sheet) in checks.items(): + name, rows = _sheet(h.admin.get(url)) + assert name == sheet, url + header = [c for c in rows[2] if c] + for col in cols: + assert col in header, f"{url} 表头缺 {col}:{header}" + assert len(rows) > 3, f"{url} 没有数据行:{rows}" + + # 内容抽查:验收时间、状态中文、负载金额都对得上 + _, rows = _sheet(h.admin.get("/api/export/custom")) + row = next(r for r in rows[3:] if r[1] == "导出-定制单") + assert row[0] == "华智下单" and row[7] == 120000 and row[10] == "2026Q1" + _, rows = _sheet(h.admin.get("/api/export/updates")) + row = next(r for r in rows[3:] if r[1] == "导出-常规项目") + assert row[5] == "风险" and row[8] == "手工" + _, rows = _sheet(h.admin.get("/api/export/staff")) + row = next(r for r in rows[3:] if r[1] == "张三") + assert row[4] == 1 and row[7] == 120000 and row[8] == 100000 + _, rows = _sheet(h.admin.get("/api/export/focus")) + row = next(r for r in rows[3:] if r[1] == "导出-重点事项") + assert row[5] == "进行中" and row[6] == "是" and row[3] == "2026-10-09" + + +def test_定制导出带合计行并跟随筛选(h): + _seed(h) + other = h.custom("导出-另一单", origin="汇智直签", amount=30000, sign_date="2026-02-02", + region="华南", project_status="已验收") + + _, rows = _sheet(h.admin.get("/api/export/custom")) + total = rows[-1] + assert total[0] == "合计" and total[1] == "2 个项目" + assert total[6] == 12 and total[7] == 150000 # 人天合计、金额合计 + assert len(rows) == 3 + 2 + 2 # 两行抬头 + 表头 + 两条数据 + 空行 + 合计 + + _, rows = _sheet(h.admin.get("/api/export/custom", params={"keyword": "另一单"})) + assert rows[-1][1] == "1 个项目" and rows[3][1] == "导出-另一单" + + _, rows = _sheet(h.admin.get("/api/export/custom", params={"origin": "华智下单"})) + assert rows[-1][1] == "1 个项目" + + h.admin.patch(f"/api/custom/projects/{other['id']}", json={"archived": True}) + _, rows = _sheet(h.admin.get("/api/export/custom")) + assert rows[-1][1] == "1 个项目" # 归档的默认不导 + _, rows = _sheet(h.admin.get("/api/export/custom", params={"archived": "all"})) + assert rows[-1][1] == "2 个项目" + _, rows = _sheet(h.admin.get("/api/export/custom", params={"archived": "true"})) + assert rows[-1][1] == "1 个项目" and rows[3][1] == "导出-另一单" + + +def test_执行记录导出按顶栏周期筛选(h): + p = h.project("周期导出") + w1, w2 = h.period(2026, 3, 1), h.period(2026, 3, 2) + w3 = h.period(2026, 4, 1) + h.update(p["id"], w1["id"], content="三月第一周") + h.update(p["id"], w2["id"], content="三月第二周") + h.update(p["id"], w3["id"], content="四月第一周") + + _, rows = _sheet(h.admin.get("/api/export/updates", params={"period_id": w1["id"]})) + assert [r[3] for r in rows[3:]] == ["三月第一周"] + + _, rows = _sheet(h.admin.get("/api/export/updates", params={"year": 2026, "month": 3})) + assert [r[3] for r in rows[3:]] == ["三月第一周", "三月第二周"] # 按月 = 当月所有周 + + _, rows = _sheet(h.admin.get("/api/export/updates")) + assert [r[3] for r in rows[3:]] == ["四月第一周"] # 不给条件 = 最新一周 + + # 认不出的周期不给空表,而是导出全量:导出是让人把数据带走的,不做隐式裁剪 + _, rows = _sheet(h.admin.get("/api/export/updates", params={"period_id": 987654})) + assert len(rows) == 3 + 3 + + # 定制周期记录同理 + c = h.custom("定制导出单") + h.custom_update(c["id"], w1["id"], content="定开三月", amount_delta=1000, revenue_delta=200) + h.custom_update(c["id"], w3["id"], content="定开四月") + _, rows = _sheet(h.admin.get("/api/export/custom-updates", params={"year": 2026, "month": 3})) + assert [r[4] for r in rows[3:]] == ["定开三月"] + _, rows = _sheet(h.admin.get("/api/export/custom-updates", params={"period_id": 987654})) + assert [r[4] for r in rows[3:]] == ["定开三月", "定开四月"] + assert rows[3][6] == 1000 and rows[3][7] == 200 + + +def test_项目导出含归档开关与统计列(h): + _seed(h) + archived = h.project("导出-已归档项目", archived=True) + + _, rows = _sheet(h.admin.get("/api/export/projects")) + names = [r[0] for r in rows[3:]] + assert "导出-常规项目" in names and "导出-已归档项目" in names # 默认 all:整库留档 + row = next(r for r in rows[3:] if r[0] == "导出-常规项目") + assert row[3] == "进行中" and row[5] == "是" and row[9] == 1 + assert row[10] and "第" in row[10] # 最近更新周期写了周次 + + _, rows = _sheet(h.admin.get("/api/export/projects", params={"archived": "false"})) + names = [r[0] for r in rows[3:]] + assert "导出-已归档项目" not in names + _, rows = _sheet(h.admin.get("/api/export/projects", params={"keyword": "归档"})) + assert [r[0] for r in rows[3:]] == ["导出-已归档项目"] diff --git a/tests/test_auth.py b/tests/test_auth.py new file mode 100644 index 0000000..fb5245c --- /dev/null +++ b/tests/test_auth.py @@ -0,0 +1,122 @@ +"""登录 / 会话 / 个人设置。""" +from __future__ import annotations + +from fastapi.testclient import TestClient + +from app.main import app + + +def test_未登录时业务接口一律401(client): + for path in ("/api/projects", "/api/custom/projects", "/api/staff", "/api/focus", + "/api/rbac/users", "/api/settings", "/api/export/custom"): + r = client.get(path) + assert r.status_code == 401, (path, r.status_code, r.text) + assert client.post("/api/projects", json={"name": "越权新建"}).status_code == 401 + + +def test_登录只认cookie不认body(client): + r = client.post("/api/auth/login", json={"username": "admin", "password": "admin123"}) + assert r.status_code == 200 + body = r.json() + assert body["username"] == "admin" and "password_hash" not in body + assert body["menus"]["rbac"] == "rw" # 内置管理员:全菜单可编辑 + assert body["role_names"] == ["管理员"] + assert body["last_login_at"] + assert "unis_session" in r.cookies # 会话是 HttpOnly Cookie + # 会话只在这台客户端上有效:另开一个不带 cookie 的客户端照样 401 + assert TestClient(app).get("/api/auth/me").status_code == 401 + + +def test_登录失败只给笼统提示(h): + r = h.anon.post("/api/auth/login", json={"username": "admin", "password": "错的"}) + assert r.status_code == 401 + assert r.json()["detail"] == "用户名或密码不正确" # 不暴露账号是否存在 + r2 = h.anon.post("/api/auth/login", json={"username": "查无此人", "password": "x123456"}) + assert r2.status_code == 401 and r2.json()["detail"] == "用户名或密码不正确" + + +def test_连续输错五次后锁定该账号(h): + for i in range(5): + r = h.anon.post("/api/auth/login", json={"username": "admin", "password": f"错{i}"}) + assert r.status_code == 401, i + r = h.anon.post("/api/auth/login", json={"username": "admin", "password": "admin123"}) + assert r.status_code == 429 # 锁定期内连正确密码也不给过 + assert "秒后再试" in r.json()["detail"] + # 限流按「IP + 账号」计,别人的账号不受影响 + h.user("other_ok", menus={"board": "ro"}) + assert h.login("other_ok").get("/api/auth/me").status_code == 200 + + +def test_成功登录会清零失败计数(h): + for _ in range(4): + assert h.anon.post("/api/auth/login", json={"username": "admin", "password": "错"}).status_code == 401 + assert h.anon.post("/api/auth/login", json={"username": "admin", "password": "admin123"}).status_code == 200 + for _ in range(4): + assert h.anon.post("/api/auth/login", json={"username": "admin", "password": "错"}).status_code == 401 + assert h.anon.post("/api/auth/login", json={"username": "admin", "password": "admin123"}).status_code == 200 + + +def test_停用账号既拦登录也断已有会话(h): + u = h.user("sleepy", menus={"board": "ro"}) + c = h.login("sleepy") + assert c.get("/api/auth/me").status_code == 200 + assert h.admin.patch(f"/api/rbac/users/{u['id']}", json={"active": False}).status_code == 200 + assert c.get("/api/auth/me").status_code == 401 # 现有 token 立刻失效 + r = h.anon.post("/api/auth/login", json={"username": "sleepy", "password": "pw123456"}) + assert r.status_code == 403 and "停用" in r.json()["detail"] + # 重新启用后能正常登录 + h.admin.patch(f"/api/rbac/users/{u['id']}", json={"active": True}) + assert h.login("sleepy").get("/api/auth/me").status_code == 200 + + +def test_改密后其他设备下线(h): + h.user("multi_dev", menus={"board": "ro"}) + c1 = h.login("multi_dev") + c2 = h.login("multi_dev") + assert c1.get("/api/auth/me").status_code == c2.get("/api/auth/me").status_code == 200 + r = c1.post("/api/auth/password", json={"old_password": "pw123456", "new_password": "newpass8"}) + assert r.status_code == 200, r.text + assert c1.get("/api/auth/me").status_code == 200 # 当前这次登录保留 + assert c2.get("/api/auth/me").status_code == 401 # 其余设备全部下线 + assert h.anon.post("/api/auth/login", json={"username": "multi_dev", + "password": "pw123456"}).status_code == 401 + assert h.login("multi_dev", "newpass8").get("/api/auth/me").status_code == 200 + + +def test_改密的三条前置校验(h): + h.user("pw_rule", menus={"board": "ro"}) + c = h.login("pw_rule") + cases = [ + ({"old_password": "不对的", "new_password": "whatever1"}, "原密码不正确"), + ({"old_password": "pw123456", "new_password": "123"}, "至少 6 位"), + ({"old_password": "pw123456", "new_password": "pw123456"}, "不能与原密码相同"), + ] + for body, expect in cases: + r = c.post("/api/auth/password", json=body) + assert r.status_code == 400, body + assert expect in r.json()["detail"], body + + +def test_退出登录后token失效(h): + h.user("bye", menus={"board": "ro"}) + c = h.login("bye") + assert c.post("/api/auth/logout").json() == {"ok": True} + assert c.get("/api/auth/me").status_code == 401 + + +def test_改昵称只能改自己(h): + h.user("nick", menus={"board": "ro"}) + c = h.login("nick") + assert c.put("/api/auth/me", json={"name": "新昵称"}).json()["name"] == "新昵称" + assert c.put("/api/auth/me", json={"name": " "}).status_code == 400 + # 昵称之外的字段改不动 + r = c.put("/api/auth/me", json={"name": "再改一次", "username": "hacked", "active": False}) + assert r.json()["username"] == "nick" and r.json()["active"] is True + + +def test_强制下线会踢掉全部会话(h): + u = h.user("kickme", menus={"board": "ro"}) + c = h.login("kickme") + assert c.get("/api/auth/me").status_code == 200 + assert h.admin.post(f"/api/rbac/users/{u['id']}/revoke").json()["revoked"] is True + assert c.get("/api/auth/me").status_code == 401 diff --git a/tests/test_custom_finance.py b/tests/test_custom_finance.py new file mode 100644 index 0000000..899781f --- /dev/null +++ b/tests/test_custom_finance.py @@ -0,0 +1,276 @@ +"""定开财务口径:跨季度 / 跨年度统计、年度计收目标、验收时间与增量金额的联动。 + +这一组用例是「跨季度统计有问题」的回归防线: +金额一律「元」,年度目标一律「万元」,验收归属只认 accept_year + accept_date。 +""" +from __future__ import annotations + +from datetime import date + +from app import constants, finance + + +def _ledger(h): + """一套故意跨年份、带脏数据的定开台账。""" + rows = {} + rows["甲"] = h.custom("甲-2025下单2026验收", origin="华智下单", amount=100000, + sign_date="2025-11-20", accept_date="Q1", accept_year=2026) + rows["乙"] = h.custom("乙-2026下单2026验收", origin="华智下单", amount=200000, + sign_date="2026-01-10", accept_date="Q3", accept_year=2026) + rows["丙"] = h.custom("丙-非下单归属", origin="提前交付", amount=50000, + sign_date="2026-02-01", accept_date="Q3", accept_year=2026) + rows["丁"] = h.custom("丁-脏下单时间", origin="华智下单", amount=80000, sign_date="2024年3月前") + rows["戊"] = h.custom("戊-无下单时间", origin="华智下单", amount=60000) + rows["己"] = h.custom("己-缺验收年度", amount=70000) + return rows + + +def _finance(h, **params): + r = h.admin.get("/api/custom/finance", params=params) + assert r.status_code == 200, r.text + return r.json() + + +# ------------------------------------------------------------------ 跨季度 / 跨年度 +def test_统计按选中年月的季度归集(h): + rows = _ledger(h) + # 只有季度没有年度的历史脏行:直接改库造出来,接口层是拦着的 + from app.models import CustomProject + from app.db import SessionLocal + with SessionLocal() as s: + s.get(CustomProject, rows["己"]["id"]).accept_date = "Q2" + s.commit() + + d = _finance(h, year=2026, month=1) + ctx = d["context"] + assert (ctx["year"], ctx["month"], ctx["quarter"]) == (2026, 1, 1) + assert ctx["quarter_label"] == "2026年Q1" + assert ctx["quarter_start"] == "2026-01-01" and ctx["quarter_end"] == "2026-03-31" + + k = d["kpi"] + # 已下单只看项目归属:提前交付不算,四单共 44 万 + assert k["placed"] == {"count": 4, "amount": 440000.0} + # 2026Q1 下单的只有乙;2026 年全年下单也只有乙 + assert k["sign_quarter"] == {"count": 1, "amount": 200000.0} + assert k["sign_year"] == {"count": 1, "amount": 200000.0} + # 验收:甲是 2026Q1,乙丙是 2026Q3;本季度只算甲,全年算三笔 + assert k["accept_quarter"] == {"count": 1, "amount": 100000.0} + assert k["accept_year"] == {"count": 3, "amount": 350000.0} + # 数据质量提示:认不出下单年份的 1 笔(戊),只有季度没有年度的 1 笔(己) + assert k["sign_unknown"] == 1 and k["accept_no_year"] == 1 + + +def test_切到历史周期只看那一年(h): + _ledger(h) + y2025 = _finance(h, year=2025, month=12) + assert (y2025["context"]["year"], y2025["context"]["quarter"]) == (2025, 4) + # 甲 2025-11 下单 → 落在 2025Q4;它的验收在 2026,不能串回 2025 + assert y2025["kpi"]["sign_quarter"] == {"count": 1, "amount": 100000.0} + assert y2025["kpi"]["sign_year"] == {"count": 1, "amount": 100000.0} + assert y2025["kpi"]["accept_quarter"] == {"count": 0, "amount": 0.0} + assert y2025["kpi"]["accept_year"] == {"count": 0, "amount": 0.0} + + # 脏文本「2024年3月前」按 2024Q1 统计,不因为脏就整笔丢掉 + y2024 = _finance(h, year=2024, month=2) + assert y2024["kpi"]["sign_quarter"] == {"count": 1, "amount": 80000.0} + assert y2024["kpi"]["sign_year"] == {"count": 1, "amount": 80000.0} + + # 顶栏选周:周期换算出来的年月季度与月视图一致 + week = h.period(2025, 12, 1) + byweek = _finance(h, period_id=week["id"]) + assert byweek["context"]["label"] == week["full_label"] + assert byweek["context"]["quarter_label"] == y2025["context"]["quarter_label"] + assert byweek["kpi"] == y2025["kpi"] + + +def test_认不出季度的项目计入年度并单列未分季(h): + """回归:有年份、认不出季度(「2024/」这种残缺值)的项目曾从季度表里静默消失, + 导致同一屏上「年度任务合计」比 KPI 年度少一笔。""" + from app.db import SessionLocal + from app.models import CustomProject + + h.custom("庚-下单只有年份", origin="华智下单", amount=320000, sign_date="2024/") + acc = h.custom("辛-验收只有年度", origin="华智下单", amount=150000, sign_date="2024-02-18") + with SessionLocal() as s: # 接口拦着「只填年度不填季度」,直接造脏行 + s.get(CustomProject, acc["id"]).accept_year = 2024 + s.commit() + + d = _finance(h, year=2024, month=5) + k, a = d["kpi"], d["annual"] + q1, q2, q3, q4 = a["quarters"] + uns = a["unscheduled"] + + # 都不在任何季度里,但都算进 2024 年度 + assert (q1["sign_count"], q2["sign_count"], q3["sign_count"], q4["sign_count"]) == (1, 0, 0, 0) + assert (q1["acc_count"], q2["acc_count"], q3["acc_count"], q4["acc_count"]) == (0, 0, 0, 0) + assert uns["sign_count"] == 1 and uns["sign_amount"] == 320000.0 + assert uns["acc_count"] == 1 and uns["acc_amount"] == 150000.0 + assert k["sign_no_quarter"] == 1 and k["accept_no_quarter"] == 1 + + # 核心不变式:四季度 + 未分季 = 合计 = KPI 年度 + t = a["total"] + assert t["sign_count"] == sum(x["sign_count"] for x in a["quarters"]) + uns["sign_count"] + assert t["sign_amount"] == k["sign_year"]["amount"] == 470000.0 + assert t["acc_count"] == sum(x["acc_count"] for x in a["quarters"]) + uns["acc_count"] == 1 + assert t["acc_amount"] == k["accept_year"]["amount"] == 150000.0 + # 目标只按四个季度累加,未分季不占目标、也不折算完成率 + assert t["target"] == sum(x["target"] for x in a["quarters"]) + + +def test_未分季为空时不影响原有合计(h): + """干净台账下未分季计数为 0,合计仍等于四个季度之和(不引入新的偏差)。""" + _ledger(h) + a = _finance(h, year=2026, month=8)["annual"] + uns, t = a["unscheduled"], a["total"] + assert uns == {"acc_count": 0, "acc_amount": 0.0, "sign_count": 0, "sign_amount": 0.0} + assert t["acc_count"] == sum(x["acc_count"] for x in a["quarters"]) + assert t["sign_amount"] == round(sum(x["sign_amount"] for x in a["quarters"]), 2) + + +def test_顶栏周期换算成季度(db): + from app.db import SessionLocal + + with SessionLocal() as s: + ctx = finance.period_context(s, year=2026, month=11) + assert (ctx["year"], ctx["quarter"]) == (2026, 4) + assert ctx["label"] == "2026年11月" + assert ctx["quarter_start"] == "2026-10-01" and ctx["quarter_end"] == "2026-12-31" + # 选中的周期不存在时按年月兜底,不会报错也不会算错年份 + assert finance.period_context(s, period_id=424242, year=2025, month=2)["quarter"] == 1 + assert finance.period_context(s)["year"] == date.today().year + assert constants.quarter_of_month(1) == 1 and constants.quarter_of_month(12) == 4 + assert constants.quarter_end(2026, 1) == "2026-03-31" + assert constants.quarter_end(2024, 1) == "2024-03-31" # 闰年也认得 + + +# ------------------------------------------------------------------ 年度计收目标 +def test_年度目标保存后读回来一模一样(h): + _ledger(h) + r = h.admin.put("/api/custom/annual-targets", + json={"year": 2026, "targets": {"1": 10, "2": 0, "3": 20, "4": None}}) + assert r.status_code == 200, r.text + saved = {"1": 10.0, "2": 0.0, "3": 20.0, "4": 0.0} + assert r.json()["targets"] == saved + assert h.admin.get("/api/custom/annual-targets", params={"year": 2026}).json()["targets"] == saved + + annual = _finance(h, year=2026, month=1)["annual"] + assert annual["year"] == 2026 and annual["targets"] == saved + q1, q2, q3, q4 = annual["quarters"] + assert q1 == {**q1, "acc_count": 1, "acc_amount": 100000.0, "rate": 1.0, "current": True} + assert q2["target"] == 0.0 and q2["rate"] is None # 没设目标就不折算完成率 + assert (q3["acc_count"], q3["acc_amount"], q3["rate"]) == (2, 250000.0, 1.25) + assert q4["current"] is False + assert annual["total"]["target"] == 30.0 + assert annual["total"]["acc_count"] == 3 and annual["total"]["acc_amount"] == 350000.0 + assert annual["total"]["sign_count"] == 1 and annual["total"]["sign_amount"] == 200000.0 + + +def test_没配过的年份用默认目标(h): + defaults = {str(q): v for q, v in constants.CUSTOM_ANNUAL_TARGETS_DEFAULT.items()} + assert h.admin.get("/api/custom/annual-targets", params={"year": 2030}).json()["targets"] == defaults + assert h.admin.get("/api/custom/annual-targets").json()["year"] == __import__("datetime").date.today().year + + +def test_目标值不是数字要报错(h): + r = h.admin.put("/api/custom/annual-targets", json={"year": 2026, "targets": {"2": "十万"}}) + assert r.status_code == 400 and "Q2" in r.json()["detail"] + + +# ------------------------------------------------------------------ 台账字段口径 +def test_验收时间必须年度季度一起填(h): + cp = h.custom("验收时间校验", amount=1000) + assert cp["accept_label"] == "" + cid = cp["id"] + patch = lambda body: h.admin.patch(f"/api/custom/projects/{cid}", json=body) + + assert "验收年度" in patch({"accept_date": "Q2"}).json()["detail"] + assert patch({"accept_date": "Q2"}).status_code == 400 + assert "别留季度为空" in patch({"accept_year": 2027, "accept_date": ""}).json()["detail"] + + ok = patch({"accept_date": "q2", "accept_year": 2027}).json() # 大小写不敏感,存成 Q2 + assert (ok["accept_date"], ok["accept_year"], ok["accept_label"]) == ("Q2", 2027, "2027Q2") + cleared = patch({"accept_date": None, "accept_year": None}).json() # 要清就一起清 + assert cleared["accept_date"] is None and cleared["accept_year"] is None + assert cleared["accept_label"] == "" + + +def test_项目状态是唯一状态字段(h): + cp = h.custom("阶段推导", project_status="退单", amount=100000) + assert cp["stage"] == "closed" + assert cp["confirmed_amount"] == 0.0 # 退单不确认收入 + accepted = h.admin.patch(f"/api/custom/projects/{cp['id']}", + json={"project_status": "已验收"}).json() + assert accepted["stage"] == "accepted" + # 商务阶段不再是可写字段:传了也不生效,避免出现两套状态 + ignored = h.admin.patch(f"/api/custom/projects/{cp['id']}", json={"stage": "lead"}).json() + assert ignored["stage"] == "accepted" + assert h.admin.patch(f"/api/custom/projects/{cp['id']}", + json={"project_status": "随便写"}).status_code == 400 + assert h.admin.post("/api/custom/projects", json={"name": "阶段推导"}).status_code == 400 + assert h.admin.post("/api/custom/projects", json={"name": " "}).status_code == 400 + assert h.admin.patch("/api/custom/projects/424242", json={"name": "x"}).status_code == 404 + + +def test_周期记录的新增量与台账同步(h): + pid = h.today_period_id + cp = h.custom("增量联动", amount=100000, revenue_amount=20000) + cur = lambda: h.admin.get(f"/api/custom/projects/{cp['id']}").json()["project"] + + u = h.custom_update(cp["id"], pid, content="本月新增下单与计收", + amount_delta=50000, revenue_delta=30000) + assert (u["amount_delta"], u["revenue_delta"]) == (50000.0, 30000.0) + assert (cur()["amount"], cur()["revenue_amount"]) == (150000.0, 50000.0) + + h.admin.patch(f"/api/custom/updates/{u['id']}", json={"revenue_delta": 10000}) + assert (cur()["amount"], cur()["revenue_amount"]) == (150000.0, 30000.0) # 按差额回补 + + assert h.admin.patch(f"/api/custom/updates/{u['id']}", json={"period_id": None}).status_code == 400 + assert h.admin.patch(f"/api/custom/updates/{u['id']}", json={"period_id": 424242}).status_code == 404 + h.admin.delete(f"/api/custom/updates/{u['id']}") + assert (cur()["amount"], cur()["revenue_amount"]) == (100000.0, 20000.0) # 删记录一并扣回 + + assert h.admin.patch("/api/custom/updates/424242", json={"content": "x"}).status_code == 404 + assert h.admin.delete("/api/custom/updates/424242").status_code == 404 + assert h.admin.post("/api/custom/updates", json={"content": "没有项目"}).status_code == 404 + assert h.admin.post("/api/custom/updates", + json={"custom_project_id": cp["id"], "content": "没有周期"}).status_code == 400 + + +# ------------------------------------------------------------------ 老库回填 +def test_回填补齐验收年份与商务阶段(h, db): + from app.models import CustomProject + + cp = h.custom("待回填", accept_date=None) + other = h.custom("待改阶段", project_status="待开发") + db.expire_all() + row = db.get(CustomProject, cp["id"]) + row.accept_date, row.accept_date_real, row.accept_year = "Q3", "2024-09-30", None + db.get(CustomProject, other["id"]).stage = "signed" # 状态与阶段对不上 + db.commit() + + notes = finance.backfill(db) + db.expire_all() + assert db.get(CustomProject, cp["id"]).accept_year == 2024 + assert db.get(CustomProject, other["id"]).stage == "signed" # 待开发本来就是 signed + assert any("验收年份" in n for n in notes) + + db.get(CustomProject, other["id"]).project_status = "已验收" + db.commit() + assert any("商务阶段" in n for n in finance.backfill(db)) + db.expire_all() + assert db.get(CustomProject, other["id"]).stage == "accepted" + assert finance.backfill(db) == [] # 再跑一次不再改任何东西 + + +def test_时间解析只认能进统计的写法(): + assert constants.parse_quarter("Q3") == 3 and constants.parse_quarter("q3") == 3 + assert constants.parse_quarter("三季度") is None and constants.parse_quarter("") is None + assert constants.parse_year_month("2026-03-31") == (2026, 3) + assert constants.parse_year_month("2026年3月") == (2026, 3) + assert constants.parse_year_month("2024年3月前") == (2024, 3) + assert constants.parse_year_month("2026") == (2026, 0) + assert constants.parse_year_month("待定") is None and constants.parse_year_month(None) is None + assert constants.derive_stage("已验收") == "accepted" + assert constants.derive_stage("", "developing") == "developing" + assert constants.merge_levels({"board": "ro"}, {"board": "rw", "rbac": "ro"}) == { + "board": "rw", "rbac": "ro"} diff --git a/tests/test_periods_projects.py b/tests/test_periods_projects.py new file mode 100644 index 0000000..ab4ff6e --- /dev/null +++ b/tests/test_periods_projects.py @@ -0,0 +1,194 @@ +"""周期、元信息、常规项目 / 分类 / 标签 / 执行记录 / 设置。""" +from __future__ import annotations + +from app import constants + + +# ------------------------------------------------------------------ 周期 +def test_周期列表会自动补出今天所在的周(h): + data = h.periods() + assert data["weeks"] and data["today_id"] + today = [w for w in data["weeks"] if w["id"] == data["today_id"]][0] + y, m, w = constants.week_of_date(__import__("datetime").date.today()) + assert (today["year"], today["month"], today["week"]) == (y, m, w) + sorts = [x["sort_key"] for x in data["weeks"]] + assert sorts == sorted(sorts) # 顶栏按时间正序 + assert all(x["first_day"] <= x["last_day"] for x in data["weeks"]) + month_keys = {(x["year"], x["month"]) for x in data["months"]} + assert (y, m) in month_keys + assert sum(x["week_count"] for x in data["months"]) == len(data["weeks"]) + + +def test_新建周期会按标签推年份并跨年(h): + base = h.periods()["today_id"] + latest = [w for w in h.periods()["weeks"] if w["id"] == base][0] + r = h.admin.post("/api/periods", json={"label": "12月第1周"}) + assert r.status_code == 200 + p = r.json()["period"] + # 12 月不早于当前月份 → 仍然是今年 + assert p["year"] == latest["year"] and (p["month"], p["week"]) == (12, 1) + assert p["sort_key"] == p["year"] * 10000 + 1201 + # 同一个周期不会重复建 + again = h.admin.post("/api/periods", json={"label": "12月第1周"}).json() + assert again["created"] is False and again["period"]["id"] == p["id"] + # 再补 1 月:月份比最新周期小,说明跨年,年份 +1 + p2 = h.admin.post("/api/periods", json={"label": "1月第1周"}).json()["period"] + assert p2["year"] == latest["year"] + 1 and p2["sort_key"] > p["sort_key"] + # 标签里写了年份就按写的算 + p3 = h.admin.post("/api/periods", json={"label": f"{latest['year'] - 1}年3月第2周"}).json()["period"] + assert p3["year"] == latest["year"] - 1 and p3["week"] == 2 + + +def test_新建周期的入参校验(h): + assert h.admin.post("/api/periods", json={}).status_code == 400 + assert h.admin.post("/api/periods", json={"label": "随便写点什么"}).status_code == 400 + p = h.period(2027, 5, 3) + assert (p["year"], p["month"], p["week"], p["sort_key"]) == (2027, 5, 3, 20270503) + + +def test_有记录的周期不能删(h): + pid = h.today_period_id + p = h.project("要被记录的周期项目") + h.update(p["id"], pid, content="本周推进") + r = h.admin.delete(f"/api/periods/{pid}") + assert r.status_code == 400 and "执行记录" in r.json()["detail"] + empty = h.period(2030, 1, 1) + assert h.admin.delete(f"/api/periods/{empty['id']}").json() == {"ok": True} + assert h.admin.delete("/api/periods/424242").status_code == 404 + + +def test_元信息给状态优先级和AI状态(h): + meta = h.admin.get("/api/meta").json() + assert [x["code"] for x in meta["statuses"]] == [c for c, _, _ in constants.STATUSES] + assert [x["code"] for x in meta["priorities"]] == [c for c, _, _ in constants.PRIORITIES] + assert meta["ai"]["enabled"] is False # 没配 Key:走本地规则 + assert meta["ai"]["has_key"] is False + + +# ------------------------------------------------------------------ 分类 / 标签 +def test_分类增删改(h): + c = h.category("研发平台", color="#123456") + assert c["color"] == "#123456" + assert h.admin.post("/api/categories", json={"name": "研发平台"}).status_code == 400 + up = h.admin.patch(f"/api/categories/{c['id']}", json={"name": "研发中台", "color": "#000"}) + assert up.json()["name"] == "研发中台" + assert h.admin.delete(f"/api/categories/{c['id']}").status_code == 200 + assert h.admin.patch(f"/api/categories/{c['id']}", json={"name": "x"}).status_code == 404 + assert h.admin.delete("/api/categories/424242").status_code == 404 + + +def test_标签重复提交返回同一个(h): + t = h.admin.post("/api/tags", json={"name": "重点"}).json() + again = h.admin.post("/api/tags", json={"name": "重点"}).json() + assert t["id"] == again["id"] + assert h.admin.delete(f"/api/tags/{t['id']}").json() == {"ok": True} + assert h.admin.delete("/api/tags/424242").status_code == 404 + + +# ------------------------------------------------------------------ 项目 +def test_项目字段与人员标签的写入(h): + cat = h.category("交付项目") + p = h.project("智慧园区", category_id=cat["id"], owners=["张三", "李四"], + members=["王五", "赵六"], tags=["新客户", "重点"], is_key=True, + progress=35, priority="p1", description="备注说明") + assert p["owner"] == "张三" and p["owners"] == ["张三", "李四"] # 第一位是主负责人 + assert p["members"] == ["王五", "赵六"] + assert {t["name"] for t in p["tags"]} == {"新客户", "重点"} + assert p["category"]["name"] == "交付项目" and p["is_key"] and p["progress"] == 35 + # 标签是自动创建的,不用先建 + assert {t["name"] for t in h.admin.get("/api/tags").json()} >= {"新客户", "重点"} + # 换负责人名单是整体替换 + up = h.admin.patch(f"/api/projects/{p['id']}", json={"owners": ["李四"], "tags": []}) + assert up.json()["owner"] == "李四" and up.json()["owners"] == ["李四"] and up.json()["tags"] == [] + + +def test_项目的重名与空名保护(h): + h.project("同名项目") + assert h.admin.post("/api/projects", json={"name": "同名项目"}).status_code == 400 + p = h.project("另一个项目") + assert h.admin.patch(f"/api/projects/{p['id']}", json={"name": "同名项目"}).status_code == 400 + assert h.admin.patch(f"/api/projects/{p['id']}", json={"name": " "}).status_code == 400 + assert h.admin.patch("/api/projects/424242", json={"name": "不存在"}).status_code == 404 + assert h.admin.get("/api/projects/424242").status_code == 404 + assert h.admin.delete("/api/projects/424242").status_code == 404 + + +def test_项目列表的筛选与本周期状态(h): + pid = h.today_period_id + cat = h.category("筛选专用") + a = h.project("甲项目", category_id=cat["id"], owners=["陈明"], is_key=True) + b = h.project("乙项目", owners=["刘芳"]) + h.update(b["id"], pid, content="乙本周有记录") + rows = {x["name"]: x for x in h.admin.get("/api/projects").json()} + assert rows["甲项目"]["updated_this_period"] is False and rows["甲项目"]["idle_weeks"] is None + assert rows["乙项目"]["updated_this_period"] is True and rows["乙项目"]["update_count"] == 1 + assert rows["甲项目"]["task_count"] == 0 + assert {x["id"] for x in h.admin.get("/api/projects", params={"is_key": True}).json()} == {a["id"]} + assert {x["id"] for x in h.admin.get("/api/projects", params={"keyword": "甲"}).json()} == {a["id"]} + assert {x["id"] for x in h.admin.get("/api/projects", params={"category_id": cat["id"]}).json()} == {a["id"]} + assert {x["id"] for x in h.admin.get("/api/projects", params={"owner": "陈明"}).json()} == {a["id"]} + # 归档后默认看不到,archived=true 才出现 + h.admin.patch(f"/api/projects/{a['id']}", json={"archived": True}) + assert a["id"] not in {x["id"] for x in h.admin.get("/api/projects").json()} + assert a["id"] in {x["id"] for x in h.admin.get("/api/projects", params={"archived": "true"}).json()} + assert a["id"] in {x["id"] for x in h.admin.get("/api/projects", params={"archived": "all"}).json()} + assert b["id"] in {x["id"] for x in h.admin.get("/api/projects", params={"owner": "刘芳"}).json()} + + +def test_按周与按月都能取到本周期数据(h): + week = h.period(2028, 3, 2) + p = h.project("跨月记录") + h.update(p["id"], week["id"], content="2028年3月第2周") + # 项目清单始终给全量,周期范围只决定「本周期是否更新 / 隔了几周没更新」 + rows = h.admin.get("/api/projects", params={"period_id": week["id"]}).json() + assert [x["name"] for x in rows] == ["跨月记录"] and rows[0]["updated_this_period"] is True + rows = h.admin.get("/api/projects", params={"year": 2028, "month": 3}).json() + assert rows and rows[0]["updated_this_period"] is True + assert rows[0]["idle_weeks"] == 0 + # 该年月还没有任何周期 → 清单照旧返回,只是都算「本周期没更新」 + rows = h.admin.get("/api/projects", params={"year": 2027, "month": 1}).json() + assert [x["name"] for x in rows] == ["跨月记录"] and rows[0]["updated_this_period"] is False + assert h.admin.get("/api/updates", params={"period_id": week["id"]}).json()[0]["content"] == "2028年3月第2周" + assert h.admin.get("/api/updates", params={"year": 2028, "month": 3}).json() != [] + assert h.admin.get("/api/updates", params={"year": 2026, "month": 1}).json() == [] + + +def test_执行记录的增改删(h): + pid = h.today_period_id + p = h.project("记录演练") + task = h.admin.post("/api/tasks", json={"project_id": p["id"], "name": "接口联调"}).json() + assert h.admin.post("/api/tasks", json={"project_id": p["id"], "name": "接口联调"}).json()["id"] == task["id"] + assert h.admin.post("/api/tasks", json={"name": "接口联调"}).status_code == 404 + assert h.admin.post("/api/tasks", json={"project_id": p["id"], "name": " "}).status_code == 400 + u = h.update(p["id"], pid, task_id=task["id"], content="联调过半", progress=60, + status="at_risk", risk="等待接口文档", next_step="约对方对齐", owner="张三") + assert u["content"] == "联调过半" and u["status"] == "at_risk" and u["task_id"] == task["id"] + assert u["period_label"] or u["period_id"] == pid + up = h.admin.patch(f"/api/updates/{u['id']}", json={"progress": 80, "status": "in_progress"}) + assert up.json()["progress"] == 80 and up.json()["status"] == "in_progress" + assert up.json()["content"] == "联调过半" # 没提交的字段保持原值 + assert h.admin.patch(f"/api/updates/{u['id']}", json={"period_id": None}).status_code == 400 + assert h.admin.patch("/api/updates/424242", json={"progress": 1}).status_code == 404 + detail = h.admin.get(f"/api/projects/{p['id']}").json() + assert detail["tasks"] and detail["updates"] + assert h.admin.delete(f"/api/updates/{u['id']}").status_code == 200 + assert h.admin.get("/api/updates", params={"project_id": p["id"]}).json() == [] + assert h.admin.delete(f"/api/updates/{u['id']}").status_code == 404 + + +def test_删除项目会带走它的记录(h): + pid = h.today_period_id + p = h.project("用完就删") + h.update(p["id"], pid, content="临时记录") + assert h.admin.delete(f"/api/projects/{p['id']}").status_code == 200 + assert h.admin.get("/api/updates", params={"project_id": p["id"]}).json() == [] + + +def test_设置只认AI相关的键(h): + r = h.admin.put("/api/settings", json={"values": {"ai_model": "glm-4", "ai_api_key": "sk-x", + "ai_temperature": "0.5", "偷改的键": "1"}}) + assert r.json() == {"ok": True} + s = h.admin.get("/api/settings").json() + assert s["ai_model"] == "glm-4" and s["ai_api_key"] == "sk-x" and s["ai_temperature"] == "0.5" + assert "偷改的键" not in s + assert h.admin.get("/api/meta").json()["ai"]["has_key"] is True # 配了 Key 就显示已配置 diff --git a/tests/test_rbac.py b/tests/test_rbac.py new file mode 100644 index 0000000..5e0b35f --- /dev/null +++ b/tests/test_rbac.py @@ -0,0 +1,340 @@ +"""RBAC:菜单授权矩阵、多角色并集、后端总闸、自我保护、会话与审计。""" +from __future__ import annotations + +from app import security +from app.db import SessionLocal +from app.models import Role, RoleMenu, User, UserRole + + +# ------------------------------------------------------------------ 元信息 +def test_权限元信息给全前端要的三样(h): + meta = h.admin.get("/api/rbac/meta").json() + assert [m["key"] for m in meta["menus"]] == [ + "board", "projects", "custom", "focus", "staff", "intake", "settings", "rbac"] + assert all(m["label"] for m in meta["menus"]) + assert [lv["value"] for lv in meta["levels"]] == ["rw", "ro", ""] + assert {a["value"] for a in meta["actions"]} == { + "create", "update", "delete", "login", "logout", "password", "revoke"} + + +def test_内置角色与管理员账号自动就位(h): + roles = h.roles() + assert set(roles) == {"管理员", "部门成员", "只读访客"} + assert all(r["is_builtin"] for r in roles.values()) + assert roles["管理员"]["menus"]["rbac"] == "rw" + # 部门成员:业务菜单可编辑,设置与权限管理一律没有 + assert roles["部门成员"]["menus"]["custom"] == "rw" + assert "settings" not in roles["部门成员"]["menus"] and "rbac" not in roles["部门成员"]["menus"] + assert all(v == "ro" for k, v in roles["只读访客"]["menus"].items() if k != "rbac") + assert "rbac" not in roles["只读访客"]["menus"] + assert h.admin.get("/api/auth/me").json()["username"] == "admin" + + +# ------------------------------------------------------------------ 后端总闸 +def test_没授权的菜单读不到也改不了(h): + c = h.user_client("only_board", menus={"board": "rw"}) + assert c.get("/api/weekly").status_code == 200 + for path in ("/api/projects", "/api/custom/finance", "/api/staff", "/api/focus", "/api/settings"): + assert c.get(path).status_code == 403, path + assert c.post("/api/projects", json={"name": "越权"}).status_code == 403 + assert c.get("/api/rbac/users").status_code == 403 # 权限管理必须显式授权 + + +def test_只读能看不能改(h): + c = h.user_client("readonly", menus={"custom": "ro", "projects": "ro"}) + assert c.get("/api/custom/projects").status_code == 200 + assert c.get("/api/projects").status_code == 200 + assert c.post("/api/custom/projects", json={"name": "只读新建"}).status_code == 403 + assert c.patch("/api/custom/projects/1", json={"amount": 1}).status_code == 403 + assert "只读" in c.post("/api/custom/projects", json={"name": "x"}).json()["detail"] + + +def test_导出接口跟着对应页面的权限(h): + viewer = h.user_client("viewer", menus={"custom": "ro", "focus": "ro"}) + assert viewer.get("/api/export/custom").status_code == 200 + assert viewer.get("/api/export/focus").status_code == 200 + assert viewer.get("/api/export/projects").status_code == 403 + writer = h.user_client("writer", menus={"projects": "rw"}) + assert writer.get("/api/export/projects").status_code == 200 + assert writer.get("/api/export/custom").status_code == 403 + + +def test_周期列表人人可读但只有设置页可改(h): + member = h.user_client("member_a") # 部门成员:没有 settings + assert member.get("/api/periods").status_code == 200 + assert member.post("/api/periods", json={"label": "1月第1周"}).status_code == 403 + assert member.get("/api/settings").status_code == 403 + assert h.admin.post("/api/periods", json={"label": "1月第1周"}).status_code == 200 + + +def test_录入页权限管住AI接口(h): + no_intake = h.user_client("no_intake", menus={"board": "rw"}) + assert no_intake.post("/api/ai/parse", json={"raw_text": "干了点活"}).status_code == 403 + assert no_intake.post("/api/custom/ai/parse", json={"raw_text": "干了点活"}).status_code == 403 + intake = h.user_client("intake_guy", menus={"intake": "rw"}) + assert intake.post("/api/ai/parse", json={"raw_text": "完成了接口"}).status_code == 200 + ro_intake = h.user_client("intake_ro", menus={"intake": "ro"}) + assert ro_intake.post("/api/ai/parse", json={"raw_text": "x"}).status_code == 403 + + +def test_一个角色被清空权限后该用户什么都干不了(h): + c = h.user_client("nobody", menus={"board": "rw"}) + assert c.get("/api/weekly").status_code == 200 + role = h.roles()["角色-nobody"] + h.admin.patch(f"/api/rbac/roles/{role['id']}", json={"menus": {}}) + assert c.get("/api/auth/me").status_code == 401 # 改授权后强制重新登录 + fresh = h.login("nobody") + # 登录本身还是通的(前端要靠 /auth/me 判断并给出「请联系管理员」的提示),但业务接口全关 + me = fresh.get("/api/auth/me") + assert me.status_code == 200 and me.json()["menus"] == {} + for path in ("/api/weekly", "/api/projects", "/api/custom/finance", "/api/rbac/users"): + assert fresh.get(path).status_code == 403, path + + +# ------------------------------------------------------------------ 多角色并集 +def test_多角色取并集同一菜单取更高级别(h): + r_board_ro = h.role("只看看", {"board": "ro", "projects": "ro"})["id"] + r_board_rw = h.role("能改看板", {"board": "rw"})["id"] + r_custom = h.role("只管定制", {"custom": "rw"})["id"] + u = h.user("multi_role", role_ids=[r_board_ro, r_board_rw, r_custom]) + assert sorted(u["role_ids"]) == sorted([r_board_ro, r_board_rw, r_custom]) + assert set(u["role_names"]) == {"只看看", "能改看板", "只管定制"} + menus = u["menus"] + assert menus["board"] == "rw" and menus["projects"] == "ro" and menus["custom"] == "rw" + assert "staff" not in menus + c = h.login("multi_role") + assert c.get("/api/weekly").status_code == 200 + assert c.post("/api/custom/projects", json={"name": "定制能写"}).status_code == 200 + assert c.post("/api/projects", json={"name": "项目不能写"}).status_code == 403 + assert c.get("/api/staff").status_code == 403 + + +# ------------------------------------------------------------------ 角色管理 +def test_角色增删改的基本规则(h): + r = h.role("报表岗", {"board": "ro", "custom": "ro"}, description="只看数") + assert r["menus"] == {"board": "ro", "custom": "ro"} and r["is_builtin"] is False + assert h.admin.post("/api/rbac/roles", json={"name": "报表岗"}).status_code == 400 + assert h.admin.post("/api/rbac/roles", json={"name": " "}).status_code == 400 + # 未知菜单 / 非法级别一律丢掉,前端传什么都不怕 + r2 = h.role("脏权限", {"board": "rw", "不存在的菜单": "rw", "custom": "读写", "staff": "admin"}) + assert r2["menus"] == {"board": "rw"} + up = h.admin.patch(f"/api/rbac/roles/{r['id']}", + json={"name": "报表查看", "description": "", "menus": {"board": "rw"}}) + assert up.status_code == 200 and up.json()["name"] == "报表查看" + assert up.json()["description"] is None and up.json()["menus"] == {"board": "rw"} + assert h.admin.patch(f"/api/rbac/roles/{r['id']}", json={"name": " "}).status_code == 400 + assert h.admin.patch("/api/rbac/roles/99999", json={"name": "x"}).status_code == 404 + assert h.admin.delete(f"/api/rbac/roles/{r['id']}").json() == {"ok": True} + assert h.admin.delete("/api/rbac/roles/99999").status_code == 404 + + +def test_角色改名不能撞已有的名字(h): + h.role("先建的", {"board": "ro"}) + r2 = h.role("后建的", {"board": "ro"}) + r = h.admin.patch(f"/api/rbac/roles/{r2['id']}", json={"name": "先建的"}) + assert r.status_code == 400 and "已存在" in r.json()["detail"] + + +def test_内置角色的三道锁(h): + builtin = h.roles()["管理员"] + assert h.admin.delete(f"/api/rbac/roles/{builtin['id']}").status_code == 400 + assert h.admin.patch(f"/api/rbac/roles/{builtin['id']}", json={"name": "超级管理员"}).status_code == 400 + # 想把管理员的「权限管理」授权去掉?会被强行留一份,杜绝把自己锁在门外 + r = h.admin.patch(f"/api/rbac/roles/{builtin['id']}", json={"menus": {"board": "rw"}}) + assert r.status_code == 200 + assert r.json()["menus"] == {"board": "rw", "rbac": "rw"} + # 改授权会把这个角色下的用户一并踢下线——管理员改自己的角色也不例外,得重新登录 + assert h.admin.get("/api/auth/me").status_code == 401 + h.admin = h.login("admin") + assert h.admin.get("/api/auth/me").json()["menus"]["board"] == "rw" + # 另外两个内置角色可以改授权,但不能删 + member = h.roles()["部门成员"] + assert h.admin.delete(f"/api/rbac/roles/{member['id']}").status_code == 400 + assert h.admin.patch(f"/api/rbac/roles/{member['id']}", json={"menus": {"board": "ro"}}).status_code == 200 + assert h.roles()["部门成员"]["menus"] == {"board": "ro"} + # 还原内置授权,免得影响同一次运行里的其它断言 + with SessionLocal() as db: + db.query(RoleMenu).filter(RoleMenu.role_id == member["id"]).delete(synchronize_session=False) + for menu, level in security.BUILTIN_ROLES[1][2].items(): + db.add(RoleMenu(role_id=member["id"], menu=menu, level=level)) + db.commit() + + +def test_正在使用的角色不能删(h): + r = h.role("临时岗", {"board": "ro"}) + h.user("temp_user", role_ids=[r["id"]]) + res = h.admin.delete(f"/api/rbac/roles/{r['id']}") + assert res.status_code == 400 and "还有用户" in res.json()["detail"] + # 自己正在用的角色也不能删(管理员角色就是 admin 正在用的) + assert h.admin.delete(f"/api/rbac/roles/{h.roles()['管理员']['id']}").status_code == 400 + assert "内置角色" in h.admin.delete(f"/api/rbac/roles/{h.roles()['管理员']['id']}").json()["detail"] + + +# ------------------------------------------------------------------ 用户管理 +def test_建账号的校验(h): + h.user("dup_user", menus={"board": "ro"}) + assert h.admin.post("/api/rbac/users", json={"name": "重名", "username": "dup_user", + "password": "pw123456"}).status_code == 400 + assert h.admin.post("/api/rbac/users", json={"name": "", "username": "no_name", + "password": "pw123456"}).status_code == 400 + assert h.admin.post("/api/rbac/users", json={"name": "短密码", "username": "short_pw", + "password": "123"}).status_code == 400 + assert h.admin.post("/api/rbac/users", json={"name": "没这个角色", "username": "ghost_role", + "password": "pw123456", + "role_ids": [424242]}).status_code == 400 + # 不指定角色 → 默认给「部门成员」,避免建出一个进不了门的账号 + d = h.user("default_role") + assert d["role_names"] == ["部门成员"] + + +def test_用户列表字段与在线状态(h): + h.user("online_one", menus={"board": "ro"}) + h.login("online_one") # 制造一个在线会话 + users = {u["username"]: u for u in h.admin.get("/api/rbac/users").json()} + u = users["online_one"] + assert u["online"] >= 1 and u["active"] is True + assert u["menus"] == {"board": "ro"} and len(u["role_ids"]) == 1 + assert "password_hash" not in u and "role_id" not in u + + +def test_改名改权限会踢掉该账号的会话(h): + u = h.user("revoke_me", menus={"board": "rw"}) + c = h.login("revoke_me") + assert c.get("/api/weekly").status_code == 200 + r = h.role("换个岗位", {"custom": "rw"}) + assert h.admin.patch(f"/api/rbac/users/{u['id']}", json={"role_ids": [r["id"]]}).status_code == 200 + assert c.get("/api/weekly").status_code == 401 # 权限变了必须重新登录 + fresh = h.login("revoke_me") + assert fresh.get("/api/weekly").status_code == 403 + assert fresh.get("/api/custom/projects").status_code == 200 + + +def test_管理员重置密码不需要旧密码但会下线对方(h): + u = h.user("reset_pw", menus={"board": "ro"}) + c = h.login("reset_pw") + assert h.admin.patch(f"/api/rbac/users/{u['id']}", json={"password": "brandnew1"}).status_code == 200 + assert c.get("/api/auth/me").status_code == 401 + assert h.anon.post("/api/auth/login", json={"username": "reset_pw", + "password": "pw123456"}).status_code == 401 + assert h.login("reset_pw", "brandnew1").get("/api/auth/me").status_code == 200 + assert h.admin.patch(f"/api/rbac/users/{u['id']}", json={"password": "1"}).status_code == 400 + + +def test_不能动自己(h): + me = h.admin.get("/api/auth/me").json() + member_role = h.roles()["部门成员"]["id"] + r1 = h.admin.patch(f"/api/rbac/users/{me['id']}", json={"role_ids": [member_role]}) + assert r1.status_code == 400 and "自己的角色" in r1.json()["detail"] + r2 = h.admin.patch(f"/api/rbac/users/{me['id']}", json={"active": False}) + assert r2.status_code == 400 and "停用" in r2.json()["detail"] + r3 = h.admin.delete(f"/api/rbac/users/{me['id']}") + assert r3.status_code == 400 and "删除自己" in r3.json()["detail"] + # 但改自己的昵称是允许的 + assert h.admin.put("/api/auth/me", json={"name": "系统管理员"}).json()["name"] == "系统管理员" + + +def test_删除账号会连带清掉会话与角色关联(h): + u = h.user("drop_me", menus={"board": "ro"}) + c = h.login("drop_me") + assert h.admin.delete(f"/api/rbac/users/{u['id']}").json() == {"ok": True} + assert c.get("/api/auth/me").status_code == 401 + assert u["id"] not in {x["id"] for x in h.admin.get("/api/rbac/users").json()} + assert h.admin.delete("/api/rbac/users/424242").status_code == 404 + + +def test_没人能管权限时启动补种会自动补一个管理员(db): + """防锁死兜底:最后一个可管理账号丢了,ensure_seed 会把管理员角色补给最早的账号。""" + with SessionLocal() as s: + member = s.query(Role).filter(Role.name == "部门成员").one() + admin_role = s.query(Role).filter(Role.name == "管理员").one() + victim = s.query(User).filter(User.username == "admin").one() + s.query(UserRole).filter(UserRole.user_id == victim.id).delete() + s.add(UserRole(user_id=victim.id, role_id=member.id)) + s.commit() + assert victim.menus.get("rbac") is None + notes = security.ensure_seed(s) + assert any("管理员" in n for n in notes), notes + s.expire_all() + assert s.get(User, victim.id).menus["rbac"] == "rw" + assert admin_role is not None + + +# ------------------------------------------------------------------ 会话 +def test_会话列表能看得到并能逐个下线(h): + u = h.user("sess_one", menus={"board": "ro"}) + h.login("sess_one") + sessions = h.admin.get("/api/rbac/sessions").json() + mine = [s for s in sessions if s["user_id"] == u["id"]] + assert len(mine) == 1 + s = mine[0] + assert s["username"] == "sess_one" and s["token"] + # 列表只展示打码后的 token_hint,但下线要用完整 token + assert s["token"].startswith(s["token_hint"].rstrip("…")) and "…" in s["token_hint"] + assert s["expires_at"] and s["created_at"] + assert h.admin.delete(f"/api/rbac/sessions/{s['token']}").json() == {"ok": True} + assert [x for x in h.admin.get("/api/rbac/sessions").json() if x["user_id"] == u["id"]] == [] + assert h.admin.delete("/api/rbac/sessions/不存在的token").status_code == 404 + + +def test_下线自己的会话等于自己退出(h): + tokens = {s["username"]: s["token"] for s in h.admin.get("/api/rbac/sessions").json()} + assert h.admin.delete(f"/api/rbac/sessions/{tokens['admin']}").status_code == 200 + assert h.admin.get("/api/auth/me").status_code == 401 + + +# ------------------------------------------------------------------ 审计 +def test_写操作与越权尝试都留痕并能筛选(h): + r = h.role("审计岗", {"board": "ro"}) + u = h.user("audit_user", role_ids=[r["id"]]) + # 角色下还有人 → 删不掉,这次失败的尝试同样进日志 + assert h.admin.delete(f"/api/rbac/roles/{r['id']}").status_code == 400 + h.admin.delete(f"/api/rbac/users/{u['id']}") + assert h.admin.delete(f"/api/rbac/roles/{r['id']}").status_code == 200 + logs = h.admin.get("/api/rbac/logs", params={"menu": "rbac", "limit": 100}).json() + assert logs["total"] >= 3 + actions = {x["action"] for x in logs["items"]} + assert {"create", "delete"} <= actions + details = ";".join(x["detail"] or "" for x in logs["items"]) + assert "新建角色「审计岗」" in details and "删除角色「审计岗」" in details + assert all(x["username"] == "admin" for x in logs["items"]) + # 被拒的那次删除也留了痕,说明里带上了状态码 + denied_role = [x for x in logs["items"] if x["status"] == 400] + assert denied_role and "HTTP 400" in denied_role[0]["detail"] + # 越权尝试同样进日志,并带上被拒的说明 + h.user("bad_try", menus={"board": "ro"}) + c = h.login("bad_try") + assert c.post("/api/projects", json={"name": "越权"}).status_code == 403 + denied = h.admin.get("/api/rbac/logs", + params={"username": "bad_try", "action": "create"}).json() + assert denied["total"] == 1 + assert denied["items"][0]["status"] == 403 and "HTTP 403" in denied["items"][0]["detail"] + assert denied["items"][0]["menu"] == "projects" and denied["items"][0]["action"] == "create" + # 失败的登录也按被尝试的账号记一笔 + h.anon.post("/api/auth/login", json={"username": "bad_try", "password": "错的答案"}) + by_action = h.admin.get("/api/rbac/logs", params={"action": "login"}).json() + assert any(x["status"] == 401 and "登录失败" in (x["detail"] or "") for x in by_action["items"]) + # 筛选参数与分页 + assert h.admin.get("/api/rbac/logs", params={"action": "revoke"}).json()["total"] == 0 + page1 = h.admin.get("/api/rbac/logs", params={"limit": 1, "offset": 0}).json() + page2 = h.admin.get("/api/rbac/logs", params={"limit": 1, "offset": 1}).json() + assert page1["total"] == page2["total"] and page1["items"][0]["id"] != page2["items"][0]["id"] + assert h.admin.get("/api/rbac/logs", params={"days": 0}).status_code == 422 + + +def test_清空日志(h): + h.role("要被记一笔", {"board": "ro"}) + assert h.admin.get("/api/rbac/logs").json()["total"] >= 1 + assert h.admin.delete("/api/rbac/logs", params={"days": 0}).json()["deleted"] >= 1 + # 清空动作本身也会被记一笔,剩下的只应有一条「删除 /api/rbac/logs」 + rest = h.admin.get("/api/rbac/logs").json()["items"] + assert all(x["path"] == "/api/rbac/logs" for x in rest), rest + + +def test_敏感写操作的说明文字可读(h): + u = h.user("note_user", menus={"board": "ro"}) + h.admin.patch(f"/api/rbac/users/{u['id']}", json={"name": "改名了", "active": False}) + h.admin.post(f"/api/rbac/users/{u['id']}/revoke") + items = h.admin.get("/api/rbac/logs", params={"limit": 50}).json()["items"] + joined = ";".join(x["detail"] or "" for x in items) + assert "修改账号 note_user:改名、停用" in joined + assert "强制下线 note_user" in joined diff --git a/tests/test_staff_focus_weekly.py b/tests/test_staff_focus_weekly.py new file mode 100644 index 0000000..0e19f82 --- /dev/null +++ b/tests/test_staff_focus_weekly.py @@ -0,0 +1,197 @@ +"""人力库(花名册 / 负载)、每周重点工作、周视图汇总。""" +from __future__ import annotations + +from app import constants + + +def _row(h, name): + rows = [x for x in h.admin.get("/api/staff").json()["items"] if x["name"] == name] + assert rows, f"花名册里找不到 {name}" + return rows[0] + + +# ------------------------------------------------------------------ 人力库 +def test_花名册的增删改查(h): + a = h.staff("陈明", group="Nex产品组", affiliation="汇智", note="接口负责人") + assert (a["group"], a["affiliation"], a["note"]) == ("Nex产品组", "汇智", "接口负责人") + assert a["sort_order"] == 1 # 不给序号就排在最后 + assert h.staff("李雷", group="AI项目组", affiliation="云数科技")["group"] == "AI产品组" + assert _row(h, "李雷")["affiliation"] == "云数" # 历史写法归一到标准口径 + + assert h.admin.post("/api/staff", json={"name": "陈明"}).status_code == 400 + assert h.admin.post("/api/staff", json={"name": " "}).status_code == 400 + assert h.admin.patch("/api/staff/424242", json={"note": "x"}).status_code == 404 + assert h.admin.delete("/api/staff/424242").status_code == 404 + + upd = h.admin.patch(f"/api/staff/{a['id']}", json={"note": "换成项目负责人", "偷改": 1}).json() + assert upd["synced"] == {"projects": 0, "custom_projects": 0} + assert upd["staff"]["note"] == "换成项目负责人" and "偷改" not in upd["staff"] + assert h.admin.patch(f"/api/staff/{a['id']}", json={"name": "李雷"}).status_code == 400 + assert h.admin.patch(f"/api/staff/{a['id']}", json={"name": " "}).status_code == 400 + + # 归档后默认列表看不到,但名字仍占着,不能新建同名 + h.admin.patch(f"/api/staff/{a['id']}", json={"archived": True}) + assert "陈明" not in [x["name"] for x in h.admin.get("/api/staff").json()["items"]] + assert "陈明" in [x["name"] for x in h.admin.get("/api/staff", params={"archived": "true"}).json()["items"]] + assert h.admin.post("/api/staff", json={"name": "陈明"}).status_code == 400 + # 关键字命中姓名或备注;小组筛选按标准口径 + assert [x["name"] for x in h.admin.get("/api/staff", params={"archived": "all", "keyword": "负责人"}).json()["items"]] == ["陈明"] + assert [x["name"] for x in h.admin.get("/api/staff", params={"keyword": "李雷"}).json()["items"]] == ["李雷"] + assert [x["name"] for x in h.admin.get("/api/staff", params={"group": "AI产品组"}).json()["items"]] == ["李雷"] + + +def test_负载统计与删除保护(h): + s = h.staff("王芳", group="定制产品组") + p = h.project("园区项目", owners=["王芳"], is_key=True) + cp = h.custom("定制甲", owner="王芳", amount=100000, revenue_amount=40000) + h.project("别人的项目", owners=["赵四"], members=["王芳"]) + row = _row(h, "王芳") + assert (row["project_count"], row["key_project_count"]) == (1, 1) + assert row["custom_count"] == 1 + assert (row["custom_amount"], row["custom_pending"]) == (100000.0, 60000.0) + assert row["last_update"] is None # 名下项目还没有任何执行记录 + + data = h.admin.get("/api/staff").json() + assert data["summary"]["total"] == 1 and data["summary"]["with_project"] == 1 + assert {"name": "定制产品组", "count": 1} in data["summary"]["groups"] + assert {"name": "未填写", "count": 1} in data["summary"]["affiliations"] + assert data["summary"]["outside"] == [{"name": "赵四", "project_count": 1, "custom_count": 0}] + assert data["dict"]["groups"] and data["dict"]["affiliations"] + + # 有执行记录之后,负载上能看到最近一次动静在哪一周 + pid = h.today_period_id + h.update(p["id"], pid, content="本周推进") + assert _row(h, "王芳")["last_update"] == h.periods()["weeks"][-1]["full_label"] + + # 名下有在管项目:默认不给删,提示归档;确认要删才删 + r = h.admin.delete(f"/api/staff/{s['id']}") + assert r.status_code == 400 and "归档" in r.json()["detail"] + assert h.admin.delete(f"/api/staff/{s['id']}?force=true").json()["ok"] is True + assert h.admin.get("/api/projects").json() and h.admin.get("/api/custom/projects").json() + + # 改名要把名下项目的负责人一并带过去,否则负载和记录会认不出人 + q = h.staff("旧名字") + mine = h.project("要跟着改名的项目", owners=["旧名字"], other_owners=["旧名字"]) + patched = h.admin.patch(f"/api/staff/{q['id']}", json={"name": "新名字"}).json() + assert patched["synced"] == {"projects": 1, "custom_projects": 0} + fresh = h.admin.get(f"/api/projects/{mine['id']}").json()["project"] + assert fresh["owner"] == "新名字" and "旧名字" not in fresh["owners"] + assert cp["id"] + + +# ------------------------------------------------------------------ 每周重点工作 +def test_重点工作按录入周归属(h): + today = h.periods()["today_id"] + item = h.focus("整理三季度复盘") + assert item["period_id"] == today # 不传周期就按今天所在的周 + assert item["status"] == "not_started" and item["delayed"] is False + + assert h.admin.post("/api/focus", json={"content": " "}).status_code == 400 + assert h.admin.post("/api/focus", json={"content": "x", "status": "起飞了"}).status_code == 400 + assert h.admin.post("/api/focus", json={"content": "x", "period_id": 424242}).status_code == 400 + bad = h.admin.post("/api/focus", json={"content": "x", "due_date": "下周五"}) + assert bad.status_code == 400 and "YYYY-MM-DD" in bad.json()["detail"] + + week = h.period(2028, 3, 2) + other = h.focus("明年这时候干", period_id=week["id"], due_date="2028-03-20", detail="说明") + assert other["period_id"] == week["id"] and other["due_date"] == "2028-03-20" + # 改预计完成时间不会把条目搬去别的周 + moved = h.admin.patch(f"/api/focus/{other['id']}", json={"due_date": "2026-01-05"}).json() + assert moved["due_date"] == "2026-01-05" and moved["period_id"] == week["id"] + assert h.admin.patch(f"/api/focus/{other['id']}", json={"due_date": ""}).json()["due_date"] is None + done = h.admin.patch(f"/api/focus/{other['id']}", + json={"status": "done", "result": "已完成", "delayed": True}).json() + assert (done["status"], done["result"], done["delayed"]) == ("done", "已完成", True) + assert h.admin.patch(f"/api/focus/{other['id']}", json={"status": "不认识"}).status_code == 400 + assert h.admin.patch(f"/api/focus/{other['id']}", json={"content": ""}).status_code == 400 + assert h.admin.patch("/api/focus/424242", json={"status": "done"}).status_code == 404 + + rows = h.admin.get("/api/focus").json() + assert [x["id"] for x in rows] == [other["id"], item["id"]] # 新录入在前 + assert [x["id"] for x in h.admin.get("/api/focus", params={"status": "done"}).json()] == [other["id"]] + assert [x["id"] for x in h.admin.get("/api/focus", params={"keyword": "复盘"}).json()] == [item["id"]] + assert [x["id"] for x in h.admin.get("/api/focus", params={"keyword": "说明"}).json()] == [other["id"]] + h.admin.patch(f"/api/focus/{item['id']}", json={"archived": True}) + assert item["id"] not in [x["id"] for x in h.admin.get("/api/focus").json()] + assert item["id"] in [x["id"] for x in h.admin.get("/api/focus", params={"archived": "true"}).json()] + assert h.admin.delete(f"/api/focus/{item['id']}").json()["ok"] is True + assert h.admin.delete("/api/focus/424242").status_code == 404 + + +# ------------------------------------------------------------------ 周视图 +def test_周视图把两条线的动态合在一起(h): + week = h.period(2028, 3, 2) + key = h.project("重点项目", owners=["王芳"], is_key=True) + quiet = h.project("沉默的重点项目", is_key=True) + h.update(key["id"], week["id"], content="接口联调过半", progress=60, + status="at_risk", risk="等对方给文档", next_step="周三对齐") + h.update(key["id"], week["id"], content="出现阻塞", status="blocked") + # 入库/下单时间取本周第一天,确保「本周新增」判定落在选中的这一周里 + week_first = constants.period_first_day(2028, 3, 2) + busy = h.custom("本周有动静的定制", owner="王芳", amount=100000, + entry_date=week_first, sign_date=week_first) + idle = h.custom("躺着不动的定制", amount=200000) + h.custom_update(busy["id"], week["id"], content="完成部署", progress=80, + amount_delta=50000, revenue_delta=20000, risk="验收时间待定") + + d = h.admin.get("/api/weekly", params={"period_id": week["id"]}).json() + assert [x["id"] for x in d["periods"]] == [week["id"]] + projects = {x["name"]: x for x in d["projects"]} + assert set(projects) == {"重点项目", "沉默的重点项目"} # 非重点又没动静的不占版面 + assert projects["重点项目"]["has_update"] and projects["重点项目"]["update_count"] == 2 + assert projects["重点项目"]["progress"] == 60.0 + assert projects["重点项目"]["progress_source"] == "本周期" + assert projects["重点项目"]["risks"] == ["等对方给文档"] + assert projects["重点项目"]["status"] == "blocked" # 多条记录取最坏状态 + assert projects["沉默的重点项目"]["has_update"] is False + assert projects["沉默的重点项目"]["progress_source"] == "项目档案" + + # 定制这一线:本周有动静 / 本周新增 / 重点才占版面,躺着不动的默认不出现 + custom = {x["name"]: x for x in d["custom"]} + assert set(custom) == {"本周有动静的定制"} + assert custom["本周有动静的定制"]["is_new"] is True # 入库时间落在本周 + assert custom["本周有动静的定制"]["period_amount_delta"] == 50000.0 + assert custom["本周有动静的定制"]["period_revenue_delta"] == 20000.0 + + k = d["kpi"] + assert (k["key_total"], k["key_updated"], k["key_idle"]) == (2, 1, 1) + assert (k["update_count"], k["custom_new"], k["custom_updated"]) == (2, 1, 1) + assert k["amount_delta"] == 50000.0 and k["revenue_delta"] == 20000.0 + assert k["risk_count"] == 2 and k["at_risk_count"] == 1 and k["blocked_count"] == 1 + + # 按人筛选只看他名下的活儿 + byowner = h.admin.get("/api/weekly", params={"period_id": week["id"], "owner": "王芳"}).json() + assert [x["name"] for x in byowner["projects"]] == ["重点项目"] + assert [x["name"] for x in byowner["custom"]] == ["本周有动静的定制"] + # 月视图:该月各周合并统计,跨周的记录也算进来 + monthly = h.admin.get("/api/weekly", params={"year": 2028, "month": 3}).json() + assert monthly["kpi"]["update_count"] == 2 and monthly["periods"][0]["id"] == week["id"] + # all_custom:在途的定制项目全部列出来,没动静的也盯一眼 + everything = h.admin.get("/api/weekly", params={"period_id": week["id"], "all_custom": True}).json() + assert {x["name"] for x in everything["custom"]} == {"本周有动静的定制", "躺着不动的定制"} + assert {x["name"]: x["is_new"] for x in everything["custom"]}["躺着不动的定制"] is False + assert everything["kpi"]["custom_total"] == 2 + + +def test_周视图的没更新周数(h): + w1 = h.period(2028, 3, 1) + w2 = h.period(2028, 3, 2) + w3 = h.period(2028, 3, 3) + p = h.project("看更新节奏", is_key=True) + h.update(p["id"], w1["id"], content="第一周更新过一次") + rows = {x["name"]: x for x in h.admin.get("/api/weekly", params={"period_id": w3["id"]}).json()["projects"]} + assert rows["看更新节奏"]["idle_weeks"] == 2 and rows["看更新节奏"]["has_update"] is False + rows = {x["name"]: x for x in h.admin.get("/api/weekly", params={"period_id": w2["id"]}).json()["projects"]} + assert rows["看更新节奏"]["idle_weeks"] == 1 + assert rows["看更新节奏"]["last_update"] == "2028年3月第1周" + + +def test_选中的年月还没有周期时给空骨架(h): + h.project("空视图") + d = h.admin.get("/api/weekly", params={"year": 2031, "month": 6}).json() + assert d["periods"] == [] and d["projects"] == [] and d["custom"] == [] + assert set(d["kpi"]) == {"key_total", "key_updated", "key_idle", "project_listed", + "update_count", "custom_total", "custom_new", "custom_updated", + "custom_amount", "amount_delta", "revenue_delta", + "risk_count", "at_risk_count", "blocked_count"} + assert all(not v for v in d["kpi"].values()) diff --git a/web/app.js b/web/app.js index 78d2bd4..6f6bec5 100644 --- a/web/app.js +++ b/web/app.js @@ -17,14 +17,13 @@ meta: null, periods: null, categories: [], - board: null, - stats: null, projects: [], drawerProject: null, // 详情抽屉:周期反馈的显示粒度 / 范围 / 往前翻页偏移 dw: { group: "week", range: 2, back: 0 }, // 定制项目 customMeta: null, + finance: null, // /custom/finance 汇总:统计条与年度任务的唯一数据源 // 定制:项目明细 / 本周进展 两个 tab(原交付流水线 / 阶段看板 / 财务跟踪已下线) customTab: "list", customAnnualEdit: false, // 年度任务:默认查看模式,点「编辑」才可改 @@ -43,7 +42,6 @@ intakeType: "general", // 更新录入的两种方式:direct = 直接写入(原样存 1 条);ai = AI 整理(补结构化字段,也只存 1 条) intakeMode: "direct", - intakePeriodId: null, drawerCustom: null, // 周看板(左栏总览 + 右栏详情) weekly: null, @@ -55,6 +53,9 @@ focusRows: [], focusFilter: "week", focusArchived: false, + // 权限管理:当前 tab / 操作日志筛选 + rbacTab: "roles", + rbacLog: { username: "", menu: "", action: "", days: 30 }, // 人力资源库 staff: [], staffDict: { groups: [], affiliations: [] }, @@ -177,7 +178,7 @@ $("#sideUser").innerHTML = `

@@ -969,7 +1004,7 @@
本期交付记录(${row.updates.length})
${row.updates.length ? row.updates.map((x) => updateItem(x, "custom")).join("") - : `
本周期没有交付记录。
`} + : `
本周期没有交付记录
`}
${hist.length ? ` @@ -989,7 +1024,7 @@ if (add) add.addEventListener("click", () => openUpdateDialog({ kind: row.kind, periodId: state.weekId, projectId: row.id, customProjectId: row.id, - status: row.status, stage: row.stage, + status: row.status, customStatus: row.project_status, }) ); bindUpdateOps(box, row.updates); @@ -1040,13 +1075,14 @@ const { added, accepted, listed } = customWeeklySections(data.custom, scopeRange()); // 高风险取全部在档项目:/weekly 的 custom 只有本期有动态的,取全量才不会漏 // 只列「统计周期所在季度」要推动验收的高风险项目(按推动验收计划 Q1~Q4) - const riskQ = "Q" + scopeQuarter(); + const ctx = (state.finance || {}).context || {}; + const riskQ = "Q" + (ctx.quarter || (Math.floor(new Date().getMonth() / 3) + 1)); const risky = (state.customAll || data.custom) .filter((r) => isHighRisk(r) && String(r.accept_plan || "").trim().toUpperCase() === riskQ) .sort((a, b) => Number(b.amount || 0) - Number(a.amount || 0)); // 合计只算列出来的行(同一项目可能同时出现在新增与验收两段,这里按 id 去重),免得数字对不上清单 const sum = listed.reduce((a, r) => a + Number(r.amount || 0), 0); - const sec = (title, sub, list, tag, o) => ` + const sec = (title, list, tag, o) => `
${title}
${list.length ? list.map((r) => weeklyCustomRow(r, tag(r), o)).join("") @@ -1068,11 +1104,11 @@
- ${sec("本周新增", "下单时间落在本周期(已下单 / 提前交付)", added, + ${sec("本周新增", added, (r) => `${esc(String(r.sign_date || "").slice(0, 10) || "本期下单")}`)} - ${sec("本周验收", "更新时间落在本周期且状态为已验收", accepted, + ${sec("本周验收", accepted, (r) => `${esc(String(r.update_date || "").slice(0, 10) || "本期验收")}`)} - ${sec("高风险项目(推动验收计划 " + riskQ + ")", "风险值为高风险且推动验收计划落在统计周期所在季度", risky, + ${sec("高风险项目(推动验收计划 " + riskQ + ")", risky, (r) => (r.project_status ? `${esc(r.project_status)}` : ""), { province: true, owner: false, empty: riskQ + " 没有推动验收的高风险项目" })}`; } @@ -1123,19 +1159,14 @@ const host = $("#view-board"); host.innerHTML = `
加载中…
`; if (!state.customMeta) state.customMeta = await api("/custom/meta"); - const [data, focusRows, customAll] = await Promise.all([ + const [data, focusRows, customAll, fin] = await Promise.all([ api("/weekly" + scopeQuery()), api("/focus" + focusQuery(["archived=false"])), - // 「本季度验收」与「定制项目 · 项目总览」同一口径:严格按「验收时间」(Q1~Q4 季度文本) api("/custom/projects?archived=false"), + api("/custom/finance" + finQuery()), ]); - const now = new Date(); - const qYear = now.getFullYear(), qNo = Math.floor(now.getMonth() / 3) + 1; - const qOf = (s) => { const t = String(s || "").trim().toUpperCase(); return /^Q[1-4]$/.test(t) ? t : ""; }; - // 与「定制项目 · 项目总览」同一口径:严格按「验收时间」(Q1~Q4 季度文本),没填的不计入 - const accQuarter = customAll.filter((p) => qOf(p.accept_date) === "Q" + qNo); - const accQuarterAmount = accQuarter.reduce((a, p) => a + Number(p.amount || 0), 0); - const accYearCount = customAll.filter((p) => qOf(p.accept_date)).length; + state.finance = fin; + const FC = fin.context, FK = fin.kpi; state.weekly = data; state.customAll = customAll; // 右栏「高风险项目」用全量台账 state.focusRows = focusRows; @@ -1161,7 +1192,7 @@
${Ico.badge("star")}
重点项目
${k.key_total}
本期已更新 ${k.key_updated}
${Ico.badge("list-checks")}
本周重点工作
${focus.week.length}
延期 ${focus.overdue.length} 条 · 已完成 ${focus.done.length} 条
${Ico.badge("activity")}
执行记录
${k.update_count}
在办项目 ${k.project_listed} 个
-
${Ico.badge("wallet")}
截止验收(${qYear}年Q${qNo})
${fen(accQuarterAmount)} 万
${accQuarter.length} 个项目 · 本年验收 ${accYearCount} 个
+
${Ico.badge("wallet")}
截止验收(${esc(FC.quarter_label)})
${fen(FK.accept_quarter.amount)} 万
${FK.accept_quarter.count} 个项目 · ${FC.year} 年验收 ${FK.accept_year.count} 个
${Ico.badge("alert")}
工作风险 / 阻塞
${k.at_risk_count} / ${k.blocked_count}
`; @@ -1481,13 +1512,13 @@
基本信息
-
+
${esc(entryWeek)}
-
+
`; $("#drawerBody").innerHTML = @@ -1772,20 +1803,53 @@ let keywordFocus = false; - /** 定制「项目归属」取值:前三项视为「已下单」,提前交付为下单前状态 */ - const CUSTOM_ORIGINS = ["华智下单", "存量项目", "汇智直签", "提前交付"]; - const CUSTOM_PLACED = ["华智下单", "存量项目", "汇智直签"]; - const isPlaced = (p) => CUSTOM_PLACED.indexOf(p.origin) >= 0; + /** 定制台账的下拉取值一律取 /custom/meta(后端是唯一来源),前端不再各写一份。 + * meta 没取到时用台账口径兜底,保证离线/异常时下拉不至于空。 */ + const CM_DEFAULTS = { + statuses: ["待开发", "进行中", "交付完成", "已验收", "退单"], + origins: ["华智下单", "存量项目", "汇智直签", "提前交付"], + placed_origins: ["华智下单", "存量项目", "汇智直签"], + industries: [], + risks: ["1.高风险", "2.低风险"], + }; + const cmOptions = (key) => { + const m = state.customMeta || {}; + return (m[key] && m[key].length) ? m[key] : CM_DEFAULTS[key]; + }; + /** 下拉 option:当前值不在标准取值里(历史脏数据)时补一项,避免一改就把原值清掉 */ + function optionHtml(list, sel) { + const l = (list || []).slice(); + if (sel && l.indexOf(sel) < 0) l.push(sel); + return l.map((v) => ``).join(""); + } + const isPlaced = (p) => cmOptions("placed_origins").indexOf(p.origin) >= 0; + + /** 验收年度下拉:验收时间只有季度,跨年靠它判定,跟季度成对填写 */ + function yearSelectHtml(id, value) { + const cur = Number(value) || 0; + const now = new Date().getFullYear(); + const list = []; + for (let y = now + 1; y >= now - 6; y--) list.push(y); + if (cur && list.indexOf(cur) < 0) list.unshift(cur); + return ``; + } async function renderCustom() { saveUI(); const host = $("#view-custom"); host.innerHTML = `
加载中…
`; if (!state.customMeta) state.customMeta = await api("/custom/meta"); - // 一次性取「全部定制项目」(不带搜索/筛选条件): - // 列表在本地按关键字/区域/状态筛选,而统计条始终基于全部数据。 - const allRows = await api("/custom/projects?archived=" + state.customArchived); + // 一次性取「全部定制项目」(不带搜索/筛选条件):列表在本地按关键字/区域/状态筛选; + // 财务口径由 /custom/finance 给出,跟着顶栏统计周期走,不随列表筛选变化。 + const [allRows, fin] = await Promise.all([ + api("/custom/projects?archived=" + state.customArchived), + api("/custom/finance" + finQuery()), + ]); state.customRows = allRows; + state.finance = fin; // 区域筛选:用规范名称、按大区分组,只列出实际有项目的区域 const usedSet = {}; @@ -1806,14 +1870,11 @@ ``; } - const STATUS_OPTIONS = ["已验收", "待开发", "交付完成", "进行中", "退单"]; - const statusFilterHtml = `` + - STATUS_OPTIONS.map((s) => ``).join(""); - const originFilterHtml = `` + - CUSTOM_ORIGINS.map((o) => ``).join(""); - const RISK_OPTIONS = ["1.高风险", "2.低风险"]; - const riskFilterHtml = `` + - RISK_OPTIONS.map((r) => ``).join(""); + const filterHtml = (label, list, cur) => `` + + list.map((v) => ``).join(""); + const statusFilterHtml = filterHtml("全部状态", cmOptions("statuses"), state.customStatus); + const originFilterHtml = filterHtml("全部归属", cmOptions("origins"), state.customOrigin); + const riskFilterHtml = filterHtml("全部风险值", cmOptions("risks"), state.customRisk); const isList = state.customTab !== "weekly" && state.customTab !== "annual"; // 三个 tab 是卡片外的页签,选中项和下方卡片连成一体;header 面板只放筛选器和功能按钮 @@ -1822,7 +1883,7 @@ .join("") + ``; const head = { tools: isList ? ` - ${keywordInputHtml("cKeyword", "搜索项目名称…(回车查询)", 200)} + ${keywordInputHtml("cKeyword", "搜索项目名称…", 200)} @@ -1833,7 +1894,7 @@ host.innerHTML = tabs + ( state.customTab === "weekly" ? renderCustomWeekly(allRows, head) - : state.customTab === "annual" ? renderCustomAnnual(allRows, head) + : state.customTab === "annual" ? renderCustomAnnual(head) : renderCustomList(allRows, head)); host.querySelectorAll("[data-ctab]").forEach((b) => @@ -1888,45 +1949,28 @@ const pageRows = pagedRows(view, "custom", [state.customTab, state.keyword, state.customOrigin, state.customRegion, state.customStatus, state.customRisk, state.customArchived]); - // ---- 统计条:基于「全部已下单项目」,不随搜索 / 筛选变化 ---- - const placed = allRows.filter(isPlaced); // 已下单 = 华智下单 / 存量项目 / 汇智直签 - const today = new Date(); - const Y = today.getFullYear(); - const M = today.getMonth() + 1; - const Q = Math.floor((M - 1) / 3) + 1; // 当前季度 1~4 - const sum = (arr, f) => arr.reduce((a, p) => a + Number(p[f] || 0), 0); - // 取日期里的「年-月」;像「2024年3月前」这种文本不参与季度/年度判定 - const ymOf = (d) => { - const s = String(d || ""); - return /^\d{4}-\d{2}/.test(s) ? { y: Number(s.slice(0, 4)), m: Number(s.slice(5, 7)) } : null; - }; - const inYear = (d) => { const t = ymOf(d); return !!t && t.y === Y; }; - const inQuarter = (d) => { const t = ymOf(d); return !!t && t.y === Y && Math.floor((t.m - 1) / 3) + 1 === Q; }; - - const signedQuarter = placed.filter((p) => inQuarter(p.sign_date)); - const signedYear = placed.filter((p) => inYear(p.sign_date)); - // 验收:严格按「验收时间」(accept_date,季度文本 Q1~Q4) —— 没填验收时间的不计入; - // 本季度 = 验收时间等于当前季度;本年 = 有验收时间(全部季度)。 - const qOf = (s) => { const t = String(s || "").trim().toUpperCase(); return /^Q[1-4]$/.test(t) ? t : ""; }; - const thisQ = "Q" + Q; - const accRows = allRows.filter((p) => qOf(p.accept_date)); - const accQuarter = accRows.filter((p) => qOf(p.accept_date) === thisQ); - const accYear = accRows; - - const stat = (label, count, amount, accent, icon) => - `
${Ico.badge(icon)}
${label}
${fen(amount)} 万
${count} 个项目
`; - + // ---- 统计条:口径全部来自 /custom/finance,跟着顶栏统计周期走,不随搜索 / 筛选变化 ---- + const C = (state.finance || {}).context || {}; + const K = (state.finance || {}).kpi || {}; + const stat = (label, box, accent, icon) => + `
${Ico.badge(icon)}
${label}
${fen((box || {}).amount)} 万
${(box || {}).count || 0} 个项目
`; const statBar = `
- ${stat("已下单项目 / 合同额", placed.length, sum(placed, "amount"), "accent-blue", "wallet")} - ${stat(`本季度下单(${Y}年Q${Q})`, signedQuarter.length, sum(signedQuarter, "amount"), "accent-violet", "trending-up")} - ${stat(`本年新增下单(${Y}年)`, signedYear.length, sum(signedYear, "amount"), "accent-violet", "trending-up")} - ${stat(`本季度验收(${Y}年Q${Q})`, accQuarter.length, sum(accQuarter, "amount"), "accent-amber", "receipt")} - ${stat(`本年验收项目(${Y}年)`, accYear.length, sum(accYear, "amount"), "accent-amber", "receipt")} + ${stat("已下单项目 / 合同额", K.placed, "accent-blue", "wallet")} + ${stat("本季度下单(" + esc(C.quarter_label || "—") + ")", K.sign_quarter, "accent-violet", "trending-up")} + ${stat("本年新增下单(" + (C.year || "—") + "年)", K.sign_year, "accent-violet", "trending-up")} + ${stat("本季度验收(" + esc(C.quarter_label || "—") + ")", K.accept_quarter, "accent-amber", "receipt")} + ${stat("本年验收(" + (C.year || "—") + "年)", K.accept_year, "accent-amber", "receipt")}
`; + // 台账里下单时间 / 验收时间填了系统认不出的写法时,在标题栏挂一个不挡事的提示 + const dirty = []; + if (K.sign_unknown) dirty.push(K.sign_unknown + " 个项目下单时间无法识别"); + if (K.accept_no_year) dirty.push(K.accept_no_year + " 个已验收项目未填验收年度"); + const dirtyTag = dirty.length + ? `${dirty.join(" · ")}` : ""; return `
- ${cardHead({ tools: hdr.tools })} + ${cardHead({ tools: hdr.tools + dirtyTag })} ${statBar} ${view.length ? customTableHtml(pageRows) : `
${state.keyword ? "没有匹配「" + esc(state.keyword) + "」的定制项目" : "当前筛选条件下没有定制项目"}
`} ${pagerBar("custom", view.length)} @@ -1938,7 +1982,7 @@ const ops = withOps !== false; const s = state.customSort || { key: "update_date", dir: "desc" }; const sth = (label, k, cls) => - `${label}${s.key === k ? (s.dir === "asc" ? " ▲" : " ▼") : ""}`; + `${label}${s.key === k ? (s.dir === "asc" ? " ▲" : " ▼") : ""}`; return `
@@ -2022,7 +2066,7 @@ function renderCustomWeekly(allRows, hdr) { hdr = hdr || {}; const sc = scopeRange(); - if (!sc) return `
没有取到当前周期的起止日期(刚更新过后端的话,请重启服务后刷新)
`; + if (!sc) return `
没有取到当前周期的起止日期
`; const start = sc.start, end = sc.end; const dayOf = (v) => String(v || "").slice(0, 10); const inScope = (v) => { const s = dayOf(v); return !!s && s >= start && s <= end; }; @@ -2055,85 +2099,74 @@ `; } - /** 年度任务:季度计收目标(可在页面上改,存后端)+ 按「验收时间 / 下单时间」回填的完成数据 */ - function renderCustomAnnual(allRows, hdr) { + /** 年度任务:四季度的计收目标(万元,可在页面编辑)+ 后端回填的完成数据。 + * 完成数据按「验收年度 + 验收季度」归集,跨年不会串;下单列按下单时间所在季度归集。 */ + function renderCustomAnnual(hdr) { hdr = hdr || {}; - const meta = annualTargetMeta(); - const Y = meta.year; - const saved = meta.targets; - const qOf = (s) => { const t = String(s || "").trim().toUpperCase(); return /^Q[1-4]$/.test(t) ? t : ""; }; - const signQ = (d) => { - const s = String(d || ""); - if (!/^\d{4}-\d{2}/.test(s) || Number(s.slice(0, 4)) !== Y) return 0; - return Math.floor((Number(s.slice(5, 7)) - 1) / 3) + 1; - }; - const sumW = (arr) => arr.reduce((a, p) => a + Number(p.amount || 0), 0) / 10000; // 元 → 万元 - const fmt = (v) => v.toLocaleString("zh-CN", { maximumFractionDigits: 2 }); - const rate = (target, acc) => (!target ? "—" : ((acc / target) * 100).toFixed(1) + "%"); - const targetOf = (q) => Number(saved[String(q)] || 0); - - const rows = [1, 2, 3, 4].map((q) => { - const acc = allRows.filter((p) => qOf(p.accept_date) === "Q" + q); // 计收:验收项目 - const sign = allRows.filter((p) => isPlaced(p) && signQ(p.sign_date) === q); // 签单:下单项目(已下单) - const accAmt = sumW(acc); - return { q, target: targetOf(q), accN: acc.length, accAmt, signN: sign.length, signAmt: sumW(sign) }; - }); - const tot = rows.reduce((a, r) => ({ - target: a.target + r.target, accN: a.accN + r.accN, accAmt: a.accAmt + r.accAmt, - signN: a.signN + r.signN, signAmt: a.signAmt + r.signAmt, - }), { target: 0, accN: 0, accAmt: 0, signN: 0, signAmt: 0 }); - + const a = (state.finance || {}).annual || {}; + const year = a.year || new Date().getFullYear(); + const quarters = a.quarters || []; const editing = !!state.customAnnualEdit; + const fmt = (v) => Number(v || 0).toLocaleString("zh-CN", { maximumFractionDigits: 2 }); + const toWan = (v) => fmt(Number(v || 0) / 10000); // 后端存元,表头是万元 + const rate = (target, acc) => (!target ? "—" : ((Number(acc || 0) / 10000 / target) * 100).toFixed(1) + "%"); + const tr = (r) => ` - - + + - - - - - + + + + + `; + const t = a.total || {}; + const u = a.unscheduled || {}; // 有年份、认不出季度的项目,计入年度但不进任何一季度 + const uRow = (!u.acc_count && !u.sign_count) ? "" : ` + + + + + + + + + `; return `
${cardHead({ tools: canW("custom") ? `` : "" })}
Q${r.q}Q${r.q}${r.current ? ` 本季度` : ""} ${editing - ? `` + ? `` : fmt(r.target)}${r.accN}${fmt(r.accAmt)}${rate(r.target, r.accAmt)}${r.signN}${fmt(r.signAmt)}${r.acc_count}${toWan(r.acc_amount)}${rate(r.target, r.acc_amount)}${r.sign_count}${toWan(r.sign_amount)}
未分季—${u.acc_count || 0}${toWan(u.acc_amount)}—${u.sign_count || 0}${toWan(u.sign_amount)}
- + - + - ${rows.map(tr).join("")} + ${quarters.map(tr).join("")} + ${uRow} - - - - - - + + + + + +
季度(${Y}年)季度(${year}年) 计收目标(万元) 计收项目数量 计收项目金额(万元) 计收完成率 新增签单项目数量新增签单项目数量金额(万元)新增签单项目金额(万元)
合计${fmt(tot.target)}${tot.accN}${fmt(tot.accAmt)}${rate(tot.target, tot.accAmt)}${tot.signN}${fmt(tot.signAmt)}${fmt(t.target)}${t.acc_count || 0}${toWan(t.acc_amount)}${rate(t.target, t.acc_amount)}${t.sign_count || 0}${toWan(t.sign_amount)}
-
`; } - /** 年度计收目标(万元):后端存一年一套,没配过时返回《年度任务.xlsx》的默认值 */ - function annualTargetMeta() { - const a = (state.customMeta && state.customMeta.annual_targets) || {}; - return { year: a.year || new Date().getFullYear(), targets: a.targets || {} }; - } - /** 年度目标:默认只读,点「编辑」进入编辑模式(按钮变「保存」),改数字实时重算完成率与合计 */ function bindAnnualTargets(host) { const btn = host.querySelector("#atSave"); @@ -2142,33 +2175,38 @@ btn.addEventListener("click", () => { state.customAnnualEdit = true; renderCustom(); }); return; } - const meta = annualTargetMeta(); - const save = btn; + const annual = ((state.finance || {}).annual) || {}; + const quarters = annual.quarters || []; const inputs = Array.prototype.slice.call(host.querySelectorAll("[data-at]")); - const fmt = (v) => v.toLocaleString("zh-CN", { maximumFractionDigits: 2 }); + const fmt = (v) => Number(v || 0).toLocaleString("zh-CN", { maximumFractionDigits: 2 }); const valOf = (q) => { const el = inputs.filter((i) => i.dataset.at === String(q))[0]; return el ? Number(el.value) || 0 : 0; }; - const rate = (target, acc) => (!target ? "—" : ((acc / target) * 100).toFixed(1) + "%"); + const unschAcc = Number(((annual.unscheduled || {}).acc_amount) || 0); + const accOf = (q) => (q === 0 + ? quarters.reduce((x, r) => x + (Number(r.acc_amount) || 0), 0) + unschAcc + : (quarters.filter((r) => r.q === q)[0] || {}).acc_amount) || 0; const recalc = () => { - const total = [1, 2, 3, 4].reduce((a, q) => a + valOf(q), 0); + const total = [1, 2, 3, 4].reduce((x, q) => x + valOf(q), 0); host.querySelectorAll("[data-ate]").forEach((cell) => { const q = Number(cell.dataset.ate); const target = q === 0 ? total : valOf(q); - cell.textContent = rate(target, Number(cell.dataset.acc) || 0); + cell.textContent = !target ? "—" : ((accOf(q) / 10000 / target) * 100).toFixed(1) + "%"; }); - host.querySelector("[data-att]").textContent = fmt(total); + const cell = host.querySelector("[data-att]"); + if (cell) cell.textContent = fmt(total); }; inputs.forEach((i) => i.addEventListener("input", recalc)); - save.addEventListener("click", async () => { + btn.addEventListener("click", async () => { const targets = {}; inputs.forEach((i) => { targets[i.dataset.at] = Number(i.value) || 0; }); - save.disabled = true; + btn.disabled = true; try { - state.customMeta.annual_targets = await put("/custom/annual-targets", { year: meta.year, targets: targets }); + await put("/custom/annual-targets", { year: annual.year, targets: targets }); + state.finance = null; // 目标变了,重新取一次财务汇总 } catch (e) { - save.disabled = false; + btn.disabled = false; toast("保存失败:" + e.message); return; } @@ -2220,20 +2258,16 @@ String(today.getMonth() + 1).padStart(2, "0") + "-" + String(today.getDate()).padStart(2, "0"); - // 选项直接对齐《定开项目.xlsx》台账字段取值 - const opts = (list, sel) => - list.map((v) => ``).join(""); - const originOpts = opts(CUSTOM_ORIGINS, "华智下单"); - const industryOpts = opts(["安平", "政府", "企业", "教育", "交通", "医疗", "高速", "行业", "其他"], ""); - const statusOpts = opts(["待开发", "进行中", "交付完成", "已验收", "退单"], "待开发"); - const riskOpts = opts(["1.高风险", "2.低风险"], "2.低风险"); + const originOpts = optionHtml(cmOptions("origins"), "华智下单"); + const industryOpts = optionHtml(cmOptions("industries"), ""); + const statusOpts = optionHtml(cmOptions("statuses"), "待开发"); + const riskOpts = optionHtml(cmOptions("risks"), "2.低风险"); const numVal = (sel) => ($(sel).value === "" ? null : Number($(sel).value)); const txtVal = (sel) => $(sel).value.trim() || null; openModal( `

数据库

${esc(health.db)}
-
- 默认使用 SQLite(data/board.db),无需安装任何服务。

- 迁移到 MySQL:
- 1. 安装驱动:pip install pymysql cryptography
- 2. 在 .env 中设置:
- DATABASE_URL=mysql+pymysql://user:pwd@host:3306/unis_board?charset=utf8mb4
- 3. 重启服务,表结构自动创建;再用 - python scripts/import_excel.py --reset 重新灌数即可。

- 数据访问层全部走 SQLAlchemy,无原生 SQL,切换方言不需要改业务代码。 -
+
data/board.db
@@ -3027,7 +3013,7 @@ ${pagedRows(weeks, "periods").map((w) => ` - ${esc(w.full_label)} (原标签:${esc(w.label)}) + ${esc(w.full_label)} ${w.update_count || 0} ${w.custom_update_count || 0} ${rw ? `` : ""} @@ -3050,7 +3036,9 @@ const id = Number(b.dataset.delperiod); const row = b.closest("tr"); const name = row.querySelector("b").textContent; - if (!confirm(`确认删除周期「${name}」?`)) return; + const ok = await confirmDialog({ title: "删除周期", danger: true, okText: "确认删除", + body: `

确认删除周期 ${esc(name)}?该周期下已没有记录。

` }); + if (!ok) return; try { await del("/periods/" + id); toast("已删除周期 " + name); @@ -3115,7 +3103,7 @@ ${peopleEditorHtml("dwOwners", "负责人", p.owners, { add: "负责人" })} ${peopleEditorHtml("dwMembers", "团队成员", p.members, { add: "成员" })}
%
-
+
` : `
项目信息
@@ -3176,7 +3164,6 @@ const gotoIntake = () => { state.intakeType = "general"; state.intakeMode = "direct"; - state.intakePeriodId = state.weekId; intakeProjectId = pid; closeDrawer(); setView("intake"); @@ -3332,7 +3319,6 @@
- ${isNew ? "" : `
改姓名会把名下项目的负责人一并改过来,历史记录不会断。
`} ` @@ -3370,8 +3356,7 @@ danger: true, okText: "确认删除", body: `

确认从花名册删除 ${esc(m.name)}?

-
删除后这个人不再出现在「负责人」下拉里。 - 若他名下还有在管项目,接口会拒绝删除 —— 离职人员请用归档,历史数据完整保留。
`, +
名下还有在管项目时不能删除,离职人员请改用归档。
`, }); if (!ok) return; try { @@ -3432,7 +3417,7 @@ `; const pageRows = pagedRows(d.items, "staff", [state.keyword, state.staffArchived, state.staffGroup]); - const table = ` + const table = `
@@ -3446,15 +3431,9 @@ : `${esc(m.name)}`} ${m.archived ? `已归档` : ""} - - - + + + @@ -3517,55 +3496,66 @@ host.querySelectorAll("[data-outside]").forEach((b) => b.addEventListener("click", () => openStaffDialog({ name: b.dataset.outside })) ); - const roStaff = !canW("staff"); - host.querySelectorAll("tr[data-sid]").forEach((tr) => { - const id = Number(tr.dataset.sid); - tr.querySelectorAll("[data-sf]").forEach((inp) => { - if (roStaff) { inp.disabled = true; return; } - inp.addEventListener("change", async () => { - const f = inp.dataset.sf; - try { - await patch("/staff/" + id, { [f]: inp.value || null }); - toast("已保存"); - await afterWrite(); - } catch (e) { toast("保存失败:" + e.message); } - }); - }); - }); } /* ------------------------------------------------------ 权限管理(RBAC) */ - /** 角色 = 一张「菜单 × 能改/只读」矩阵;用户挂一个角色。下拉改完即存,后端立刻生效。 */ + const RBAC_TABS = [["roles", "角色权限"], ["users", "用户"], ["sessions", "在线会话"], ["logs", "操作日志"]]; + + /** 角色权限矩阵 / 用户挂角色 / 在线会话 / 操作日志,四个 tab 共用一次 meta+roles+users 请求。 */ async function renderRbac() { const host = $("#view-rbac"); host.innerHTML = `
加载中…
`; + const tab = state.rbacTab || "roles"; const [meta, roles, users] = await Promise.all([ api("/rbac/meta"), api("/rbac/roles"), api("/rbac/users"), ]); const rw = canW("rbac"); - const menus = meta.menus; const save = async (fn) => { try { await fn(); } catch (e) { toast("保存失败:" + e.message); } await renderRbac(); }; + let sessions = [], logs = { total: 0, items: [] }; + if (tab === "sessions") sessions = await api("/rbac/sessions"); + if (tab === "logs") logs = await api("/rbac/logs" + rbacLogQuery()); + const tabs = `
` + RBAC_TABS.map(([k, label]) => + ``).join("") + `
`; + const pages = { + roles: rbacRolesPage(meta, roles, rw), + users: rbacUsersPage(users, rw), + sessions: rbacSessionsPage(sessions, rw), + logs: rbacLogsPage(meta, logs, rw), + }; + host.innerHTML = tabs + (pages[tab] || pages.roles); + + host.querySelectorAll("[data-rbactab]").forEach((b) => + b.addEventListener("click", () => { state.rbacTab = b.dataset.rbactab; renderRbac(); }) + ); + bindPager(host, renderRbac); + if (tab === "roles") bindRbacRoles(host, roles, rw, save); + else if (tab === "users") bindRbacUsers(host, users, roles, rw, save); + else if (tab === "sessions") bindRbacSessions(host, rw, save); + else bindRbacLogs(host, save); + } + + /* ---- tab 1:角色 × 菜单 权限矩阵(改一格提交整行,后端立刻生效) ---- */ + function rbacRolesPage(meta, roles, rw) { const levelCell = (role, m) => { const cur = (role.menus || {})[m.key] || ""; return ``; }; - const rolePage = pagedRows(roles, "rbacRole"); - const roleTable = `
姓名归属小组人员归属说明 在管项目定制项目定制合同额${esc(m.group || "—")}${esc(m.affiliation || "—")}${nl2br(m.note) || "—"} ${m.project_count ? `${m.project_count}${m.key_project_count ? ` ${starMark(true, false, "重点项目")}${m.key_project_count}` : ""}` : "—"} ${m.custom_count} ${m.custom_amount ? fen(m.custom_amount) + " 万" : "—"}
+ const table = `
- ${menus.map((m) => ``).join("")} + ${meta.menus.map((m) => ``).join("")} ${rw ? `` : ""} - ${rolePage.map((r) => ` - - ${menus.map((m) => levelCell(r, m)).join("")} + ${pagedRows(roles, "rbacRole").map((r) => ` + + ${meta.menus.map((m) => levelCell(r, m)).join("")} ${rw ? `` : ""} `).join("")}
角色 / 说明${esc(m.label)}${esc(m.label)}用户操作
${esc(r.name)}${r.is_builtin ? ` 内置` : ""}${r.description ? `${esc(r.description)}` : ""}
${esc(r.name)}${r.is_builtin ? ` 内置` : ""}${r.description ? `${esc(r.description)}` : ""}${r.user_count} @@ -3573,52 +3563,18 @@
`; + return listCard({ + title: "角色权限", count: roles.length, rows: roles, table: table, empty: "还没有角色", + pager: pagerBar("rbacRole", roles.length), + tools: rw ? `` : "", + }); + } - const roleOpts = (sel) => roles.map((r) => - ``).join(""); - const userPage = pagedRows(users, "rbacUser"); - const userTable = ` - - - ${rw ? `` : ""} - - ${userPage.map((u) => { - const self = u.id === state.me.id; - return ` - - - - - - ${rw ? `` : ""} - `; - }).join("")} -
姓名登录账号角色可用菜单最近登录操作
${esc(u.name)}${self ? ` 我自己` : ""}${u.active ? "" : ` 已停用`}${esc(u.username)}${u.menus ? Object.keys(u.menus).length : 0}${esc(u.last_login_at ? u.last_login_at.replace("T", " ").slice(0, 16) : "从未登录")} - - ${self ? "" : ` - - `} -
`; - - host.innerHTML = - listCard({ - title: "角色权限", count: roles.length, rows: roles, table: roleTable, empty: "还没有角色", - pager: pagerBar("rbacRole", roles.length), - tools: rw ? `` : "", - }) + - `
` + - listCard({ - title: "用户", count: users.length, rows: users, table: userTable, empty: "还没有用户", - pager: pagerBar("rbacUser", users.length), - tools: rw ? `` : "", - }); - - bindPager(host, renderRbac); - // ---- 权限矩阵:一个角色的整行一起提交 ---- + function bindRbacRoles(host, roles, rw, save) { host.querySelectorAll("[data-rmenu]").forEach((sel) => sel.addEventListener("change", () => { const rid = Number(sel.dataset.rmenu); - const mine = state.me.role_id === rid; + const mine = (state.me.role_ids || []).indexOf(rid) >= 0; const next = {}; sel.closest("tr").querySelectorAll("[data-rmenu]").forEach((x) => { if (x.value) next[x.dataset.menu] = x.value; }); save(() => patch("/rbac/roles/" + rid, { menus: next })).then(() => { @@ -3639,19 +3595,60 @@ if (ok) save(() => del("/rbac/roles/" + r.id)); }) ); + } - // ---- 用户 ---- + /* ---- tab 2:用户(可挂多个角色,权限取并集) ---- */ + function rbacUsersPage(users, rw) { + const table = ` + + + + ${rw ? `` : ""} + + ${pagedRows(users, "rbacUser").map((u) => { + const self = u.id === state.me.id; + return ` + + + + + + + ${rw ? `` : ""} + `; + }).join("")} +
姓名登录账号角色可用菜单在线最近登录操作
${esc(u.name)}${self ? ` 我自己` : ""}${u.active ? "" : ` 已停用`}${esc(u.username)}${(u.role_names || []).length ? (u.role_names || []).map((n) => `${esc(n)}`).join(" ") : `未分配`}${u.menus ? Object.keys(u.menus).length : 0}${u.online || 0}${esc(u.last_login_at ? u.last_login_at.replace("T", " ").slice(0, 16) : "从未登录")} + + + + ${self ? "" : ` + + `} +
`; + return listCard({ + title: "用户", count: users.length, rows: users, table: table, empty: "还没有用户", + pager: pagerBar("rbacUser", users.length), + tools: rw ? `` : "", + }); + } + + function bindRbacUsers(host, users, roles, rw, save) { + const find = (id) => users.find((x) => x.id === Number(id)); const bnu = $("#btnNewUser"); if (bnu) bnu.addEventListener("click", () => openUserDialog(null, roles)); - host.querySelectorAll("[data-urole]").forEach((sel) => - sel.addEventListener("change", () => - save(() => patch("/rbac/users/" + Number(sel.dataset.urole), { role_id: Number(sel.value) })) - ) + host.querySelectorAll("[data-uedit]").forEach((b) => + b.addEventListener("click", () => openUserDialog(find(b.dataset.uedit), roles)) ); host.querySelectorAll("[data-upw]").forEach((b) => - b.addEventListener("click", () => - openPasswordReset(users.find((x) => x.id === Number(b.dataset.upw))) - ) + b.addEventListener("click", () => openPasswordReset(find(b.dataset.upw))) + ); + host.querySelectorAll("[data-urevoke]").forEach((b) => + b.addEventListener("click", async () => { + const u = find(b.dataset.urevoke); + const ok = await confirmDialog({ title: "强制下线", okText: "确认下线", + body: `

下线 ${esc(u.name)}(${esc(u.username)})的所有登录?该账号需要重新登录。

` }); + if (ok) save(() => post("/rbac/users/" + u.id + "/revoke", {})); + }) ); host.querySelectorAll("[data-uactive]").forEach((b) => b.addEventListener("click", () => { @@ -3661,7 +3658,7 @@ ); host.querySelectorAll("[data-udel]").forEach((b) => b.addEventListener("click", async () => { - const u = users.find((x) => x.id === Number(b.dataset.udel)); + const u = find(b.dataset.udel); const ok = await confirmDialog({ title: "删除用户", danger: true, okText: "确认删除", body: `

确认删除用户 ${esc(u.name)}(${esc(u.username)})?该账号会立即下线。

` }); if (ok) save(() => del("/rbac/users/" + u.id)); @@ -3669,7 +3666,105 @@ ); } - /** 角色只影响「能看哪些菜单」,名称说明在这里改,菜单授权在矩阵里勾 */ + /* ---- tab 3:在线会话 ---- */ + function rbacSessionsPage(sessions, rw) { + const table = ` + + + ${rw ? `` : ""} + + ${pagedRows(sessions, "rbacSession").map((x) => ` + + + + + + + ${rw ? `` : ""} + `).join("")} +
用户登录账号登录时间有效期至来源客户端操作
${esc(x.name)}${esc(x.username)}${esc((x.created_at || "").replace("T", " ").slice(0, 16))}${esc((x.expires_at || "").replace("T", " ").slice(0, 16))}${esc(x.ip || "—")}${esc(x.user_agent || "—")}
`; + return listCard({ + title: "在线会话", count: sessions.length, rows: sessions, table: table, + empty: "当前没有有效登录", pager: pagerBar("rbacSession", sessions.length), + }); + } + + function bindRbacSessions(host, rw, save) { + if (!rw) return; + host.querySelectorAll("[data-kick]").forEach((b) => + b.addEventListener("click", () => save(() => del("/rbac/sessions/" + encodeURIComponent(b.dataset.kick)))) + ); + } + + /* ---- tab 4:操作日志 ---- */ + function rbacLogQuery() { + const f = state.rbacLog; + const p = ["days=" + f.days, "limit=200"]; + if (f.username) p.push("username=" + encodeURIComponent(f.username)); + if (f.menu) p.push("menu=" + encodeURIComponent(f.menu)); + if (f.action) p.push("action=" + encodeURIComponent(f.action)); + return "?" + p.join("&"); + } + + function rbacLogsPage(meta, data, rw) { + const f = state.rbacLog; + const sel = (id, label, options, cur) => `${label}`; + const menus = [{ value: "", label: "全部菜单" }].concat(meta.menus.map((m) => ({ value: m.key, label: m.label }))); + const actions = [{ value: "", label: "全部动作" }].concat(meta.actions.map((a) => ({ value: a.value, label: a.label }))); + const days = [1, 7, 30, 90].map((d) => ({ value: d, label: d + " 天内" })); + const items = data.items || []; + const label = (a) => ((meta.actions || []).filter((x) => x.value === a)[0] || {}).label || a || "—"; + const table = ` + + + + ${pagedRows(items, "rbacLog").map((x) => ` + + + + + + + + `).join("")} +
时间操作人动作菜单接口状态说明
${esc((x.created_at || "").replace("T", " ").slice(0, 19))}${esc(x.username || "—")}${esc(label(x.action))}${esc(((meta.menus || []).filter((m) => m.key === x.menu)[0] || {}).label || x.menu || "—")}${esc((x.method || "") + " " + (x.path || ""))}${x.status}${esc(x.detail || "—")}
`; + return listCard({ + title: "操作日志", count: data.total, rows: items, table: table, empty: "这个时间段没有操作记录", + pager: pagerBar("rbacLog", items.length), + tools: `` + + sel("lgMenu", "", menus, f.menu) + sel("lgAction", "", actions, f.action) + sel("lgDays", "", days, f.days) + + (rw ? `` : ""), + }); + } + + function bindRbacLogs(host, save) { + const f = state.rbacLog; + const input = $("#lgUser"); + if (input) { + input.addEventListener("keydown", (e) => { + if (e.key !== "Enter") return; + e.preventDefault(); + f.username = input.value.trim(); renderRbac(); + }); + input.addEventListener("search", () => { f.username = input.value.trim(); renderRbac(); }); + } + const bindSel = (id, key, cast) => { + const el = $("#" + id); + if (el) el.addEventListener("change", () => { f[key] = cast ? cast(el.value) : el.value; renderRbac(); }); + }; + bindSel("lgMenu", "menu"); + bindSel("lgAction", "action"); + bindSel("lgDays", "days", Number); + const cl = $("#lgClear"); + if (cl) cl.addEventListener("click", async () => { + const ok = await confirmDialog({ title: "清空操作日志", danger: true, okText: "确认清空", + body: `

将删除全部操作日志,删除后无法恢复。

` }); + if (ok) save(() => del("/rbac/logs")); + }); + } + function openRoleDialog(role) { const isNew = !role; openModal( @@ -3677,7 +3772,7 @@ ` @@ -3705,19 +3800,23 @@
-
+
${ + roles.map((r) => ``).join("") + }
+ ${!isNew && u.id === state.me.id ? `
不能修改自己的角色
` : ""} ${isNew ? `
` : ""}
-
换角色会强制该账号重新登录,权限立即按新角色生效。
` ); + const roleIds = () => $$("[data-urole]").filter((c) => c.checked).map((c) => Number(c.dataset.urole)); $("#mOk").addEventListener("click", async () => { const name = $("#usName").value.trim(); if (!name) return modalError("请填写姓名"); + if (!roleIds().length) return modalError("至少要挂一个角色"); const btn = $("#mOk"); btn.disabled = true; try { @@ -3725,9 +3824,11 @@ const username = $("#usUser").value.trim(); const password = $("#usPass").value.trim(); if (!username) return void (btn.disabled = false, modalError("请填写登录账号")); - await post("/rbac/users", { name: name, username: username, password: password, role_id: Number($("#usRole").value), active: true }); + await post("/rbac/users", { + name: name, username: username, password: password, active: true, role_ids: roleIds(), + }); } else { - await patch("/rbac/users/" + u.id, { name: name }); + await patch("/rbac/users/" + u.id, { name: name, role_ids: roleIds() }); } closeModal(); toast(isNew ? `已新建用户「${name}」` : "已保存"); @@ -3742,7 +3843,7 @@ ` @@ -3763,11 +3864,17 @@ state.categories = await api("/categories"); } + // 顶栏控件按视图给:周期选择器只对按周/月统计的页面有意义,搜索框对设置/权限/录入没有作用 + const PERIOD_VIEWS = ["board", "projects", "custom", "focus", "intake"]; + const SEARCH_VIEWS = ["board", "projects", "custom", "focus", "staff"]; + function setView(view) { if (!can(view)) view = firstAllowedView(); if (!view) { hostNoPermission(); return; } state.view = view; saveUI(); + document.querySelector(".period-bar").classList.toggle("hidden", PERIOD_VIEWS.indexOf(view) < 0); + $("#globalSearch").classList.toggle("hidden", SEARCH_VIEWS.indexOf(view) < 0); $$("#nav .nav-item").forEach((b) => b.classList.toggle("active", b.dataset.view === view)); $$(".view").forEach((v) => v.classList.add("hidden")); $("#view-" + view).classList.remove("hidden"); diff --git a/web/index.html b/web/index.html index c9aadc3..c92d838 100644 --- a/web/index.html +++ b/web/index.html @@ -92,15 +92,7 @@
DMS管理平台软件开发部
-
-

进展、风险、计收
一张看板看完

-
    -
  • 自研产品:每周执行记录与重点清单
  • -
  • 定制项目:下单、交付到验收计收
  • -
  • 权限管理:谁能看、谁能改,一处配好
  • -
-
-
数据留在本部门服务器,仅限内部使用
+

进展、风险、计收
一张看板看完

@@ -112,7 +104,6 @@ -
忘记密码或需要开通账号,请联系管理员
diff --git a/web/styles.css b/web/styles.css index 642d977..4f9b954 100644 --- a/web/styles.css +++ b/web/styles.css @@ -241,9 +241,13 @@ button:focus-visible, input:focus-visible, select:focus-visible, textarea:focus- /* ---------------- 权限管理 ---------------- */ .rbac-menu-th { font-size: 11px !important; white-space: nowrap; } -.rbac-role { min-width: 168px; } -.rbac-role b { display: block; font-size: 13px; } +.rbac-role { min-width: 138px; } +/* 权限矩阵列多,收紧内边距,避免 1280 宽时操作列盖住「用户」列 */ +.tbl-tight th, .tbl-tight td { padding-left: 8px; padding-right: 8px; } +.rbac-role b { font-size: 13px; } .rbac-role span { font-size: 11px; color: var(--muted); } +.rbac-role .desc { display: block; margin-top: 3px; } +.staff-note { max-width: 190px; font-size: 12px; color: var(--muted); } .tag-mini.builtin { background: #eef2ff; color: #4f46e5; } /* ---------------- main ---------------- */ @@ -734,3 +738,10 @@ table.tbl td.col-ops .btn.sm { padding: 0 7px; } /* 操作列按钮收紧,避 /* 主导航分组标题(业务模块 / 支撑功能) */ .nav-label { font-size: 11px; color: var(--muted); letter-spacing: .6px; padding: 14px 10px 4px; } + +/* 角色多选(用户弹窗) */ +.check-row { display: flex; flex-wrap: wrap; gap: 8px 14px; padding: 4px 0; } +.check { display: inline-flex; align-items: center; gap: 6px; font-size: 13px; color: var(--text); cursor: pointer; } +.check input { width: 15px; height: 15px; accent-color: var(--primary); cursor: pointer; } +.check input:disabled { cursor: not-allowed; } +.check input:disabled + * { color: var(--muted); }