From 1a41aed3b7d32ff31e7c1bdfc28f043fe4079beb Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 2 Nov 2026 13:17:40 +0800 Subject: [PATCH] =?UTF-8?q?refactor(platform):=20=E5=A5=91=E7=BA=A6?= =?UTF-8?q?=E9=9D=A2=E6=8C=89=E5=AE=98=E6=96=B9=E6=A8=A1=E5=9D=97=E5=90=8D?= =?UTF-8?q?=E9=87=8D=E7=BB=84=EF=BC=8C=E5=8E=BB=E6=8E=89=20face=5F*=20?= =?UTF-8?q?=E5=BA=8F=E5=8F=B7=E5=BC=8F=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 影响: - 路由、响应形状、契约台账**零变化**(620 测试全绿,fe-gap 缺口 441/900 不变) - 官方模块名 ↔ 官方前端 `api/<模块>/**` 目录名一一对应,查缺口不用猜 改动: - 新增 `platform/compat/`:按官方模块拆成 system / permission / message / scheduletask / core + helper(公共底座:导入 / 通用工具 / 判别头 / 守卫 / 共享常量 / 菜单与用户信息构造) - `face_b.rs`(26578 行 / 371 端点)→ `platform/compat/` 六个模块文件 - `face_c.rs` 草稿暂不入库(onlineDev 未接线) - `platform/system.rs` → `platform/registry.rs`(多应用注册表,让位官方模块名) - `platform/permission.rs` → `platform/authorization.rs`(授权引擎,同上) 设计: - 不用 `jnpf/` 这一层 —— 本仓要弱化原厂概念,且 `check-naming.sh` 的 NM1 规则会把含原厂名的目录判为阻断 - 跨模块引用一律 `pub(super)`,不让契约面细节外泄到 crate 公共 API - impl 块跟随其类型走(否则 Rust 报「不能为 crate 外的类型定义 inherent impl」) --- HANDOFF.md | 2 +- src/backend/src/lowcode_seed.rs | 2 +- src/backend/src/modules/books.rs | 4 +- src/backend/src/modules/demo.rs | 4 +- src/backend/src/modules/shop.rs | 4 +- src/backend/src/platform/auth.rs | 14 +- .../{permission.rs => authorization.rs} | 6 +- src/backend/src/platform/compat/core.rs | 45 + src/backend/src/platform/compat/helper.rs | 902 ++ src/backend/src/platform/compat/message.rs | 1209 +++ src/backend/src/platform/compat/mod.rs | 24 + src/backend/src/platform/compat/permission.rs | 6283 +++++++++++ .../src/platform/compat/scheduletask.rs | 427 + .../platform/{face_b.rs => compat/system.rs} | 9228 +---------------- src/backend/src/platform/crud.rs | 6 +- src/backend/src/platform/mod.rs | 6 +- .../src/platform/{system.rs => registry.rs} | 14 +- src/backend/src/platform/seed.rs | 18 +- src/backend/src/routes.rs | 884 +- src/backend/tests/auth_it.rs | 2 +- src/backend/tests/batch6_it.rs | 6 +- src/backend/tests/batch7_it.rs | 5 +- src/backend/tests/permission_it.rs | 4 +- 23 files changed, 9422 insertions(+), 9677 deletions(-) rename src/backend/src/platform/{permission.rs => authorization.rs} (97%) create mode 100644 src/backend/src/platform/compat/core.rs create mode 100644 src/backend/src/platform/compat/helper.rs create mode 100644 src/backend/src/platform/compat/message.rs create mode 100644 src/backend/src/platform/compat/mod.rs create mode 100644 src/backend/src/platform/compat/permission.rs create mode 100644 src/backend/src/platform/compat/scheduletask.rs rename src/backend/src/platform/{face_b.rs => compat/system.rs} (64%) rename src/backend/src/platform/{system.rs => registry.rs} (92%) diff --git a/HANDOFF.md b/HANDOFF.md index fe31f74..818d7e0 100644 --- a/HANDOFF.md +++ b/HANDOFF.md @@ -1269,7 +1269,7 @@ xop run --secret GU=git_local_user --secret GP=git_local_pass -- bash -c ' **按包顺序**执行 + 幂等(`CREATE TABLE IF NOT EXISTS`)。 - 🔴 **`sspf-store` 的两处表数断言必须改成「不写死」**(`db.rs:1226,1233`)—— 写死 52 是批次 9/10 各踩一次的坑,改成「base 表数写死 + 业务表数 ≥ N」或直接读 `ddl_tables()` 对账。 -- 🔴 **`is_builtin_table`(`face_b.rs:12993`)取 `ddl_tables()`** ⇒ 业务包建的表会**自动变成内置表** +- 🔴 **`is_builtin_table`(`platform/compat/system.rs:5879`)取 `ddl_tables()`** ⇒ 业务包建的表会**自动变成内置表** ⇒ 数据建模页**看不到**用户自己建的表了。这条要**重新想**(本批至少要保证行为不回退)。 - 🔴 `main.rs::whitelist_self_check` 的**双向对账**(孤儿 DDL / 漏建表)要改成 「DDL = base 表 + **所有包**的表」,否则包表会被判成孤儿 DDL ⇒ 启动失败。 diff --git a/src/backend/src/lowcode_seed.rs b/src/backend/src/lowcode_seed.rs index ee987d3..7fa2b7b 100644 --- a/src/backend/src/lowcode_seed.rs +++ b/src/backend/src/lowcode_seed.rs @@ -45,7 +45,7 @@ use crate::lowcode_crud::now_iso; use crate::lowcode_ddl; use crate::platform::config::Profile; use crate::platform::db::{pglite, Db}; -use crate::platform::system::MAIN_SYSTEM_ID; +use crate::platform::registry::MAIN_SYSTEM_ID; /// 示例功能在 `base_visual_dev` 里的**固定 id**。 /// diff --git a/src/backend/src/modules/books.rs b/src/backend/src/modules/books.rs index 724c3dc..a57cad6 100644 --- a/src/backend/src/modules/books.rs +++ b/src/backend/src/modules/books.rs @@ -21,7 +21,7 @@ use crate::platform::entity::{ColumnSpec, EntitySpec}; use crate::platform::envelope::ActionResult; use crate::platform::menu::MenuSpec; use crate::platform::state::AppState; -use crate::platform::system; +use crate::platform::registry; /// `book_shop_book` 的列清单(**顺序 = 响应 JSON 的键序**)。 const BOOK_COLUMNS: &[ColumnSpec] = &[ @@ -113,7 +113,7 @@ pub const BOOK_MENU: MenuSpec = MenuSpec { menu_type: 2, icon: Some("app"), sort_code: 8, - system_en_code: system::MAIN_SYSTEM_CODE, + system_en_code: registry::MAIN_SYSTEM_CODE, }; /// 本模块的 3 条路由(**业务层的路由表**)—— 钉子测试遍历它。 diff --git a/src/backend/src/modules/demo.rs b/src/backend/src/modules/demo.rs index e3d26c7..4c61bd9 100644 --- a/src/backend/src/modules/demo.rs +++ b/src/backend/src/modules/demo.rs @@ -20,7 +20,7 @@ use crate::platform::crud::{handle_delete, handle_list, handle_save}; use crate::platform::entity::{ColumnSpec, EntitySpec}; use crate::platform::envelope::ActionResult; use crate::platform::menu::MenuSpec; -use crate::platform::system; +use crate::platform::registry; use crate::platform::state::AppState; /// `demo_item` 的列清单(**顺序 = 响应 JSON 的键序**)。 @@ -97,7 +97,7 @@ pub const DEMO_MENU: MenuSpec = MenuSpec { menu_type: 2, icon: Some("app"), sort_code: 6, - system_en_code: system::MAIN_SYSTEM_CODE, + system_en_code: registry::MAIN_SYSTEM_CODE, }; /// 本模块的 3 条路由(**业务层的路由表**)—— 钉子测试遍历它。 diff --git a/src/backend/src/modules/shop.rs b/src/backend/src/modules/shop.rs index acb6580..ee5fa68 100644 --- a/src/backend/src/modules/shop.rs +++ b/src/backend/src/modules/shop.rs @@ -20,7 +20,7 @@ use crate::platform::entity::{ColumnSpec, EntitySpec}; use crate::platform::envelope::ActionResult; use crate::platform::menu::MenuSpec; use crate::platform::state::AppState; -use crate::platform::system; +use crate::platform::registry; /// `shop_product` 的列清单(**顺序 = 响应 JSON 的键序**)。 const PRODUCT_COLUMNS: &[ColumnSpec] = &[ @@ -88,7 +88,7 @@ pub const PRODUCT_MENU: MenuSpec = MenuSpec { menu_type: 2, icon: Some("app"), sort_code: 7, - system_en_code: system::MAIN_SYSTEM_CODE, + system_en_code: registry::MAIN_SYSTEM_CODE, }; /// 本模块的 3 条路由(**业务层的路由表**)—— 钉子测试遍历它。 diff --git a/src/backend/src/platform/auth.rs b/src/backend/src/platform/auth.rs index 663b36e..5138b8a 100644 --- a/src/backend/src/platform/auth.rs +++ b/src/backend/src/platform/auth.rs @@ -21,10 +21,10 @@ use serde_json::{json, Value}; use crate::platform::cipher::decrypt_to_md5; use crate::platform::db::pglite::ToSql; use crate::platform::envelope::{fail, ok, ActionResult}; -use crate::platform::permission::{build_menu_list, has_module}; +use crate::platform::authorization::{build_menu_list, has_module}; use crate::platform::session::TokenUser; use crate::platform::state::AppState; -use crate::platform::system; +use crate::platform::registry; /// token 有效期(秒)—— 契约 §6.1:恒为 `7200`。 const TOKEN_EXPIRES_IN: i64 = 7200; @@ -333,8 +333,8 @@ pub(crate) fn parse_user_agent(ua: &str) -> (String, String) { /// (`JNPF_COMPAT_SURFACE.md` §3.1)⇒ **面 A 的形状一个字都不动**。 pub async fn current_user(state: &AppState, headers: HeaderMap) -> Json { // 🔴 判别头 = `Vue-Version: 3`(本仓前端唯一不发的官方头 ⇒ 零歧义)。 - if crate::platform::face_b::is_face_b(&headers) { - return crate::platform::face_b::current_user(state, &headers).await; + if crate::platform::compat::helper::is_face_b(&headers) { + return crate::platform::compat::helper::current_user(state, &headers).await; } let Some(user) = resolve_user(state, &headers) else { @@ -342,7 +342,7 @@ pub async fn current_user(state: &AppState, headers: HeaderMap) -> Json Result> { - if crate::platform::face_b::is_face_b(headers) { + if crate::platform::compat::helper::is_face_b(headers) { require_login_face_b(state, headers).await } else { require_login(state, headers).await @@ -422,7 +422,7 @@ pub async fn require_module( ) -> Result> { let user = require_login(state, headers).await?; let system_id = - system::resolve_system_id(&state.db, system::app_code_of(headers).as_deref()).await; + registry::resolve_system_id(&state.db, registry::app_code_of(headers).as_deref()).await; if has_module(&state.db, &user.user_id, user.is_admin, module_key, &system_id).await { Ok(user) } else { diff --git a/src/backend/src/platform/permission.rs b/src/backend/src/platform/authorization.rs similarity index 97% rename from src/backend/src/platform/permission.rs rename to src/backend/src/platform/authorization.rs index efa7141..6efff47 100644 --- a/src/backend/src/platform/permission.rs +++ b/src/backend/src/platform/authorization.rs @@ -1,7 +1,11 @@ -//! permission —— 四源权限合并 + 管理员短路 + 未映射放行 + 菜单树。 +//! authorization —— 四源权限合并 + 管理员短路 + 未映射放行 + 菜单树。 //! //! 契约:`docs/contract.md` §8.1(四源合并)/ §8.2(判定顺序)/ §8.3(菜单树)。 //! +//! 🔴 **为什么叫 `authorization` 而不是 `permission`**:本仓的**契约面**按官方模块名 +//! 组织(`compat/permission.rs` = 官方面 B 的 permission 端点集)。平台机制这一层 +//! 要用**语义名**区分开 —— 它管的是「授权判定引擎」,不是「权限端点」。 +//! //! 逐字对齐 react 参考实现 `ssw-jnpf-lite-react/src/backend/src/sys/permission.service.ts` //! (`resolveUserModuleIds` / `hasModule` / `buildMenuList` / `toTree`)。 //! diff --git a/src/backend/src/platform/compat/core.rs b/src/backend/src/platform/compat/core.rs new file mode 100644 index 0000000..edd5581 --- /dev/null +++ b/src/backend/src/platform/compat/core.rs @@ -0,0 +1,45 @@ +//! core —— 官方面 B 的 **core** 端点集(`/api/oauth/*` 等框架级能力)。 +//! +//! 🔴 官方前端 `src/api/core/**` 共 4 个文件(`auth` / `common` / `user` / `index`), +//! 对应的是**框架自带**能力(登录 / 当前用户 / 公共字典),不是业务资源。 +//! 本仓能对齐的部分落在 `oauth` / 公共拉取这一层。 +//! +//! 真源:官方 Java `jnpf-oauth` + `jnpf-public`。 + + +use axum::extract::{Path, State}; +use axum::http::HeaderMap; +use axum::Json; +use serde_json::{json, Value}; +use crate::platform::envelope::{ok, ActionResult}; +use crate::platform::auth::require_login_face_b; +use crate::platform::state::AppState; +/// `POST /api/oauth/Logout` —— 官方 `LoginController.java:155`。 +/// +/// 🔴 **未登录也返成功**:前端 `store/auth.ts:86` 把 `logoutApi()` 包在 +/// `try { … } catch { /* 不做任何处理 */ }` 里,**返回值完全被忽略**; +/// 但它一旦是 **HTTP 404**,会走 `errorMessageResponseInterceptor` 弹一个红条。 +/// ⇒ 这里恒 `ok(null)`,无论有没有 token。 +/// +/// 🔴 **不改变服务端会话状态**:本仓 token 是进程内内存表(`platform/session.rs`), +/// 没有 `revoke` 接口(接口 immutability 见 `SessionStore`)⇒ 登出即「客户端丢弃 token」, +/// 服务端不做失效登记。这是**已知限制 B5**(`docs/known-limitations.md`)。 +pub async fn logout_handler(State(state): State, headers: HeaderMap) -> Json { + // 鉴权结果刻意丢弃:有 token ⇒ 走一遍换取无效的分支也已经够了(无 remove 接口)。 + let _ = require_login_face_b(&state, &headers).await; + ok(Value::Null) +} + +/// `GET /api/oauth/getLoginConfig` —— 登录页配置(**登录前**就拉 ⇒ 不能要 token)。 +/// +/// 🔴 前端 `views/_core/login/LoginForm.vue:160-163`:`res.data.redirect` ⇒ `data` +/// 必须是**对象**(给 `null` 会 `Cannot read properties of null`)。 +pub async fn get_login_config() -> Json { + ok(json!({})) +} + +/// `GET /api/oauth/getConfig/{account}` —— 帐号的登录/锁屏配置(`user.ts:31`)。 +pub async fn get_user_config(Path(account): Path) -> Json { + let _ = account.trim(); + ok(json!({})) +} diff --git a/src/backend/src/platform/compat/helper.rs b/src/backend/src/platform/compat/helper.rs new file mode 100644 index 0000000..3b48d1f --- /dev/null +++ b/src/backend/src/platform/compat/helper.rs @@ -0,0 +1,902 @@ +//! helper —— 契约面的**公共底座**(导入 / 通用工具 / 判别 / 守卫 / 共享常量 / +//! 菜单与用户信息构造)。 +//! +//! 🔴 **为什么单独一个 `helper`**:契约面按官方模块拆开后,下列东西被**多个模块共用** +//! —— 放任何一个模块里都会让别的模块反向依赖它 ⇒ 拆分的意义就没了。 +//! 典型:面 B 判别头 `is_face_b`(**全部** handler 都要过)、登录守卫 `guard`、 +//! 分页信封 `page_list`、SQL 参数拼装 `params_of`、菜单树构造 `build_menu_tree`、 +//! 当前用户信息 `build_user_info`。 +//! +//! 🔴 **本文件不装业务知识**:只放「怎么把官方形状的请求变成响应」的基础设施。 +//! 真源:`JNPF_COMPAT_SURFACE.md`(§2.2 判别头 / §3 端点 / §4 码表)。 + + +use std::collections::{HashMap, HashSet}; +use axum::body::Bytes; +use axum::extract::{Path, RawQuery, State}; +use axum::http::HeaderMap; +use axum::Json; +use serde_json::{json, Map, Value}; +use crate::platform::envelope::{code, fail, ok, ActionResult}; +use crate::platform::db::{pglite, pglite::ToSql, Db}; +use crate::platform::auth::require_login_face_b; +use crate::platform::auth::resolve_user; +use crate::platform::crud::value_to_text; +use crate::platform::authorization::has_en_code_permission; +use crate::platform::authorization::resolve_user_module_ids; +use crate::platform::session::TokenUser; +use crate::platform::state::AppState; +use crate::platform::registry; +pub use sspf_contract::headers::VUE_VERSION; +use super::system::{menu_node, official_view_path}; +use super::permission::{USER_DETAIL_COLUMNS, organize_name_of}; +/// 本仓的系统 id(`currentSystemId` / `userInfo.systemId` / 菜单 `systemId` 的兜底值)。 +/// +/// 🔴 单一真源在 [`crate::platform::registry`](`base_system.f_id`);这里只是别名, +/// **不要另写一份字面量**——否则主系统 id 改一处漏一处。 +pub(super) const SYSTEM_ID: &str = registry::MAIN_SYSTEM_ID; + +/// 本仓的系统编码(`userInfo.systemCode`)。 +/// +/// 🔴 官方常量 `JnpfConst.MAIN_SYSTEM_CODE = "mainSystem"`;前端也硬比较这个值 +/// (`systemCode === 'mainSystem'` 决定首页布局)⇒ 同样只做别名。 +pub const SYSTEM_CODE: &str = registry::MAIN_SYSTEM_CODE; + +/// `@SaCheckPermission("permission.user")`。 +pub(super) const EN_USER: &str = "permission.user"; + +/// `@SaCheckPermission("permission.role")`。 +pub(super) const EN_ROLE: &str = "permission.role"; + +/// `@SaCheckPermission("permission.organize")`。 +pub(super) const EN_ORGANIZE: &str = "permission.organize"; + +/// `@SaCheckPermission("permission.menu")`。 +pub(super) const EN_MENU: &str = "permission.menu"; + +/// `@SaCheckPermission("permission.position")`。 +pub(super) const EN_POSITION: &str = "permission.position"; + +/// 🔴 `@SaCheckPermission("permission.identity")`(官方 `StandingController`)。 +pub(super) const EN_IDENTITY: &str = "permission.identity"; + +/// 🔴 `@SaCheckPermission("permission.authGroup")`(官方 `PermissionGroupController`)。 +pub(super) const EN_AUTH_GROUP: &str = "permission.authGroup"; + +/// 🔴 `@SaCheckPermission("permission.action")`。 +/// +/// 🔴 官方 `ActionController` 是 `{"permission.auth", "permission.role", "permission.action"}` +/// 的 **SaMode.OR** 三选一;本仓的 `guard()` 只吃**一个**点权限码 +/// ⇒ 取**动作自己的**那个(最贴近语义)。 +pub(super) const EN_ACTION: &str = "permission.action"; + +/// 🔴 `@SaCheckPermission("msgCenter.notice")`(官方 `NoticeController` 的公告那半截)。 +/// +/// 🔴 **只有公告守它**;消息列表 / 全部已读 / 读消息 / 删记录 / 回执 +/// **都不带** `@SaCheckPermission` —— 登录即可用(谁看自己的消息都不该要授权)。 +pub(super) const EN_NOTICE: &str = "msgCenter.notice"; + +/// 菜单树的最大层数(防御 `f_parent_id` 被改成人为环时的无限递归)。 +pub(super) const MAX_TREE_DEPTH: usize = 32; + +/// 🔴 **这个请求是不是「面 B」** —— 判别头 `Vue-Version: 3`。 +/// +/// **唯一的全局判别规则**(`JNPF_COMPAT_SURFACE.md` §2.2): +/// ```text +/// 请求头含 "Vue-Version: 3" ⇒ 走【面 B】官方形状 +/// 否则 ⇒ 走【面 A】ssw 形状 +/// ``` +pub fn is_face_b(headers: &HeaderMap) -> bool { + // 判据真值源在契约层:MCP 适配器、后续插件都要用同一份判断, + // 不许各自再写一遍 `Vue-Version == "3"`(写错一处就是两面串味)。 + sspf_contract::headers::is_face_b(headers) +} + +/// DB 报错 ⇒ 面 B 的 `500`(官方 `EXCEPTION`);真因只进服务端日志,**不外泄**。 +pub(super) fn db_error(e: pglite::Error, ctx: &str) -> Json { + eprintln!("[face-b] {ctx}失败: {e}"); + fail(code::EXCEPTION, "系统异常,请联系管理员") +} + +/// 解析 JSON body;失败 ⇒ `fail(400, "请求参数格式错误")`。 +/// +/// 🔴 **不用 axum 的 `Json`**:它的解析失败会返回 **422 + 非信封 body** ⇒ 契约破。 +pub(super) fn parse_body(body: &Bytes) -> Result> { + match serde_json::from_slice::(body) { + Ok(v) => Ok(v), + Err(_) => Err(fail(code::FAIL, "请求参数格式错误")), + } +} + +/// 分页参数(官方 `Pagination.java`:`pageSize` 默认 `20` / `currentPage` 默认 `1`)。 +pub(super) struct Paging { + pub(super) current_page: i64, + pub(super) page_size: i64, + pub(super) offset: i64, +} + +impl Paging { + /// 从 query 取分页参数;**缺失 / 非法 ⇒ 用官方默认值**(不报错)。 + pub(super) fn of(raw: &RawQuery) -> Self { + let current_page = crate::platform::sys::query_param(raw, "currentPage") + .trim() + .parse::() + .unwrap_or(1) + .max(1); + // 🔴 `pageSize` 夹在 `[1, 1000]` —— 防「pageSize=0」把 SQL 打成语法错、 + // 防超大值把整表拉进内存。 + let page_size = crate::platform::sys::query_param(raw, "pageSize") + .trim() + .parse::() + .unwrap_or(20) + .clamp(1, 1000); + Self { + current_page, + page_size, + offset: (current_page - 1) * page_size, + } + } + + /// 从 **JSON body** 取分页参数(官方好几个「列表」是 `POST`,分页在 body 里 —— + /// 例如 `POST /api/message/Notice/List`)。缺失 / 非法同样回落官方默认值。 + pub(super) fn of_body(obj: &Map) -> Self { + let num = |key: &str| { + obj.get(key) + .and_then(|v| v.as_i64().or_else(|| v.as_str()?.trim().parse().ok())) + }; + let current_page = num("currentPage").unwrap_or(1).max(1); + // 🔴 同一道夹逼:`pageSize` 落在 `[1, 1000]`。 + let page_size = num("pageSize").unwrap_or(20).clamp(1, 1000); + Self { + current_page, + page_size, + offset: (current_page - 1) * page_size, + } + } +} + +/// 官方 `PageListVO` —— `{pagination:{currentPage,pageSize,total}, list:[…]}`。 +/// +/// 🔴 **`data` 必须是对象**(不是裸数组)—— 官方 `PageListVO` 有 `pagination` + `list` 两个字段。 +pub(super) fn page_list(current_page: i64, page_size: i64, total: i64, list: Vec) -> Value { + json!({ + "pagination": { + "currentPage": current_page, + "pageSize": page_size, + "total": total, + }, + "list": list, + }) +} + +/// 官方 `ListVO` —— `{list:[…]}`(**只有 `list` 一个字段**)。 +pub(super) fn list_vo(list: Vec) -> Value { + json!({ "list": list }) +} + +/// 绑定参数数组 ⇒ `&[&(dyn ToSql + Sync)]`(值一律按 text 传,类型转换交给 SQL 里的 CAST)。 +pub(super) fn params_of(values: &[Option]) -> Vec<&(dyn ToSql + Sync)> { + values.iter().map(|v| v as &(dyn ToSql + Sync)).collect() +} + +/// 面 B 的守卫:**登录(602)** + **点权限(`f_en_code` ⇒ 403)**。 +pub(super) async fn guard( + state: &AppState, + headers: &HeaderMap, + en_code: &str, +) -> Result> { + let user = require_login_face_b(state, headers).await?; + // 🔴 多应用:按 `App-Code` 解析当前系统 ⇒ 点权限判据限定在该系统。 + let system_id = + registry::resolve_system_id(&state.db, registry::app_code_of(headers).as_deref()).await; + if has_en_code_permission(&state.db, &user.user_id, user.is_admin, en_code, &system_id).await { + Ok(user) + } else { + Err(fail(code::NO_PERMISSION, "无权限")) + } +} + +/// 一行菜单(`AllMenuSelectVO` 那 15 个字段的原料)。 +pub(super) struct MenuRow { + pub(super) id: String, + pub(super) full_name: String, + pub(super) en_code: Option, + pub(super) parent_id: String, + pub(super) icon: Option, + pub(super) url_address: Option, + pub(super) page_address: Option, + pub(super) link_target: Option, + pub(super) menu_type: i64, + pub(super) property_json: Option, + pub(super) sort_code: i64, + pub(super) system_id: Option, + pub(super) is_data: bool, +} + +/// 菜单投影(面 B 专用)—— 🔴 **显式列出每一列并加 `AS ""` 别名** +/// (PG 会把未加引号的标识符折叠成小写 ⇒ `row_to_json` 的键会变样且**静默**)。 +pub(super) const MENU_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ + f_en_code AS \"enCode\", COALESCE(f_parent_id, '0') AS \"parentId\", \ + f_icon AS \"icon\", f_url_address AS \"urlAddress\", \ + f_page_address AS \"pageAddress\", f_link_target AS \"linkTarget\", \ + COALESCE(f_type, 2) AS \"type\", f_property_json AS \"propertyJson\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\", f_system_id AS \"systemId\", \ + COALESCE(f_is_data_authorize, 0) AS \"isData\""; + +/// 读当前用户**可见**的菜单行(未软删 + 四源合并过滤)。 +/// +/// 🔴 非管理员的可见集合来自 `resolve_user_module_ids`(四源合并:直授/角色/组织/岗位), +/// 与面 A 的 `build_menu_list` **同一套判据** ⇒ 两个面看到的菜单集合一致。 +pub(super) async fn load_menus(db: &Db, user_id: &str, is_admin: i32, system_id: &str) -> Vec { + let sql = format!( + "SELECT {MENU_PROJECTION} FROM base_module WHERE f_delete_mark = 0 \ + AND f_system_id = $1::text \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + let rows = match db.query_json_params(&sql, &[&system_id]).await { + Ok(rows) => rows, + Err(e) => { + eprintln!("[face-b] 菜单查询失败(按空菜单处理): {e}"); + return Vec::new(); + } + }; + let mut items: Vec = rows.iter().filter_map(parse_menu_row).collect(); + if is_admin != 1 { + let visible = resolve_user_module_ids(db, user_id).await; + items.retain(|m| visible.contains(&m.id)); + } + items +} + +/// 一行 JSON ⇒ [`MenuRow`]。 +pub(super) fn parse_menu_row(row: &Value) -> Option { + let id = row["id"].as_str()?.to_string(); + if id.is_empty() { + return None; + } + Some(MenuRow { + id, + full_name: row["fullName"].as_str().unwrap_or_default().to_string(), + en_code: row["enCode"].as_str().map(str::to_string), + // 🔴 react: `parentId: m.parentId || '0'` —— 空 ⇒ `'0'`。 + parent_id: match row["parentId"].as_str() { + Some(p) if !p.is_empty() => p.to_string(), + _ => "0".to_string(), + }, + icon: row["icon"].as_str().map(str::to_string), + url_address: row["urlAddress"].as_str().map(str::to_string), + page_address: row["pageAddress"].as_str().map(str::to_string), + link_target: row["linkTarget"].as_str().map(str::to_string), + menu_type: row["type"].as_i64().unwrap_or(2), + property_json: row["propertyJson"].as_str().map(str::to_string), + sort_code: row["sortCode"].as_i64().unwrap_or(0), + system_id: row["systemId"].as_str().map(str::to_string), + is_data: row["isData"].as_i64().unwrap_or(0) != 0, + }) +} + +/// `f_property_json`(TEXT)⇒ JSON 值;空 / 非法 ⇒ `null`。 +fn parse_property_json(raw: Option<&str>) -> Value { + let Some(text) = raw else { + return Value::Null; + }; + let trimmed = text.trim(); + if trimmed.is_empty() { + return Value::Null; + } + serde_json::from_str::(trimmed).unwrap_or(Value::Null) +} + +/// 一个菜单节点 ⇒ 官方 `AllMenuSelectVO`(**15 个字段,一个不少**)。 +/// +/// 🔴 **键名与顺序照官方 `AllMenuSelectVO.java:12-50`**(`id` / `fullName` / `enCode` / +/// `parentId` / `icon` / `hasChildren` / `urlAddress` / `pageAddress` / `linkTarget` / +/// `children` / `type` / `propertyJson` / `sortCode` / `systemId` / `isData`)。 +pub(super) fn menu_value(row: MenuRow, children: Vec, has_children: bool) -> Value { + let MenuRow { + id, + full_name, + en_code, + parent_id, + icon, + url_address, + page_address, + link_target, + menu_type, + property_json, + sort_code, + system_id, + is_data, + } = row; + json!({ + "id": id, + "fullName": full_name, + "enCode": en_code, + "parentId": parent_id, + "icon": icon, + "hasChildren": has_children, + // 🔴 **面 B 的 `urlAddress` 必须是「官方前端的视图路径」**,不是库里的 `f_url_address`。 + // 前端 `packages/utils/src/helpers/generate-routes-backend.ts:71-92`: + // `route.path = '/' + urlAddress`,且 `component = pageMap['/' + urlAddress + '/index.vue']` + // (`pageMap` = `import.meta.glob('../views/**/*.vue'`)⇒ 值必须指向**真实 .vue 文件**。 + // 而库里的 `f_url_address`(`system/User`)是**面 A** 的守卫 key,官方前端没有 + // `views/system/User/index.vue` ⇒ 点了菜单永远 404。 + // 官方自己的口径就是「编码 ⇒ 路径」(同一文件 `:57` 对目录/应用用的是 + // `/${enCode.replaceAll('.', '/')}`)⇒ 这里对**所有类型**统一用同一条规则: + // `permission.user` ⇒ `permission/user` ⇒ 命中 `views/permission/user/index.vue` ✅ + "urlAddress": official_view_path(en_code.as_deref(), url_address.as_deref()), + "pageAddress": page_address, + "linkTarget": link_target, + "children": children, + "type": menu_type, + "propertyJson": parse_property_json(property_json.as_deref()), + "sortCode": sort_code, + // 🔴 种子菜单的 `f_system_id` 是 NULL ⇒ 兜底成本仓系统 id(单系统)。 + "systemId": system_id + .filter(|s| !s.trim().is_empty()) + .unwrap_or_else(|| SYSTEM_ID.to_string()), + "isData": is_data, + }) +} + +/// 建菜单树(根 = `parentId` 为空 / `'0'` / **父不在可见集合内**)。 +fn build_menu_tree(rows: Vec) -> Vec { + let visible: HashSet = rows.iter().map(|m| m.id.clone()).collect(); + let mut by_parent: HashMap> = HashMap::new(); + let mut roots: Vec = Vec::new(); + for row in rows { + if row.parent_id != "0" && visible.contains(&row.parent_id) { + by_parent.entry(row.parent_id.clone()).or_default().push(row); + } else { + roots.push(row); + } + } + roots + .into_iter() + .map(|row| menu_node(row, &mut by_parent, 0)) + .collect() +} + +/// 官方 `PermissionModel` 列表 —— **每个可见菜单一条**。 +/// +/// 🔴 **官方语义**:`modelId` = **菜单 id** +/// (官方前端 `views/common/dynamicModel/list/index.vue:739`: +/// `permissionList.find(o => o.modelId === searchInfo.menuId)`) +/// ⇒ 本仓按「菜单」给一条,`moduleName` = 菜单全名。 +/// +/// 🔴 `button` / `column` / `resource` / `form` **恒为空数组** —— 本仓**不实现** +/// 按钮级权限(`base_module_button` / `_column` / `_form` / `_data` 都不做) +/// ⇒ 官方前端的按钮会被过滤掉(**已知限制 B4**,`docs/known-limitations.md` §H)。 +fn build_permission_list(rows: &[MenuRow]) -> Vec { + rows.iter() + .map(|m| { + json!({ + "modelId": m.id, + "moduleName": m.full_name, + "button": [], + "column": [], + "resource": [], + "form": [], + }) + }) + .collect() +} + +/// `GET /api/oauth/CurrentUser` 的**面 B**分支 —— 官方 `PcUserVO` 形状。 +/// +/// 🔴 **顶层五个字段一个都不能少**(官方前端 `store/auth.ts:121` 逐个取用): +/// `menuList` / `permissionList` / `userInfo` / `currentSystemId` / `sysConfigInfo`。 +/// +/// 🔴 未登录 ⇒ **`602`**(官方前端只对 `601`/`602` 清 token ⇒ 返 `600` 会卡住不跳登录)。 +pub async fn current_user(state: &AppState, headers: &HeaderMap) -> Json { + let Some(user) = resolve_user(state, headers) else { + return fail(code::SESSION_ERROR, "登录状态已失效,请重新登录"); + }; + + // 🔴 多应用:按 `App-Code` 解析当前系统 ⇒ 菜单树 / userInfo / currentSystemId 都按该系统。 + let sys = registry::resolve_system(&state.db, registry::app_code_of(headers).as_deref()).await; + let menus = load_menus(&state.db, &user.user_id, user.is_admin, &sys.id).await; + let permission_list = build_permission_list(&menus); + let menu_list = build_menu_tree(menus); + let user_info = build_user_info(&state.db, &user, &sys.id, &sys.code).await; + + ok(json!({ + "menuList": menu_list.clone(), + "permissionList": permission_list, + // 🔴 官方 `GetUserInfoModel`(`basic.d.ts:94-100`)声明了 `routerList` 但 + // **前端一处都没读**(`grep routerList` 在 app/packages 里 0 命中); + // 为对齐类型仍给出同一棵树,避免将来有页面取值时拿到 undefined。 + "routerList": menu_list, + "userInfo": user_info, + "currentSystemId": sys.id, + // 🔴 `sysConfigInfo` 返 **空对象**(不是 null)⇒ 官方前端 `baseStore.setSysConfig` 不炸。 + "sysConfigInfo": {}, + })) +} + +/// 官方 `UserCommonInfoVO`(15 个字段)。 +/// +/// 🔴 `isAdministrator` 在这里是 **布尔**(官方 `UserCommonInfoVO.java:75` 是 `Boolean`)—— +/// 而**列表项**里它是**数字**(官方 `UserListVO.java:60` 是 `Integer`)⇒ 两处**故意不同**。 +async fn build_user_info(db: &Db, user: &TokenUser, system_id: &str, system_code: &str) -> Value { + let rows = match db + .query_json_params( + "SELECT f_real_name AS \"realName\", f_head_icon AS \"headIcon\", \ + f_organize_id AS \"organizeId\", f_position_id AS \"positionId\", \ + f_mobile_phone AS \"mobilePhone\", f_email AS \"email\", \ + f_gender AS \"gender\", f_role_id AS \"roleId\", f_group_id AS \"groupId\", \ + f_secretkey AS \"secretKey\", f_manager_id AS \"manager\", \ + (EXTRACT(EPOCH FROM f_birthday) * 1000)::bigint AS \"birthday\", \ + (EXTRACT(EPOCH FROM f_prev_log_time) * 1000)::bigint AS \"prevLoginTime\", \ + f_prev_log_ip AS \"prevLoginIp\" \ + FROM base_user WHERE f_id = $1::text AND f_delete_mark = 0 LIMIT 1", + &[&user.user_id], + ) + .await + { + Ok(rows) => rows, + Err(e) => { + eprintln!("[face-b] 读用户信息失败: {e}"); + Vec::new() + } + }; + let row = rows.first(); + let real_name = row + .and_then(|r| r["realName"].as_str()) + .filter(|s| !s.is_empty()) + .unwrap_or(user.account.as_str()) + .to_string(); + let head_icon = row.and_then(|r| r["headIcon"].as_str()).map(str::to_string); + let organize_id = row + .and_then(|r| r["organizeId"].as_str()) + .filter(|s| !s.is_empty()) + .map(str::to_string); + let position_id = row + .and_then(|r| r["positionId"].as_str()) + .filter(|s| !s.is_empty()) + .map(str::to_string); + let prev_login_time = row.and_then(|r| r["prevLoginTime"].as_i64()); + let prev_login_ip = row + .and_then(|r| r["prevLoginIp"].as_str()) + .filter(|s| !s.is_empty()) + .map(str::to_string); + let organize_name = match organize_id.as_deref() { + Some(id) => organize_name_of(db, id).await, + None => None, + }; + // 🔴 `f_role_id` / `f_group_id` 是 TEXT(官方历史遗留,逗号分隔)⇒ 拆成数组。 + // 官方 `UserInfo` 把 `roleIds` / `groupIds` / `organizeIds` 声明成**非可选数组**, + // 前端 store 会直接遍历 ⇒ 缺键或给 null 都可能崩,这里一律给空数组兜底。 + let text_of = |key: &str| { + row.and_then(|r| r[key].as_str()) + .filter(|s| !s.is_empty()) + .map(str::to_string) + }; + let split_ids = |key: &str| -> Vec { + text_of(key) + .map(|s| { + s.split(',') + .map(str::trim) + .filter(|x| !x.is_empty()) + .map(str::to_string) + .collect() + }) + .unwrap_or_default() + }; + let role_ids = split_ids("roleId"); + let group_ids = split_ids("groupId"); + let organize_ids: Vec = organize_id.iter().cloned().collect(); + let organize_list_vo: Vec = organize_id + .as_ref() + .map(|id| { + vec![json!({ + "id": id, + "fullName": organize_name.clone().unwrap_or_default(), + })] + }) + .unwrap_or_default(); + + json!({ + "userId": user.user_id, + "userAccount": user.account, + "userName": real_name, + "headIcon": head_icon, + // ---- 以下为官方 `UserInfo`(`basic.d.ts:52-92`)的完整字段集 ---- + // 🔴 该类型里 `roleIds` / `groupIds` / `organizeIds` / `positionIds` / + // `organizeList` / `positionList` / `standingList` 都是**非可选数组** ⇒ + // 必须给 [](缺键会让前端 store 遍历时崩)。 + "gender": text_of("gender"), + "birthday": row.and_then(|r| r["birthday"].as_i64()), + "mobilePhone": text_of("mobilePhone"), + "email": text_of("email"), + "manager": text_of("manager"), + "organizeId": organize_id, + "organizeIds": organize_ids, + "organizeName": organize_name, + "organizeList": organize_list_vo, + "positionId": position_id, + // 🔴 本仓**没有**岗位表(`base_position` 不在 v1 范围)⇒ 恒空。 + "positionIds": Vec::::new(), + "positionList": Vec::::new(), + "positionName": Value::Null, + "roleIds": role_ids, + "roleName": Value::Null, + "groupIds": group_ids, + "standingList": Vec::::new(), + "portalId": Value::Null, + "departmentId": Value::Null, + "departmentName": Value::Null, + "systemId": system_id, + "systemCode": system_code, + "systemName": if system_code == SYSTEM_CODE { "系统平台" } else { "" }, + "systemColor": "", + "systemIcon": "", + "securityKey": text_of("secretKey").unwrap_or_default(), + "signId": "", + "signImg": "", + "saasAppId": "", + "saasAppName": "", + // 🔴 前端 `store/auth.ts:143` 的 `handleUpdatePreferences`: + // `if (userInfo.preferenceJson) preferenceJson = JSON.parse(userInfo.preferenceJson)` + // ⇒ **空串会被判假** ⇒ 保留前端自带的 `defaultPreferencesConfig`; + // 而给 `"{}"` 会被 parse 成空对象 ⇒ `updatePreferences({})` 把整套偏好清空 + // ⇒ `app.locale` / `app.defaultHomePath` 全丢 ⇒ 抛错 ⇒ `fetchUserInfo` 进 catch + // ⇒ 立刻 logout(**登录页原地打转的真正原因**,排查了两个小时的那条)。 + // ⇒ 必须是**字符串**,且必须是**空串**(不是 `"{}"`)。 + "preferenceJson": "", + // 🔴 官方 `prevLogin`:1 = 上次登录 / 2 = 本次登录。本仓不区分 ⇒ 恒 1。 + "prevLogin": 1, + "prevLoginTime": prev_login_time, + "prevLoginIPAddress": prev_login_ip, + "prevLoginIPAddressName": Value::Null, + "isAdministrator": user.is_admin == 1, + }) +} + +/// 取 body 里的 id 数组(`{ids:[…]}` / `{ids:"a,b"}` 都认)。 +/// +/// 🔴 非数组 ⇒ **空集合**(官方批量接口对空集合返回成功,不报错)。 +/// 取 `obj[key]` 的字符串 id 数组(数组或逗号串都收;空 ⇒ 空数组)。 +pub(super) fn id_list_of(obj: &Map, key: &str) -> Vec { + match obj.get(key) { + Some(Value::Array(items)) => items + .iter() + .filter_map(|v| match v { + Value::String(s) if !s.is_empty() => Some(s.clone()), + Value::Number(n) => Some(n.to_string()), + _ => None, + }) + .collect(), + Some(Value::String(s)) if !s.is_empty() => { + s.split(',').map(|x| x.trim().to_string()).collect() + } + _ => Vec::new(), + } +} + +pub(super) fn id_list(obj: &Map) -> Vec { + match obj.get("ids") { + Some(Value::Array(items)) => items + .iter() + .filter_map(|v| match v { + Value::String(s) if !s.is_empty() => Some(s.clone()), + Value::Number(n) => Some(n.to_string()), + _ => None, + }) + .collect(), + Some(Value::String(s)) if !s.is_empty() => { + s.split(',').map(|x| x.trim().to_string()).collect() + } + _ => Vec::new(), + } +} + +/// `$1::text::integer` 这种占位符(**统一走 text 传值,类型交给 SQL 里的 CAST**)。 +pub(super) fn placeholder(index: usize, cast: &str) -> String { + format!("${index}::text{cast}") +} + +/// `GET /api/permission/Users/{id}` —— 单条详情(编辑弹窗)。 +/// +/// ⚠️ **`{id}` 会吞掉所有「`Users/` 下一段的静态 GET」**(`Selector` / `getWorkByUser` / +/// `getUserList` …):它们现在会落到这里、返 `400 用户不存在`,而不是 404。 +/// matchit 的口径是**静态段优先** ⇒ 一旦把那些路由注册进来,自动夺回,无需改这里。 +pub async fn user_info( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let id = id.trim().to_string(); + let sql = format!( + "SELECT {USER_DETAIL_COLUMNS} FROM base_user \ + WHERE f_id = $1::text AND f_delete_mark = 0 LIMIT 1" + ); + let rows = match state.db.query_json_params(&sql, &[&id]).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "用户详情查询"), + }; + match rows.into_iter().next() { + Some(row) => ok(row), + None => fail(code::FAIL, "用户不存在"), + } +} + +/// 用户选择器的投影(`QueryUserSelect` 要 `id` + `fullName`,多选还要 `headIcon`)。 +pub(super) const USER_SELECTOR_PROJECTION: &str = "f_id AS \"id\", f_real_name AS \"fullName\", \ + f_account AS \"account\", f_head_icon AS \"headIcon\", \ + f_organize_id AS \"organizeId\", f_gender AS \"gender\""; + +/// 批量取「姓名/账号」标签(官方 `realName + "/" + account`)。 +/// +/// 🔴 **按 `f_id` 与 `f_account` 双键建表**:本仓写 `f_creator_user_id` 时用的是**账号** +/// (见 `seed.rs` 的 `ADMIN_ACCOUNT`),而官方的历史数据里是 **id** +/// ⇒ 只按其中一种查,另一种就永远显示空。两种都收,key 也两样都放。 +pub(super) async fn user_labels(state: &AppState, ids: &[String]) -> HashMap { + let mut unique: Vec = ids.iter().filter(|s| !s.is_empty()).cloned().collect(); + unique.sort(); + unique.dedup(); + if unique.is_empty() { + return HashMap::new(); + } + let joined = unique.join(","); + match state + .db + .query_json_params( + "SELECT f_id AS \"id\", f_real_name AS \"realName\", f_account AS \"account\" \ + FROM base_user \ + WHERE f_id = ANY(string_to_array($1::text, ',')) \ + OR f_account = ANY(string_to_array($1::text, ','))", + &[&joined], + ) + .await + { + Ok(rows) => { + let mut map = HashMap::new(); + for row in rows { + let id = row + .get("id") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + let account = row.get("account").and_then(Value::as_str).unwrap_or(""); + let name = row + .get("realName") + .and_then(Value::as_str) + .filter(|s| !s.is_empty()) + .unwrap_or(account); + let label = if account.is_empty() || name == account { + name.to_string() + } else { + format!("{name}/{account}") + }; + if !id.is_empty() { + map.insert(id, label.clone()); + } + if !account.is_empty() { + map.insert(account.to_string(), label); + } + } + map + } + Err(e) => { + eprintln!("[face-b] 用户标签查询失败(降级为空): {e}"); + HashMap::new() + } + } +} + +/// 面 B 的「任一权限」守卫 —— 官方用 `@SaCheckPermission(..., mode = SaMode.OR)` 的地方。 +pub(super) async fn guard_any( + state: &AppState, + headers: &HeaderMap, + en_codes: &[&str], +) -> Result> { + let user = require_login_face_b(state, headers).await?; + let system_id = + registry::resolve_system_id(&state.db, registry::app_code_of(headers).as_deref()).await; + for en_code in en_codes { + if has_en_code_permission(&state.db, &user.user_id, user.is_admin, en_code, &system_id).await + { + return Ok(user); + } + } + Err(fail(code::NO_PERMISSION, "无权限")) +} + +/// JSON 对象里取文本(**去首尾空白**,空串 ⇒ `None`)。 +pub(super) fn text_field(obj: &Map, key: &str) -> Option { + let raw = value_to_text(obj.get(key))?; + let trimmed = raw.trim(); + if trimmed.is_empty() { + None + } else { + Some(trimmed.to_string()) + } +} + +/// JSON 对象里取整数(`1` / `"1"` / `true` 都认)—— 用于 `::text::integer` 参数位。 +/// +/// 🔴 不能把 JSON 数字直接 `value_to_text` 后当参数:`1.0` 会变成 `"1.0"`, +/// `'1.0'::text::integer` 在 PG 里是**硬错误**(`invalid input syntax`)。 +pub(super) fn int_field(obj: &Map, key: &str) -> Option { + match obj.get(key)? { + Value::Number(n) => n.as_i64().or_else(|| n.as_f64().map(|f| f as i64)), + Value::String(s) => s.trim().parse::().ok(), + Value::Bool(b) => Some(i64::from(*b)), + _ => None, + } +} + +/// 取 query 里的字符串参数(去空白)。 +pub(super) fn qv(raw: &RawQuery, key: &str) -> String { + crate::platform::sys::query_param(raw, key).trim().to_string() +} + +#[cfg(test)] +mod tests { + use super::*; + + fn headers_with(vue_version: Option<&str>) -> HeaderMap { + let mut headers = HeaderMap::new(); + if let Some(v) = vue_version { + headers.insert( + VUE_VERSION, + axum::http::HeaderValue::from_str(v).expect("头值必须是合法 ASCII"), + ); + } + headers + } + + /// 🔴 **判别规则只有一条**:头 `Vue-Version: 3` ⇒ 面 B;否则面 A。 + #[test] + fn discriminator_is_vue_version_header() { + assert!(is_face_b(&headers_with(Some("3")))); + assert!(!is_face_b(&headers_with(None))); + // 🔴 本仓前端也发 `App-Code` / `Jnpf-Origin` ⇒ **不能**拿它们当判据。 + let mut headers = headers_with(None); + headers.insert("app-code", axum::http::HeaderValue::from_static("mainSystem")); + headers.insert("jnpf-origin", axum::http::HeaderValue::from_static("pc")); + assert!(!is_face_b(&headers), "App-Code / Jnpf-Origin 绝不能当判别头"); + } + + /// 头值带空格也应识别(HTTP 头值两侧空白无意义)。 + #[test] + fn discriminator_ignores_surrounding_whitespace() { + assert!(is_face_b(&headers_with(Some(" 3 ")))); + } + + /// 头值不是 `3`(如 `2`)⇒ 不是面 B。 + #[test] + fn discriminator_rejects_other_values() { + assert!(!is_face_b(&headers_with(Some("2")))); + assert!(!is_face_b(&headers_with(Some("")))); + } + + /// 🔴 **官方 `PageListVO` 形状**:`{pagination:{currentPage,pageSize,total}, list:[…]}`。 + #[test] + fn page_list_vo_has_pagination_and_list() { + let v = page_list(2, 20, 42, vec![json!({"id": "u1"})]); + assert_eq!(v["pagination"]["currentPage"], 2); + assert_eq!(v["pagination"]["pageSize"], 20); + assert_eq!(v["pagination"]["total"], 42); + assert!(v["list"].is_array()); + assert_eq!(v["list"][0]["id"], "u1"); + } + + /// 🔴 **官方 `ListVO` 形状**:`{list:[…]}`(**只有** `list` 一个字段)。 + #[test] + fn list_vo_has_only_list() { + let v = list_vo(vec![json!({"id": "m1"})]); + assert!(v.get("list").is_some()); + assert!(v.get("pagination").is_none()); + assert_eq!(v.as_object().map(|o| o.len()), Some(1)); + } + + /// 分页参数:缺省 ⇒ 官方默认(`pageSize=20` / `currentPage=1`)。 + #[test] + fn paging_defaults_to_official_values() { + let raw = RawQuery(None); + let p = Paging::of(&raw); + assert_eq!(p.current_page, 1); + assert_eq!(p.page_size, 20); + assert_eq!(p.offset, 0); + } + + /// 分页参数:回显请求值;`pageSize=0` / 负数 ⇒ 夹到 1(不生成非法 SQL)。 + #[test] + fn paging_echoes_and_clamps() { + let raw = RawQuery(Some("currentPage=3&pageSize=5".to_string())); + let p = Paging::of(&raw); + assert_eq!(p.current_page, 3); + assert_eq!(p.page_size, 5); + assert_eq!(p.offset, 10); + + let raw = RawQuery(Some("pageSize=0¤tPage=-1".to_string())); + let p = Paging::of(&raw); + assert_eq!(p.current_page, 1); + assert_eq!(p.page_size, 1); + } + + /// 🔴 **菜单节点必须齐 15 个官方字段**(`AllMenuSelectVO.java:12-50`)。 + #[test] + fn menu_node_has_all_15_official_keys() { + let row = MenuRow { + id: "m1".to_string(), + full_name: "用户管理".to_string(), + en_code: Some("permission.user".to_string()), + parent_id: "0".to_string(), + icon: None, + url_address: Some("system/User".to_string()), + page_address: None, + link_target: None, + menu_type: 2, + property_json: None, + sort_code: 2, + system_id: None, + is_data: false, + }; + let v = menu_value(row, Vec::new(), false); + for key in [ + "id", + "fullName", + "enCode", + "parentId", + "icon", + "hasChildren", + "urlAddress", + "pageAddress", + "linkTarget", + "children", + "type", + "propertyJson", + "sortCode", + "systemId", + "isData", + ] { + assert!(v.get(key).is_some(), "面 B 菜单节点必须含键 {key}"); + } + // 🔴 `systemId` 为 NULL ⇒ 兜底成本仓系统 id(单系统)。 + assert_eq!(v["systemId"], SYSTEM_ID); + assert_eq!(v["isData"], false); + assert_eq!(v["children"].as_array().map(|a| a.len()), Some(0)); + } + + /// `propertyJson`:空 ⇒ `null`;合法 JSON ⇒ 解析;非法 ⇒ `null`。 + #[test] + fn property_json_is_parsed_or_null() { + assert_eq!(parse_property_json(None), Value::Null); + assert_eq!(parse_property_json(Some(" ")), Value::Null); + assert_eq!(parse_property_json(Some("{\"a\":1}"))["a"], 1); + assert_eq!(parse_property_json(Some("not json")), Value::Null); + } + + /// 🔴 **`permissionList` 的 `modelId` 是菜单 id**(官方语义:`find(o => o.modelId === menuId)`)。 + #[test] + fn permission_list_model_id_is_menu_id() { + let rows = vec![MenuRow { + id: "m_user".to_string(), + full_name: "用户管理".to_string(), + en_code: Some("permission.user".to_string()), + parent_id: "m_sys".to_string(), + icon: None, + url_address: None, + page_address: None, + link_target: None, + menu_type: 2, + property_json: None, + sort_code: 2, + system_id: None, + is_data: false, + }]; + let list = build_permission_list(&rows); + assert_eq!(list.len(), 1); + assert_eq!(list[0]["modelId"], "m_user"); + assert_eq!(list[0]["moduleName"], "用户管理"); + for key in ["button", "column", "resource", "form"] { + assert_eq!(list[0][key].as_array().map(|a| a.len()), Some(0)); + } + } +} diff --git a/src/backend/src/platform/compat/message.rs b/src/backend/src/platform/compat/message.rs new file mode 100644 index 0000000..16ce521 --- /dev/null +++ b/src/backend/src/platform/compat/message.rs @@ -0,0 +1,1209 @@ +//! message —— 官方面 B 的 **message** 端点集(`/api/message/*`)。 +//! +//! 真源:官方 Java `jnpf-message` + 官方前端 `src/api/**`(`businessCategory` / +//! `message` / `notice`)+ 官方 DDL `base_business_category` / `base_message` / +//! `base_notice`。 + + +use std::collections::HashMap; +use axum::body::Bytes; +use axum::extract::{Path, RawQuery, State}; +use axum::http::HeaderMap; +use axum::Json; +use serde_json::{json, Map, Value}; +use crate::platform::envelope::{code, fail, ok, ActionResult}; +use crate::platform::auth::require_login_face_b; +use crate::platform::crud::value_to_text; +use crate::platform::ids::new_uuid; +use crate::platform::state::AppState; +use super::helper::{EN_NOTICE, Paging, db_error, guard, id_list, id_list_of, list_vo, page_list, params_of, parse_body, placeholder, user_labels}; +/// 🔴 业务分类里「公告」一级 / 「公告提醒」二级的**官方雪花 id**。 +/// +/// 公告发布时要往 `base_message.f_category` 拼这两个 id(官方存的就是 id 串: +/// `t.getCategory().contains(id)` / `.like(category)` 两处都是子串匹配) +/// ⇒ 页签过滤(按二级 id 子串)和类型名(按一级 id ⇒ enCode)才能同时成立。 +const CATEGORY_ANNOUNCE: &str = "2046494646179336192"; + +const CATEGORY_ANNOUNCE_REMIND: &str = "2046498549667074048"; + +/// `MessageInfoVO` 的原料。 +const MESSAGE_PROJECTION: &str = "f_id AS \"id\", f_title AS \"title\", \ + COALESCE(f_type, 0) AS \"type\", COALESCE(f_is_read, 0) AS \"isRead\", \ + f_flow_type AS \"flowType\", f_category AS \"category\", \ + (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"releaseTime\", \ + f_creator_user_id AS \"creatorUserId\""; + +/// `f_type` ⇒ 一级分类 `enCode`(官方 `BusinessCategoryEnum.getTypeByEnCode` 的反向)。 +/// +/// 前端 `getTypeName(enCode)` 拿它去一级分类列表里找 `fullName` +/// (`_core/messageRecord/index.vue:204`)⇒ 必须是一级的 enCode,不能是 `flow_todo` 这种。 +fn message_type_en_code(kind: Option) -> &'static str { + match kind { + Some(1) => "announce", + Some(2) | Some(5) => "flow", + Some(3) | Some(4) => "sys", + Some(6) => "app", + _ => "other", + } +} + +/// `f_type` ⇒ 中文类型名(官方 `BusinessCategoryEnum.categoryName`)。 +fn message_type_name(kind: Option) -> &'static str { + match kind { + Some(1) => "公告", + Some(2) => "流程", + Some(3) => "系统", + Some(4) => "日程", + Some(5) => "表单", + Some(6) => "应用", + _ => "其他", + } +} + +/// 给消息行补 `releaseUser` / `creatorUser` / `enCode` / `typeName` / `lastModifyTime`。 +fn shape_message_row(row: &mut Value, labels: &HashMap) { + let Some(obj) = row.as_object_mut() else { + return; + }; + let creator_id = obj + .get("creatorUserId") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + let label = labels.get(&creator_id).cloned().unwrap_or_default(); + let kind = obj.get("type").and_then(Value::as_i64); + let release_time = obj.get("releaseTime").cloned().unwrap_or(Value::Null); + obj.insert("releaseUser".to_string(), Value::String(label.clone())); + obj.insert("creatorUser".to_string(), Value::String(label)); + obj.insert("lastModifyTime".to_string(), release_time); + obj.insert( + "enCode".to_string(), + Value::String(message_type_en_code(kind).to_string()), + ); + obj.insert( + "typeName".to_string(), + Value::String(message_type_name(kind).to_string()), + ); + obj.remove("creatorUserId"); +} + +/// `GET /api/message` —— 消息中心列表(`PageListVO`,按当前收件人过滤)。 +/// +/// 参数(官方 `PaginationMessage`):`type` / `notType` / `category`(二级分类 id,*子串匹配*) +/// / `isRead` / `keyword`(标题)+ `currentPage` / `pageSize`。 +pub async fn message_list( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let paging = Paging::of(&raw); + let mut conds = vec![ + "COALESCE(f_delete_mark, 0) = 0".to_string(), + "f_user_id = $1::text".to_string(), + ]; + let mut values: Vec> = vec![Some(user.user_id.clone())]; + let q = |name: &str| { + crate::platform::sys::query_param(&raw, name) + .trim() + .to_string() + }; + let (kind, not_type, category, is_read, keyword) = ( + q("type"), + q("notType"), + q("category"), + q("isRead"), + q("keyword"), + ); + if !kind.is_empty() { + values.push(Some(kind)); + conds.push(format!("COALESCE(f_type, 0) = ${}::text::integer", values.len())); + } + if !not_type.is_empty() { + values.push(Some(not_type)); + conds.push(format!("COALESCE(f_type, 0) <> ${}::text::integer", values.len())); + } + if !category.is_empty() && category != "-1" { + values.push(Some(format!("%{category}%"))); + conds.push(format!("COALESCE(f_category, '') LIKE ${}::text", values.len())); + } + if !is_read.is_empty() { + values.push(Some(is_read)); + conds.push(format!("COALESCE(f_is_read, 0) = ${}::text::integer", values.len())); + } + if !keyword.is_empty() { + values.push(Some(format!("%{keyword}%"))); + conds.push(format!("COALESCE(f_title, '') ILIKE ${}::text", values.len())); + } + let where_sql = conds.join(" AND "); + let count_sql = format!("SELECT COUNT(*)::text AS \"n\" FROM base_message WHERE {where_sql}"); + let total: i64 = match state.db.query_json_params(&count_sql, ¶ms_of(&values)).await { + Ok(rows) => rows + .first() + .and_then(|r| r.get("n")) + .and_then(Value::as_str) + .and_then(|s| s.parse::().ok()) + .unwrap_or(0), + Err(e) => return db_error(e, "消息计数"), + }; + let mut list_values = values.clone(); + list_values.push(Some(paging.page_size.to_string())); + let limit_n = list_values.len(); + list_values.push(Some(paging.offset.to_string())); + let offset_n = list_values.len(); + let sql = format!( + "SELECT {MESSAGE_PROJECTION} FROM base_message WHERE {where_sql} \ + ORDER BY f_creator_time DESC NULLS LAST, f_id DESC \ + LIMIT ${limit_n}::text::integer OFFSET ${offset_n}::text::integer" + ); + let rows = match state.db.query_json_params(&sql, ¶ms_of(&list_values)).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "消息列表查询"), + }; + let creator_ids: Vec = rows + .iter() + .filter_map(|r| r.get("creatorUserId").and_then(Value::as_str).map(str::to_string)) + .collect(); + let labels = user_labels(&state, &creator_ids).await; + let list: Vec = rows + .into_iter() + .map(|mut row| { + shape_message_row(&mut row, &labels); + row + }) + .collect(); + ok(page_list(paging.current_page, paging.page_size, total, list)) +} + +/// `GET /api/message/ReadInfo/{id}` —— 读一条消息(**顺带置已读**)。 +/// +/// 🔴 官方 `messageRead` 会写库(`f_is_read = 1` + `f_read_time`)—— 这不是纯查询, +/// 前端「点开就变已读」全靠它。`f_is_read` 已经是 `2`(已回执)时**不回退**。 +pub async fn message_read_info( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let sql = "SELECT f_id AS \"id\", f_title AS \"title\", COALESCE(f_type, 0) AS \"type\", \ + COALESCE(f_is_read, 0) AS \"isRead\", f_flow_type AS \"flowType\", \ + COALESCE(f_body_text, '') AS \"bodyText\", f_category AS \"category\", \ + (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"releaseTime\", \ + f_creator_user_id AS \"creatorUserId\" \ + FROM base_message WHERE f_id = $1::text AND f_user_id = $2::text \ + AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1"; + let rows = match state + .db + .query_json_params(sql, &[&id, &user.user_id]) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "消息详情查询"), + }; + let Some(mut row) = rows.into_iter().next() else { + return fail(code::FAIL, "消息不存在"); + }; + let is_read = row.get("isRead").and_then(Value::as_i64).unwrap_or(0); + if is_read != 2 { + let values = [Some(id.clone()), Some(user.user_id.clone())]; + if let Err(e) = state + .db + .exec_params( + "UPDATE base_message SET f_is_read = 1, f_read_time = now() \ + WHERE f_id = $1::text AND f_user_id = $2::text", + ¶ms_of(&values), + ) + .await + { + eprintln!("[face-b] 消息置已读失败(不影响读取): {e}"); + } + if let Some(obj) = row.as_object_mut() { + obj.insert("isRead".to_string(), json!(1)); + } + } + // 公告类消息的 `f_body_text` 是**公告快照 JSON**(官方同款)⇒ 能把公告正文/封面/附件 + // 直接摊平到 VO 上。解析失败就当普通文本,别报错。 + let raw_body = row + .get("bodyText") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + if let Ok(Value::Object(inner)) = serde_json::from_str::(&raw_body) { + if let Some(obj) = row.as_object_mut() { + for key in [ + "bodyText", + "coverImage", + "files", + "excerpt", + "category", + "expirationTime", + ] { + if let Some(v) = inner.get(key) { + obj.insert(key.to_string(), v.clone()); + } + } + } + } + let creator_id = row + .get("creatorUserId") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + let labels = user_labels(&state, &[creator_id]).await; + let label = labels + .values() + .next() + .cloned() + .unwrap_or_default(); + let kind = row.get("type").and_then(Value::as_i64); + if let Some(obj) = row.as_object_mut() { + obj.insert("creatorUser".to_string(), Value::String(label.clone())); + obj.insert("releaseUser".to_string(), Value::String(label)); + obj.insert( + "typeName".to_string(), + Value::String(message_type_name(kind).to_string()), + ); + obj.insert("isReply".to_string(), Value::Bool(false)); + obj.remove("creatorUserId"); + } + ok(row) +} + +/// `POST /api/message/Actions/ReadAll` —— 全部已读(可带 `ids` / `category` 收窄)。 +pub async fn message_read_all( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => Map::new(), + Err(resp) => return resp, + }; + let ids = id_list(&obj); + let category = obj + .get("category") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + let mut values: Vec> = vec![Some(user.user_id.clone())]; + let mut conds = vec![ + "COALESCE(f_delete_mark, 0) = 0".to_string(), + "f_user_id = $1::text".to_string(), + "COALESCE(f_is_read, 0) = 0".to_string(), + ]; + if !ids.is_empty() { + values.push(Some(ids.join(","))); + conds.push(format!( + "f_id = ANY(string_to_array(${}::text, ','))", + values.len() + )); + } + if !category.is_empty() && category != "-1" { + values.push(Some(format!("%{category}%"))); + conds.push(format!("COALESCE(f_category, '') LIKE ${}::text", values.len())); + } + let sql = format!( + "UPDATE base_message SET f_is_read = 1, f_read_time = now() WHERE {}", + conds.join(" AND ") + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "标记消息已读"); + } + ok(Value::Null) +} + +/// `DELETE /api/message/Record` —— 删消息记录(body `{ids: "a,b"}`,只删自己的)。 +pub async fn message_record_delete( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => Map::new(), + Err(resp) => return resp, + }; + let ids = id_list(&obj); + if ids.is_empty() { + return fail(code::FAIL, "请选择要删除的消息"); + } + let values = [Some(user.account.clone()), Some(ids.join(",")), Some(user.user_id)]; + if let Err(e) = state + .db + .exec_params( + "UPDATE base_message SET f_delete_mark = 1, f_delete_time = now(), \ + f_delete_user_id = $1::text \ + WHERE f_id = ANY(string_to_array($2::text, ',')) AND f_user_id = $3::text", + ¶ms_of(&values), + ) + .await + { + return db_error(e, "删除消息记录"); + } + ok(Value::Null) +} + +/// `POST /api/message/Reply/{id}` —— 手动回执(`f_is_read = 2`,官方同款)。 +pub async fn message_reply( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let values = [Some(id.trim().to_string()), Some(user.user_id)]; + if let Err(e) = state + .db + .exec_params( + "UPDATE base_message SET f_is_read = 2, f_read_time = now() \ + WHERE f_id = $1::text AND f_user_id = $2::text", + ¶ms_of(&values), + ) + .await + { + return db_error(e, "消息回执"); + } + ok(Value::Null) +} + +/// `MessageNoticeVO` 的原料。 +const NOTICE_PROJECTION: &str = "f_id AS \"id\", f_title AS \"title\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\", f_category AS \"category\", \ + (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\", \ + (EXTRACT(EPOCH FROM f_last_modify_time) * 1000)::bigint AS \"lastModifyTime\", \ + (EXTRACT(EPOCH FROM f_expiration_time) * 1000)::bigint AS \"expirationTime\", \ + f_creator_user_id AS \"creatorUserId\", f_last_modify_user_id AS \"lastModifyUserId\""; + +/// `NoticeCrForm` / `NoticeUpForm` ⇒ 列。 +const NOTICE_WRITE_FIELDS: [(&str, &str, &str); 10] = [ + ("title", "f_title", ""), + ("bodyText", "f_body_text", ""), + ("toUserIds", "f_to_user_ids", ""), + ("coverImage", "f_cover_image", ""), + ("files", "f_files", ""), + ("category", "f_category", ""), + ("type", "f_type", "::integer"), + ("sendConfigId", "f_send_config_id", ""), + ("description", "f_description", ""), + ("replyType", "f_reply_type", "::integer"), +]; + +/// 正文抽摘要(官方 `NoticeEntity.getExcerpt()` 是 getter,不落列)。 +fn notice_excerpt(html: &str) -> String { + let mut out = String::new(); + let mut in_tag = false; + for ch in html.chars() { + match ch { + '<' => in_tag = true, + '>' => in_tag = false, + c if !in_tag => out.push(c), + _ => {} + } + if out.chars().count() >= 120 { + break; + } + } + out.trim().to_string() +} + +/// `POST /api/message/Notice/List` —— 公告列表(`PageListVO`)。 +/// +/// 支持 `keyword`(标题)、`type`(分类 enCode 数组 / 逗号串)、`enabledMark`(状态数组)、 +/// `releaseUser`(发布人 id 数组)。时间区间过滤(`releaseTime` / `creatorTime` / +/// `expirationTime`)**暂不实现** —— 见 `docs/contract.md` 的 `partial` 标注。 +pub async fn notice_list( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_NOTICE).await { + return resp; + } + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => Map::new(), + Err(resp) => return resp, + }; + let paging = Paging::of_body(&obj); + let mut conds = vec!["COALESCE(f_delete_mark, 0) = 0".to_string()]; + let mut values: Vec> = Vec::new(); + if let Some(keyword) = obj + .get("keyword") + .and_then(Value::as_str) + .map(str::trim) + .filter(|s| !s.is_empty()) + { + values.push(Some(format!("%{keyword}%"))); + conds.push(format!("COALESCE(f_title, '') ILIKE ${}::text", values.len())); + } + let types = id_list_of(&obj, "type"); + if !types.is_empty() { + values.push(Some(types.join(","))); + conds.push(format!( + "f_category = ANY(string_to_array(${}::text, ','))", + values.len() + )); + } + let marks = id_list_of(&obj, "enabledMark"); + if !marks.is_empty() { + values.push(Some(marks.join(","))); + conds.push(format!( + "COALESCE(f_enabled_mark, 0)::text = ANY(string_to_array(${}::text, ','))", + values.len() + )); + } + let releasers = id_list_of(&obj, "releaseUser"); + if !releasers.is_empty() { + values.push(Some(releasers.join(","))); + conds.push(format!( + "f_last_modify_user_id = ANY(string_to_array(${}::text, ','))", + values.len() + )); + } + let where_sql = conds.join(" AND "); + let count_sql = format!("SELECT COUNT(*)::text AS \"n\" FROM base_notice WHERE {where_sql}"); + let total: i64 = match state.db.query_json_params(&count_sql, ¶ms_of(&values)).await { + Ok(rows) => rows + .first() + .and_then(|r| r.get("n")) + .and_then(Value::as_str) + .and_then(|s| s.parse::().ok()) + .unwrap_or(0), + Err(e) => return db_error(e, "公告计数"), + }; + let mut list_values = values.clone(); + list_values.push(Some(paging.page_size.to_string())); + let limit_n = list_values.len(); + list_values.push(Some(paging.offset.to_string())); + let offset_n = list_values.len(); + let sql = format!( + "SELECT {NOTICE_PROJECTION}, COALESCE(f_body_text, '') AS \"bodyText\" \ + FROM base_notice WHERE {where_sql} \ + ORDER BY f_creator_time DESC NULLS LAST, f_id DESC \ + LIMIT ${limit_n}::text::integer OFFSET ${offset_n}::text::integer" + ); + let rows = match state.db.query_json_params(&sql, ¶ms_of(&list_values)).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "公告列表查询"), + }; + let mut ids: Vec = Vec::new(); + for row in &rows { + for key in ["creatorUserId", "lastModifyUserId"] { + if let Some(v) = row.get(key).and_then(Value::as_str) { + ids.push(v.to_string()); + } + } + } + let labels = user_labels(&state, &ids).await; + let list: Vec = rows + .into_iter() + .map(|row| shape_notice_row(row, &labels)) + .collect(); + ok(page_list(paging.current_page, paging.page_size, total, list)) +} + +/// 给公告行补 `creatorUser` / `releaseUser` / `excerpt` 并摘掉内部 id。 +fn shape_notice_row(mut row: Value, labels: &HashMap) -> Value { + let body = row + .get("bodyText") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + let Some(obj) = row.as_object_mut() else { + return row; + }; + let creator_id = obj + .get("creatorUserId") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + let modify_id = obj + .get("lastModifyUserId") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + let creator = labels.get(&creator_id).cloned().unwrap_or_default(); + obj.insert("creatorUser".to_string(), Value::String(creator)); + // 官方 `releaseUser` 取的是 `lastModifyUserId`(= 发布人)的姓名/账号。 + let releaser = if modify_id.is_empty() { + String::new() + } else { + labels.get(&modify_id).cloned().unwrap_or_default() + }; + obj.insert("releaseUser".to_string(), Value::String(releaser)); + obj.insert("excerpt".to_string(), Value::String(notice_excerpt(&body))); + obj.remove("bodyText"); + obj.remove("creatorUserId"); + obj.remove("lastModifyUserId"); + row +} + +/// `POST /api/message/Notice` —— 新建公告(草稿:`f_enabled_mark = 0`)。 +pub async fn notice_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_NOTICE).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let title = obj + .get("title") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + if title.is_empty() { + return fail(code::FAIL, "公告标题缺失"); + } + let new_id = new_uuid(); + let mut columns: Vec = vec![ + "f_id".into(), + "f_tenant_id".into(), + "f_title".into(), + "f_enabled_mark".into(), + "f_delete_mark".into(), + "f_creator_user_id".into(), + ]; + let mut casts: Vec<&str> = vec!["", "", "", "::integer", "::integer", ""]; + let mut values: Vec> = vec![ + Some(new_id), + Some("0".to_string()), + Some(title), + Some("0".to_string()), + Some("0".to_string()), + Some(user.account.clone()), + ]; + for (json_key, column, cast) in NOTICE_WRITE_FIELDS { + if column == "f_title" { + continue; + } + if !obj.contains_key(json_key) { + continue; + } + columns.push(column.to_string()); + casts.push(cast); + values.push(value_to_text(obj.get(json_key))); + } + if !obj.contains_key("replyType") { + // 官方:`replyType` 为空时写 0(不回执)。 + columns.push("f_reply_type".to_string()); + casts.push("::integer"); + values.push(Some("0".to_string())); + } + columns.push("f_creator_time".to_string()); + let mut marks: Vec = (0..values.len()) + .map(|i| placeholder(i + 1, casts[i])) + .collect(); + marks.push("now()".to_string()); + let sql = format!( + "INSERT INTO base_notice ({}) VALUES ({})", + columns.join(", "), + marks.join(", ") + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "新建公告"); + } + ok(Value::Null) +} + +/// `PUT /api/message/Notice/{id}` —— 改公告(只 SET body 里出现的键)。 +pub async fn notice_update( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_NOTICE).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let mut sets: Vec = Vec::new(); + let mut values: Vec> = Vec::new(); + for (json_key, column, cast) in NOTICE_WRITE_FIELDS { + if !obj.contains_key(json_key) { + continue; + } + values.push(value_to_text(obj.get(json_key))); + sets.push(format!("{} = ${}::text{}", column, values.len(), cast)); + } + if sets.is_empty() { + return ok(Value::Null); + } + values.push(Some(user.account.clone())); + sets.push(format!("f_last_modify_user_id = ${}::text", values.len())); + sets.push("f_last_modify_time = now()".to_string()); + values.push(Some(id)); + let sql = format!( + "UPDATE base_notice SET {} WHERE f_id = ${}::text AND COALESCE(f_delete_mark, 0) = 0", + sets.join(", "), + values.len() + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "修改公告"); + } + ok(Value::Null) +} + +/// `GET /api/message/Notice/{id}` —— 公告详情(`NoticeInfoVO`)。 +pub async fn notice_info( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_NOTICE).await { + return resp; + } + let id = id.trim().to_string(); + let sql = format!( + "SELECT {NOTICE_PROJECTION}, COALESCE(f_body_text, '') AS \"bodyText\", \ + f_to_user_ids AS \"toUserIds\", f_cover_image AS \"coverImage\", f_files AS \"files\", \ + COALESCE(f_reply_type, 0) AS \"replyType\" \ + FROM base_notice WHERE f_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1" + ); + let rows = match state.db.query_json_params(&sql, &[&id]).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "公告详情查询"), + }; + let Some(mut row) = rows.into_iter().next() else { + return fail(code::FAIL, "公告不存在"); + }; + let body = row + .get("bodyText") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + let creator_id = row + .get("creatorUserId") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + let modify_id = row + .get("lastModifyUserId") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + let labels = user_labels(&state, &[creator_id, modify_id]).await; + let creator = row + .get("creatorUserId") + .and_then(Value::as_str) + .and_then(|id| labels.get(id).cloned()) + .unwrap_or_default(); + let releaser = row + .get("lastModifyUserId") + .and_then(Value::as_str) + .and_then(|id| labels.get(id).cloned()) + .unwrap_or_default(); + let reply_type = row.get("replyType").and_then(Value::as_i64).unwrap_or(0); + if let Some(obj) = row.as_object_mut() { + obj.insert("creatorUser".to_string(), Value::String(creator)); + obj.insert( + "releaseUser".to_string(), + Value::String(if releaser.is_empty() { + String::new() + } else { + releaser + }), + ); + obj.insert("excerpt".to_string(), Value::String(notice_excerpt(&body))); + obj.insert( + "isReply".to_string(), + Value::Bool(reply_type != 0), + ); + obj.remove("creatorUserId"); + obj.remove("lastModifyUserId"); + } + ok(row) +} + +/// `DELETE /api/message/Notice/{id}` —— 删公告(软删 + `enabledMark = -1`,同官方语义)。 +pub async fn notice_delete( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match guard(&state, &headers, EN_NOTICE).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let values = [Some(user.account.clone()), Some(id.trim().to_string())]; + if let Err(e) = state + .db + .exec_params( + "UPDATE base_notice SET f_enabled_mark = -1, f_delete_mark = 1, \ + f_delete_time = now(), f_delete_user_id = $1::text WHERE f_id = $2::text", + ¶ms_of(&values), + ) + .await + { + return db_error(e, "删除公告"); + } + ok(Value::Null) +} + +/// `PUT /api/message/Notice/{id}/Actions/Release` —— 发布公告 ⇒ **真的给收件人各落一条站内消息**。 +/// +/// 🔴 这是全链路的关键一步:不落 `base_message`,消息记录页永远是空的。 +/// 官方 `sendFlowMsgUtil.sentNotice` 走的就是这条(按 `f_to_user_ids` 逐人插 +/// `base_message`,为空则发给全部用户)。本仓同样「为空 ⇒ 全体用户」。 +/// 🔴 `f_category` 拼「公告一级 id,公告提醒二级 id」(官方就是 id 串,两处都是子串匹配) +/// ⇒ 消息记录页按二级页签过滤、按一级 enCode 显示类型名,两者同时成立。 +pub async fn notice_release( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_NOTICE).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => Map::new(), + Err(resp) => return resp, + }; + let sql = "SELECT f_title AS \"title\", COALESCE(f_body_text, '') AS \"bodyText\", \ + f_to_user_ids AS \"toUserIds\", COALESCE(f_cover_image, '') AS \"coverImage\", \ + COALESCE(f_files, '') AS \"files\", COALESCE(f_category, '') AS \"category\", \ + COALESCE(f_expiration_time::text, '') AS \"expirationText\", \ + (EXTRACT(EPOCH FROM f_expiration_time) * 1000)::bigint AS \"expirationTime\" \ + FROM base_notice WHERE f_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1"; + let rows = match state.db.query_json_params(sql, &[&id]).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "公告发布前查询"), + }; + let Some(row) = rows.into_iter().next() else { + return fail(code::FAIL, "公告不存在"); + }; + let title = row + .get("title") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + let body_text = row + .get("bodyText") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + let to_user_ids = row + .get("toUserIds") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + let snapshot = json!({ + "id": id, + "title": title, + "bodyText": body_text, + "coverImage": row.get("coverImage").cloned().unwrap_or(Value::Null), + "files": row.get("files").cloned().unwrap_or(Value::Null), + "category": row.get("category").cloned().unwrap_or(Value::Null), + "expirationTime": row.get("expirationTime").cloned().unwrap_or(Value::Null), + "excerpt": notice_excerpt(&body_text), + }) + .to_string(); + + // 1) 公告本体置「已发送」。 + let send_time = obj.get("sendTime").and_then(Value::as_i64); + let mut sets: Vec = vec![ + "f_enabled_mark = 1".to_string(), + "f_last_modify_user_id = $1::text".to_string(), + "f_last_modify_time = now()".to_string(), + ]; + let mut values: Vec> = vec![Some(user.account.clone())]; + match send_time { + Some(ts) => { + values.push(Some(ts.to_string())); + sets.push(format!("f_send_time = to_timestamp(${}::text::bigint / 1000.0)", values.len())); + } + None => sets.push("f_send_time = now()".to_string()), + } + if !to_user_ids.is_empty() { + // 发布时带上收件人(官方 release 不写 toUserIds,本仓允许「发布即定收件人」)。 + values.push(Some(to_user_ids.clone())); + sets.push(format!("f_to_user_ids = ${}::text", values.len())); + } + values.push(Some(id.clone())); + let update_sql = format!( + "UPDATE base_notice SET {} WHERE f_id = ${}::text", + sets.join(", "), + values.len() + ); + if let Err(e) = state.db.exec_params(&update_sql, ¶ms_of(&values)).await { + return db_error(e, "公告置已发送"); + } + + // 2) 收件人:`f_to_user_ids` 为空 ⇒ 全体启用用户。 + let targets: Vec = if to_user_ids.is_empty() { + match state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_user \ + WHERE COALESCE(f_delete_mark, 0) = 0 AND COALESCE(f_enabled_mark, 1) = 1", + &[], + ) + .await + { + Ok(rows) => rows + .into_iter() + .filter_map(|r| r.get("id").and_then(Value::as_str).map(str::to_string)) + .collect(), + Err(e) => return db_error(e, "公告收件人查询"), + } + } else { + to_user_ids + .split(',') + .map(|s| s.trim().to_string()) + .filter(|s| !s.is_empty()) + .collect() + }; + + // 3) 逐人落 `base_message`(一条 INSERT 多组 VALUES ⇒ 一次往返)。 + let category = format!("{CATEGORY_ANNOUNCE},{CATEGORY_ANNOUNCE_REMIND}"); + let mut tuples: Vec = Vec::new(); + let mut msg_values: Vec> = Vec::new(); + for target in &targets { + let base = msg_values.len(); + msg_values.push(Some(new_uuid())); + msg_values.push(Some("1".to_string())); // f_type = 公告 + msg_values.push(Some(title.clone())); + msg_values.push(Some(target.clone())); + msg_values.push(Some("0".to_string())); // f_is_read + msg_values.push(Some(user.account.clone())); + msg_values.push(Some("0".to_string())); // f_delete_mark + msg_values.push(Some("0".to_string())); // f_tenant_id + msg_values.push(Some(snapshot.clone())); + msg_values.push(Some(category.clone())); + tuples.push(format!( + "(${}::text, ${}::text::integer, ${}::text, ${}::text, ${}::text::integer, \ + now(), ${}::text, ${}::text::integer, ${}::text, ${}::text, ${}::text)", + base + 1, + base + 2, + base + 3, + base + 4, + base + 5, + base + 6, + base + 7, + base + 8, + base + 9, + base + 10 + )); + } + if !tuples.is_empty() { + let insert_sql = format!( + "INSERT INTO base_message \ + (f_id, f_type, f_title, f_user_id, f_is_read, f_creator_time, f_creator_user_id, \ + f_delete_mark, f_tenant_id, f_body_text, f_category) VALUES {}", + tuples.join(", ") + ); + if let Err(e) = state.db.exec_params(&insert_sql, ¶ms_of(&msg_values)).await { + return db_error(e, "公告推送站内消息"); + } + } + ok(Value::Null) +} + +/// `GET /api/message/Notice/{id}/ReplyUserList` —— 回执人员列表(`ListVO`)。 +/// +/// 官方口径:`f_body_text LIKE %noticeId%` + `f_is_read = 2` 的消息 ⇒ 去重成人。 +pub async fn notice_reply_user_list( + State(state): State, + headers: HeaderMap, + Path(id): Path, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_NOTICE).await { + return resp; + } + let keyword = crate::platform::sys::query_param(&raw, "keyword") + .trim() + .to_string(); + let mut values: Vec> = vec![Some(format!("%{}%", id.trim()))]; + let mut conds = vec![ + "COALESCE(f_delete_mark, 0) = 0".to_string(), + "COALESCE(f_is_read, 0) = 2".to_string(), + "COALESCE(f_body_text, '') LIKE $1::text".to_string(), + ]; + if !keyword.is_empty() { + values.push(Some(format!("%{keyword}%"))); + conds.push(format!( + "f_user_id = ANY(string_to_array(${}::text, ','))", + values.len() + )); + } + let sql = format!( + "SELECT f_user_id AS \"userId\", \ + (EXTRACT(EPOCH FROM MAX(f_read_time)) * 1000)::bigint AS \"replyTime\" \ + FROM base_message WHERE {} GROUP BY f_user_id", + conds.join(" AND ") + ); + let rows = match state.db.query_json_params(&sql, ¶ms_of(&values)).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "回执人员查询"), + }; + let ids: Vec = rows + .iter() + .filter_map(|r| r.get("userId").and_then(Value::as_str).map(str::to_string)) + .collect(); + let labels = user_labels(&state, &ids).await; + let list: Vec = rows + .into_iter() + .filter_map(|row| { + let user_id = row.get("userId").and_then(Value::as_str)?.to_string(); + let reply = labels.get(&user_id).cloned().unwrap_or_default(); + Some(json!({ + "id": user_id, + "replyUser": reply, + "headIcon": Value::Null, + "replyTime": row.get("replyTime").cloned().unwrap_or(Value::Null), + })) + }) + .collect(); + ok(list_vo(list)) +} + +/// `GET /api/message/imreply` —— 会话列表。 +/// +/// 形状对齐官方 `ImReplyListVo`:`{id: 对方userId, realName, account, headIcon, +/// latestMessage, latestDate, unreadMessage, messageType}`。 +pub async fn im_reply_list( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let keyword = crate::platform::sys::query_param(&raw, "keyword") + .trim() + .to_lowercase(); + // 会话 + 对方用户信息(对方已被禁用/删除的会话官方也会过滤掉) + let rows = match state + .db + .query_json_params( + "SELECT COALESCE(r.f_receive_user_id, '') AS \"id\", \ + COALESCE(u.f_real_name, '') AS \"realName\", \ + COALESCE(u.f_account, '') AS \"account\", \ + COALESCE(u.f_head_icon, '') AS \"headIcon\" \ + FROM base_im_reply r \ + JOIN base_user u ON u.f_id = r.f_receive_user_id \ + WHERE COALESCE(r.f_delete_mark, 0) = 0 AND r.f_user_id = $1::text \ + AND COALESCE(u.f_delete_mark, 0) = 0 AND COALESCE(u.f_enabled_mark, 1) = 1", + &[&user.user_id], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "会话列表查询"), + }; + + // 未读数:按发信人分组一次算完(避免 N+1) + let unread: HashMap = match state + .db + .query_json_params( + "SELECT COALESCE(f_send_user_id, '') AS \"sender\", COUNT(*)::bigint AS \"total\" \ + FROM base_im_content \ + WHERE f_receive_user_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 \ + GROUP BY f_send_user_id", + &[&user.user_id], + ) + .await + { + Ok(rows) => rows + .into_iter() + .map(|r| { + ( + r.get("sender") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(), + r.get("total").and_then(Value::as_i64).unwrap_or(0), + ) + }) + .collect(), + Err(e) => return db_error(e, "未读消息统计"), + }; + + // 每个对方的最新一条消息:`DISTINCT ON` 取最近 + let latest: HashMap = match state + .db + .query_json_params( + "SELECT DISTINCT ON (peer) peer, content, ts, content_type FROM ( \ + SELECT CASE WHEN f_send_user_id = $1::text THEN f_receive_user_id ELSE f_send_user_id END AS peer, \ + COALESCE(f_content, '') AS content, \ + COALESCE((EXTRACT(EPOCH FROM f_send_time) * 1000)::bigint, 0) AS ts, \ + COALESCE(f_content_type, '') AS content_type \ + FROM base_im_content \ + WHERE COALESCE(f_delete_mark, 0) = 0 \ + AND (f_send_user_id = $1::text OR f_receive_user_id = $1::text) \ + ) m ORDER BY peer, ts DESC", + &[&user.user_id], + ) + .await + { + Ok(rows) => rows + .into_iter() + .map(|r| { + ( + r.get("peer") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(), + ( + r.get("content") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(), + r.get("ts").and_then(Value::as_i64).unwrap_or(0), + r.get("content_type") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(), + ), + ) + }) + .collect(), + Err(e) => return db_error(e, "最新消息查询"), + }; + + let mut list: Vec = rows + .into_iter() + .map(|row| { + let id = row + .get("id") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + let (latest_message, latest_date, message_type) = + latest.get(&id).cloned().unwrap_or_default(); + json!({ + "id": id, + "realName": row.get("realName").cloned().unwrap_or(Value::Null), + "account": row.get("account").cloned().unwrap_or(Value::Null), + "headIcon": row.get("headIcon").cloned().unwrap_or(Value::Null), + "latestMessage": latest_message, + "latestDate": latest_date, + "messageType": message_type, + "unreadMessage": unread.get(&id).copied().unwrap_or(0), + }) + }) + .filter(|item| { + if keyword.is_empty() { + return true; + } + let account = item + .get("account") + .and_then(Value::as_str) + .unwrap_or_default() + .to_lowercase(); + let real_name = item + .get("realName") + .and_then(Value::as_str) + .unwrap_or_default() + .to_lowercase(); + account.contains(&keyword) || real_name.contains(&keyword) + }) + .collect(); + // 按最新消息时间倒序(官方同一排序) + list.sort_by_key(|item| { + std::cmp::Reverse(item.get("latestDate").and_then(Value::as_i64).unwrap_or(0)) + }); + ok(list_vo(list)) +} + +/// `DELETE /api/message/imreply/deleteChatRecord/{id}` —— 删除与某人的聊天记录。 +/// +/// 官方 `imContentService.deleteChatRecord(我, 对方)`:只删**双方之间**的消息。 +pub async fn im_reply_delete_chat( + State(state): State, + headers: HeaderMap, + Path(peer): Path, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let peer = peer.trim().to_string(); + if peer.is_empty() { + return fail(code::FAIL, "缺少会话对象"); + } + if let Err(e) = state + .db + .exec_params( + "UPDATE base_im_content SET f_delete_mark = 1, f_delete_time = now() \ + WHERE COALESCE(f_delete_mark, 0) = 0 AND ( \ + (f_send_user_id = $1::text AND f_receive_user_id = $2::text) \ + OR (f_send_user_id = $2::text AND f_receive_user_id = $1::text) )", + &[&user.user_id, &peer], + ) + .await + { + return db_error(e, "删除聊天记录"); + } + ok(json!("")) +} + +/// `DELETE /api/message/imreply/relocation/{id}` —— 把会话从「我的列表」移除。 +/// +/// 官方 `imReplyService.relocation(我, 对方)`:只动 `base_im_reply`(消息还在)。 +pub async fn im_reply_relocation( + State(state): State, + headers: HeaderMap, + Path(peer): Path, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let peer = peer.trim().to_string(); + if peer.is_empty() { + return fail(code::FAIL, "缺少会话对象"); + } + if let Err(e) = state + .db + .exec_params( + "UPDATE base_im_reply SET f_delete_mark = 1, f_delete_time = now() \ + WHERE f_user_id = $1::text AND f_receive_user_id = $2::text \ + AND COALESCE(f_delete_mark, 0) = 0", + &[&user.user_id, &peer], + ) + .await + { + return db_error(e, "移除会话"); + } + ok(json!("")) +} diff --git a/src/backend/src/platform/compat/mod.rs b/src/backend/src/platform/compat/mod.rs new file mode 100644 index 0000000..d401bb8 --- /dev/null +++ b/src/backend/src/platform/compat/mod.rs @@ -0,0 +1,24 @@ +//! compat —— **契约面**(官方兼容端点),按官方模块名组织。 +//! +//! 🔴 **命名依据**:官方前端 `src/api/<模块>/**` 的目录名。 +//! 这样「缺口表 ↔ 代码位置 ↔ 官方出处」三者一一对应,查缺口时不用猜。 +//! +//! | 模块 | 官方前端目录 | 路径前缀 | +//! |---|---|---| +//! | `system` | `api/system/**` | `/api/system/*` | +//! | `permission` | `api/permission/**` | `/api/permission/*` | +//! | `message` | `api/**`(businessCategory / message / notice) | `/api/message/*` | +//! | `scheduletask` | `api/system/task.ts` | `/api/scheduletask/*` | +//! | `core` | `api/core/**` | `/api/oauth/*` 等 | +//! | `online_dev` | `api/onlineDev/**` | `/api/onlineDev/*`、`/api/Report/*` | +//! | `work_flow` | `api/workFlow/**` | `/api/workflow/*` | +//! +//! 🔴 **`helper` 不是官方模块**:它是契约面的**公共底座**(导入 / 通用工具 / +//! 判别头 / 守卫 / 共享常量 / 菜单与用户信息构造),被多个官方模块共用。 + +pub mod helper; +pub mod system; +pub mod permission; +pub mod message; +pub mod scheduletask; +pub mod core; diff --git a/src/backend/src/platform/compat/permission.rs b/src/backend/src/platform/compat/permission.rs new file mode 100644 index 0000000..62bc671 --- /dev/null +++ b/src/backend/src/platform/compat/permission.rs @@ -0,0 +1,6283 @@ +//! permission —— 官方面 B 的 **permission** 端点集(`/api/permission/*`)。 +//! +//! 🔴 **只放 `/api/permission/*`**:用户 / 角色 / 组织 / 岗位 / 菜单 / 用户分组 / +//! 数据字典 / 权限组 / 动作 / 身份 / 授权读取与写入 / 个人设置 / 选人 / 关系 / +//! 第三方账号关联。 +//! +//! 🔴 **`f_object_type` 必须全小写**(`user` / `organize` / `position`)—— 官方 +//! `PermissionConst` 与本仓授权引擎都只认小写;写成 `"User"` 会「绑定成功但 +//! 权限永不生效」的**静默**失效。 +//! +//! 真源:官方 Java `jnpf-permission` + 官方前端 `src/api/permission/**`。 + + +use std::collections::{HashMap, HashSet}; +use axum::body::Bytes; +use axum::extract::{Path, RawQuery, State}; +use axum::http::HeaderMap; +use axum::Json; +use serde_json::{json, Map, Value}; +use crate::platform::envelope::{code, fail, ok, ActionResult}; +use crate::platform::db::{pglite, pglite::ToSql, Db}; +use crate::platform::auth::require_login_face_b; +use crate::platform::cipher::md5_hex; +use crate::platform::crud::value_to_text; +use crate::platform::ids::new_uuid; +use crate::platform::session::TokenUser; +use crate::platform::state::AppState; +use crate::platform::registry; +use super::helper::{EN_ACTION, EN_AUTH_GROUP, EN_IDENTITY, EN_ORGANIZE, EN_POSITION, EN_ROLE, EN_USER, Paging, USER_SELECTOR_PROJECTION, db_error, guard, guard_any, id_list, id_list_of, list_vo, load_menus, page_list, params_of, parse_body, placeholder, qv, text_field}; +use super::system::{SYSTEM_LIST_PROJECTION, load_system_tops, log_page, shape_system_list_item}; +/// 机构名(查不到 ⇒ `None`)。 +pub(super) async fn organize_name_of(db: &Db, id: &str) -> Option { + let rows = match db + .query_json_params( + "SELECT f_full_name AS \"fullName\" FROM base_organize \ + WHERE f_id = $1::text AND f_delete_mark = 0 LIMIT 1", + &[&id], + ) + .await + { + Ok(rows) => rows, + Err(e) => { + eprintln!("[face-b] 读机构名失败: {e}"); + return None; + } + }; + rows.first() + .and_then(|r| r["fullName"].as_str()) + .map(str::to_string) +} + +/// `GET /api/permission/Users` —— 官方 `UserController.java:295` 的形状。 +/// +/// 🔴 **硬性要求**(`JNPF_COMPAT_SURFACE.md` §3.2): +/// 1. `data` 是**对象**(`pagination` + `list`),**不是**裸数组; +/// 2. 列表项**不含** `password` / `secretkey`(投影里根本不选那两列); +/// 3. `pagination.total` = **总条数**; +/// 4. `currentPage` / `pageSize` **原样回显**; +/// 5. `creatorTime` 是**毫秒时间戳(数字)**; +/// 6. `isAdministrator` 是**数字** `0|1`(官方 `UserListVO.java:60` 是 `Integer`)。 +pub async fn users_list( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let page = Paging::of(&raw); + + // 🔴 `keyword`:用户管理页顶部搜索框。空 ⇒ 不参与 WHERE(与 `group_list` 同一套写法)。 + // 搜 `f_account` / `f_real_name` / `f_mobile_phone` 三列(官方 `UserController` 同口径)。 + let keyword = crate::platform::sys::query_param(&raw, "keyword"); + let keyword = keyword.trim().to_string(); + let like_values = [Some(format!("%{keyword}%"))]; + // 🔴 空关键词 ⇒ **一个参数都不传**(SQL 里没有 `$1`,多传一个就是 + // 「bind message supplies 1 parameters, but prepared statement requires 0」)。 + let kw_params: Vec<&(dyn ToSql + Sync)> = if keyword.is_empty() { + Vec::new() + } else { + params_of(&like_values) + }; + let kw_filter = if keyword.is_empty() { + String::new() + } else { + " AND (f_account ILIKE $1::text OR f_real_name ILIKE $1::text \ + OR COALESCE(f_mobile_phone,'') ILIKE $1::text)".to_string() + }; + + let total_sql = format!( + "SELECT count(*)::bigint AS \"c\" FROM base_user WHERE f_delete_mark = 0{}", + kw_filter + ); + let total = match state.db.query_json_params(&total_sql, &kw_params).await { + Ok(rows) => rows + .into_iter() + .next() + .and_then(|r| r["c"].as_i64()) + .unwrap_or(0), + Err(e) => return db_error(e, "用户总数查询"), + }; + + let limit = Some(page.page_size.to_string()); + let offset = Some(page.offset.to_string()); + let tail = [limit, offset]; + // 🔴 关键词占位符必须**排在分页之前**(`$1` = like,`$2`/`$3` = limit/offset)。 + let mut values: Vec> = Vec::new(); + if !keyword.is_empty() { + values.push(like_values[0].clone()); + } + values.extend(tail.iter().cloned()); + let params = params_of(&values); + let (p_limit, p_offset) = if keyword.is_empty() { + ("$1", "$2") + } else { + ("$2", "$3") + }; + let sql = format!( + "SELECT f_id AS \"id\", f_account AS \"account\", f_real_name AS \"realName\", \ + f_real_name AS \"fullName\", f_gender AS \"gender\", \ + f_mobile_phone AS \"mobilePhone\", f_email AS \"email\", \ + f_organize_id AS \"organize\", f_description AS \"description\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ + (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\", \ + COALESCE(f_lock_mark, 0) AS \"lockMark\", \ + COALESCE(f_handover_mark, 0) AS \"handoverMark\", \ + COALESCE(f_is_administrator, 0) AS \"isAdministrator\", \ + f_head_icon AS \"headIcon\", f_unlock_time AS \"unlockTime\", \ + f_position_id AS \"position\", 0 AS \"isDutyUser\", \ + NULL::text AS \"maxRelationId\" \ + FROM base_user WHERE f_delete_mark = 0{} \ + ORDER BY f_creator_time DESC, f_id ASC \ + LIMIT {p_limit}::text::integer OFFSET {p_offset}::text::integer", + kw_filter + ); + let rows = match state.db.query_json_params(&sql, ¶ms).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "用户列表查询"), + }; + + ok(page_list(page.current_page, page.page_size, total, rows)) +} + +/// `GET /api/permission/Role` —— 官方 `RoleController.java:99-100` 的形状(PageListVO)。 +pub async fn roles_list( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ROLE).await { + return resp; + } + let page = Paging::of(&raw); + + let total = match state + .db + .scalar_text("SELECT count(*) FROM base_role WHERE f_delete_mark = 0") + .await + { + Ok(Some(t)) => t.trim().parse::().unwrap_or(0), + Ok(None) => 0, + Err(e) => return db_error(e, "角色总数查询"), + }; + + let limit = Some(page.page_size.to_string()); + let offset = Some(page.offset.to_string()); + let values = [limit, offset]; + let params = params_of(&values); + let rows = match state + .db + .query_json_params( + "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ + f_type AS \"type\", f_description AS \"description\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\", \ + (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\", \ + COALESCE(f_delete_mark, 0) AS \"deleteMark\" \ + FROM base_role WHERE f_delete_mark = 0 \ + ORDER BY f_sort_code ASC, f_full_name ASC \ + LIMIT $1::text::integer OFFSET $2::text::integer", + ¶ms, + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "角色列表查询"), + }; + + ok(page_list(page.current_page, page.page_size, total, rows)) +} + +/// `GET /api/permission/Organize/AsyncList/{id}` —— 官方 `OrganizeController.java:107-110`。 +/// +/// 🔴 **按 parentId 逐层取**(`id` = 父节点 id,根为 `0`)—— 官方前端就是靠这个接口 +/// 逐层展开机构树 ⇒ **不能**只有「全量列表」。 +/// +/// 🔴 响应是 `ActionResult>` ⇒ **`data` 是 `{pagination, list}`**。 +pub async fn organize_async_list( + State(state): State, + headers: HeaderMap, + Path(parent_id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ORGANIZE).await { + return resp; + } + let parent = parent_id.trim(); + let parent = if parent.is_empty() { "0" } else { parent }.to_string(); + + let rows = match state + .db + .query_json_params( + "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ + COALESCE(f_parent_id, '0') AS \"parentId\", f_category AS \"category\", \ + f_manager_id AS \"managerId\", COALESCE(f_sort_code, 0) AS \"sortCode\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ + f_description AS \"description\", f_organize_id_tree AS \"organizeIdTree\", \ + f_org_name_tree AS \"orgNameTree\", f_duty_position AS \"dutyPosition\", \ + (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\" \ + FROM base_organize WHERE f_delete_mark = 0 \ + AND COALESCE(f_parent_id, '0') = $1::text \ + ORDER BY f_sort_code ASC, f_full_name ASC", + &[&parent], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "组织列表查询"), + }; + + let total = rows.len() as i64; + ok(page_list(1, total.max(1), total, rows)) +} + +/// `POST /api/permission/Authority/Data/{objectId}/Values` —— 官方 `AuthorizeController.java:99-100`。 +/// +/// **请求体**(官方 `DataValuesQuery.java:14-24`): +/// ```json +/// { "type":"module", "objectType":"role", "moduleIds":"" } +/// ``` +/// - `type` **不能为空**(官方直接返 `fail`)⇒ 本仓同样返 `fail(400)`; +/// - `moduleIds` 是**逗号分隔的字符串**(不是数组)—— 本仓读的是**已勾选**值, +/// 不靠 `moduleIds` 入参(那是「前端已勾选」的回传,官方用它做差集); +/// - `objectType` = `role` / `organize` / `position` / `user`。 +/// +/// **响应**(官方 `AuthorizeDataReturnVO.java:16-27`)= `{list, ids, all}`。 +/// +/// 🔴 **面 B v1 降级**(`JNPF_COMPAT_SURFACE.md` §3.6): +/// - `list` 恒 `[]` —— 本仓**不实现**官方那套权限树模型; +/// - `all` 返本仓**全部菜单 id**(官方的 `all` **不含**菜单 id)⇒ **已知错位 B1**; +/// - `ids` 语义**正确**(已勾选的菜单 id)。 +pub async fn authority_values( + State(state): State, + headers: HeaderMap, + Path(object_id): Path, + body: Bytes, +) -> Json { + if let Err(resp) = require_login_face_b(&state, &headers).await { + return resp; + } + let obj = match parse_body(&body) { + Ok(o) => o, + Err(resp) => return resp, + }; + + let type_ = obj.get("type").and_then(Value::as_str).unwrap_or(""); + if type_.trim().is_empty() { + // 🔴 官方:`type` 为空 ⇒ 直接 `fail`(`AuthorizeController.java:112-114`)。 + return fail(code::FAIL, "type 不能为空"); + } + let object_type = obj + .get("objectType") + .and_then(Value::as_str) + .map(str::trim) + .filter(|s| !s.is_empty()) + .unwrap_or("role") + .to_string(); + + let ids = match granted_module_ids(&state.db, &object_type, &object_id).await { + Ok(ids) => ids, + Err(e) => return db_error(e, "授权读取"), + }; + let all = match all_module_ids(&state.db).await { + Ok(ids) => ids, + Err(e) => return db_error(e, "菜单全集查询"), + }; + + ok(json!({ + "list": [], + "ids": ids, + "all": all, + })) +} + +/// 已勾选的菜单 id(`base_authorize`,`f_item_type='module'`)。 +async fn granted_module_ids( + db: &Db, + object_type: &str, + object_id: &str, +) -> Result, pglite::Error> { + let object_type = object_type.to_string(); + let object_id = object_id.to_string(); + let rows = db + .query_json_params( + "SELECT f_item_id AS \"itemId\" FROM base_authorize \ + WHERE f_object_type = $1::text AND f_object_id = $2::text \ + AND f_item_type = 'module' AND f_delete_mark = 0", + &[&object_type, &object_id], + ) + .await?; + Ok(rows + .iter() + .filter_map(|r| r["itemId"].as_str()) + .filter(|s| !s.is_empty()) + .map(str::to_string) + .collect()) +} + +/// 本仓全部菜单 id(`all`)。 +async fn all_module_ids(db: &Db) -> Result, pglite::Error> { + let rows = db + .query_json( + "SELECT f_id AS \"id\" FROM base_module WHERE f_delete_mark = 0 \ + ORDER BY f_sort_code ASC, f_full_name ASC", + ) + .await?; + Ok(rows + .iter() + .filter_map(|r| r["id"].as_str()) + .filter(|s| !s.is_empty()) + .map(str::to_string) + .collect()) +} + +/// 官方 `UserCrForm` 的写白名单:`(JSON 键, 列名, CAST)`。 +/// +/// 🔴 键名逐字对齐 `views/permission/user/Form.vue` 的 `field` +/// (`ranks` 对应列 `f_rank`,`certificatesType` 对应 `f_certificates_type`—— +/// 官方的驼峰与 DDL 的下划线**不是**机械对应,别想当然用下划线转换)。 +/// 表外的键**静默丢弃**(官方 Jackson 只收 DTO 声明的字段)。 +const USER_WRITE_FIELDS: &[(&str, &str, &str)] = &[ + ("account", "f_account", ""), + ("realName", "f_real_name", ""), + ("nickName", "f_nick_name", ""), + ("headIcon", "f_head_icon", ""), + ("gender", "f_gender", ""), + ("birthday", "f_birthday", "::timestamp"), + ("mobilePhone", "f_mobile_phone", ""), + ("telePhone", "f_tele_phone", ""), + ("landline", "f_landline", ""), + ("email", "f_email", ""), + ("nation", "f_nation", ""), + ("nativePlace", "f_native_place", ""), + ("entryDate", "f_entry_date", "::timestamp"), + ("certificatesType", "f_certificates_type", ""), + ("certificatesNumber", "f_certificates_number", ""), + ("education", "f_education", ""), + ("urgentContacts", "f_urgent_contacts", ""), + ("urgentTelePhone", "f_urgent_tele_phone", ""), + ("postalAddress", "f_postal_address", ""), + ("signature", "f_signature", ""), + ("description", "f_description", ""), + ("sortCode", "f_sort_code", "::bigint"), + ("enabledMark", "f_enabled_mark", "::integer"), + ("ranks", "f_rank", ""), + ("organizeId", "f_organize_id", ""), +]; + +/// 详情投影 —— 编辑弹窗 `setFieldsValue(res.data)` **直接吃这份**。 +/// +/// 🔴 少一个键 ⇒ 弹窗里那一格永远是空的,而且**不报错**(静默)。 +/// 🔴 `birthday` / `entryDate` 用 `to_char(…,'YYYY-MM-DD')`:官方 VO 是日期串, +/// `::text` 会带出 ` 00:00:00` ⇒ DatePicker 解析失败。 +pub(super) const USER_DETAIL_COLUMNS: &str = "f_id AS \"id\", f_account AS \"account\", \ + f_real_name AS \"realName\", f_nick_name AS \"nickName\", f_head_icon AS \"headIcon\", \ + f_gender AS \"gender\", to_char(f_birthday, 'YYYY-MM-DD') AS \"birthday\", \ + f_mobile_phone AS \"mobilePhone\", f_tele_phone AS \"telePhone\", f_landline AS \"landline\", \ + f_email AS \"email\", f_nation AS \"nation\", f_native_place AS \"nativePlace\", \ + to_char(f_entry_date, 'YYYY-MM-DD') AS \"entryDate\", \ + f_certificates_type AS \"certificatesType\", \ + f_certificates_number AS \"certificatesNumber\", f_education AS \"education\", \ + f_urgent_contacts AS \"urgentContacts\", f_urgent_tele_phone AS \"urgentTelePhone\", \ + f_postal_address AS \"postalAddress\", f_signature AS \"signature\", \ + f_description AS \"description\", COALESCE(f_sort_code, 0) AS \"sortCode\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\", f_rank AS \"ranks\", \ + f_organize_id AS \"organizeId\", f_position_id AS \"positionId\", \ + COALESCE(f_is_administrator, 0) AS \"isAdministrator\", \ + COALESCE(f_lock_mark, 0) AS \"lockMark\", f_unlock_time AS \"unlockTime\", \ + (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\", \ + f_creator_user_id AS \"creatorUserId\", f_tenant_id AS \"tenantId\", \ + COALESCE(f_delete_mark, 0) AS \"deleteMark\""; + +/// body ⇒ 白名单内的 `(列, CAST, 值)`;**只收 body 里真出现的键**。 +fn user_write_fields(obj: &Map) -> Vec<(&'static str, &'static str, Option)> { + let mut out = Vec::new(); + for (json_key, column, cast) in USER_WRITE_FIELDS { + if obj.contains_key(*json_key) { + out.push((*column, *cast, value_to_text(obj.get(*json_key)))); + } + } + out +} + +/// JS 真值语义的布尔(`isAdministrator` 前端传布尔或数字都可能)。 +fn flag_of(v: Option<&Value>) -> &'static str { + match v { + Some(Value::Bool(true)) => "1", + Some(Value::Number(n)) if n.as_i64().unwrap_or(0) != 0 => "1", + Some(Value::String(s)) if s == "1" || s.eq_ignore_ascii_case("true") => "1", + _ => "0", + } +} + +/// 账号查重(`f_delete_mark = 0` 范围内)。 +/// +/// 🔴 官方 DDL 对 `f_account` **无 UNIQUE** ⇒ 唯一性只在应用层,必须显式查。 +async fn account_owner(db: &Db, account: &str) -> Result, pglite::Error> { + let rows = db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_user \ + WHERE f_account = $1::text AND f_delete_mark = 0 LIMIT 1", + &[&account], + ) + .await?; + Ok(rows + .first() + .and_then(|r| r["id"].as_str()) + .map(str::to_string)) +} + +/// `POST /api/permission/Users` —— 官方建档(JSON body)。 +pub async fn user_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_USER).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + + let account = obj + .get("account") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + if account.is_empty() { + return fail(code::FAIL, "账号不能为空"); + } + match account_owner(&state.db, &account).await { + Ok(Some(_)) => return fail(code::FAIL, format!("账号已存在:{account}")), + Ok(None) => {} + Err(e) => return db_error(e, "用户查重"), + } + + let new_id = new_uuid(); + let mut columns: Vec<&str> = vec!["f_id", "f_tenant_id"]; + let mut casts: Vec<&str> = vec!["", ""]; + let mut values: Vec> = vec![Some(new_id.clone()), Some("0".to_string())]; + + for (column, cast, value) in user_write_fields(&obj) { + // `account` 已在上面校验过,这里照常写入(白名单里本来就有它)。 + columns.push(column); + casts.push(cast); + values.push(value); + } + // 前端没给的口径走官方默认值(`enabledMark=1` / `sortCode=0`)。 + if !obj.contains_key("enabledMark") { + columns.push("f_enabled_mark"); + casts.push("::integer"); + values.push(Some("1".to_string())); + } + if !obj.contains_key("sortCode") { + columns.push("f_sort_code"); + casts.push("::bigint"); + values.push(Some("0".to_string())); + } + // 口令:body 里非空 ⇒ md5;否则官方默认 `123456`。 + let password = match obj.get("password").and_then(Value::as_str) { + Some(p) if !p.is_empty() => md5_hex(p), + _ => md5_hex("123456"), + }; + columns.push("f_password"); + casts.push(""); + values.push(Some(password)); + columns.push("f_is_administrator"); + casts.push("::integer"); + values.push(Some(flag_of(obj.get("isAdministrator")).to_string())); + columns.push("f_delete_mark"); + casts.push("::integer"); + values.push(Some("0".to_string())); + columns.push("f_creator_user_id"); + casts.push(""); + values.push(Some(user.account.clone())); + // 审计列直接用 SQL 自己的 `now()`,**不占参数位**(不受客户端时区影响,也少一个绑定)。 + columns.push("f_creator_time"); + let mut marks: Vec = (0..values.len()) + .map(|i| placeholder(i + 1, casts[i])) + .collect(); + marks.push("now()".to_string()); + let sql = format!( + "INSERT INTO base_user ({}) VALUES ({})", + columns.join(", "), + marks.join(", ") + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "新建用户"); + } + ok(json!({ "id": new_id })) +} + +/// `PUT /api/permission/Users/{id}` —— 官方改档(**只 SET body 里出现的键**)。 +pub async fn user_update( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + + // 存在性:**不按 `f_delete_mark` 过滤**(软删过的行也算存在,与 sys.rs 一致)。 + let exists = match state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_user WHERE f_id = $1::text LIMIT 1", + &[&id], + ) + .await + { + Ok(rows) => !rows.is_empty(), + Err(e) => return db_error(e, "用户查询"), + }; + if !exists { + return fail(code::FAIL, "用户不存在"); + } + + // 账号改了就查重(改成自己不算冲突)。 + if let Some(account) = obj.get("account").and_then(Value::as_str) { + if !account.trim().is_empty() { + match account_owner(&state.db, account.trim()).await { + Ok(Some(owner)) if owner != id => { + return fail(code::FAIL, format!("账号已存在:{}", account.trim())) + } + Ok(_) => {} + Err(e) => return db_error(e, "用户查重"), + } + } + } + + let fields = user_write_fields(&obj); + let mut assignments: Vec = Vec::new(); + let mut values: Vec> = vec![Some(id.clone())]; + for (column, cast, value) in fields { + values.push(value); + assignments.push(format!("{column} = {}", placeholder(values.len(), cast))); + } + if assignments.is_empty() { + // 没有任何可写字段 ⇒ 视为成功(幂等),不要打一条空 SET 的语法错 SQL。 + return ok(Value::Null); + } + assignments.push("f_last_modify_time = now()".to_string()); + let sql = format!( + "UPDATE base_user SET {} WHERE f_id = $1::text", + assignments.join(", ") + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "更新用户"); + } + ok(Value::Null) +} + +/// `DELETE /api/permission/Users/{id}` —— 软删(**幂等**:不存在也返回成功)。 +pub async fn user_delete( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let id = id.trim().to_string(); + if let Err(e) = state + .db + .exec_params( + "UPDATE base_user SET f_delete_mark = 1, f_delete_time = now() \ + WHERE f_id = $1::text", + &[&id], + ) + .await + { + return db_error(e, "删除用户"); + } + ok(Value::Null) +} + +/// `POST /api/permission/Users/BatchDelete` —— 批量软删(一条语句 ⇒ 原子)。 +pub async fn users_batch_delete( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let ids = id_list(&obj); + if ids.is_empty() { + return ok(Value::Null); + } + let mut values: Vec> = ids.iter().map(|s| Some(s.clone())).collect(); + let marks: Vec = (1..=values.len()).map(|i| format!("${i}::text")).collect(); + let sql = format!( + "UPDATE base_user SET f_delete_mark = 1, f_delete_time = now() \ + WHERE f_id IN ({})", + marks.join(", ") + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "批量删除用户"); + } + values.clear(); + ok(Value::Null) +} + +/// `POST /api/permission/Users/BatchUpdateState` —— 批量启停(`enabledMark` 0/1/2)。 +pub async fn users_batch_update_state( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let ids = id_list(&obj); + if ids.is_empty() { + return ok(Value::Null); + } + let enabled = match obj.get("enabledMark").and_then(Value::as_i64) { + Some(v) => v, + None => return fail(code::FAIL, "缺少 enabledMark"), + }; + // $1 = enabledMark,其余 = id + let mut values: Vec> = vec![Some(enabled.to_string())]; + values.extend(ids.iter().map(|s| Some(s.clone()))); + let marks: Vec = (2..=values.len()).map(|i| format!("${i}::text")).collect(); + let sql = format!( + "UPDATE base_user SET f_enabled_mark = $1::text::integer, f_last_modify_time = now() \ + WHERE f_id IN ({})", + marks.join(", ") + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "批量更新用户状态"); + } + ok(Value::Null) +} + +/// `POST /api/permission/Users/{id}/Actions/ResetPassword` —— 重置口令。 +/// +/// 🔴 官方表单字段是 `password`(`views/permission/user/ResetPassword.vue`), +/// 这里额外兼容 `newPassword`(部分版本的 DTO 用它)。 +pub async fn user_reset_password( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let plain = obj + .get("password") + .or_else(|| obj.get("newPassword")) + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + if plain.is_empty() { + return fail(code::FAIL, "口令不能为空"); + } + let values = [Some(id), Some(md5_hex(&plain))]; + if let Err(e) = state + .db + .exec_params( + "UPDATE base_user SET f_password = $2::text, f_change_password_date = now(), \ + f_last_modify_time = now() WHERE f_id = $1::text", + ¶ms_of(&values), + ) + .await + { + return db_error(e, "重置口令"); + } + ok(Value::Null) +} + +/// `PUT /api/permission/Users/{id}/Actions/unlock` —— 解除锁定。 +pub async fn user_unlock( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let id = id.trim().to_string(); + if let Err(e) = state + .db + .exec_params( + "UPDATE base_user SET f_lock_mark = 0, f_unlock_time = NULL, \ + f_log_error_count = 0, f_last_modify_time = now() WHERE f_id = $1::text", + &[&id], + ) + .await + { + return db_error(e, "解除锁定"); + } + ok(Value::Null) +} + +/// `GET /api/permission/Users/{id}/GetPosition` —— 用户岗位。 +/// +/// 🔴 **没有 `base_position` 表**(本仓 12 张表里没有)⇒ 岗位只能从 +/// `base_user.f_position_id` 反推。前端 `res.data.flatMap(o => o.id)` 要的是 +/// **对象数组**,所以这里必须包成 `[{ "id": … }]`,不能直接返字符串数组。 +pub async fn user_get_position( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let id = id.trim().to_string(); + let rows = match state + .db + .query_json_params( + "SELECT f_position_id AS \"positionId\" FROM base_user \ + WHERE f_id = $1::text AND f_delete_mark = 0 LIMIT 1", + &[&id], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "用户岗位查询"), + }; + let raw = rows + .first() + .and_then(|r| r["positionId"].as_str()) + .unwrap_or_default(); + let list: Vec = raw + .split(',') + .map(str::trim) + .filter(|s| !s.is_empty()) + .map(|pid| json!({ "id": pid })) + .collect(); + ok(Value::Array(list)) +} + +/// 分组投影(不含 `f_delete_time` / `f_delete_user_id` 等无人消费的审计列)。 +const GROUP_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ + f_en_code AS \"enCode\", f_description AS \"description\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\", \ + (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\""; + +/// 🔴 **列名只来自这张白名单**(`JNPF-PostgreSQL.sql:1758` 的 14 列): +/// 驼峰 ≠ 下划线机械转换 ⇒ 别用 `snake_case()` 猜。 +const GROUP_WRITE_FIELDS: [(&str, &str, &str); 5] = [ + ("fullName", "f_full_name", ""), + ("enCode", "f_en_code", ""), + ("description", "f_description", ""), + ("enabledMark", "f_enabled_mark", "::integer"), + ("sortCode", "f_sort_code", "::bigint"), +]; + +/// `GET /api/permission/Group` —— 用户管理页左侧的**分组树**(`ListVO`)。 +/// +/// 🔴 前端 `views/permission/user/index.vue:338-341`: +/// `state.treeData = [{fullName:'全部用户', id:''}, ...(res.data.list || [])]` +/// ⇒ **`data` 必须是有 `list` 的对象**(裸数组会被 `|| []` 吞成空树)。 +pub async fn group_list( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let keyword = crate::platform::sys::query_param(&raw, "keyword"); + let keyword = keyword.trim().to_string(); + // 空关键词 ⇒ 不参与 WHERE(`like '%%'` 也能过,但显式分开更好读、更好测)。 + let sql = if keyword.is_empty() { + format!( + "SELECT {GROUP_PROJECTION} FROM base_group WHERE COALESCE(f_delete_mark,0) = 0 \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ) + } else { + format!( + "SELECT {GROUP_PROJECTION} FROM base_group WHERE COALESCE(f_delete_mark,0) = 0 \ + AND (f_full_name ILIKE $1::text OR f_en_code ILIKE $1::text) \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ) + }; + // 🔴 `like` 必须**先绑定再取引用**:`params_of(&[like])` 里的临时数组活不过这条语句。 + let like_values = [Some(format!("%{keyword}%"))]; + let params: Vec<&(dyn ToSql + Sync)> = if keyword.is_empty() { + Vec::new() + } else { + params_of(&like_values) + }; + let rows = match state.db.query_json_params(&sql, ¶ms).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "分组列表查询"), + }; + ok(list_vo(rows)) +} + +/// `GET /api/permission/Group/{id}` —— 分组详情(`GroupForm.vue:64` 直接 `setFieldsValue(res.data)`)。 +pub async fn group_info( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let id = id.trim().to_string(); + let sql = format!( + "SELECT {GROUP_PROJECTION} FROM base_group \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1" + ); + let rows = match state.db.query_json_params(&sql, &[&id]).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "分组详情查询"), + }; + match rows.into_iter().next() { + Some(row) => ok(row), + None => fail(code::FAIL, "分组不存在"), + } +} + +/// `POST /api/permission/Group` —— 建分组。 +pub async fn group_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_USER).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let full_name = obj + .get("fullName") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + if full_name.is_empty() { + return fail(code::FAIL, "分组名称不能为空"); + } + + let new_id = new_uuid(); + let mut columns: Vec<&str> = vec!["f_id", "f_tenant_id", "f_full_name"]; + let mut casts: Vec<&str> = vec!["", "", ""]; + let mut values: Vec> = + vec![Some(new_id.clone()), Some("0".to_string()), Some(full_name)]; + + for (json_key, column, cast) in GROUP_WRITE_FIELDS { + // `fullName` 已写入首列,跳过(避免重复列)。 + if column == "f_full_name" { + continue; + } + if obj.contains_key(json_key) { + columns.push(column); + casts.push(cast); + values.push(value_to_text(obj.get(json_key))); + } + } + if !obj.contains_key("enabledMark") { + columns.push("f_enabled_mark"); + casts.push("::integer"); + values.push(Some("1".to_string())); + } + if !obj.contains_key("sortCode") { + columns.push("f_sort_code"); + casts.push("::bigint"); + values.push(Some("0".to_string())); + } + columns.push("f_creator_user_id"); + casts.push(""); + values.push(Some(user.account.clone())); + columns.push("f_delete_mark"); + casts.push("::integer"); + values.push(Some("0".to_string())); + // 🔴 `f_creator_time` 用 SQL `now()` ⇒ **不占参数位**(否则 `$n` 与 columns 错位)。 + columns.push("f_creator_time"); + let mut marks: Vec = (0..values.len()) + .map(|i| placeholder(i + 1, casts[i])) + .collect(); + marks.push("now()".to_string()); + let sql = format!( + "INSERT INTO base_group ({}) VALUES ({})", + columns.join(", "), + marks.join(", ") + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "新建分组"); + } + ok(json!({ "id": new_id })) +} + +/// `PUT /api/permission/Group/{id}` —— 改分组(**只 SET body 里出现的键**)。 +pub async fn group_update( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_USER).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let rows = match state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_group \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", + &[&id], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "分组查询"), + }; + if rows.is_empty() { + return fail(code::FAIL, "分组不存在"); + } + + let mut sets: Vec = Vec::new(); + let mut values: Vec> = Vec::new(); + for (json_key, column, cast) in GROUP_WRITE_FIELDS { + if !obj.contains_key(json_key) { + continue; + } + values.push(value_to_text(obj.get(json_key))); + sets.push(format!("{} = ${}::text{}", column, values.len(), cast)); + } + if sets.is_empty() { + return ok(Value::Null); + } + values.push(Some(user.account.clone())); + sets.push(format!("f_last_modify_user_id = ${}::text", values.len())); + sets.push("f_last_modify_time = now()".to_string()); + values.push(Some(id)); + let sql = format!( + "UPDATE base_group SET {} WHERE f_id = ${}::text", + sets.join(", "), + values.len() + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "修改分组"); + } + ok(Value::Null) +} + +/// `DELETE /api/permission/Group/{id}` —— 删分组(软删 + 解绑成员)。 +pub async fn group_delete( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match guard(&state, &headers, EN_USER).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let values = [Some(user.account.clone()), Some(id.clone())]; + if let Err(e) = state + .db + .exec_params( + "UPDATE base_group SET f_delete_mark = 1, f_delete_time = now(), \ + f_delete_user_id = $1::text WHERE f_id = $2::text", + ¶ms_of(&values), + ) + .await + { + return db_error(e, "删除分组"); + } + // 关系行同步软删(否则树删了、成员还在 ⇒ 下次同 id 建组会「复活」旧成员)。 + let rel = [Some(user.account.clone()), Some(id)]; + if let Err(e) = state + .db + .exec_params( + "UPDATE base_user_relation SET f_delete_mark = 1, f_delete_time = now() \ + WHERE f_object_type = 'Group' AND f_object_id = $2::text \ + AND f_delete_user_id = $1::text", + ¶ms_of(&rel), + ) + .await + { + return db_error(e, "删除分组关系"); + } + ok(Value::Null) +} + +/// 分组—用户关系的**软删/插回**(`AddUser` / `DeleteUser` 共用)。 +/// +/// 🔴 关系落在 `base_user_relation`(`f_object_type = 'Group'`),**不**在 `base_group`。 +async fn group_toggle_members( + state: &AppState, + user: &str, + group_id: &str, + ids: Vec, + add: bool, +) -> Result<(), pglite::Error> { + for user_id in ids { + if add { + // 幂等:同一 (用户, 分组) 只留一条未删的关系行。 + let exists = state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_user_relation \ + WHERE f_user_id = $1::text AND f_object_type = 'Group' \ + AND f_object_id = $2::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", + ¶ms_of(&[Some(user_id.clone()), Some(group_id.to_string())]), + ) + .await?; + if exists.is_empty() { + let new_id = new_uuid(); + let values = [ + Some(new_id), + Some(user_id), + Some(group_id.to_string()), + Some(user.to_string()), + ]; + state + .db + .exec_params( + "INSERT INTO base_user_relation \ + (f_id, f_tenant_id, f_user_id, f_object_type, f_object_id, \ + f_creator_user_id, f_creator_time, f_delete_mark) \ + VALUES ($1::text, '0', $2::text, 'Group', $3::text, $4::text, now(), 0)", + ¶ms_of(&values), + ) + .await?; + } + } else { + let values = [Some(user.to_string()), Some(user_id), Some(group_id.to_string())]; + state + .db + .exec_params( + "UPDATE base_user_relation SET f_delete_mark = 1, f_delete_time = now(), \ + f_delete_user_id = $1::text \ + WHERE f_user_id = $2::text AND f_object_type = 'Group' \ + AND f_object_id = $3::text", + ¶ms_of(&values), + ) + .await?; + } + } + Ok(()) +} + +/// `POST /api/permission/Group/{id}/Actions/AddUser` —— 分组加成员(body `{ids:[…]}`)。 +pub async fn group_add_user( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_USER).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let ids = id_list(&obj); + if ids.is_empty() { + return ok(Value::Null); + } + if let Err(e) = group_toggle_members(&state, &user.account, &id, ids, true).await { + return db_error(e, "分组添加用户"); + } + ok(Value::Null) +} + +/// `POST /api/permission/Group/{id}/Actions/DeleteUser` —— 分组移出成员。 +pub async fn group_remove_user( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_USER).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let ids = id_list(&obj); + if ids.is_empty() { + return ok(Value::Null); + } + if let Err(e) = group_toggle_members(&state, &user.account, &id, ids, false).await { + return db_error(e, "分组移除用户"); + } + ok(Value::Null) +} + +/// `POST /api/permission/Users/{id}/SetPosition` —— 给单个用户设岗位。 +/// +/// 🔴 **没有 `base_position` 表** ⇒ 岗位只能落在 `base_user.f_position_id`(逗号分隔), +/// 与 `GET .../GetPosition` 的读法(同一个字段反推)成一对。 +pub async fn user_set_position( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let ids = id_list(&obj); + let values = [Some(ids.join(",")), Some(id)]; + if let Err(e) = state + .db + .exec_params( + "UPDATE base_user SET f_position_id = $1::text, f_last_modify_time = now() \ + WHERE f_id = $2::text", + ¶ms_of(&values), + ) + .await + { + return db_error(e, "设置用户岗位"); + } + ok(Value::Null) +} + +/// `POST /api/permission/Users/SetPositionBatch` —— 批量设岗位(body `{userIds:[…], ids:[…]}`)。 +/// +/// 🔴 **同路径不能挂在 `/Users/{id}` 上**:那条路由会把 `SetPositionBatch` 当 id 吃掉。 +/// matchit 静态段优先 ⇒ 单独注册 `/Users/SetPositionBatch` 即可正确分流。 +pub async fn users_set_position_batch( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + // 🔴 批量接口的**用户**集合是 `userIds`(不是 `ids`)—— `ids` 在这里是**岗位**集合 + // (`views/permission/user/index.vue:380`:`batchSetUserPosition({ userIds, ids })`)。 + let user_ids = match obj.get("userIds") { + Some(Value::Array(items)) => items + .iter() + .filter_map(Value::as_str) + .map(str::to_string) + .collect::>(), + _ => Vec::new(), + }; + if user_ids.is_empty() { + return ok(Value::Null); + } + let positions = id_list(&obj).join(","); + let values = [Some(positions), Some(user_ids.join(","))]; + // 一条 SQL 覆盖全部用户(用 `= ANY(string_to_array(...))` ⇒ 原子,不用循环)。 + if let Err(e) = state + .db + .exec_params( + "UPDATE base_user SET f_position_id = $1::text, f_last_modify_time = now() \ + WHERE f_id = ANY(string_to_array($2::text, ','))", + ¶ms_of(&values), + ) + .await + { + return db_error(e, "批量设置用户岗位"); + } + ok(Value::Null) +} + +/// `GET /api/permission/Users/{id}/SelectorByUserPosId` —— 同岗位用户(离职交接的接收人选)。 +pub async fn user_selector_by_pos_id( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let id = id.trim().to_string(); + let sql = format!( + "SELECT {USER_SELECTOR_PROJECTION} FROM base_user \ + WHERE f_delete_mark = 0 AND f_id <> $1::text \ + AND COALESCE(f_position_id, '') <> '' \ + AND COALESCE(f_position_id, '') = \ + (SELECT COALESCE(f_position_id, '') FROM base_user WHERE f_id = $1::text LIMIT 1) \ + ORDER BY f_real_name ASC" + ); + let rows = match state.db.query_json_params(&sql, &[&id]).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "同岗位用户查询"), + }; + ok(list_vo(rows)) +} + +/// `DELETE /api/permission/socials/{id}?userId=` —— 第三方账号解绑。 +/// +/// 🔴 本仓没有 `base_socials_users` 表(`JNPF-PostgreSQL.sql:4038`)⇒ **无绑可解** +/// ⇒ 恒返成功(前端 `createMessage.success(res.msg)`,不读 `data`)。 +pub async fn socials_delete( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + // 路径参数读了但不落库:留着是为了让「未注册路径」与「已注册但无表」可区分。 + let _ = id.trim(); + ok(Value::Null) +} + +/// `POST /api/permission/Users/workHandover` —— 离职交接(写接口)。 +/// +/// 🔴 本仓**不落**工作流/流程任务 ⇒ 只做「能落库的那部分」: +/// `handoverMark` 置 1(离职)与 `f_last_modify_time`;其余交给调用方页面。 +/// body 形如 `{ fromId, toUserId, … }`(`WorkHandoverModal.vue`)。 +pub async fn users_work_handover( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let from_id = obj + .get("fromId") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + if from_id.is_empty() { + return fail(code::FAIL, "交接人不能为空"); + } + let values = [Some(from_id)]; + if let Err(e) = state + .db + .exec_params( + "UPDATE base_user SET f_handover_mark = 1, f_last_modify_time = now() \ + WHERE f_id = $1::text", + ¶ms_of(&values), + ) + .await + { + return db_error(e, "离职交接"); + } + ok(Value::Null) +} + +/// 机构投影(对齐 `organize_async_list` 的字段集,两处必须一致)。 +const ORGANIZE_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ + f_en_code AS \"enCode\", COALESCE(f_parent_id, '0') AS \"parentId\", \ + f_category AS \"category\", f_manager_id AS \"managerId\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ + f_description AS \"description\", f_organize_id_tree AS \"organizeIdTree\", \ + f_org_name_tree AS \"orgNameTree\", f_duty_position AS \"dutyPosition\", \ + (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\""; + +/// 🔴 **列名只来自这张白名单**(`db/schema.sql:53` 的 21 列): +/// 驼峰 ≠ 下划线机械转换 ⇒ 别用 `snake_case()` 猜。 +/// 表单实际提交的键(`OrganizeForm.vue:33-68`):parentId/category/fullName/enCode/sortCode/description。 +const ORGANIZE_WRITE_FIELDS: [(&str, &str, &str); 8] = [ + ("parentId", "f_parent_id", ""), + ("category", "f_category", ""), + ("fullName", "f_full_name", ""), + ("enCode", "f_en_code", ""), + ("description", "f_description", ""), + ("managerId", "f_manager_id", ""), + ("enabledMark", "f_enabled_mark", "::integer"), + ("sortCode", "f_sort_code", "::bigint"), +]; + +/// `GET /api/permission/Organize` —— 机构全量列表(`ListVO`)。 +pub async fn organize_list( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ORGANIZE).await { + return resp; + } + let sql = format!( + "SELECT {ORGANIZE_PROJECTION} FROM base_organize WHERE COALESCE(f_delete_mark,0) = 0 \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + let rows = match state.db.query_json_params(&sql, &[]).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "机构列表查询"), + }; + ok(list_vo(rows)) +} + +/// `GET /api/permission/Organize/{id}` —— 机构详情(`OrganizeForm.vue:103` 直接 `setFieldsValue(res.data)`)。 +pub async fn organize_info( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ORGANIZE).await { + return resp; + } + let id = id.trim().to_string(); + let sql = format!( + "SELECT {ORGANIZE_PROJECTION} FROM base_organize \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1" + ); + let rows = match state.db.query_json_params(&sql, &[&id]).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "机构详情查询"), + }; + match rows.into_iter().next() { + Some(row) => ok(row), + None => fail(code::FAIL, "机构不存在"), + } +} + +/// `POST /api/permission/Organize` —— 建机构。 +/// +/// 🔴 `f_organize_id_tree` / `f_org_name_tree`:官方是「父树 + 自己」的拼接, +/// 这里按同样的语义落库(父不存在 ⇒ 自己就是根)。 +pub async fn organize_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_ORGANIZE).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let full_name = obj + .get("fullName") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + if full_name.is_empty() { + return fail(code::FAIL, "机构名称不能为空"); + } + let parent_id = obj + .get("parentId") + .and_then(Value::as_str) + .unwrap_or_default() + .trim(); + let parent_id: String = if parent_id.is_empty() { + "0".to_string() + } else { + parent_id.to_string() + }; + + // 父树:查父节点的 id_tree / name_tree,没有就视为根。 + let (id_tree_prefix, name_tree_prefix) = if parent_id == "0" { + (String::new(), String::new()) + } else { + let prow = state + .db + .query_json_params( + "SELECT COALESCE(f_organize_id_tree, f_id) AS \"t\", \ + COALESCE(f_org_name_tree, f_full_name) AS \"n\" \ + FROM base_organize WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", + &[&parent_id], + ) + .await + .unwrap_or_default(); + match prow.into_iter().next() { + Some(r) => ( + r["t"].as_str().unwrap_or_default().to_string(), + r["n"].as_str().unwrap_or_default().to_string(), + ), + None => (String::new(), String::new()), + } + }; + + let new_id = new_uuid(); + let id_tree = if id_tree_prefix.is_empty() { + new_id.clone() + } else { + format!("{id_tree_prefix},{new_id}") + }; + let name_tree = if name_tree_prefix.is_empty() { + full_name.clone() + } else { + format!("{name_tree_prefix},{full_name}") + }; + + let mut columns: Vec<&str> = vec![ + "f_id", + "f_tenant_id", + "f_full_name", + "f_parent_id", + "f_organize_id_tree", + "f_org_name_tree", + ]; + let mut casts: Vec<&str> = vec!["", "", "", "", "", ""]; + let mut values: Vec> = vec![ + Some(new_id.clone()), + Some("0".to_string()), + Some(full_name), + Some(parent_id), + Some(id_tree), + Some(name_tree), + ]; + + for (json_key, column, cast) in ORGANIZE_WRITE_FIELDS { + // `fullName` / `parentId` 已作为首四列写入,跳过(避免重复列)。 + if column == "f_full_name" || column == "f_parent_id" { + continue; + } + if obj.contains_key(json_key) { + columns.push(column); + casts.push(cast); + values.push(value_to_text(obj.get(json_key))); + } + } + if !obj.contains_key("enabledMark") { + columns.push("f_enabled_mark"); + casts.push("::integer"); + values.push(Some("1".to_string())); + } + if !obj.contains_key("sortCode") { + columns.push("f_sort_code"); + casts.push("::bigint"); + values.push(Some("0".to_string())); + } + columns.push("f_creator_user_id"); + casts.push(""); + values.push(Some(user.account.clone())); + columns.push("f_delete_mark"); + casts.push("::integer"); + values.push(Some("0".to_string())); + // 🔴 `f_creator_time` 用 SQL `now()` ⇒ **不占参数位**(否则 `$n` 与 columns 错位)。 + columns.push("f_creator_time"); + let mut marks: Vec = (0..values.len()) + .map(|i| placeholder(i + 1, casts[i])) + .collect(); + marks.push("now()".to_string()); + let sql = format!( + "INSERT INTO base_organize ({}) VALUES ({})", + columns.join(", "), + marks.join(", ") + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "新建机构"); + } + ok(json!({ "id": new_id })) +} + +/// `PUT /api/permission/Organize/{id}` —— 改机构(**只 SET body 里出现的键**)。 +pub async fn organize_update( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_ORGANIZE).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let rows = match state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_organize \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", + &[&id], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "机构查询"), + }; + if rows.is_empty() { + return fail(code::FAIL, "机构不存在"); + } + + let mut sets: Vec = Vec::new(); + let mut values: Vec> = Vec::new(); + for (json_key, column, cast) in ORGANIZE_WRITE_FIELDS { + if !obj.contains_key(json_key) { + continue; + } + values.push(value_to_text(obj.get(json_key))); + sets.push(format!("{} = ${}::text{}", column, values.len(), cast)); + } + if sets.is_empty() { + return ok(Value::Null); + } + values.push(Some(user.account.clone())); + sets.push(format!("f_last_modify_user_id = ${}::text", values.len())); + sets.push("f_last_modify_time = now()".to_string()); + values.push(Some(id)); + let sql = format!( + "UPDATE base_organize SET {} WHERE f_id = ${}::text", + sets.join(", "), + values.len() + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "修改机构"); + } + ok(Value::Null) +} + +/// `DELETE /api/permission/Organize/{id}` —— 删机构(软删)。 +/// +/// 🔴 **不级联**:官方删父机构会连带子机构,本仓只软删本行(子机构会「悬挂」)。 +/// 这是**已知限制**,写进 `docs/known-limitations.md`,避免误以为级联已实现。 +pub async fn organize_delete( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match guard(&state, &headers, EN_ORGANIZE).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let values = [Some(user.account.clone()), Some(id)]; + let sql = "UPDATE base_organize SET f_delete_mark = 1, f_delete_time = now(), \ + f_delete_user_id = $1::text WHERE f_id = $2::text \ + AND COALESCE(f_delete_mark,0) = 0"; + if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { + return db_error(e, "删除机构"); + } + ok(Value::Null) +} + +/// `GET /api/permission/Organize/Selector` —— 机构下拉(`ListVO`)。 +/// +/// 🔴 前端 `getOrganizeSelector()` 默认 `{parentId:'0'}`,但**本仓不做逐层剪枝**: +/// 权限页的组织选择器要能一次看到全树 ⇒ 恒返全部机构,`parentId` 仅做兼容占位。 +pub async fn organize_selector( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ORGANIZE).await { + return resp; + } + let sql = format!( + "SELECT f_id AS \"id\", f_full_name AS \"fullName\", \ + COALESCE(f_parent_id, '0') AS \"parentId\", f_category AS \"category\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\", \ + f_organize_id_tree AS \"organizeIdTree\" \ + FROM base_organize WHERE COALESCE(f_delete_mark,0) = 0 \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + let rows = match state.db.query_json_params(&sql, &[]).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "机构下拉查询"), + }; + ok(list_vo(rows)) +} + +/// 岗位投影(对齐官方 `base_position` 的 23 列里被消费的那部分)。 +const POSITION_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ + f_en_code AS \"enCode\", f_type AS \"type\", \ + COALESCE(f_organize_id, '') AS \"organizeId\", \ + COALESCE(f_parent_id, '0') AS \"parentId\", \ + f_description AS \"description\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\", \ + COALESCE(f_is_condition, 0) AS \"isCondition\", \ + COALESCE(f_default_mark, 0) AS \"defaultMark\", \ + f_duty_user AS \"dutyUser\", f_position_id_tree AS \"positionIdTree\", \ + (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\""; + +/// 🔴 **列名只来自这张白名单**(`db/schema.sql` 的 `base_position`,官方 DDL 逐字)。 +const POSITION_WRITE_FIELDS: [(&str, &str, &str); 8] = [ + ("fullName", "f_full_name", ""), + ("enCode", "f_en_code", ""), + ("type", "f_type", ""), + ("organizeId", "f_organize_id", ""), + ("parentId", "f_parent_id", ""), + ("description", "f_description", ""), + ("enabledMark", "f_enabled_mark", "::integer"), + ("sortCode", "f_sort_code", "::bigint"), +]; + +/// `GET /api/permission/Organize/AsyncPosList` —— 组织 + 岗位混合下拉(官方 `organize.ts:68`)。 +/// +/// 🔴 前端 `getOrgAndPosSelector({id, type})`:机构管理页「组织/岗位」两个面板都用它。 +/// 本仓**岗位与组织是两张表**,没有官方那种「一个接口混出两种节点」的模型 +/// ⇒ 按 `type` 分流:`organize` 返机构、`position` 返岗位、其他返机构(默认)。 +pub async fn organize_async_pos_list( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ORGANIZE).await { + return resp; + } + let kind = crate::platform::sys::query_param(&raw, "type"); + let kind = kind.trim().to_string(); + let rows = if kind == "position" { + let sql = format!( + "SELECT {POSITION_PROJECTION} FROM base_position \ + WHERE COALESCE(f_delete_mark,0) = 0 \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + state.db.query_json_params(&sql, &[]).await + } else { + let parent = crate::platform::sys::query_param(&raw, "id"); + let parent = parent.trim(); + let parent = if parent.is_empty() { "0" } else { parent }.to_string(); + let sql = format!( + "SELECT {ORGANIZE_PROJECTION} FROM base_organize WHERE f_delete_mark = 0 \ + AND COALESCE(f_parent_id, '0') = $1::text \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + state.db.query_json_params(&sql, &[&parent]).await + }; + match rows { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "组织岗位下拉查询"), + } +} + +/// `GET /api/permission/Position` —— 岗位列表(`ListVO`)。 +pub async fn position_list( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_POSITION).await { + return resp; + } + let sql = format!( + "SELECT {POSITION_PROJECTION} FROM base_position WHERE COALESCE(f_delete_mark,0) = 0 \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + match state.db.query_json_params(&sql, &[]).await { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "岗位列表查询"), + } +} + +/// `GET /api/permission/Position/{id}` —— 岗位详情。 +pub async fn position_info( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_POSITION).await { + return resp; + } + let id = id.trim().to_string(); + let sql = format!( + "SELECT {POSITION_PROJECTION} FROM base_position \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1" + ); + match state.db.query_json_params(&sql, &[&id]).await { + Ok(rows) => match rows.into_iter().next() { + Some(row) => ok(row), + None => fail(code::FAIL, "岗位不存在"), + }, + Err(e) => db_error(e, "岗位详情查询"), + } +} + +/// `POST /api/permission/Position` —— 建岗位。 +pub async fn position_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_POSITION).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let full_name = obj + .get("fullName") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + if full_name.is_empty() { + return fail(code::FAIL, "岗位名称不能为空"); + } + + let new_id = new_uuid(); + let mut columns: Vec<&str> = vec!["f_id", "f_tenant_id", "f_full_name"]; + let mut casts: Vec<&str> = vec!["", "", ""]; + let mut values: Vec> = + vec![Some(new_id.clone()), Some("0".to_string()), Some(full_name)]; + + for (json_key, column, cast) in POSITION_WRITE_FIELDS { + if column == "f_full_name" { + continue; + } + if obj.contains_key(json_key) { + columns.push(column); + casts.push(cast); + values.push(value_to_text(obj.get(json_key))); + } + } + if !obj.contains_key("enabledMark") { + columns.push("f_enabled_mark"); + casts.push("::integer"); + values.push(Some("1".to_string())); + } + if !obj.contains_key("sortCode") { + columns.push("f_sort_code"); + casts.push("::bigint"); + values.push(Some("0".to_string())); + } + // `f_position_id_tree`:本仓岗位只有一层(无父子树)⇒ 就是自己。 + columns.push("f_position_id_tree"); + casts.push(""); + values.push(Some(new_id.clone())); + columns.push("f_creator_user_id"); + casts.push(""); + values.push(Some(user.account.clone())); + columns.push("f_delete_mark"); + casts.push("::integer"); + values.push(Some("0".to_string())); + columns.push("f_creator_time"); + let mut marks: Vec = (0..values.len()) + .map(|i| placeholder(i + 1, casts[i])) + .collect(); + marks.push("now()".to_string()); + let sql = format!( + "INSERT INTO base_position ({}) VALUES ({})", + columns.join(", "), + marks.join(", ") + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "新建岗位"); + } + ok(json!({ "id": new_id })) +} + +/// `PUT /api/permission/Position/{id}` —— 改岗位(**只 SET body 里出现的键**)。 +pub async fn position_update( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_POSITION).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let rows = match state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_position \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", + &[&id], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "岗位查询"), + }; + if rows.is_empty() { + return fail(code::FAIL, "岗位不存在"); + } + + let mut sets: Vec = Vec::new(); + let mut values: Vec> = Vec::new(); + for (json_key, column, cast) in POSITION_WRITE_FIELDS { + if !obj.contains_key(json_key) { + continue; + } + values.push(value_to_text(obj.get(json_key))); + sets.push(format!("{} = ${}::text{}", column, values.len(), cast)); + } + if sets.is_empty() { + return ok(Value::Null); + } + values.push(Some(user.account.clone())); + sets.push(format!("f_last_modify_user_id = ${}::text", values.len())); + sets.push("f_last_modify_time = now()".to_string()); + values.push(Some(id)); + let sql = format!( + "UPDATE base_position SET {} WHERE f_id = ${}::text", + sets.join(", "), + values.len() + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "修改岗位"); + } + ok(Value::Null) +} + +/// `DELETE /api/permission/Position/{id}` —— 删岗位(软删)。 +pub async fn position_delete( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match guard(&state, &headers, EN_POSITION).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let values = [Some(user.account.clone()), Some(id)]; + let sql = "UPDATE base_position SET f_delete_mark = 1, f_delete_time = now(), \ + f_delete_user_id = $1::text WHERE f_id = $2::text \ + AND COALESCE(f_delete_mark,0) = 0"; + if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { + return db_error(e, "删除岗位"); + } + ok(Value::Null) +} + +/// `GET /api/permission/Position/Selector` —— 岗位下拉(`ListVO`)。 +pub async fn position_selector( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_POSITION).await { + return resp; + } + let sql = format!( + "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ + f_type AS \"type\", COALESCE(f_organize_id, '') AS \"organizeId\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\" \ + FROM base_position WHERE COALESCE(f_delete_mark,0) = 0 \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + match state.db.query_json_params(&sql, &[]).await { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "岗位下拉查询"), + } +} + +/// `GET /api/permission/Position/SelectorTree` —— 岗位下拉**树**(按 `organizeId` 分组)。 +/// +/// 🔴 前端 `getPositionSelectorTree({organizeId})` 要的是「机构下挂岗位」的两层结构; +/// 本仓岗位表**没有层级**(`f_parent_id` 未建模)⇒ 退化为「按机构分组的平铺树」, +/// `organizeId` 命中就只返该机构的岗位。 +pub async fn position_selector_tree( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_POSITION).await { + return resp; + } + let org = crate::platform::sys::query_param(&raw, "organizeId"); + let org = org.trim().to_string(); + let (sql, params): (String, Vec>) = if org.is_empty() { + ( + format!( + "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ + COALESCE(f_organize_id, '') AS \"organizeId\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\" \ + FROM base_position WHERE COALESCE(f_delete_mark,0) = 0 \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ), + Vec::new(), + ) + } else { + ( + format!( + "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ + COALESCE(f_organize_id, '') AS \"organizeId\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\" \ + FROM base_position WHERE COALESCE(f_delete_mark,0) = 0 \ + AND COALESCE(f_organize_id,'') = $1::text \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ), + vec![Some(org)], + ) + }; + match state.db.query_json_params(&sql, ¶ms_of(¶ms)).await { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "岗位下拉树查询"), + } +} + +/// `POST /api/permission/Position/PositionCondition` —— 按 id 集取岗位(body `{ids:[…]}`)。 +pub async fn position_condition( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_POSITION).await { + return resp; + } + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return ok(list_vo(Vec::new())), + Err(resp) => return resp, + }; + let ids = id_list(&obj); + if ids.is_empty() { + return ok(list_vo(Vec::new())); + } + let joined = ids.join(","); + let sql = format!( + "SELECT {POSITION_PROJECTION} FROM base_position \ + WHERE COALESCE(f_delete_mark,0) = 0 \ + AND f_id = ANY(string_to_array($1::text, ',')) \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + match state + .db + .query_json_params(&sql, ¶ms_of(&[Some(joined)])) + .await + { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "岗位条件查询"), + } +} + +/// `POST /api/permission/Position/SelectedList` —— 已选岗位基本信息(body `{ids:[…]}`)。 +/// +/// 🔴 **刻意不复用 `position_condition`**:契约扫描器是**静态**推守卫的, +/// 委托调用会让它「推不出守卫」(CC6 判「推不出 ≠ 一致」)⇒ 这里自立一份。 +pub async fn position_selected_list( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_POSITION).await { + return resp; + } + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return ok(list_vo(Vec::new())), + Err(resp) => return resp, + }; + let ids = id_list(&obj); + if ids.is_empty() { + return ok(list_vo(Vec::new())); + } + let joined = ids.join(","); + let sql = format!( + "SELECT {POSITION_PROJECTION} FROM base_position \ + WHERE COALESCE(f_delete_mark,0) = 0 \ + AND f_id = ANY(string_to_array($1::text, ',')) \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + match state + .db + .query_json_params(&sql, ¶ms_of(&[Some(joined)])) + .await + { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "已选岗位查询"), + } +} + +/// `POST /api/permission/Position/{id}/Actions/DutyPosition` —— 设为机构责任岗位。 +pub async fn position_duty_position( + State(state): State, + headers: HeaderMap, + Path(id): Path, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_POSITION).await { + return resp; + } + let id = id.trim().to_string(); + let org = crate::platform::sys::query_param(&raw, "organizeId"); + let org = org.trim().to_string(); + if org.is_empty() { + return fail(code::FAIL, "organizeId 不能为空"); + } + let values = [Some(id), Some(org)]; + let sql = "UPDATE base_organize SET f_duty_position = $1::text WHERE f_id = $2::text \ + AND COALESCE(f_delete_mark,0) = 0"; + if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { + return db_error(e, "设置责任岗位"); + } + ok(Value::Null) +} + +/// `POST /api/permission/Position/{id}/Actions/DutyUser` —— 设为岗位责任人。 +pub async fn position_duty_user( + State(state): State, + headers: HeaderMap, + Path(id): Path, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_POSITION).await { + return resp; + } + let id = id.trim().to_string(); + let user_id = crate::platform::sys::query_param(&raw, "userId"); + let user_id = user_id.trim().to_string(); + if user_id.is_empty() { + return fail(code::FAIL, "userId 不能为空"); + } + let values = [Some(user_id), Some(id)]; + let sql = "UPDATE base_position SET f_duty_user = $1::text WHERE f_id = $2::text \ + AND COALESCE(f_delete_mark,0) = 0"; + if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { + return db_error(e, "设置岗位责任人"); + } + ok(Value::Null) +} + +/// 🔴 **列名只来自这张白名单**(`db/schema.sql` 的 `base_role`,官方 DDL 逐字)。 +const ROLE_WRITE_FIELDS: [(&str, &str, &str); 7] = [ + ("fullName", "f_full_name", ""), + ("enCode", "f_en_code", ""), + ("type", "f_type", ""), + ("globalMark", "f_global_mark", "::integer"), + ("description", "f_description", ""), + ("enabledMark", "f_enabled_mark", "::integer"), + ("sortCode", "f_sort_code", "::bigint"), +]; + +const ROLE_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ + f_en_code AS \"enCode\", f_type AS \"type\", \ + COALESCE(f_global_mark, 0) AS \"globalMark\", f_description AS \"description\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\", \ + COALESCE(f_is_condition, 0) AS \"isCondition\", \ + (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\""; + +/// `GET /api/permission/Role/{id}` —— 角色详情。 +pub async fn role_info( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ROLE).await { + return resp; + } + let id = id.trim().to_string(); + let sql = format!( + "SELECT {ROLE_PROJECTION} FROM base_role \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1" + ); + match state.db.query_json_params(&sql, &[&id]).await { + Ok(rows) => match rows.into_iter().next() { + Some(row) => ok(row), + None => fail(code::FAIL, "角色不存在"), + }, + Err(e) => db_error(e, "角色详情查询"), + } +} + +/// `POST /api/permission/Role` —— 建角色。 +pub async fn role_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_ROLE).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let full_name = obj + .get("fullName") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + if full_name.is_empty() { + return fail(code::FAIL, "角色名称不能为空"); + } + + let new_id = new_uuid(); + let mut columns: Vec<&str> = vec!["f_id", "f_tenant_id", "f_full_name"]; + let mut casts: Vec<&str> = vec!["", "", ""]; + let mut values: Vec> = + vec![Some(new_id.clone()), Some("0".to_string()), Some(full_name)]; + + for (json_key, column, cast) in ROLE_WRITE_FIELDS { + if column == "f_full_name" { + continue; + } + if obj.contains_key(json_key) { + columns.push(column); + casts.push(cast); + values.push(value_to_text(obj.get(json_key))); + } + } + if !obj.contains_key("enabledMark") { + columns.push("f_enabled_mark"); + casts.push("::integer"); + values.push(Some("1".to_string())); + } + if !obj.contains_key("sortCode") { + columns.push("f_sort_code"); + casts.push("::bigint"); + values.push(Some("0".to_string())); + } + columns.push("f_creator_user_id"); + casts.push(""); + values.push(Some(user.account.clone())); + columns.push("f_delete_mark"); + casts.push("::integer"); + values.push(Some("0".to_string())); + columns.push("f_creator_time"); + let mut marks: Vec = (0..values.len()) + .map(|i| placeholder(i + 1, casts[i])) + .collect(); + marks.push("now()".to_string()); + let sql = format!( + "INSERT INTO base_role ({}) VALUES ({})", + columns.join(", "), + marks.join(", ") + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "新建角色"); + } + ok(json!({ "id": new_id })) +} + +/// `PUT /api/permission/Role/{id}` —— 改角色(**只 SET body 里出现的键**)。 +pub async fn role_update( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_ROLE).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let rows = match state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_role \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", + &[&id], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "角色查询"), + }; + if rows.is_empty() { + return fail(code::FAIL, "角色不存在"); + } + + let mut sets: Vec = Vec::new(); + let mut values: Vec> = Vec::new(); + for (json_key, column, cast) in ROLE_WRITE_FIELDS { + if !obj.contains_key(json_key) { + continue; + } + values.push(value_to_text(obj.get(json_key))); + sets.push(format!("{} = ${}::text{}", column, values.len(), cast)); + } + if sets.is_empty() { + return ok(Value::Null); + } + values.push(Some(user.account.clone())); + sets.push(format!("f_last_modify_user_id = ${}::text", values.len())); + sets.push("f_last_modify_time = now()".to_string()); + values.push(Some(id)); + let sql = format!( + "UPDATE base_role SET {} WHERE f_id = ${}::text", + sets.join(", "), + values.len() + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "修改角色"); + } + ok(Value::Null) +} + +/// `DELETE /api/permission/Role/{id}` —— 删角色(软删)。 +pub async fn role_delete( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match guard(&state, &headers, EN_ROLE).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let values = [Some(user.account.clone()), Some(id)]; + let sql = "UPDATE base_role SET f_delete_mark = 1, f_delete_time = now(), \ + f_delete_user_id = $1::text WHERE f_id = $2::text \ + AND COALESCE(f_delete_mark,0) = 0"; + if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { + return db_error(e, "删除角色"); + } + ok(Value::Null) +} + +/// `GET /api/permission/Role/Selector` —— 角色下拉(`ListVO`)。 +pub async fn role_selector( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ROLE).await { + return resp; + } + let type_filter = crate::platform::sys::query_param(&raw, "type"); + let type_filter = type_filter.trim().to_string(); + let (sql, params): (String, Vec>) = if type_filter.is_empty() { + ( + format!( + "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ + f_type AS \"type\", COALESCE(f_sort_code, 0) AS \"sortCode\" \ + FROM base_role WHERE COALESCE(f_delete_mark,0) = 0 \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ), + Vec::new(), + ) + } else { + ( + format!( + "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ + f_type AS \"type\", COALESCE(f_sort_code, 0) AS \"sortCode\" \ + FROM base_role WHERE COALESCE(f_delete_mark,0) = 0 AND f_type = $1::text \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ), + vec![Some(type_filter)], + ) + }; + match state.db.query_json_params(&sql, ¶ms_of(¶ms)).await { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "角色下拉查询"), + } +} + +/// `POST /api/permission/Role/RoleCondition` —— 按 id 集取角色(body `{ids:[…]}`)。 +pub async fn role_condition( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ROLE).await { + return resp; + } + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return ok(list_vo(Vec::new())), + Err(resp) => return resp, + }; + let ids = id_list(&obj); + if ids.is_empty() { + return ok(list_vo(Vec::new())); + } + let joined = ids.join(","); + let sql = format!( + "SELECT {ROLE_PROJECTION} FROM base_role \ + WHERE COALESCE(f_delete_mark,0) = 0 \ + AND f_id = ANY(string_to_array($1::text, ',')) \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + match state + .db + .query_json_params(&sql, ¶ms_of(&[Some(joined)])) + .await + { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "角色条件查询"), + } +} + +/// `GET /api/permission/Group/Selector` —— 分组下拉(`ListVO`)。 +pub async fn group_selector( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let sql = format!( + "SELECT {GROUP_PROJECTION} FROM base_group WHERE COALESCE(f_delete_mark,0) = 0 \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + match state.db.query_json_params(&sql, &[]).await { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "分组下拉查询"), + } +} + +/// `GET /api/permission/Users/Selector` —— 用户下拉(**用户选择器**,`ListVO`)。 +/// +/// 🔴 几乎所有「选人」控件都走它(工作流、授权、交接)。本仓只有 `base_user` 一张表 +/// ⇒ 恒返未软删用户;`organizeId`/`positionId`/`roleId` 暂不做过滤(本仓无对应关系表)。 +pub async fn users_selector( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let keyword = crate::platform::sys::query_param(&raw, "keyword"); + let keyword = keyword.trim().to_string(); + let sql = if keyword.is_empty() { + format!( + "SELECT f_id AS \"id\", f_account AS \"account\", f_real_name AS \"realName\", \ + f_real_name AS \"fullName\", f_gender AS \"gender\", \ + f_mobile_phone AS \"mobilePhone\", f_email AS \"email\", \ + f_head_icon AS \"headIcon\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\" \ + FROM base_user WHERE f_delete_mark = 0 \ + ORDER BY f_sort_code ASC, f_account ASC" + ) + } else { + format!( + "SELECT f_id AS \"id\", f_account AS \"account\", f_real_name AS \"realName\", \ + f_real_name AS \"fullName\", f_gender AS \"gender\", \ + f_mobile_phone AS \"mobilePhone\", f_email AS \"email\", \ + f_head_icon AS \"headIcon\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\" \ + FROM base_user WHERE f_delete_mark = 0 \ + AND (f_account ILIKE $1::text OR f_real_name ILIKE $1::text) \ + ORDER BY f_sort_code ASC, f_account ASC" + ) + }; + let like_values = [Some(format!("%{keyword}%"))]; + let params: Vec<&(dyn ToSql + Sync)> = if keyword.is_empty() { + Vec::new() + } else { + params_of(&like_values) + }; + match state.db.query_json_params(&sql, ¶ms).await { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "用户下拉查询"), + } +} + +/// `POST /api/permission/Users/getUserList` —— 按 id 集取用户基本信息(body `{ids:[…]}`)。 +pub async fn users_get_user_list( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return ok(list_vo(Vec::new())), + Err(resp) => return resp, + }; + let ids = id_list(&obj); + if ids.is_empty() { + return ok(list_vo(Vec::new())); + } + let joined = ids.join(","); + let sql = "SELECT f_id AS \"id\", f_account AS \"account\", f_real_name AS \"realName\", \ + f_real_name AS \"fullName\", f_gender AS \"gender\", \ + f_mobile_phone AS \"mobilePhone\", f_email AS \"email\", \ + f_head_icon AS \"headIcon\", f_organize_id AS \"organizeId\", \ + f_position_id AS \"positionId\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\" \ + FROM base_user WHERE f_delete_mark = 0 \ + AND f_id = ANY(string_to_array($1::text, ',')) \ + ORDER BY f_account ASC"; + match state + .db + .query_json_params(sql, ¶ms_of(&[Some(joined)])) + .await + { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "用户基本信息查询"), + } +} + +/// `POST /api/permission/Users/getSelectedList` —— 已选用户(**刻意不复用 `getUserList`**)。 +pub async fn users_get_selected_list( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return ok(list_vo(Vec::new())), + Err(resp) => return resp, + }; + let ids = id_list(&obj); + if ids.is_empty() { + return ok(list_vo(Vec::new())); + } + let joined = ids.join(","); + let sql = "SELECT f_id AS \"id\", f_account AS \"account\", f_real_name AS \"realName\", \ + f_real_name AS \"fullName\", f_head_icon AS \"headIcon\", \ + f_organize_id AS \"organizeId\", f_position_id AS \"positionId\" \ + FROM base_user WHERE f_delete_mark = 0 \ + AND f_id = ANY(string_to_array($1::text, ','))"; + match state + .db + .query_json_params(sql, ¶ms_of(&[Some(joined)])) + .await + { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "已选用户查询"), + } +} + +/// `POST /api/permission/Users/getSelectedUserList` —— 已选用户(**组织维度**,恒同 `getSelectedList`)。 +pub async fn users_get_selected_user_list( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return ok(list_vo(Vec::new())), + Err(resp) => return resp, + }; + let ids = id_list(&obj); + if ids.is_empty() { + return ok(list_vo(Vec::new())); + } + let joined = ids.join(","); + let sql = "SELECT f_id AS \"id\", f_account AS \"account\", f_real_name AS \"realName\", \ + f_real_name AS \"fullName\", f_head_icon AS \"headIcon\", \ + f_organize_id AS \"organizeId\", f_position_id AS \"positionId\" \ + FROM base_user WHERE f_delete_mark = 0 \ + AND f_id = ANY(string_to_array($1::text, ','))"; + match state + .db + .query_json_params(sql, ¶ms_of(&[Some(joined)])) + .await + { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "已选用户(组织维度)查询"), + } +} + +/// `GET /api/permission/Users/ReceiveUserList` —— 工作交接的**接收人**候选(`ListVO`)。 +pub async fn users_receive_user_list( + State(state): State, + headers: HeaderMap, +) -> Json { + // 🔴 守卫**先自己判一遍**:契约扫描器静态推守卫,纯委托会「推不出」。 + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + users_selector(State(state), headers, RawQuery(None)).await +} + +/// `GET /api/permission/Users/getAllPermission` —— 当前用户的**全部点权限**(`ListVO`)。 +/// +/// 🔴 本仓**只做菜单级**权限(已知限制 (ag))⇒ 点权限集合 = 可见菜单的 `f_en_code` 列表。 +pub async fn users_get_all_permission( + State(state): State, + headers: HeaderMap, +) -> Json { + let user = match guard(&state, &headers, EN_USER).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let sys = registry::resolve_system(&state.db, registry::app_code_of(&headers).as_deref()).await; + let rows = load_menus(&state.db, &user.user_id, user.is_admin, &sys.id).await; + let list: Vec = rows + .into_iter() + .filter_map(|m| { + let code = m.en_code.clone().unwrap_or_default().trim().to_string(); + if code.is_empty() { + None + } else { + Some(json!({ "enCode": code, "id": m.id, "fullName": m.full_name })) + } + }) + .collect(); + ok(list_vo(list)) +} + +/// `GET /api/permission/Users/Authorize` —— 用户授权页的**已授权集合**(`ListVO`)。 +/// +/// 🔴 本仓授权只到菜单级 ⇒ 返该用户可见菜单 id 列表,形状与 `getAllPermission` 同源。 +pub async fn users_authorize( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + users_get_all_permission(State(state), headers).await +} + +/// `GET /api/permission/Authority/{type}/{objectId}` —— 通用权限树(门户/流程/打印模板)。 +/// +/// 🔴 本仓**没有** Portal / 流程 / 打印模板三类对象 ⇒ 恒返空权限模型 +/// (`ids:[]` + `all:false`),与面 B 的 `AuthorityDataReturnVO` 同形。 +pub async fn authority_common_values( + State(state): State, + headers: HeaderMap, + Path((kind, object_id)): Path<(String, String)>, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ROLE).await { + return resp; + } + let _ = (kind.trim(), object_id.trim()); + ok(json!({ "ids": [], "all": false, "list": [] })) +} + +/// `POST /api/permission/Authority/{type}/{objectId}` —— 更新通用权限(**恒成功**)。 +pub async fn authority_common_update( + State(state): State, + headers: HeaderMap, + Path((kind, object_id)): Path<(String, String)>, + body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ROLE).await { + return resp; + } + let _ = (kind.trim(), object_id.trim(), body); + ok(Value::Null) +} + +/// `GET /api/permission/RoleRelation/roleList` —— 某对象已绑定的角色(`ListVO`)。 +/// +/// 🔴 官方是「按 objectId 查角色关系」;本仓 `base_role_relation` 只记**用户↔角色** +/// ⇒ `objectId` 当**用户 id** 用;查不到就返空(不是错误)。 +pub async fn role_relation_role_list( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ROLE).await { + return resp; + } + let object_id = crate::platform::sys::query_param(&raw, "objectId"); + let object_id = object_id.trim().to_string(); + if object_id.is_empty() { + return ok(list_vo(Vec::new())); + } + // 🔴 `base_role_relation` 是**通用对象关系**(`f_object_type` + `f_object_id`), + // 没有 `f_user_id` 这一列 —— 官方同构(`RoleRelation` 可挂用户/机构/岗位/分组)。 + let sql = "SELECT r.f_id AS \"id\", r.f_full_name AS \"fullName\", \ + r.f_en_code AS \"enCode\", r.f_type AS \"type\", \ + COALESCE(r.f_sort_code, 0) AS \"sortCode\" \ + FROM base_role_relation rr \ + JOIN base_role r ON r.f_id = rr.f_role_id \ + WHERE COALESCE(rr.f_delete_mark,0) = 0 AND COALESCE(r.f_delete_mark,0) = 0 \ + AND rr.f_object_id = $1::text \ + ORDER BY r.f_sort_code ASC, r.f_full_name ASC"; + match state + .db + .query_json_params(sql, ¶ms_of(&[Some(object_id)])) + .await + { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "角色关系查询"), + } +} + +/// `POST /api/permission/RoleRelation/addRoles` —— 给对象批量**加**角色(body `{objectId, roleIds}`)。 +pub async fn role_relation_add_roles( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_ROLE).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let object_id = obj + .get("objectId") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + let ids = id_list_of(&obj, "roleIds"); + if object_id.is_empty() || ids.is_empty() { + return ok(Value::Null); + } + let object_type = obj + .get("objectType") + .and_then(Value::as_str) + .unwrap_or_default() + .trim(); + // 🔴 默认值必须是**小写** `user`(官方 `PermissionConst.USER`)—— + // 写成 `User` 会让这一行对授权引擎(只认 `f_object_type='user'`)**永久不可见**。 + // 前端实际总传小写(`organize/index.vue` `type: … ? 'position' : 'organize'`), + // 这里只是兜底。 + let object_type = if object_type.is_empty() { + "user".to_string() + } else { + object_type.to_string() + }; + for role_id in ids { + let values = [ + Some(new_uuid()), + Some(user.account.clone()), + Some(object_id.clone()), + Some(object_type.clone()), + Some(role_id), + ]; + let sql = "INSERT INTO base_role_relation \ + (f_id, f_creator_user_id, f_object_id, f_object_type, f_role_id, \ + f_creator_time, f_delete_mark) \ + VALUES ($1::text, $2::text, $3::text, $4::text, $5::text, now(), 0) \ + ON CONFLICT DO NOTHING"; + if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { + return db_error(e, "添加角色关系"); + } + } + ok(Value::Null) +} + +/// `POST /api/permission/RoleRelation/deleteRoles` —— 批量**解绑**角色(body `{objectId, roleIds}`)。 +pub async fn role_relation_delete_roles( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_ROLE).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let object_id = obj + .get("objectId") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + let ids = id_list_of(&obj, "roleIds"); + if object_id.is_empty() || ids.is_empty() { + return ok(Value::Null); + } + for role_id in ids { + let values = [ + Some(user.account.clone()), + Some(object_id.clone()), + Some(role_id), + ]; + let sql = "UPDATE base_role_relation SET f_delete_mark = 1, f_delete_time = now(), \ + f_delete_user_id = $1::text \ + WHERE f_object_id = $2::text AND f_role_id = $3::text"; + if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { + return db_error(e, "删除角色关系"); + } + } + ok(Value::Null) +} + +/// `POST /api/permission/RoleRelation/delete` —— 解绑(body `{objectId, ids}`,恒等价 `deleteRoles`)。 +pub async fn role_relation_delete( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ROLE).await { + return resp; + } + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return ok(Value::Null), + Err(resp) => return resp, + }; + let object_id = obj + .get("objectId") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + let ids = id_list_of(&obj, "ids"); + if object_id.is_empty() || ids.is_empty() { + return ok(Value::Null); + } + for role_id in ids { + let values = [Some(object_id.clone()), Some(role_id)]; + let sql = "UPDATE base_role_relation SET f_delete_mark = 1, f_delete_time = now() \ + WHERE f_object_id = $1::text AND f_role_id = $2::text"; + if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { + return db_error(e, "删除角色关系"); + } + } + ok(Value::Null) +} + +/// `POST /api/permission/UserRelation` —— 建用户↔对象关系(body `{objectType, objectId, userIds}`)。 +pub async fn user_relation_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_USER).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let object_type = obj + .get("objectType") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + let object_id = obj + .get("objectId") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + let ids = id_list_of(&obj, "userIds"); + if object_id.is_empty() || ids.is_empty() { + return ok(Value::Null); + } + let object_type = if object_type.is_empty() { + "Group".to_string() + } else { + object_type + }; + for uid in ids { + let values = [ + Some(new_uuid()), + Some(user.account.clone()), + Some(uid), + Some(object_type.clone()), + Some(object_id.clone()), + ]; + let sql = "INSERT INTO base_user_relation \ + (f_id, f_creator_user_id, f_user_id, f_object_type, f_object_id, \ + f_creator_time, f_delete_mark) \ + VALUES ($1::text, $2::text, $3::text, $4::text, $5::text, now(), 0) \ + ON CONFLICT DO NOTHING"; + if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { + return db_error(e, "新建用户关系"); + } + } + ok(Value::Null) +} + +/// `POST /api/permission/UserRelation/delete` —— 删用户↔对象关系(body `{objectType, objectId, userIds}`)。 +pub async fn user_relation_delete( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_USER).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let object_id = obj + .get("objectId") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + let ids = id_list_of(&obj, "userIds"); + if object_id.is_empty() || ids.is_empty() { + return ok(Value::Null); + } + for uid in ids { + let values = [ + Some(user.account.clone()), + Some(uid), + Some(object_id.clone()), + ]; + let sql = "UPDATE base_user_relation SET f_delete_mark = 1, f_delete_time = now(), \ + f_delete_user_id = $1::text \ + WHERE f_user_id = $2::text AND f_object_id = $3::text"; + if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { + return db_error(e, "删除用户关系"); + } + } + ok(Value::Null) +} + +/// `GET /api/permission/UserRelation/userList` —— 某对象下的用户(`ListVO`)。 +pub async fn user_relation_user_list( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let object_id = crate::platform::sys::query_param(&raw, "objectId"); + let object_id = object_id.trim().to_string(); + if object_id.is_empty() { + return ok(list_vo(Vec::new())); + } + let sql = "SELECT u.f_id AS \"id\", u.f_account AS \"account\", \ + u.f_real_name AS \"realName\", u.f_real_name AS \"fullName\", \ + u.f_head_icon AS \"headIcon\", \ + COALESCE(u.f_enabled_mark, 0) AS \"enabledMark\" \ + FROM base_user_relation ur \ + JOIN base_user u ON u.f_id = ur.f_user_id \ + WHERE COALESCE(ur.f_delete_mark,0) = 0 AND COALESCE(u.f_delete_mark,0) = 0 \ + AND ur.f_object_id = $1::text"; + match state + .db + .query_json_params(sql, ¶ms_of(&[Some(object_id)])) + .await + { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "用户关系列表查询"), + } +} + +/// 个人资料的**写白名单** —— 只收这些键,其余(`appSecret` 等)一律忽略。 +/// +/// 🔴 与 `USER_WRITE_FIELDS` 的差别:这里**不含** `account` / `organizeId` / `enabledMark` +/// —— 个人中心不许自己改账号、机构、启用状态(那是管理员页面的权力)。 +const SELF_WRITE_FIELDS: &[(&str, &str, &str)] = &[ + ("realName", "f_real_name", ""), + ("nickName", "f_nick_name", ""), + ("gender", "f_gender", ""), + ("birthday", "f_birthday", "::timestamp"), + ("mobilePhone", "f_mobile_phone", ""), + ("telePhone", "f_tele_phone", ""), + ("landline", "f_landline", ""), + ("email", "f_email", ""), + ("nation", "f_nation", ""), + ("nativePlace", "f_native_place", ""), + ("certificatesType", "f_certificates_type", ""), + ("certificatesNumber", "f_certificates_number", ""), + ("education", "f_education", ""), + ("urgentContacts", "f_urgent_contacts", ""), + ("urgentTelePhone", "f_urgent_tele_phone", ""), + ("postalAddress", "f_postal_address", ""), + ("signature", "f_signature", ""), +]; + +/// 逗号分隔的 id 串 ⇒ 去空去重的 `Vec`。 +fn split_id_text(text: Option<&str>) -> Vec { + let mut out: Vec = Vec::new(); + for part in text.unwrap_or("").split(',') { + let t = part.trim(); + if !t.is_empty() && !out.iter().any(|x| x == t) { + out.push(t.to_string()); + } + } + out +} + +/// `GET /api/permission/Users/Current/BaseInfo` —— 个人资料(官方 `UserBaseInfoVO`)。 +/// +/// 🔴 前端 `views/_core/profile/index.vue` 用 `user.avatar` 渲染头像(**不是** `headIcon`) +/// ⇒ 两个键都给,值相同。 +/// 🔴 `preferenceJson` 必须是**字符串**(`index.vue` 直接 `JSON.parse`)。 +pub async fn self_base_info( + State(state): State, + headers: HeaderMap, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let sql = "SELECT f_account AS \"account\", f_real_name AS \"realName\", \ + f_nick_name AS \"nickName\", f_head_icon AS \"headIcon\", \ + f_gender AS \"gender\", to_char(f_birthday, 'YYYY-MM-DD') AS \"birthday\", \ + f_mobile_phone AS \"mobilePhone\", f_tele_phone AS \"telePhone\", \ + f_landline AS \"landline\", f_email AS \"email\", f_nation AS \"nation\", \ + f_native_place AS \"nativePlace\", \ + to_char(f_entry_date, 'YYYY-MM-DD') AS \"entryDate\", \ + f_certificates_type AS \"certificatesType\", \ + f_certificates_number AS \"certificatesNumber\", f_education AS \"education\", \ + f_urgent_contacts AS \"urgentContacts\", \ + f_urgent_tele_phone AS \"urgentTelePhone\", \ + f_postal_address AS \"postalAddress\", f_signature AS \"signature\", \ + f_organize_id AS \"organizeId\", f_position_id AS \"positionId\", \ + f_manager_id AS \"managerId\", f_role_id AS \"roleId\", \ + COALESCE(f_is_administrator, 0) AS \"isAdministrator\", \ + COALESCE(f_language, 'zh-CN') AS \"language\", \ + COALESCE(f_theme, 'W-001') AS \"theme\", \ + COALESCE(f_log_success_count, 0) AS \"logSuccessCount\", \ + COALESCE(f_log_error_count, 0) AS \"logErrorCount\" \ + FROM base_user WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1"; + let rows = match state + .db + .query_json_params(sql, ¶ms_of(&[Some(user.user_id.clone())])) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "个人资料查询"), + }; + let Some(mut row) = rows.into_iter().next() else { + return fail(code::SESSION_ERROR, "登录状态已失效,请重新登录"); + }; + + let head_icon = row["headIcon"].as_str().unwrap_or_default().to_string(); + // 头像:官方 VO 的 `avatar` 就是用户头像地址。 + row["avatar"] = json!(head_icon); + + // 上级:`realName/account`(官方拼法);查不到 ⇒ 空串。 + let manager_id = row["managerId"].as_str().unwrap_or_default().to_string(); + let manager = if manager_id.is_empty() { + String::new() + } else { + match state + .db + .query_json_params( + "SELECT f_real_name AS \"realName\", f_account AS \"account\" FROM base_user \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", + ¶ms_of(&[Some(manager_id.clone())]), + ) + .await + { + Ok(rows) => rows.first().map_or(String::new(), |r| { + format!( + "{}/{}", + r["realName"].as_str().unwrap_or_default(), + r["account"].as_str().unwrap_or_default() + ) + }), + Err(_) => String::new(), + } + }; + row["manager"] = json!(manager); + + // 组织名 + 岗位名(逗号拼接)—— 都是**展示字段**,查不到就是空串,绝不让整页 500。 + let organize_id = row["organizeId"].as_str().unwrap_or_default().to_string(); + row["organize"] = json!(organize_name_of(&state.db, &organize_id).await.unwrap_or_default()); + let position_ids = split_id_text(row["positionId"].as_str()); + let mut position_names: Vec = Vec::new(); + for pid in &position_ids { + if let Ok(rows) = state + .db + .query_json_params( + "SELECT f_full_name AS \"fullName\" FROM base_position \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", + ¶ms_of(&[Some(pid.clone())]), + ) + .await + { + if let Some(name) = rows.first().and_then(|r| r["fullName"].as_str()) { + position_names.push(name.to_string()); + } + } + } + row["position"] = json!(position_names.join(",")); + + // 偏好设置 + AppSecret 都在 `base_user_extra`。 + let extra = read_user_extra(&state.db, &user.user_id).await; + row["preferenceJson"] = json!(extra.0); + row["appSecret"] = json!(extra.1); + // 多租户:本仓单租户 ⇒ false(前端拿它决定要不要显示「企业信息」页签)。 + row["isTenant"] = json!(false); + // 在线设备列表:本仓 session 是进程内内存表,可给可空;前端 `v-for` 对空数组安全。 + row["pcOnlineModelList"] = json!([]); + row["appOnlineModelList"] = json!([]); + row["ranks"] = Value::Null; + row["saasAppId"] = Value::Null; + ok(row) +} + +/// 读 `base_user_extra`:`(preferenceJson, appSecret)`;没有行 ⇒ `("", "")`。 +async fn read_user_extra(db: &Db, user_id: &str) -> (String, String) { + let rows = match db + .query_json_params( + "SELECT f_preference_json AS \"preferenceJson\", f_property_json AS \"propertyJson\" \ + FROM base_user_extra WHERE f_user_id = $1::text \ + AND COALESCE(f_delete_mark,0) = 0 ORDER BY f_creator_time ASC LIMIT 1", + ¶ms_of(&[Some(user_id.to_string())]), + ) + .await + { + Ok(rows) => rows, + Err(e) => { + eprintln!("[face-b] 读用户额外信息失败: {e}"); + return (String::new(), String::new()); + } + }; + let row = match rows.first() { + Some(r) => r, + None => return (String::new(), String::new()), + }; + let pref = row["preferenceJson"].as_str().unwrap_or_default().to_string(); + // 🔴 `f_property_json` 存的是 `{"appSecret":"…"}`;解析失败就当空(不抛错)。 + let secret = row["propertyJson"] + .as_str() + .and_then(|s| serde_json::from_str::(s).ok()) + .and_then(|v| v.get("appSecret").and_then(Value::as_str).map(str::to_string)) + .unwrap_or_default(); + (pref, secret) +} + +/// 写 `base_user_extra`(有行则 UPDATE,无行则 INSERT)。 +async fn upsert_user_extra( + db: &Db, + user_id: &str, + account: &str, + pref: Option<&str>, + secret: Option<&str>, +) -> Result<(), pglite::Error> { + let existing = db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_user_extra WHERE f_user_id = $1::text \ + AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", + ¶ms_of(&[Some(user_id.to_string())]), + ) + .await?; + match existing.first().and_then(|r| r["id"].as_str()) { + Some(id) => { + let mut sets: Vec = Vec::new(); + let mut values: Vec> = Vec::new(); + if let Some(p) = pref { + values.push(Some(p.to_string())); + sets.push(format!("f_preference_json = {}", placeholder(values.len(), ""))); + } + if let Some(s) = secret { + values.push(Some(json!({ "appSecret": s }).to_string())); + sets.push(format!("f_property_json = {}", placeholder(values.len(), ""))); + } + if sets.is_empty() { + return Ok(()); + } + // 🔴 追加顺序必须与 SQL 占位符对齐:`f_last_modify_user_id` 先、`f_id` 后。 + values.push(Some(account.to_string())); + values.push(Some(id.to_string())); + let sql = format!( + "UPDATE base_user_extra SET {}, f_last_modify_time = now(), \ + f_last_modify_user_id = {} WHERE f_id = {} AND f_tenant_id = '0'", + sets.join(", "), + placeholder(values.len() - 1, ""), + placeholder(values.len(), "") + ); + db.exec_params(&sql, ¶ms_of(&values)).await + } + None => { + let new_id = new_uuid(); + let mut columns: Vec<&str> = vec![ + "f_id", + "f_tenant_id", + "f_user_id", + "f_creator_user_id", + "f_enabled_mark", + "f_delete_mark", + ]; + let mut casts: Vec<&str> = vec!["", "", "", "", "::integer", "::integer"]; + let mut values: Vec> = vec![ + Some(new_id), + Some("0".to_string()), + Some(user_id.to_string()), + Some(account.to_string()), + Some("1".to_string()), + Some("0".to_string()), + ]; + if let Some(p) = pref { + columns.push("f_preference_json"); + casts.push(""); + values.push(Some(p.to_string())); + } + if let Some(s) = secret { + columns.push("f_property_json"); + casts.push(""); + values.push(Some(json!({ "appSecret": s }).to_string())); + } + columns.push("f_creator_time"); + let mut marks: Vec = (0..values.len()) + .map(|i| placeholder(i + 1, casts[i])) + .collect(); + marks.push("now()".to_string()); + let sql = format!( + "INSERT INTO base_user_extra ({}) VALUES ({})", + columns.join(", "), + marks.join(", ") + ); + db.exec_params(&sql, ¶ms_of(&values)).await + } + } +} + +/// `PUT /api/permission/Users/Current/BaseInfo` —— 改个人资料(**只 SET body 里出现的键**)。 +/// +/// 🔴 `preferenceJson` 单独走 `base_user_extra`(官方表就叫这个),不进 `base_user`。 +pub async fn self_update_base_info( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + + let mut sets: Vec = Vec::new(); + let mut values: Vec> = Vec::new(); + for (json_key, column, cast) in SELF_WRITE_FIELDS { + let Some(v) = obj.get(*json_key) else { continue }; + // 姓名不许清空(官方 `UserInfoForm.realName` 是 `@NotBlank`)。 + if *json_key == "realName" && v.as_str().map(str::trim).unwrap_or("").is_empty() { + return fail(code::FAIL, "姓名不能为空"); + } + values.push(value_to_text(Some(v))); + sets.push(format!("{column} = {}", placeholder(values.len(), cast))); + } + if !sets.is_empty() { + // 🔴 参数顺序必须与 SQL 占位符**逐字对齐**: + // `f_last_modify_user_id` 先、`f_id` 后 ⇒ 追加顺序也是「账号 → 用户 id」。 + values.push(Some(user.account.clone())); + values.push(Some(user.user_id.clone())); + let sql = format!( + "UPDATE base_user SET {}, f_last_modify_time = now(), \ + f_last_modify_user_id = {} WHERE f_id = {} AND f_tenant_id = '0'", + sets.join(", "), + placeholder(values.len() - 1, ""), + placeholder(values.len(), "") + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "修改个人资料"); + } + } + + if let Some(pref) = obj.get("preferenceJson").and_then(Value::as_str) { + if let Err(e) = + upsert_user_extra(&state.db, &user.user_id, &user.account, Some(pref), None).await + { + return db_error(e, "保存偏好设置"); + } + } + ok(json!("修改成功")) +} + +/// `PUT /api/permission/Users/Current/Avatar` —— 改头像(body `{headIcon}`)。 +pub async fn self_update_avatar( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let head_icon = obj + .get("headIcon") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + let sql = "UPDATE base_user SET f_head_icon = $1::text, f_last_modify_time = now(), \ + f_last_modify_user_id = $2::text WHERE f_id = $3::text AND f_tenant_id = '0'"; + match state + .db + .exec_params( + sql, + ¶ms_of(&[ + Some(head_icon), + Some(user.account.clone()), + Some(user.user_id.clone()), + ]), + ) + .await + { + Ok(_) => ok(json!("更新成功")), + Err(e) => db_error(e, "修改头像"), + } +} + +/// `PUT /api/permission/Users/Current/SystemTheme` —— 改主题(body `{theme}`)。 +pub async fn self_update_theme( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let theme = obj + .get("theme") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + let sql = "UPDATE base_user SET f_theme = $1::text, f_last_modify_time = now(), \ + f_last_modify_user_id = $2::text WHERE f_id = $3::text AND f_tenant_id = '0'"; + match state + .db + .exec_params( + sql, + ¶ms_of(&[ + Some(theme), + Some(user.account.clone()), + Some(user.user_id.clone()), + ]), + ) + .await + { + Ok(_) => ok(json!("更新成功")), + Err(e) => db_error(e, "修改主题"), + } +} + +/// `PUT /api/permission/Users/Current/SystemLanguage` —— 改语言(body `{language}`)。 +pub async fn self_update_language( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let language = obj + .get("language") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + let sql = "UPDATE base_user SET f_language = $1::text, f_last_modify_time = now(), \ + f_last_modify_user_id = $2::text WHERE f_id = $3::text AND f_tenant_id = '0'"; + match state + .db + .exec_params( + sql, + ¶ms_of(&[ + Some(language), + Some(user.account.clone()), + Some(user.user_id.clone()), + ]), + ) + .await + { + Ok(_) => ok(json!("更新成功")), + Err(e) => db_error(e, "修改语言"), + } +} + +/// `POST /api/permission/Users/Current/Actions/ModifyPassword` —— 改密码。 +/// +/// 🔴 本仓口令存储 = `md5(明文)`(`platform/auth.rs`)⇒ 前端发来的 +/// `oldPassword` / `password` **本身已是 md5 串**,直接比、直接存。 +/// 🔴 官方那条 `md5(old + secretkey)` 与图形验证码校验本仓**不做** +/// (无 `ImageCode` 服务)⇒ 记入已知限制,不静默伪成功:旧密码错了照样返失败。 +pub async fn self_modify_password( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let old = obj + .get("oldPassword") + .and_then(Value::as_str) + .unwrap_or_default() + .to_lowercase(); + let new = obj + .get("password") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + if old.is_empty() || new.is_empty() { + return fail(code::FAIL, "旧密码和新密码不能为空"); + } + let rows = match state + .db + .query_json_params( + "SELECT COALESCE(f_password, '') AS \"password\" FROM base_user \ + WHERE f_id = $1::text AND f_tenant_id = '0' LIMIT 1", + ¶ms_of(&[Some(user.user_id.clone())]), + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "读旧密码"), + }; + let stored = rows + .first() + .and_then(|r| r["password"].as_str()) + .unwrap_or_default() + .to_lowercase(); + if stored.is_empty() || stored != old { + return fail(code::FAIL, "旧密码错误,请重新输入"); + } + let sql = "UPDATE base_user SET f_password = $1::text, f_change_password_date = now(), \ + f_last_modify_time = now(), f_last_modify_user_id = $2::text \ + WHERE f_id = $3::text AND f_tenant_id = '0'"; + match state + .db + .exec_params( + sql, + ¶ms_of(&[ + Some(new), + Some(user.account.clone()), + Some(user.user_id.clone()), + ]), + ) + .await + { + Ok(_) => ok(json!("密码修改成功,请重新登录")), + Err(e) => db_error(e, "修改密码"), + } +} + +/// `GET /api/permission/Users/Current/Subordinate/{id}` —— 我的下属。 +/// +/// `id = "0"` ⇒ 直属当前用户的下属;否则该用户的下属。 +pub async fn self_subordinate( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let manager_id = if id.trim().is_empty() || id.trim() == "0" { + user.user_id.clone() + } else { + id.trim().to_string() + }; + let sql = "SELECT u.f_id AS \"id\", u.f_head_icon AS \"avatar\", \ + COALESCE(u.f_real_name, u.f_account) AS \"userName\", \ + COALESCE(o.f_full_name, '') AS \"department\", \ + COALESCE(p.f_full_name, '') AS \"position\" \ + FROM base_user u \ + LEFT JOIN base_organize o ON o.f_id = u.f_organize_id \ + LEFT JOIN base_position p ON p.f_id = u.f_position_id \ + WHERE u.f_manager_id = $1::text AND COALESCE(u.f_delete_mark,0) = 0 \ + ORDER BY u.f_sort_code ASC, u.f_account ASC"; + match state + .db + .query_json_params(sql, ¶ms_of(&[Some(manager_id)])) + .await + { + Ok(mut rows) => { + for r in rows.iter_mut() { + r["isLeaf"] = json!(false); + } + ok(Value::Array(rows)) + } + Err(e) => db_error(e, "我的下属查询"), + } +} + +/// `GET /api/permission/Users/Current/SystemLog` —— **我的**登录日志。 +/// +/// 🔴 与 `GET /api/system/Log?category=1` 共用 [`log_page`](官方也是同一个 `LogService`), +/// 区别只有一个:这里**强制 `f_user_id = 当前用户`**(个人中心不该看到别人的登录记录)。 +/// 🔴 数据来源是 `base_sys_log`(登录成功/失败都落一行,见 `auth::write_login_log`) +/// —— 早先这里是恒空分页,页面形状对但永远没内容。 +pub async fn self_system_log( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + match log_page(&state, &raw, 1, Some(&user.user_id)).await { + Ok(data) => ok(data), + Err(resp) => resp, + } +} + +/// `GET /api/permission/Users/Current/getUserOrganizes` —— 我所属的组织(含祖先链)。 +pub async fn self_organizes( + State(state): State, + headers: HeaderMap, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let rows = match state + .db + .query_json_params( + "SELECT f_organize_id AS \"organizeId\" FROM base_user \ + WHERE f_id = $1::text AND f_tenant_id = '0' LIMIT 1", + ¶ms_of(&[Some(user.user_id.clone())]), + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "读用户机构"), + }; + let organize_id = rows + .first() + .and_then(|r| r["organizeId"].as_str()) + .unwrap_or_default() + .to_string(); + if organize_id.is_empty() { + return ok(Value::Array(Vec::new())); + } + // `f_organize_id_tree` 形如 `parent,self`(官方语义);用它一次性取整条链。 + let sql = "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_parent_id AS \"parentId\", \ + COALESCE(f_organize_id_tree, '') AS \"organizeIdTree\" \ + FROM base_organize WHERE COALESCE(f_delete_mark,0) = 0 AND \ + (f_id = $1::text OR f_organize_id_tree LIKE '%' || $1::text || '%') \ + ORDER BY f_sort_code ASC"; + match state + .db + .query_json_params(sql, ¶ms_of(&[Some(organize_id)])) + .await + { + Ok(rows) => ok(Value::Array(rows)), + Err(e) => db_error(e, "我的组织查询"), + } +} + +/// `GET /api/permission/Users/Current/getUserPositions` —— 我的岗位(`PosistionCurrentModel`)。 +pub async fn self_positions( + State(state): State, + headers: HeaderMap, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let rows = match state + .db + .query_json_params( + "SELECT COALESCE(f_position_id, '') AS \"positionId\" FROM base_user \ + WHERE f_id = $1::text AND f_tenant_id = '0' LIMIT 1", + ¶ms_of(&[Some(user.user_id.clone())]), + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "读用户岗位"), + }; + let ids = split_id_text(rows.first().and_then(|r| r["positionId"].as_str())); + let mut list: Vec = Vec::new(); + for (i, pid) in ids.iter().enumerate() { + let sql = "SELECT p.f_id AS \"id\", p.f_full_name AS \"fullName\", \ + p.f_organize_id AS \"organizeId\", \ + COALESCE(o.f_full_name, '') AS \"orgTreeName\", \ + COALESCE(par.f_full_name, '') AS \"parentName\", \ + COALESCE(mgr.f_real_name, '') AS \"managerName\" \ + FROM base_position p \ + LEFT JOIN base_organize o ON o.f_id = p.f_organize_id \ + LEFT JOIN base_position par ON par.f_id = p.f_parent_id \ + LEFT JOIN base_user mgr ON mgr.f_id = o.f_manager_id \ + WHERE p.f_id = $1::text LIMIT 1"; + let Ok(rows) = state + .db + .query_json_params(sql, ¶ms_of(&[Some(pid.clone())])) + .await + else { + continue; + }; + let Some(mut row) = rows.into_iter().next() else { + continue; + }; + // 第一个岗位视为默认(本仓 `f_position_id` 首位即主岗)。 + row["isDefault"] = json!(i == 0); + list.push(row); + } + ok(Value::Array(list)) +} + +/// `GET /api/permission/Users/Current/getUserRoles` —— 我的角色。 +pub async fn self_roles(State(state): State, headers: HeaderMap) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let rows = match state + .db + .query_json_params( + "SELECT COALESCE(f_role_id, '') AS \"roleId\" FROM base_user \ + WHERE f_id = $1::text AND f_tenant_id = '0' LIMIT 1", + ¶ms_of(&[Some(user.user_id.clone())]), + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "读用户角色"), + }; + let ids = split_id_text(rows.first().and_then(|r| r["roleId"].as_str())); + let mut list: Vec = Vec::new(); + for rid in ids { + if let Ok(rows) = state + .db + .query_json_params( + "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\" \ + FROM base_role WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", + ¶ms_of(&[Some(rid)]), + ) + .await + { + list.extend(rows); + } + } + ok(Value::Array(list)) +} + +/// `PUT /api/permission/Users/Current/major` —— 设默认岗位 / 切换身份 / 切换系统。 +/// +/// `majorType` 官方常量见 `PermissionConst`:`position` / `stand` / `system`。 +pub async fn self_major( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let major_id = obj + .get("majorId") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + let major_type = obj + .get("majorType") + .and_then(Value::as_str) + .unwrap_or_default() + .to_lowercase(); + if major_id.is_empty() { + return fail(code::FAIL, "参数不能为空"); + } + match major_type.as_str() { + // 切岗位(组织跟着岗位走) + "position" | "pos" => { + let rows = match state + .db + .query_json_params( + "SELECT f_organize_id AS \"organizeId\" FROM base_position \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", + ¶ms_of(&[Some(major_id.clone())]), + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "读岗位"), + }; + let Some(row) = rows.first() else { + return fail(code::FAIL, "岗位不存在"); + }; + let organize_id = row["organizeId"].as_str().unwrap_or_default().to_string(); + let sql = "UPDATE base_user SET f_position_id = $1::text, f_organize_id = $2::text, \ + f_last_modify_time = now(), f_last_modify_user_id = $3::text \ + WHERE f_id = $4::text AND f_tenant_id = '0'"; + match state + .db + .exec_params( + sql, + ¶ms_of(&[ + Some(major_id), + Some(organize_id), + Some(user.account.clone()), + Some(user.user_id.clone()), + ]), + ) + .await + { + Ok(_) => ok(json!("设置成功")), + Err(e) => db_error(e, "设置默认岗位"), + } + } + // 切身份:本仓无多身份体系 ⇒ 只记字段,不影响权限(`known-limitations` B6) + "stand" | "standing" => { + let sql = "UPDATE base_user SET f_standing = $1::text, f_last_modify_time = now(), \ + f_last_modify_user_id = $2::text WHERE f_id = $3::text AND f_tenant_id = '0'"; + match state + .db + .exec_params( + sql, + ¶ms_of(&[ + Some(major_id), + Some(user.account.clone()), + Some(user.user_id.clone()), + ]), + ) + .await + { + Ok(_) => ok(json!("设置成功")), + Err(e) => db_error(e, "切换身份"), + } + } + // 切系统(多应用) + "system" => { + let sql = "UPDATE base_user SET f_app_system_id = $1::text, \ + f_last_modify_time = now(), f_last_modify_user_id = $2::text \ + WHERE f_id = $3::text AND f_tenant_id = '0'"; + match state + .db + .exec_params( + sql, + ¶ms_of(&[ + Some(major_id), + Some(user.account.clone()), + Some(user.user_id.clone()), + ]), + ) + .await + { + Ok(_) => ok(json!("设置成功")), + Err(e) => db_error(e, "切换系统"), + } + } + _ => fail(code::FAIL, "不支持的切换类型"), + } +} + +/// 个性签名投影(官方 `SignListVO`)。 +const SIGN_PROJECTION: &str = "f_id AS \"id\", f_sign_img AS \"signImg\", \ + COALESCE(f_is_default, 0) AS \"isDefault\", f_description AS \"description\", \ + (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\""; + +/// `GET /api/permission/Users/Current/SignImg` —— 个性签名列表。 +pub async fn self_sign_list( + State(state): State, + headers: HeaderMap, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let sql = format!( + "SELECT {SIGN_PROJECTION} FROM base_sign_img \ + WHERE f_creator_user_id = $1::text AND COALESCE(f_delete_mark,0) = 0 \ + ORDER BY f_is_default DESC, f_creator_time ASC" + ); + match state + .db + .query_json_params(&sql, ¶ms_of(&[Some(user.account.clone())])) + .await + { + Ok(rows) => ok(Value::Array(rows)), + Err(e) => db_error(e, "个性签名列表"), + } +} + +/// `POST /api/permission/Users/Current/SignImg` —— 新建个性签名。 +pub async fn self_sign_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let sign_img = obj + .get("signImg") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + if sign_img.trim().is_empty() { + return fail(code::FAIL, "签名图片不能为空"); + } + let new_id = new_uuid(); + // 🔴 `$N::integer` **不行**:本仓所有参数都按 **text** 绑定(`Option`), + // PG 报「cannot convert between the Rust type Option and the Postgres type int4」。 + // ⇒ 整仓统一走 `$N::text::integer`(类型交给 SQL 里的 CAST)。 + let sql = "INSERT INTO base_sign_img \ + (f_id, f_tenant_id, f_sign_img, f_is_default, f_description, \ + f_enabled_mark, f_sort_code, f_creator_time, f_creator_user_id, f_delete_mark) \ + VALUES ($1::text, '0', $2::text, $3::text::integer, $4::text, 1, 0, now(), $5::text, 0)"; + if let Err(e) = state + .db + .exec_params( + sql, + ¶ms_of(&[ + Some(new_id.clone()), + Some(sign_img), + value_to_text(obj.get("isDefault")), + value_to_text(obj.get("description")), + Some(user.account.clone()), + ]), + ) + .await + { + return db_error(e, "新建个性签名"); + } + ok(json!({ "id": new_id })) +} + +/// `DELETE /api/permission/Users/Current/{id}/SignImg` —— 删个性签名(软删,只能删自己的)。 +pub async fn self_sign_delete( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let sql = "UPDATE base_sign_img SET f_delete_mark = 1, f_delete_time = now(), \ + f_delete_user_id = $1::text WHERE f_id = $2::text \ + AND f_creator_user_id = $1::text AND f_tenant_id = '0'"; + match state + .db + .exec_params(sql, ¶ms_of(&[Some(user.account.clone()), Some(id)])) + .await + { + Ok(_) => ok(json!("删除成功")), + Err(e) => db_error(e, "删除个性签名"), + } +} + +/// `PUT /api/permission/Users/Current/{id}/SignImg` —— 设为默认签名(同用户其余置 0)。 +pub async fn self_sign_default( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + // 先确认这条签名属于自己(否则就是越权改别人的)。 + let owned = match state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_sign_img WHERE f_id = $1::text \ + AND f_creator_user_id = $2::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", + ¶ms_of(&[Some(id.clone()), Some(user.account.clone())]), + ) + .await + { + Ok(rows) => !rows.is_empty(), + Err(e) => return db_error(e, "读个性签名"), + }; + if !owned { + return fail(code::FAIL, "签名不存在"); + } + let clear = "UPDATE base_sign_img SET f_is_default = 0 WHERE f_creator_user_id = $1::text \ + AND f_tenant_id = '0' AND COALESCE(f_delete_mark,0) = 0"; + if let Err(e) = state + .db + .exec_params(clear, ¶ms_of(&[Some(user.account.clone())])) + .await + { + return db_error(e, "重置默认签名"); + } + let set = "UPDATE base_sign_img SET f_is_default = 1, f_last_modify_time = now(), \ + f_last_modify_user_id = $1::text WHERE f_id = $2::text AND f_tenant_id = '0'"; + match state + .db + .exec_params(set, ¶ms_of(&[Some(user.account.clone()), Some(id)])) + .await + { + Ok(_) => ok(json!("设置成功")), + Err(e) => db_error(e, "设置默认签名"), + } +} + +/// `GET /api/permission/Users/Current/getAppSecret` —— AppSecret(没有 ⇒ 空串)。 +pub async fn self_get_app_secret( + State(state): State, + headers: HeaderMap, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let (_, secret) = read_user_extra(&state.db, &user.user_id).await; + ok(json!(secret)) +} + +/// `PUT /api/permission/Users/Current/saveAppSecret` —— 重新生成 AppSecret。 +/// +/// 🔴 生成规则:两段 `new_uuid()` 去掉横线拼起来(32 位十六进制), +/// **不落日志**(`eprintln` 里也不打),否则等于把密钥写进 `/tmp/*.log`。 +pub async fn self_save_app_secret( + State(state): State, + headers: HeaderMap, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let secret = format!( + "{}{}", + new_uuid().replace('-', ""), + new_uuid().replace('-', "") + ); + if let Err(e) = + upsert_user_extra(&state.db, &user.user_id, &user.account, None, Some(&secret)).await + { + return db_error(e, "生成 AppSecret"); + } + ok(json!(secret)) +} + +/// `GET /api/permission/Users/Current/saasList` —— 可切换租户列表。 +/// +/// 🔴 本仓**单租户**(`base_tenant` 只有 `'0'`)⇒ 恒空数组。恒空 stderr +/// 比「返 404 让前端弹红条」好,且形状与官方一致。 +pub async fn self_saas_list( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = require_login_face_b(&state, &headers).await { + return resp; + } + ok(Value::Array(Vec::new())) +} + +/// `GET /api/permission/Users/Current/saasinfo` —— 当前租户信息(本仓恒空对象)。 +pub async fn self_saas_info( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = require_login_face_b(&state, &headers).await { + return resp; + } + ok(json!({})) +} + +/// `GET /api/permission/Users/Current/saasTenantName/{id}` —— 租户名(本仓恒空串)。 +pub async fn self_saas_tenant_name( + State(state): State, + headers: HeaderMap, + Path(_id): Path, +) -> Json { + if let Err(resp) = require_login_face_b(&state, &headers).await { + return resp; + } + ok(json!("")) +} + +/// `POST /api/permission/Users/Current/saasjoin` —— 加入企业(本仓单租户 ⇒ 明确失败)。 +/// +/// 🔴 **不返成功**:返成功会让前端以为切过去了,后面全都是空数据; +/// 明确 `400` + 可读原因,前端弹一条红条比默默错更好查。 +pub async fn self_saas_join( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = require_login_face_b(&state, &headers).await { + return resp; + } + fail(code::FAIL, "本系统为单租户部署,不支持加入其他企业") +} + +/// `DELETE /api/permission/Users/Current/{id}/saas` —— 退出企业(单租户 ⇒ 同上)。 +pub async fn self_saas_exit( + State(state): State, + headers: HeaderMap, + Path(_id): Path, + _raw: RawQuery, +) -> Json { + if let Err(resp) = require_login_face_b(&state, &headers).await { + return resp; + } + fail(code::FAIL, "本系统为单租户部署,不存在可退出的企业") +} + +/// 🔴 **列名只来自这张白名单**(官方 `JNPF-PostgreSQL.sql:3278` 的 16 列逐字)。 +/// +/// 🔴 `f_permission_member` 存的是**逗号分隔的用户 id 串**(官方 +/// `PermissionGroupController.permissionMember`:`entity.getPermissionMember().split(",")`)。 +const PERMISSION_GROUP_WRITE_FIELDS: [(&str, &str, &str); 5] = [ + ("fullName", "f_full_name", ""), + ("enCode", "f_en_code", ""), + ("description", "f_description", ""), + ("enabledMark", "f_enabled_mark", "::integer"), + ("sortCode", "f_sort_code", "::bigint"), +]; + +/// 权限组投影(官方 `PermissionGroupListVO` 的字段)。 +/// +/// 🔴 官方 `PermissionGroupController.list` 会把 `f_permission_member` 里的 +/// **用户 id 串**换成**用户名串**(`userService.getFullNameByIds`)⇒ +/// 这里用子查询做同样的替换(**不是** id 串)。 +const PERMISSION_GROUP_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ + f_en_code AS \"enCode\", f_description AS \"description\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ + COALESCE(f_type, 0) AS \"type\", \ + COALESCE((SELECT string_agg(COALESCE(NULLIF(u.f_real_name, ''), u.f_account, ''), ',') \ + FROM base_user u \ + WHERE u.f_id = ANY(string_to_array(COALESCE(base_permission_group.f_permission_member, ''), ',')) \ + AND COALESCE(u.f_delete_mark,0) = 0), '') AS \"permissionMember\", \ + (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\""; + +/// `GET /api/permission/PermissionGroup` —— 权限组列表(官方 `ActionResult.page`)。 +pub async fn permission_group_list( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_AUTH_GROUP).await { + return resp; + } + let keyword = crate::platform::sys::query_param(&raw, "keyword"); + let keyword = keyword.trim().to_string(); + let page = Paging::of(&raw); + let (count_sql, list_sql, mut params): (String, String, Vec>) = if keyword.is_empty() { + ( + "SELECT count(*)::bigint AS \"c\" FROM base_permission_group \ + WHERE COALESCE(f_delete_mark,0) = 0".to_string(), + format!( + "SELECT {PERMISSION_GROUP_PROJECTION} FROM base_permission_group \ + WHERE COALESCE(f_delete_mark,0) = 0 \ + ORDER BY f_sort_code ASC, f_full_name ASC \ + LIMIT $1::text::integer OFFSET $2::text::integer" + ), + vec![], + ) + } else { + ( + "SELECT count(*)::bigint AS \"c\" FROM base_permission_group \ + WHERE COALESCE(f_delete_mark,0) = 0 \ + AND (f_full_name ILIKE $1::text OR f_en_code ILIKE $1::text)" + .to_string(), + format!( + "SELECT {PERMISSION_GROUP_PROJECTION} FROM base_permission_group \ + WHERE COALESCE(f_delete_mark,0) = 0 \ + AND (f_full_name ILIKE $1::text OR f_en_code ILIKE $1::text) \ + ORDER BY f_sort_code ASC, f_full_name ASC \ + LIMIT $2::text::integer OFFSET $3::text::integer" + ), + vec![Some(format!("%{keyword}%"))], + ) + }; + let total = match state.db.query_json_params(&count_sql, ¶ms_of(¶ms)).await { + Ok(rows) => rows + .into_iter() + .next() + .and_then(|r| r["c"].as_i64()) + .unwrap_or(0), + Err(e) => return db_error(e, "权限组总数查询"), + }; + params.push(Some(page.page_size.to_string())); + params.push(Some(page.offset.to_string())); + match state.db.query_json_params(&list_sql, ¶ms_of(¶ms)).await { + Ok(rows) => ok(page_list(page.current_page, page.page_size, total, rows)), + Err(e) => db_error(e, "权限组列表查询"), + } +} + +/// `GET /api/permission/PermissionGroup/{id}` —— 权限组详情。 +pub async fn permission_group_info( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_AUTH_GROUP).await { + return resp; + } + let id = id.trim().to_string(); + let sql = format!( + "SELECT {PERMISSION_GROUP_PROJECTION} FROM base_permission_group \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1" + ); + match state.db.query_json_params(&sql, &[&id]).await { + Ok(rows) => match rows.into_iter().next() { + Some(row) => ok(row), + None => fail(code::FAIL, "权限组不存在"), + }, + Err(e) => db_error(e, "权限组详情查询"), + } +} + +/// `POST /api/permission/PermissionGroup` —— 新建权限组。 +pub async fn permission_group_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_AUTH_GROUP).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let full_name = obj + .get("fullName") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + if full_name.is_empty() { + return fail(code::FAIL, "名称不能为空"); + } + + let new_id = new_uuid(); + let mut columns: Vec<&str> = vec!["f_id", "f_tenant_id", "f_full_name"]; + let mut casts: Vec<&str> = vec!["", "", ""]; + let mut values: Vec> = + vec![Some(new_id.clone()), Some("0".to_string()), Some(full_name)]; + + for (json_key, column, cast) in PERMISSION_GROUP_WRITE_FIELDS { + if column == "f_full_name" { + continue; + } + if obj.contains_key(json_key) { + columns.push(column); + casts.push(cast); + values.push(value_to_text(obj.get(json_key))); + } + } + if !obj.contains_key("enabledMark") { + columns.push("f_enabled_mark"); + casts.push("::integer"); + values.push(Some("1".to_string())); + } + if !obj.contains_key("sortCode") { + columns.push("f_sort_code"); + casts.push("::bigint"); + values.push(Some("0".to_string())); + } + // 🔴 `f_type`:官方注释「权限类型 1.自定义 0.全部」⇒ 默认 1(自定义)。 + if !obj.contains_key("type") { + columns.push("f_type"); + casts.push("::integer"); + values.push(Some("1".to_string())); + } else if let Some(t) = value_to_text(obj.get("type")) { + columns.push("f_type"); + casts.push("::integer"); + values.push(Some(t)); + } + columns.push("f_creator_user_id"); + casts.push(""); + values.push(Some(user.account.clone())); + columns.push("f_delete_mark"); + casts.push("::integer"); + values.push(Some("0".to_string())); + columns.push("f_creator_time"); + let mut marks: Vec = (0..values.len()) + .map(|i| placeholder(i + 1, casts[i])) + .collect(); + marks.push("now()".to_string()); + let sql = format!( + "INSERT INTO base_permission_group ({}) VALUES ({})", + columns.join(", "), + marks.join(", ") + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "新建权限组"); + } + ok(json!({ "id": new_id })) +} + +/// `PUT /api/permission/PermissionGroup/{id}` —— 改权限组(**只 SET body 里出现的键**)。 +pub async fn permission_group_update( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_AUTH_GROUP).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let rows = match state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_permission_group \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", + &[&id], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "权限组查询"), + }; + if rows.is_empty() { + return fail(code::FAIL, "权限组不存在"); + } + + let mut sets: Vec = Vec::new(); + let mut values: Vec> = Vec::new(); + for (json_key, column, cast) in PERMISSION_GROUP_WRITE_FIELDS { + if !obj.contains_key(json_key) { + continue; + } + values.push(value_to_text(obj.get(json_key))); + sets.push(format!("{} = ${}::text{}", column, values.len(), cast)); + } + if obj.contains_key("type") { + values.push(value_to_text(obj.get("type"))); + sets.push(format!("f_type = ${}::text::integer", values.len())); + } + if sets.is_empty() { + return ok(Value::Null); + } + values.push(Some(user.account.clone())); + sets.push(format!("f_last_modify_user_id = ${}::text", values.len())); + sets.push("f_last_modify_time = now()".to_string()); + values.push(Some(id)); + let sql = format!( + "UPDATE base_permission_group SET {} WHERE f_id = ${}::text", + sets.join(", "), + values.len() + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "修改权限组"); + } + ok(Value::Null) +} + +/// `DELETE /api/permission/PermissionGroup/{id}` —— 删权限组(软删 + 解绑授权)。 +pub async fn permission_group_delete( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match guard(&state, &headers, EN_AUTH_GROUP).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let values = [Some(user.account.clone()), Some(id.clone())]; + if let Err(e) = state + .db + .exec_params( + "UPDATE base_permission_group SET f_delete_mark = 1, f_delete_time = now(), \ + f_delete_user_id = $1::text WHERE f_id = $2::text \ + AND COALESCE(f_delete_mark,0) = 0", + ¶ms_of(&values), + ) + .await + { + return db_error(e, "删除权限组"); + } + // 官方 `PermissionGroupController.delete` 还会删掉该组的授权关系。 + // 🔴 `$1` 必须**真的被用到**(PG 会拒「无法确定 $1 类型」)⇒ + // 这里把 `f_delete_user_id = $1` 一起写上(既是审计列,也用掉了参数)。 + let rel = [Some(user.account.clone()), Some(id)]; + if let Err(e) = state + .db + .exec_params( + "UPDATE base_authorize SET f_delete_mark = 1, f_delete_time = now(), \ + f_delete_user_id = $1::text \ + WHERE f_object_id = $2::text AND COALESCE(f_delete_mark,0) = 0", + ¶ms_of(&rel), + ) + .await + { + return db_error(e, "删除权限组授权关系"); + } + ok(Value::Null) +} + +/// `POST /api/permission/PermissionGroup/{id}/Actions/Copy` —— 复制权限组。 +/// +/// 🔴 官方 `PermissionGroupController.actionsCopy`: +/// - `fullName` 加 `.副本<5 位随机>`、`enCode` 加同样 5 位; +/// - **清空** `f_permission_member`; +/// - 授权关系逐条复制(`f_object_id` 换成新 id)。 +pub async fn permission_group_copy( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match guard(&state, &headers, EN_AUTH_GROUP).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let rows = match state + .db + .query_json_params( + "SELECT f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ + f_description AS \"description\", COALESCE(f_sort_code,0) AS \"sortCode\", \ + COALESCE(f_enabled_mark,0) AS \"enabledMark\", COALESCE(f_type,0) AS \"type\" \ + FROM base_permission_group \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", + &[&id], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "权限组查询"), + }; + let Some(row) = rows.into_iter().next() else { + return fail(code::FAIL, "权限组不存在"); + }; + let full_name = row["fullName"].as_str().unwrap_or_default().to_string(); + let en_code = row["enCode"].as_str().unwrap_or_default().to_string(); + + // 🔴 5 位随机后缀(官方 `UUID.randomUUID().toString().substring(0, 5)`)。 + let suffix = &new_uuid()[..5]; + let new_full_name = format!("{full_name}.副本{suffix}"); + let new_en_code = format!("{en_code}{suffix}"); + if new_full_name.chars().count() > 50 || new_en_code.chars().count() > 50 { + return fail(code::FAIL, "名称或编码长度超过 50 个字符"); + } + + let new_id = new_uuid(); + let values = [ + Some(new_id.clone()), + Some(new_full_name), + Some(new_en_code), + value_to_text(row.get("description")), + value_to_text(row.get("sortCode")), + value_to_text(row.get("enabledMark")), + value_to_text(row.get("type")), + Some(user.account.clone()), + ]; + // 🔴 `f_permission_member` **清空**(官方 `entity.setPermissionMember(null)`)。 + let sql = "INSERT INTO base_permission_group \ + (f_id, f_full_name, f_en_code, f_description, f_sort_code, f_enabled_mark, \ + f_type, f_creator_user_id, f_creator_time, f_delete_mark, f_tenant_id) \ + VALUES ($1::text, $2::text, $3::text, $4::text, $5::text::bigint, \ + $6::text::integer, $7::text::integer, $8::text, now(), 0, '0')"; + if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { + return db_error(e, "复制权限组"); + } + + // 复制授权关系(`f_object_id` 换成新 id)。 + let auths = match state + .db + .query_json_params( + "SELECT f_id AS \"id\", f_item_type AS \"itemType\", f_item_id AS \"itemId\", \ + f_object_type AS \"objectType\", f_sort_code AS \"sortCode\" \ + FROM base_authorize WHERE f_object_id = $1::text \ + AND COALESCE(f_delete_mark,0) = 0", + &[&id], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "权限组授权查询"), + }; + for auth in auths { + let row_id = new_uuid(); + let values = [ + Some(row_id), + value_to_text(auth.get("itemType")), + value_to_text(auth.get("itemId")), + Some(new_id.clone()), + value_to_text(auth.get("objectType")), + value_to_text(auth.get("sortCode")), + Some(user.account.clone()), + ]; + let sql = "INSERT INTO base_authorize \ + (f_id, f_item_type, f_item_id, f_object_id, f_object_type, f_sort_code, \ + f_creator_user_id, f_creator_time, f_delete_mark, f_tenant_id) \ + VALUES ($1::text, $2::text, $3::text, $4::text, $5::text, \ + $6::text::bigint, $7::text, now(), 0, '0')"; + if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { + return db_error(e, "复制权限组授权关系"); + } + } + ok(json!({ "id": new_id })) +} + +/// `GET /api/permission/PermissionGroup/PermissionMember/{id}` —— 权限组成员。 +/// +/// 🔴 官方返回 `ListVO`(`{list:[…]}`),成员是**用户**的简要信息 +/// (`UserIdListVo`:`id` / `fullName` / `headIcon` / `gender` / `mobilePhone` / `organize` / `type`)。 +pub async fn permission_group_member_list( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_AUTH_GROUP).await { + return resp; + } + let id = id.trim().to_string(); + let rows = match state + .db + .query_json_params( + "SELECT COALESCE(f_permission_member, '') AS \"member\" FROM base_permission_group \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", + &[&id], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "权限组成员查询"), + }; + let Some(row) = rows.into_iter().next() else { + return fail(code::FAIL, "权限组不存在"); + }; + let member = row["member"].as_str().unwrap_or_default().to_string(); + let ids = split_id_text(Some(member.as_str())); + if ids.is_empty() { + return ok(list_vo(Vec::new())); + } + // 🔴 `= ANY($1::text[])` **不行**:本仓参数一律按 text 绑定(`Option`), + // PG 会把 `$1::text[]` 当成 `_text`(数组类型)⇒ 协议错 + // ("cannot convert between the Rust type String and the Postgres type _text")。 + // ⇒ 改成 `string_to_array($1::text, ',')`(**函数在 SQL 里做** ⇒ 参数仍是 text)。 + let sql = "SELECT f_id AS \"id\", COALESCE(f_real_name, f_account, '') AS \"fullName\", \ + f_head_icon AS \"headIcon\", f_gender AS \"gender\", \ + f_mobile_phone AS \"mobilePhone\", '' AS \"organize\", 'user' AS \"type\" \ + FROM base_user \ + WHERE f_id = ANY(string_to_array($1::text, ',')) \ + AND COALESCE(f_delete_mark,0) = 0"; + let id_csv = ids.join(","); + match state.db.query_json_params(sql, &[&id_csv]).await { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "权限组成员列表查询"), + } +} + +/// `POST /api/permission/PermissionGroup/PermissionMember/{id}` —— 保存权限组成员。 +/// +/// 🔴 官方 `savePermissionMember`:body `{ids:[…]}` ⇒ 逗号串写 `f_permission_member`。 +pub async fn permission_group_member_save( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_AUTH_GROUP).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let rows = match state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_permission_group \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", + &[&id], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "权限组查询"), + }; + if rows.is_empty() { + return fail(code::FAIL, "权限组不存在"); + } + let ids = id_list(&obj); + let member = ids.join(","); + let values = [ + Some(member), + Some(user.account.clone()), + Some(id), + ]; + let sql = "UPDATE base_permission_group SET f_permission_member = $1::text, \ + f_last_modify_user_id = $2::text, f_last_modify_time = now() \ + WHERE f_id = $3::text"; + if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { + return db_error(e, "保存权限组成员"); + } + ok(Value::Null) +} + +/// 🔴 **列名只来自这张白名单**(官方 `JNPF-PostgreSQL.sql:1` 的 15 列逐字)。 +/// +/// 🔴🔴 **官方陷阱**:`base_action.f_enabled_mark` 是 **VARCHAR(11)**(不是 INTEGER), +/// 官方注释「启用0,禁用1」⇒ 存的是**字符串** `'0'` / `'1'`。 +const ACTION_WRITE_FIELDS: [(&str, &str, &str); 4] = [ + ("fullName", "f_full_name", ""), + ("enCode", "f_en_code", ""), + ("description", "f_description", ""), + ("sortCode", "f_sort_code", "::bigint"), +]; + +/// 动作投影(官方 `ActionEntity` 的字段)。 +/// +/// 🔴 `type`:**1=自定义 / 其它=系统**(前端 `action/index.vue`: +/// `record.type == 1 ? '自定义' : '系统'`)⇒ 原样透传,不做归一化。 +const ACTION_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ + f_en_code AS \"enCode\", f_description AS \"description\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\", \ + COALESCE(f_type, 0) AS \"type\", \ + COALESCE(f_enabled_mark, '0') AS \"enabledMark\""; + +/// `GET /api/permission/Action` —— 动作列表(官方 `ActionResult.page`)。 +pub async fn action_list( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ACTION).await { + return resp; + } + let keyword = crate::platform::sys::query_param(&raw, "keyword"); + let keyword = keyword.trim().to_string(); + let page = Paging::of(&raw); + let (count_sql, list_sql, mut params): (String, String, Vec>) = if keyword.is_empty() { + ( + "SELECT count(*)::bigint AS \"c\" FROM base_action \ + WHERE COALESCE(f_delete_mark,0) = 0".to_string(), + format!( + "SELECT {ACTION_PROJECTION} FROM base_action \ + WHERE COALESCE(f_delete_mark,0) = 0 \ + ORDER BY f_sort_code ASC, f_full_name ASC \ + LIMIT $1::text::integer OFFSET $2::text::integer" + ), + vec![], + ) + } else { + ( + "SELECT count(*)::bigint AS \"c\" FROM base_action \ + WHERE COALESCE(f_delete_mark,0) = 0 \ + AND (f_full_name ILIKE $1::text OR f_en_code ILIKE $1::text \ + OR f_description ILIKE $1::text)".to_string(), + format!( + "SELECT {ACTION_PROJECTION} FROM base_action \ + WHERE COALESCE(f_delete_mark,0) = 0 \ + AND (f_full_name ILIKE $1::text OR f_en_code ILIKE $1::text \ + OR f_description ILIKE $1::text) \ + ORDER BY f_sort_code ASC, f_full_name ASC \ + LIMIT $2::text::integer OFFSET $3::text::integer" + ), + vec![Some(format!("%{keyword}%"))], + ) + }; + let total = match state.db.query_json_params(&count_sql, ¶ms_of(¶ms)).await { + Ok(rows) => rows + .into_iter() + .next() + .and_then(|r| r["c"].as_i64()) + .unwrap_or(0), + Err(e) => return db_error(e, "动作总数查询"), + }; + params.push(Some(page.page_size.to_string())); + params.push(Some(page.offset.to_string())); + match state.db.query_json_params(&list_sql, ¶ms_of(¶ms)).await { + Ok(rows) => ok(page_list(page.current_page, page.page_size, total, rows)), + Err(e) => db_error(e, "动作列表查询"), + } +} + +/// `GET /api/permission/Action/{id}` —— 动作详情。 +pub async fn action_info( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ACTION).await { + return resp; + } + let id = id.trim().to_string(); + let sql = format!( + "SELECT {ACTION_PROJECTION} FROM base_action \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1" + ); + match state.db.query_json_params(&sql, &[&id]).await { + Ok(rows) => match rows.into_iter().next() { + Some(row) => ok(row), + None => fail(code::FAIL, "动作不存在"), + }, + Err(e) => db_error(e, "动作详情查询"), + } +} + +/// `POST /api/permission/Action` —— 新建动作。 +/// +/// 🔴 官方 `ActionServiceImpl.insertOrUpdate`:**新建一律 `type=1`(自定义)**。 +pub async fn action_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_ACTION).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let full_name = obj + .get("fullName") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + if full_name.is_empty() { + return fail(code::FAIL, "动作名称不能为空"); + } + let en_code = obj + .get("enCode") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + if en_code.is_empty() { + return fail(code::FAIL, "动作编码不能为空"); + } + + let new_id = new_uuid(); + let mut columns: Vec<&str> = vec!["f_id", "f_tenant_id", "f_full_name", "f_en_code"]; + let mut casts: Vec<&str> = vec!["", "", "", ""]; + let mut values: Vec> = vec![ + Some(new_id.clone()), + Some("0".to_string()), + Some(full_name), + Some(en_code), + ]; + + for (json_key, column, cast) in ACTION_WRITE_FIELDS { + if column == "f_full_name" || column == "f_en_code" { + continue; + } + if obj.contains_key(json_key) { + columns.push(column); + casts.push(cast); + values.push(value_to_text(obj.get(json_key))); + } + } + if !obj.contains_key("sortCode") { + columns.push("f_sort_code"); + casts.push("::bigint"); + values.push(Some("0".to_string())); + } + // 🔴 `f_type` = 1(自定义)—— 官方 `insertOrUpdate` 强制。 + columns.push("f_type"); + casts.push("::integer"); + values.push(Some("1".to_string())); + // 🔴 `f_enabled_mark` 是 **VARCHAR(11)** ⇒ 不加 CAST,直接传字符串。 + if !obj.contains_key("enabledMark") { + columns.push("f_enabled_mark"); + casts.push(""); + values.push(Some("0".to_string())); + } else if let Some(v) = value_to_text(obj.get("enabledMark")) { + columns.push("f_enabled_mark"); + casts.push(""); + values.push(Some(v)); + } + columns.push("f_creator_user_id"); + casts.push(""); + values.push(Some(user.account.clone())); + columns.push("f_delete_mark"); + casts.push("::integer"); + values.push(Some("0".to_string())); + columns.push("f_creator_time"); + let mut marks: Vec = (0..values.len()) + .map(|i| placeholder(i + 1, casts[i])) + .collect(); + marks.push("now()".to_string()); + let sql = format!( + "INSERT INTO base_action ({}) VALUES ({})", + columns.join(", "), + marks.join(", ") + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "新建动作"); + } + ok(json!({ "id": new_id })) +} + +/// `PUT /api/permission/Action/{id}` —— 改动作(**只 SET body 里出现的键**)。 +pub async fn action_update( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_ACTION).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let rows = match state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_action \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", + &[&id], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "动作查询"), + }; + if rows.is_empty() { + return fail(code::FAIL, "动作不存在"); + } + + let mut sets: Vec = Vec::new(); + let mut values: Vec> = Vec::new(); + for (json_key, column, cast) in ACTION_WRITE_FIELDS { + if !obj.contains_key(json_key) { + continue; + } + values.push(value_to_text(obj.get(json_key))); + sets.push(format!("{} = ${}::text{}", column, values.len(), cast)); + } + // 🔴 `f_enabled_mark` 是 VARCHAR(11) ⇒ 不加 CAST。 + if obj.contains_key("enabledMark") { + values.push(value_to_text(obj.get("enabledMark"))); + sets.push(format!("f_enabled_mark = ${}::text", values.len())); + } + if sets.is_empty() { + return ok(Value::Null); + } + values.push(Some(user.account.clone())); + sets.push(format!("f_last_modify_user_id = ${}::text", values.len())); + sets.push("f_last_modify_time = now()".to_string()); + values.push(Some(id)); + let sql = format!( + "UPDATE base_action SET {} WHERE f_id = ${}::text", + sets.join(", "), + values.len() + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "修改动作"); + } + ok(Value::Null) +} + +/// `DELETE /api/permission/Action/{id}` —— 删动作(软删)。 +pub async fn action_delete( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match guard(&state, &headers, EN_ACTION).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let values = [Some(user.account.clone()), Some(id)]; + let sql = "UPDATE base_action SET f_delete_mark = 1, f_delete_time = now(), \ + f_delete_user_id = $1::text WHERE f_id = $2::text \ + AND COALESCE(f_delete_mark,0) = 0"; + if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { + return db_error(e, "删除动作"); + } + ok(Value::Null) +} + +/// 🔴 **列名只来自这张白名单**(官方 `JNPF-PostgreSQL.sql:4071` 的 15 列逐字)。 +/// +/// 🔴 官方 `f_is_system` 的语义是 **1=系统身份 / 2=自定义** +/// (`COMMENT ON COLUMN base_standing.f_is_system IS '是否系统(1-系统,2-自定义)'`) +/// ⇒ **新建默认写 2(自定义)**,不是 1。 +const STANDING_WRITE_FIELDS: [(&str, &str, &str); 5] = [ + ("fullName", "f_full_name", ""), + ("enCode", "f_en_code", ""), + ("description", "f_description", ""), + ("enabledMark", "f_enabled_mark", "::integer"), + ("sortCode", "f_sort_code", "::bigint"), +]; + +/// 身份投影(`StandingVO` / `StandingInfoVO` 用到的字段)。 +/// +/// 🔴 `isSystem` **归一化成 1/0**(官方 `StandingController.list`: +/// `item.setIsSystem(Objects.equals(item.getIsSystem(), 1) ? 1 : 0)`) +/// ⇒ 前端 `!node.isSystem` 判断「系统身份不可编辑/不可删」才成立。 +const STANDING_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ + f_en_code AS \"enCode\", f_description AS \"description\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\", \ + CASE WHEN COALESCE(f_is_system, 0) = 1 THEN 1 ELSE 0 END AS \"isSystem\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\""; + +/// 🔴 官方 `PermissionConst` 的取值(`jnpf-common-core/.../constant/PermissionConst.java`): +/// `ROLE="role"` / `POSITION="position"` / `STAND="standing"`。 +const STANDING_ITEM_TYPE: &str = "standing"; + +const STANDING_OBJECT_TYPE_ROLE: &str = "role"; + +const STANDING_OBJECT_TYPE_POSITION: &str = "position"; + +/// `GET /api/permission/Standing` —— 身份列表(官方 `ActionResult.page` ⇒ `PageListVO`)。 +/// +/// 🔴 前端 `views/permission/identity/index.vue`: +/// `state.treeData = res.data.list || []` ⇒ **`data` 必须是有 `list` 的对象**。 +pub async fn standing_list( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_IDENTITY).await { + return resp; + } + let keyword = crate::platform::sys::query_param(&raw, "keyword"); + let keyword = keyword.trim().to_string(); + let page = Paging::of(&raw); + let (count_sql, list_sql, mut params): (String, String, Vec>) = if keyword.is_empty() { + ( + "SELECT count(*)::bigint AS \"c\" FROM base_standing \ + WHERE COALESCE(f_delete_mark,0) = 0".to_string(), + format!( + "SELECT {STANDING_PROJECTION} FROM base_standing \ + WHERE COALESCE(f_delete_mark,0) = 0 \ + ORDER BY f_sort_code ASC, f_full_name ASC \ + LIMIT $1::text::integer OFFSET $2::text::integer" + ), + vec![], + ) + } else { + ( + "SELECT count(*)::bigint AS \"c\" FROM base_standing \ + WHERE COALESCE(f_delete_mark,0) = 0 \ + AND (f_full_name ILIKE $1::text OR f_en_code ILIKE $1::text)" + .to_string(), + format!( + "SELECT {STANDING_PROJECTION} FROM base_standing \ + WHERE COALESCE(f_delete_mark,0) = 0 \ + AND (f_full_name ILIKE $1::text OR f_en_code ILIKE $1::text) \ + ORDER BY f_sort_code ASC, f_full_name ASC \ + LIMIT $2::text::integer OFFSET $3::text::integer" + ), + vec![Some(format!("%{keyword}%"))], + ) + }; + let total = match state.db.query_json_params(&count_sql, ¶ms_of(¶ms)).await { + Ok(rows) => rows + .into_iter() + .next() + .and_then(|r| r["c"].as_i64()) + .unwrap_or(0), + Err(e) => return db_error(e, "身份总数查询"), + }; + params.push(Some(page.page_size.to_string())); + params.push(Some(page.offset.to_string())); + match state.db.query_json_params(&list_sql, ¶ms_of(¶ms)).await { + Ok(rows) => ok(page_list(page.current_page, page.page_size, total, rows)), + Err(e) => db_error(e, "身份列表查询"), + } +} + +/// `GET /api/permission/Standing/{id}` —— 身份详情(官方 `StandingInfoVO`)。 +pub async fn standing_info( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_IDENTITY).await { + return resp; + } + let id = id.trim().to_string(); + let sql = format!( + "SELECT {STANDING_PROJECTION} FROM base_standing \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1" + ); + match state.db.query_json_params(&sql, &[&id]).await { + Ok(rows) => match rows.into_iter().next() { + Some(row) => ok(row), + None => fail(code::FAIL, "身份不存在"), + }, + Err(e) => db_error(e, "身份详情查询"), + } +} + +/// `POST /api/permission/Standing` —— 新建身份。 +/// +/// 🔴 官方 `StandingController.create` 返 `ActionResult.success(msg)`(**无 id**), +/// 但本仓面 B 的惯例是返 `{id}`(前端 `Form.vue` 不用返回值,返 `{id}` 更通用)。 +pub async fn standing_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_IDENTITY).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let full_name = obj + .get("fullName") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + if full_name.is_empty() { + return fail(code::FAIL, "名称不能为空"); + } + + let new_id = new_uuid(); + let mut columns: Vec<&str> = vec!["f_id", "f_tenant_id", "f_full_name"]; + let mut casts: Vec<&str> = vec!["", "", ""]; + let mut values: Vec> = + vec![Some(new_id.clone()), Some("0".to_string()), Some(full_name)]; + + for (json_key, column, cast) in STANDING_WRITE_FIELDS { + if column == "f_full_name" { + continue; + } + if obj.contains_key(json_key) { + columns.push(column); + casts.push(cast); + values.push(value_to_text(obj.get(json_key))); + } + } + if !obj.contains_key("enabledMark") { + columns.push("f_enabled_mark"); + casts.push("::integer"); + values.push(Some("1".to_string())); + } + if !obj.contains_key("sortCode") { + columns.push("f_sort_code"); + casts.push("::bigint"); + values.push(Some("0".to_string())); + } + // 🔴 `f_is_system` = 2(**自定义**)—— 官方 DDL 注释:1=系统,2=自定义。 + columns.push("f_is_system"); + casts.push("::integer"); + values.push(Some("2".to_string())); + columns.push("f_creator_user_id"); + casts.push(""); + values.push(Some(user.account.clone())); + columns.push("f_delete_mark"); + casts.push("::integer"); + values.push(Some("0".to_string())); + // 🔴 `f_creator_time` 用 SQL `now()` ⇒ **不占参数位**。 + columns.push("f_creator_time"); + let mut marks: Vec = (0..values.len()) + .map(|i| placeholder(i + 1, casts[i])) + .collect(); + marks.push("now()".to_string()); + let sql = format!( + "INSERT INTO base_standing ({}) VALUES ({})", + columns.join(", "), + marks.join(", ") + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "新建身份"); + } + ok(json!({ "id": new_id })) +} + +/// `PUT /api/permission/Standing/{id}` —— 改身份(**只 SET body 里出现的键**)。 +pub async fn standing_update( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_IDENTITY).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let rows = match state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_standing \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", + &[&id], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "身份查询"), + }; + if rows.is_empty() { + return fail(code::FAIL, "身份不存在"); + } + + let mut sets: Vec = Vec::new(); + let mut values: Vec> = Vec::new(); + for (json_key, column, cast) in STANDING_WRITE_FIELDS { + if !obj.contains_key(json_key) { + continue; + } + values.push(value_to_text(obj.get(json_key))); + sets.push(format!("{} = ${}::text{}", column, values.len(), cast)); + } + if sets.is_empty() { + return ok(Value::Null); + } + values.push(Some(user.account.clone())); + sets.push(format!("f_last_modify_user_id = ${}::text", values.len())); + sets.push("f_last_modify_time = now()".to_string()); + values.push(Some(id)); + let sql = format!( + "UPDATE base_standing SET {} WHERE f_id = ${}::text", + sets.join(", "), + values.len() + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "修改身份"); + } + ok(Value::Null) +} + +/// `DELETE /api/permission/Standing/{id}` —— 删身份(软删 + 解绑关联关系)。 +pub async fn standing_delete( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match guard(&state, &headers, EN_IDENTITY).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let values = [Some(user.account.clone()), Some(id.clone())]; + if let Err(e) = state + .db + .exec_params( + "UPDATE base_standing SET f_delete_mark = 1, f_delete_time = now(), \ + f_delete_user_id = $1::text WHERE f_id = $2::text \ + AND COALESCE(f_delete_mark,0) = 0", + ¶ms_of(&values), + ) + .await + { + return db_error(e, "删除身份"); + } + // 关联关系同步软删(官方 `StandingServiceImpl.delete` 也删 `authorize`)。 + // 🔴 **参数必须与占位符逐字对齐**:`$1`=f_item_type('standing')、`$2`=f_item_id、 + // `$3`=删除人(写进审计列 `f_delete_user_id`,否则 PG 拒「无法确定参数类型」)。 + let rel = [ + Some(STANDING_ITEM_TYPE.to_string()), + Some(id), + Some(user.account.clone()), + ]; + if let Err(e) = state + .db + .exec_params( + "UPDATE base_authorize SET f_delete_mark = 1, f_delete_time = now(), \ + f_delete_user_id = $3::text \ + WHERE f_item_type = $1::text AND f_item_id = $2::text \ + AND COALESCE(f_delete_mark,0) = 0", + ¶ms_of(&rel), + ) + .await + { + return db_error(e, "删除身份关联关系"); + } + ok(Value::Null) +} + +/// `GET /api/permission/Standing/list` —— 身份**关联列表**(该身份下挂的角色/岗位)。 +/// +/// 🔴 官方 `StandingController.lists`: +/// - `type=position` ⇒ 岗位(`base_position`);否则 ⇒ 角色(`base_role`); +/// - 关联关系落在 `base_authorize`:`f_item_id`=身份 id、`f_item_type`='standing'、 +/// `f_object_type`='role'/'position'、`f_object_id`=角色/岗位 id。 +pub async fn standing_relation_list( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_IDENTITY).await { + return resp; + } + let standing_id = crate::platform::sys::query_param(&raw, "id"); + let standing_id = standing_id.trim().to_string(); + let kind = crate::platform::sys::query_param(&raw, "type"); + let kind = kind.trim().to_string(); + let keyword = crate::platform::sys::query_param(&raw, "keyword"); + let keyword = keyword.trim().to_string(); + let page = Paging::of(&raw); + + if kind == STANDING_OBJECT_TYPE_POSITION { + // 岗位:本仓 `base_position` 已有 ⇒ 直接按 `base_authorize` 的关系取。 + let sql = format!( + "SELECT p.f_id AS \"id\", p.f_full_name AS \"fullName\", p.f_en_code AS \"enCode\", \ + p.f_description AS \"description\", \ + COALESCE(p.f_sort_code, 0) AS \"sortCode\", \ + 0 AS \"globalMark\", \ + COALESCE(p.f_enabled_mark, 0) AS \"enabledMark\", \ + 0 AS \"isSystem\", \ + 0 AS \"disable\" \ + FROM base_position p \ + JOIN base_authorize a \ + ON a.f_object_id = p.f_id AND a.f_object_type = '{STANDING_OBJECT_TYPE_POSITION}' \ + AND a.f_item_type = '{STANDING_ITEM_TYPE}' AND a.f_item_id = $1::text \ + AND COALESCE(a.f_delete_mark,0) = 0 \ + WHERE COALESCE(p.f_delete_mark,0) = 0 \ + ORDER BY p.f_sort_code ASC, p.f_full_name ASC" + ); + return match state.db.query_json_params(&sql, &[&standing_id]).await { + Ok(rows) => ok(page_list(1, rows.len().max(1) as i64, rows.len() as i64, rows)), + Err(e) => db_error(e, "身份岗位关联查询"), + }; + } + + // 角色:官方按 `base_role` 的 `f_global_mark` 判「系统身份」。 + let mut filters = vec![ + "a.f_item_type = 'standing'".to_string(), + "a.f_item_id = $1::text".to_string(), + "a.f_object_type = 'role'".to_string(), + "COALESCE(a.f_delete_mark,0) = 0".to_string(), + "COALESCE(r.f_delete_mark,0) = 0".to_string(), + ]; + let mut params: Vec> = vec![Some(standing_id.clone())]; + if !keyword.is_empty() { + filters.push("(r.f_full_name ILIKE $2::text OR r.f_en_code ILIKE $2::text)".to_string()); + params.push(Some(format!("%{keyword}%"))); + } + let where_sql = filters.join(" AND "); + let sql = format!( + "SELECT r.f_id AS \"id\", r.f_full_name AS \"fullName\", r.f_en_code AS \"enCode\", \ + r.f_description AS \"description\", \ + COALESCE(r.f_sort_code, 0) AS \"sortCode\", \ + COALESCE(r.f_global_mark, 0) AS \"globalMark\", \ + COALESCE(r.f_enabled_mark, 0) AS \"enabledMark\", \ + CASE WHEN COALESCE(r.f_global_mark, 0) = 1 THEN 1 ELSE 0 END AS \"isSystem\", \ + 0 AS \"disable\" \ + FROM base_role r JOIN base_authorize a ON a.f_object_id = r.f_id \ + WHERE {where_sql} \ + ORDER BY r.f_global_mark ASC, r.f_full_name ASC" + ); + match state.db.query_json_params(&sql, ¶ms_of(¶ms)).await { + Ok(rows) => ok(page_list( + page.current_page, + page.page_size, + rows.len() as i64, + rows, + )), + Err(e) => db_error(e, "身份角色关联查询"), + } +} + +/// `POST /api/permission/Standing/{id}/Actions/AddObject` —— 给身份加角色/岗位。 +/// +/// 🔴 官方 `StandingController.addObject`:body `{ids:[…], type:'role'|'position'}`; +/// 关系写 `base_authorize`(`f_item_id`=身份 id、`f_item_type`='standing')。 +pub async fn standing_add_object( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_IDENTITY).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let ids = id_list(&obj); + if ids.is_empty() { + return ok(Value::Null); + } + let kind = obj + .get("type") + .and_then(Value::as_str) + .unwrap_or(STANDING_OBJECT_TYPE_ROLE) + .trim() + .to_string(); + let object_type = if kind == STANDING_OBJECT_TYPE_POSITION { + STANDING_OBJECT_TYPE_POSITION.to_string() + } else { + STANDING_OBJECT_TYPE_ROLE.to_string() + }; + + // 幂等:已存在的关联跳过(官方 `addObject` 也是 `!authorizeList.contains(thisId)`)。 + let existing = match state + .db + .query_json_params( + "SELECT f_object_id AS \"id\" FROM base_authorize \ + WHERE f_item_type = $1::text AND f_item_id = $2::text \ + AND f_object_type = $3::text AND COALESCE(f_delete_mark,0) = 0", + &[&STANDING_ITEM_TYPE, &id, &object_type], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "身份关联查询"), + }; + let existing_ids: HashSet = existing + .iter() + .filter_map(|r| r["id"].as_str()) + .map(str::to_string) + .collect(); + + for object_id in ids { + if existing_ids.contains(&object_id) { + continue; + } + let new_row_id = new_uuid(); + let values = [ + Some(new_row_id), + Some(STANDING_ITEM_TYPE.to_string()), + Some(id.clone()), + Some(object_type.clone()), + Some(object_id), + Some(user.account.clone()), + ]; + // 🔴 `f_creator_time` 用 `now()` ⇒ 不占参数位。 + let sql = "INSERT INTO base_authorize \ + (f_id, f_item_type, f_item_id, f_object_type, f_object_id, \ + f_creator_user_id, f_creator_time, f_delete_mark, f_tenant_id) \ + VALUES ($1::text, $2::text, $3::text, $4::text, $5::text, $6::text, \ + now(), 0, '0')"; + if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { + return db_error(e, "新增身份关联"); + } + } + ok(Value::Null) +} + +/// `POST /api/permission/Standing/{id}/Actions/DeleteObject` —— 从身份移除角色/岗位。 +pub async fn standing_delete_object( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_IDENTITY).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let ids = id_list(&obj); + if ids.is_empty() { + return ok(Value::Null); + } + let kind = obj + .get("type") + .and_then(Value::as_str) + .unwrap_or(STANDING_OBJECT_TYPE_ROLE) + .trim() + .to_string(); + let object_type = if kind == STANDING_OBJECT_TYPE_POSITION { + STANDING_OBJECT_TYPE_POSITION.to_string() + } else { + STANDING_OBJECT_TYPE_ROLE.to_string() + }; + + for object_id in ids { + let values = [ + Some(user.account.clone()), + Some(STANDING_ITEM_TYPE.to_string()), + Some(id.clone()), + Some(object_type.clone()), + Some(object_id), + ]; + let sql = "UPDATE base_authorize SET f_delete_mark = 1, f_delete_time = now(), \ + f_delete_user_id = $1::text \ + WHERE f_item_type = $2::text AND f_item_id = $3::text \ + AND f_object_type = $4::text AND f_object_id = $5::text \ + AND COALESCE(f_delete_mark,0) = 0"; + if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { + return db_error(e, "删除身份关联"); + } + } + ok(Value::Null) +} + +/// 官方 `RoleRelationController` 的 OR 守卫之一(本仓没有这个 `f_en_code` ⇒ 实际放行)。 +const EN_AUTH: &str = "permission.auth"; + +/// `GET /api/permission/RoleRelation` —— 角色已绑定的对象列表 +/// (官方 `RoleRelationController.java:80`)。 +/// +/// 官方按 `type` 分三条查询:`user`(补岗位名 / 组织名 / 性别名)、`organize` +/// (`fullName` = 组织全路径)、`position`(`fullName` = 组织全路径 + `/` + 岗位名)。 +/// 🔴 本仓**不做性别字典翻译**(`SEX_TYPE` 字典没种子化)⇒ `gender` 返回原码, +/// 契约标 `partial`;其余字段都是真读。 +pub async fn role_relation_list( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard_any(&state, &headers, &[EN_AUTH, EN_ORGANIZE, EN_ROLE]).await { + return resp; + } + let role_id = qv(&raw, "roleId"); + if role_id.is_empty() { + return fail(code::FAIL, "缺少角色 id"); + } + let ty = qv(&raw, "type").to_lowercase(); + let keyword = qv(&raw, "keyword").to_lowercase(); + let page = Paging::of(&raw); + + // 🔴 `f_object_type` 必须**全小写**(`user` / `organize` / `position`): + // ① 官方 `PermissionConst.USER/ORGANIZE/POSITION` 就是小写 + // (`jnpf-common-core/.../PermissionConst.java`),`setEntity` 落的是前端传的 `type`, + // 而前端 tab 的 key 也是小写(`views/permission/role/index.vue:259` `key="user"`); + // ② 本仓授权引擎 `permission.rs::query_user_role_ids` 也只认 `f_object_type='user'` + // ⇒ 这里写成首字母大写的话,绑定会**显示成功但权限永不生效**(静默失效)。 + let object_type = match ty.as_str() { + "organize" => "organize", + "position" => "position", + _ => "user", + }; + + let (select_cols, from_sql, kw_cond, order_sql) = match object_type { + "organize" => ( + "t.f_id AS \"id\", COALESCE(t.f_en_code, '') AS \"enCode\", \ + COALESCE(t.f_full_name, '') AS \"fullName\", \ + COALESCE(t.f_org_name_tree, t.f_full_name, '') AS \"orgNameTree\", \ + COALESCE(t.f_category, '') AS \"category\"", + "base_role_relation r JOIN base_organize t ON t.f_id = r.f_object_id", + "t.f_full_name ILIKE $2::text OR t.f_en_code ILIKE $2::text", + "COALESCE(t.f_sort_code, 0) ASC, t.f_creator_time ASC NULLS LAST", + ), + "position" => ( + "t.f_id AS \"id\", COALESCE(t.f_en_code, '') AS \"enCode\", \ + COALESCE(t.f_full_name, '') AS \"fullName\", \ + COALESCE(o.f_org_name_tree, o.f_full_name, '') AS \"orgNameTree\", \ + COALESCE(t.f_organize_id, '') AS \"organizeId\"", + "base_role_relation r JOIN base_position t ON t.f_id = r.f_object_id \ + LEFT JOIN base_organize o ON o.f_id = t.f_organize_id", + "t.f_full_name ILIKE $2::text OR t.f_en_code ILIKE $2::text", + "COALESCE(t.f_sort_code, 0) ASC, t.f_creator_time ASC NULLS LAST", + ), + _ => ( + "t.f_id AS \"id\", COALESCE(t.f_account, '') AS \"account\", \ + COALESCE(t.f_real_name, '') AS \"realName\", \ + COALESCE(t.f_gender, '') AS \"gender\", \ + COALESCE(t.f_mobile_phone, '') AS \"mobilePhone\", \ + COALESCE(o.f_full_name, '') AS \"organize\", \ + COALESCE((SELECT string_agg(p.f_full_name, ',' \ + ORDER BY COALESCE(p.f_sort_code, 0)) \ + FROM base_position p \ + WHERE p.f_id = ANY(string_to_array(COALESCE(t.f_position_id, ''), ',')) \ + AND COALESCE(p.f_delete_mark, 0) = 0), '') AS \"position\"", + "base_role_relation r JOIN base_user t ON t.f_id = r.f_object_id \ + LEFT JOIN base_organize o ON o.f_id = t.f_organize_id", + "t.f_account ILIKE $2::text OR t.f_real_name ILIKE $2::text", + "COALESCE(t.f_sort_code, 0) ASC, t.f_creator_time ASC NULLS LAST", + ), + }; + + let mut values: Vec> = vec![Some(role_id.clone())]; + let mut conds = vec![ + "r.f_role_id = $1::text".to_string(), + format!("r.f_object_type = '{object_type}'"), + "COALESCE(r.f_delete_mark, 0) = 0".to_string(), + "COALESCE(t.f_delete_mark, 0) = 0".to_string(), + ]; + if !keyword.is_empty() { + values.push(Some(format!("%{keyword}%"))); + conds.push(format!("({kw_cond})")); + } + let where_sql = conds.join(" AND "); + + let count_sql = + format!("SELECT COUNT(*)::bigint AS \"total\" FROM {from_sql} WHERE {where_sql}"); + let total = match state + .db + .query_json_params(&count_sql, ¶ms_of(&values)) + .await + { + Ok(rows) => rows + .first() + .and_then(|r| r.get("total")) + .and_then(Value::as_i64) + .unwrap_or(0), + Err(e) => return db_error(e, "角色绑定对象计数"), + }; + + let mut page_values = values.clone(); + page_values.push(Some(page.page_size.to_string())); + let n = page_values.len(); + page_values.push(Some(page.offset.to_string())); + let m = page_values.len(); + let sql = format!( + "SELECT {select_cols} FROM {from_sql} WHERE {where_sql} \ + ORDER BY {order_sql} LIMIT ${n}::text::integer OFFSET ${m}::text::integer" + ); + let list = match state.db.query_json_params(&sql, ¶ms_of(&page_values)).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "角色绑定对象查询"), + }; + ok(page_list(page.current_page, page.page_size, total, list)) +} + +/// `POST /api/permission/RoleRelation` —— 给角色批量绑定对象 +/// (官方 `RoleRelationController.java:153`)。 +/// +/// 官方语义(`RoleRelationServiceImpl.roleAddObjectIds`)逐条对齐: +/// ① `ids` 空 ⇒ 失败「请选择要绑定的对象」(`SYS134`); +/// ② 角色不存在 ⇒ 失败; +/// ③ `type=user` 时先把**停用/已删**的用户过滤掉(`getRelUserEnable`); +/// ④ **已绑定过的跳过**(官方用 `roleSet` 差集); +/// ⑤ **超管不能添加**(官方 `adminIds` ⇒ 记进 errList,不落库); +/// ⑥ 结果三分支:有成功有失败 ⇒ 成功(`部分成功`);全失败 ⇒ 失败;全成功 ⇒ 成功; +/// ⑦ 绑完把**相关用户踢下线**(官方 `delCurUser`)—— 否则新权限要等重新登录才生效。 +pub async fn role_relation_add( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard_any(&state, &headers, &[EN_AUTH, EN_ORGANIZE, EN_ROLE]).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let role_id = text_field(&obj, "roleId").unwrap_or_default(); + if role_id.is_empty() { + return fail(code::FAIL, "缺少角色 id"); + } + // 🔴 与 `role_relation_list` 同一口径:`f_object_type` **全小写** + // (官方 `PermissionConst` 是 `user`/`organize`/`position`;授权引擎只认小写)。 + let ty = text_field(&obj, "type").unwrap_or_else(|| "user".to_string()); + let object_type = match ty.to_lowercase().as_str() { + "organize" => "organize", + "position" => "position", + _ => "user", + }; + let mut ids = id_list_of(&obj, "ids"); + if ids.is_empty() { + return fail(code::FAIL, "请选择要绑定的对象"); + } + + let role = match state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_role \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", + &[&role_id], + ) + .await + { + Ok(rows) => rows.into_iter().next(), + Err(e) => return db_error(e, "角色查询"), + }; + if role.is_none() { + return fail(code::FAIL, "角色不存在"); + } + + // ③ 停用/已删的用户不绑(官方 `getRelUserEnable`)。 + if object_type == "user" { + let placeholders: Vec = + (0..ids.len()).map(|i| format!("${}::text", i + 1)).collect(); + let sql = format!( + "SELECT f_id AS \"id\" FROM base_user WHERE f_id IN ({}) \ + AND COALESCE(f_delete_mark, 0) = 0 AND COALESCE(f_enabled_mark, 1) = 1", + placeholders.join(", ") + ); + let owned: Vec = ids.clone(); + let refs: Vec<&(dyn ToSql + Sync)> = + owned.iter().map(|s| s as &(dyn ToSql + Sync)).collect(); + match state.db.query_json_params(&sql, &refs).await { + Ok(rows) => { + let enabled: Vec = rows + .iter() + .filter_map(|r| r.get("id").and_then(Value::as_str).map(str::to_string)) + .collect(); + ids.retain(|id| enabled.contains(id)); + } + Err(e) => return db_error(e, "用户可用性查询"), + } + } + if ids.is_empty() { + return fail(code::FAIL, "所选对象都不可用(已停用或已删除)"); + } + + // ④ 已绑定的跳过。 + let bound = match state + .db + .query_json_params( + "SELECT f_object_id AS \"objectId\" FROM base_role_relation \ + WHERE f_role_id = $1::text AND f_object_type = $2::text \ + AND COALESCE(f_delete_mark, 0) = 0", + &[&role_id, &object_type.to_string()], + ) + .await + { + Ok(rows) => rows + .iter() + .filter_map(|r| { + r.get("objectId") + .and_then(Value::as_str) + .map(str::to_string) + }) + .collect::>(), + Err(e) => return db_error(e, "角色已绑定对象查询"), + }; + ids.retain(|id| !bound.contains(id)); + + // ⑤ 超管不能添加。 + let mut err_list: Vec = Vec::new(); + if object_type == "user" && !ids.is_empty() { + let placeholders: Vec = + (0..ids.len()).map(|i| format!("${}::text", i + 1)).collect(); + let sql = format!( + "SELECT f_id AS \"id\" FROM base_user WHERE f_id IN ({}) \ + AND COALESCE(f_is_administrator, 0) = 1", + placeholders.join(", ") + ); + let owned: Vec = ids.clone(); + let refs: Vec<&(dyn ToSql + Sync)> = + owned.iter().map(|s| s as &(dyn ToSql + Sync)).collect(); + match state.db.query_json_params(&sql, &refs).await { + Ok(rows) => { + for r in &rows { + if let Some(id) = r.get("id").and_then(Value::as_str) { + err_list.push(format!("超管不能添加:{id}")); + ids.retain(|x| x != id); + } + } + } + Err(e) => return db_error(e, "超管查询"), + } + } + + let mut added: Vec = Vec::new(); + for object_id in &ids { + let values = [ + Some(new_uuid()), + Some(user.account.clone()), + Some(object_id.clone()), + Some(object_type.to_string()), + Some(role_id.clone()), + ]; + let sql = "INSERT INTO base_role_relation \ + (f_id, f_creator_user_id, f_object_id, f_object_type, f_role_id, \ + f_creator_time, f_delete_mark) \ + VALUES ($1::text, $2::text, $3::text, $4::text, $5::text, now(), 0)"; + match state.db.exec_params(sql, ¶ms_of(&values)).await { + Ok(_) => added.push(object_id.clone()), + Err(e) => return db_error(e, "角色绑定写入"), + } + } + + // ⑦ 相关用户踢下线(官方 `delCurUser`)。 + if object_type == "user" { + state.sessions.revoke_user_ids(&added); + } + + if !err_list.is_empty() && !added.is_empty() { + // 官方这里返 `success("部分成功")` ⇒ 200,但有一条提示。 + return ok(json!({ "partial": true, "errList": err_list })); + } + if !err_list.is_empty() { + return fail(code::FAIL, &err_list.join(";")); + } + ok(Value::Null) +} + +/// `POST /api/permission/Group/GroupCondition` —— 按 id 集合取分组下拉 +/// (官方 `GroupController.java:219`)。 +/// +/// 官方给每个 VO 盖一个常量 `icon`(`PermissionConst.GROUP_ICON`);本仓没有这个 +/// 图标常量 ⇒ `icon` 返空串(前端有默认图标),契约 note 写明。 +pub async fn group_condition( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + if let Err(resp) = require_login_face_b(&state, &headers).await { + return resp; + } + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let ids = id_list_of(&obj, "ids"); + if ids.is_empty() { + return ok(Value::Array(Vec::new())); + } + let placeholders: Vec = (0..ids.len()).map(|i| format!("${}::text", i + 1)).collect(); + let sql = format!( + "SELECT f_id AS \"id\", COALESCE(f_full_name, '') AS \"fullName\", \ + COALESCE(f_en_code, '') AS \"enCode\", '' AS \"icon\" \ + FROM base_group WHERE f_id IN ({}) AND COALESCE(f_delete_mark, 0) = 0 \ + ORDER BY COALESCE(f_sort_code, 0) ASC", + placeholders.join(", ") + ); + let owned: Vec = ids; + let refs: Vec<&(dyn ToSql + Sync)> = owned.iter().map(|s| s as &(dyn ToSql + Sync)).collect(); + match state.db.query_json_params(&sql, &refs).await { + Ok(rows) => ok(Value::Array(rows)), + Err(e) => db_error(e, "分组下拉查询"), + } +} + +/// `POST /api/permission/Organize/SelectedList` —— 自定义范围**回显** +/// (官方 `OrganizeController.java:341`)。 +/// +/// 🔴 `ids` 的每个元素是 **`<组织id>--<类型后缀>`**(官方 `split("--")`): +/// 返回的 `id` 必须**原样带回**(前端拿它做删除),`orgNameTree` 按后缀追加说明。 +/// 本仓没有 `SysParamEnum` 的后缀表 ⇒ **不追加任何文字**,但 id 原样保留。 +pub async fn organize_selected_list( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + if let Err(resp) = require_login_face_b(&state, &headers).await { + return resp; + } + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let id_strs = id_list_of(&obj, "ids"); + if id_strs.is_empty() { + return ok(list_vo(Vec::new())); + } + // 只取 `--` 前的真 id(后缀是前端的选择语义,不是主键的一部分)。 + let real_ids: Vec = id_strs + .iter() + .map(|s| s.split("--").next().unwrap_or("").to_string()) + .filter(|s| !s.is_empty()) + .collect(); + if real_ids.is_empty() { + return ok(list_vo(Vec::new())); + } + let placeholders: Vec = (0..real_ids.len()) + .map(|i| format!("${}::text", i + 1)) + .collect(); + let sql = format!( + "SELECT f_id AS \"id\", COALESCE(f_en_code, '') AS \"enCode\", \ + COALESCE(f_full_name, '') AS \"fullName\", \ + COALESCE(f_org_name_tree, f_full_name, '') AS \"orgNameTree\", \ + COALESCE(f_category, '') AS \"category\" \ + FROM base_organize WHERE f_id IN ({}) AND COALESCE(f_delete_mark, 0) = 0", + placeholders.join(", ") + ); + let owned: Vec = real_ids.clone(); + let refs: Vec<&(dyn ToSql + Sync)> = owned.iter().map(|s| s as &(dyn ToSql + Sync)).collect(); + let rows = match state.db.query_json_params(&sql, &refs).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "自定义范围回显查询"), + }; + let mut by_id: HashMap = HashMap::new(); + for r in rows { + let id = r + .get("id") + .and_then(Value::as_str) + .unwrap_or("") + .to_string(); + by_id.insert(id, r); + } + // **按入参顺序**回填(官方就是这么干的),查不到的直接丢弃。 + let mut list: Vec = Vec::new(); + for id_str in &id_strs { + let real = id_str.split("--").next().unwrap_or(""); + if let Some(row) = by_id.get(real) { + let mut item = row.clone(); + if let Some(o) = item.as_object_mut() { + o.insert("id".to_string(), json!(id_str)); + } + list.push(item); + } + } + ok(list_vo(list)) +} + +/// `POST /api/permission/Organize/OrganizeCondition` —— 自定义范围**下拉树** +/// (官方 `OrganizeController.java:351`)。 +/// +/// 🔴 官方这里会把 `$ORG` / `$ORGANDSUB` / `$ORGANIZEANDPROGENY` 三个**数据接口变量** +/// 展开成「我所在的机构 / 我及下级 / 我及后代」。本仓没有建模数据接口变量 +/// (`DataInterfaceVarConst` 不在官方快照里,取值无法逐字对齐)⇒ 遇到 `$` / `@` +/// 开头的标记**明确业务失败**,让调用方传具体机构 id。**能力不存在就不假装。** +pub async fn organize_condition( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + if let Err(resp) = require_login_face_b(&state, &headers).await { + return resp; + } + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let id_strs = id_list_of(&obj, "ids"); + if id_strs.is_empty() { + return ok(list_vo(Vec::new())); + } + let mut real_ids: Vec = Vec::new(); + for id_str in &id_strs { + let head = id_str.split("--").next().unwrap_or("").trim(); + if head.is_empty() { + continue; + } + if head.starts_with('$') || head.starts_with('@') { + return fail( + code::FAIL, + "本仓未建模数据接口变量($ORG / $ORGANDSUB / $ORGANIZEANDPROGENY),请传具体机构 id", + ); + } + real_ids.push(head.to_string()); + } + if real_ids.is_empty() { + return ok(list_vo(Vec::new())); + } + let placeholders: Vec = (0..real_ids.len()) + .map(|i| format!("${}::text", i + 1)) + .collect(); + let sql = format!( + "SELECT f_id AS \"id\", COALESCE(f_parent_id, '0') AS \"parentId\", \ + COALESCE(f_full_name, '') AS \"fullName\", \ + COALESCE(f_org_name_tree, f_full_name, '') AS \"orgNameTree\", \ + COALESCE(f_category, '') AS \"category\" \ + FROM base_organize WHERE f_id IN ({}) AND COALESCE(f_delete_mark, 0) = 0 \ + ORDER BY COALESCE(f_sort_code, 0) ASC, f_full_name ASC", + placeholders.join(", ") + ); + let owned: Vec = real_ids.clone(); + let refs: Vec<&(dyn ToSql + Sync)> = owned.iter().map(|s| s as &(dyn ToSql + Sync)).collect(); + let rows = match state.db.query_json_params(&sql, &refs).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "自定义范围下拉查询"), + }; + // 按 `f_parent_id` 组成树:父不在集合内的当根(官方 `convertListToTreeDot` 同义)。 + let in_set: Vec = rows + .iter() + .filter_map(|r| r.get("id").and_then(Value::as_str).map(str::to_string)) + .collect(); + let mut children: HashMap> = HashMap::new(); + let mut roots: Vec = Vec::new(); + for r in rows { + let id = r + .get("id") + .and_then(Value::as_str) + .unwrap_or("") + .to_string(); + let parent = r + .get("parentId") + .and_then(Value::as_str) + .unwrap_or("0") + .to_string(); + let mut node = r.clone(); + if let Some(o) = node.as_object_mut() { + o.insert("icon".to_string(), json!("")); + o.insert("children".to_string(), json!([])); + } + if parent != id && in_set.contains(&parent) { + children.entry(parent).or_default().push(node); + } else { + roots.push(node); + } + } + fn attach(node: &mut Value, children: &HashMap>) { + let id = node + .get("id") + .and_then(Value::as_str) + .unwrap_or("") + .to_string(); + if let Some(kids) = children.get(&id) { + let mut kids = kids.clone(); + for kid in kids.iter_mut() { + attach(kid, children); + } + if let Some(o) = node.as_object_mut() { + o.insert("children".to_string(), Value::Array(kids)); + } + } + } + for root in roots.iter_mut() { + attach(root, &children); + } + ok(list_vo(roots)) +} + +/// `GET /api/permission/Users/getWorkByUser?fromId=` —— 用户工作详情 +/// (官方 `UserController.java:2174`)。 +/// +/// 官方返回 `WorkHandoverVo {flow, flowTask, app, isAppShow}`: +/// - `flow` / `flowTask` 来自**工作流引擎**(`templateApi.flowWork`)⇒ 本仓没有 +/// 工作流 ⇒ 恒空数组(**不编待办条数**); +/// - `app` 是该用户**有权限的应用系统**列表 ⇒ 真查; +/// - `isAppShow` = `app` 非空(官方同义)。 +pub async fn user_get_work_by_user( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let from_id = qv(&raw, "fromId"); + if from_id.is_empty() { + return fail(code::FAIL, "缺少 userId"); + } + let target = match state + .db + .query_json_params( + "SELECT f_id AS \"id\", COALESCE(f_account, '') AS \"account\", \ + COALESCE(f_is_administrator, 0)::bigint AS \"isAdmin\" \ + FROM base_user WHERE f_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", + &[&from_id], + ) + .await + { + Ok(rows) => rows.into_iter().next(), + Err(e) => return db_error(e, "用户查询"), + }; + let Some(target) = target else { + return fail(code::FAIL, "用户不存在"); + }; + let user = TokenUser { + user_id: from_id.clone(), + account: target + .get("account") + .and_then(Value::as_str) + .unwrap_or("") + .to_string(), + is_admin: target + .get("isAdmin") + .and_then(Value::as_i64) + .and_then(|v| i32::try_from(v).ok()) + .unwrap_or(0), + issued_at_ms: 0, + ip: String::new(), + user_agent: String::new(), + }; + let mut conds = vec![ + "COALESCE(f_delete_mark, 0) = 0".to_string(), + "COALESCE(f_is_main, 0) = 0".to_string(), + ]; + let mut values: Vec> = Vec::new(); + if user.is_admin != 1 { + values.push(Some(format!("%{}%", user.user_id))); + let n = values.len(); + conds.push(format!( + "(COALESCE(f_user_id, '') LIKE ${n}::text OR COALESCE(f_authorize_id, '') LIKE ${n}::text)" + )); + } + let sql = format!( + "SELECT {SYSTEM_LIST_PROJECTION} FROM base_system WHERE {} \ + ORDER BY COALESCE(f_sort_code, 0) ASC", + conds.join(" AND ") + ); + let rows = match state.db.query_json_params(&sql, ¶ms_of(&values)).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "用户可访问系统查询"), + }; + let tops = load_system_tops(&state, &user).await; + let app: Vec = rows + .into_iter() + .map(|row| shape_system_list_item(row, &user, &tops)) + .collect(); + let is_app_show = !app.is_empty(); + ok(json!({ + "flow": [], + "flowTask": [], + "app": app, + "isAppShow": is_app_show, + })) +} + +/// `GET /api/permission/socials` —— 第三方账号绑定列表 +/// (官方 `SocialsUserController.java:94`)。 +/// +/// 🔴 官方在 `socialsConfig.getConfig() == null` 时**直接失败**(`PS019`)—— +/// 本仓根本没有第三方登录配置 ⇒ **走的正是官方这条失败分支**,不是偷懒: +/// 没有 provider 就返空数组,页面会显示「没有可绑定的平台」; +/// 而真实情况是「未开启」,后者才对。 +pub async fn socials_list( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = require_login_face_b(&state, &headers).await { + return resp; + } + fail(code::FAIL, "未开启第三方登录配置,无法绑定第三方账号") +} + +/// `GET /api/permission/socials/render/{source}` —— 第三方授权的跳转地址 +/// (官方 `SocialsUserController.java:129`)。 +/// +/// 官方返回 OAuth 授权 URL(`authRequest.authorize(...)`)。本仓没有 OAuth 客户端 +/// 注册表 ⇒ **明确业务失败**,绝不返假 URL(前端会直接跳转,跳到 404 页更难查)。 +pub async fn socials_render( + State(state): State, + headers: HeaderMap, + Path(source): Path, +) -> Json { + if let Err(resp) = require_login_face_b(&state, &headers).await { + return resp; + } + let source = source.trim(); + fail( + code::FAIL, + &format!("未开启第三方登录配置,无法发起 {source} 授权"), + ) +} + +/// 一条导入的落库规格(三实体共用一套流程:校验必填 → 判重 → 落库 → 统计)。 +struct ImportSpec { + /// 目标表 + table: &'static str, + /// 判重列(账号 / 编码) + key_col: &'static str, + /// body 里必填的键(缺 ⇒ 该行失败) + required: &'static [&'static str], + /// (body 键, 列名):**只写 body 里出现的键**,没出现的不进 INSERT + cols: &'static [(&'static str, &'static str)], + /// 固定列(列名, SQL 字面量)—— 例如新用户的默认口令 + fixed: &'static [(&'static str, &'static str)], + /// 判重时的中文名(「账号」/「编码」) + key_label: &'static str, +} + +const IMPORT_USER: ImportSpec = ImportSpec { + table: "base_user", + key_col: "f_account", + required: &["account", "realName"], + cols: &[ + ("account", "f_account"), + ("realName", "f_real_name"), + ("gender", "f_gender"), + ("mobilePhone", "f_mobile_phone"), + ("telePhone", "f_tele_phone"), + ("email", "f_email"), + ("organizeId", "f_organize_id"), + ("positionId", "f_position_id"), + ("description", "f_description"), + ], + fixed: &[ + ("f_password", "md5('123456')"), + ("f_is_administrator", "0"), + ("f_enabled_mark", "1"), + ("f_delete_mark", "0"), + ], + key_label: "账号", +}; + +const IMPORT_ORGANIZE: ImportSpec = ImportSpec { + table: "base_organize", + key_col: "f_en_code", + required: &["fullName", "enCode"], + cols: &[ + ("parentId", "f_parent_id"), + ("fullName", "f_full_name"), + ("enCode", "f_en_code"), + ("category", "f_category"), + ("description", "f_description"), + ], + fixed: &[("f_enabled_mark", "1"), ("f_delete_mark", "0")], + key_label: "编码", +}; + +const IMPORT_POSITION: ImportSpec = ImportSpec { + table: "base_position", + key_col: "f_en_code", + required: &["fullName", "enCode"], + cols: &[ + ("organizeId", "f_organize_id"), + ("fullName", "f_full_name"), + ("enCode", "f_en_code"), + ("description", "f_description"), + ], + fixed: &[("f_enabled_mark", "1"), ("f_delete_mark", "0")], + key_label: "编码", +}; + +/// 单行落库。返回 `Ok(())` 或失败原因(人话)。 +async fn import_one_row(state: &AppState, spec: &ImportSpec, obj: &Map) -> Result<(), String> { + // ① 必填校验 + let mut missing: Vec<&str> = Vec::new(); + for key in spec.required { + if text_field(obj, key).is_none() { + missing.push(key); + } + } + if !missing.is_empty() { + return Err(format!("缺少必填字段:{}", missing.join(" / "))); + } + // ② 判重(表内唯一;`key_col` 一定在 `cols` 里) + let key_value = spec + .cols + .iter() + .find(|(_, c)| *c == spec.key_col) + .and_then(|(k, _)| text_field(obj, k)); + if let Some(value) = key_value.as_ref() { + let sql = format!( + "SELECT 1 AS \"hit\" FROM {} WHERE {} = $1::text LIMIT 1", + spec.table, spec.key_col + ); + match state.db.query_json_params(&sql, &[value]).await { + Ok(hit) => { + if !hit.is_empty() { + return Err(format!("{}已存在:{value}", spec.key_label)); + } + } + Err(e) => return Err(format!("判重失败:{e}")), + } + } + // ③ 组装 INSERT:body 里出现的键 → 固定字面量 → uuid + let mut columns: Vec = Vec::new(); + let mut values: Vec> = Vec::new(); + for (key, col) in spec.cols { + if let Some(v) = text_field(obj, key) { + columns.push(col.to_string()); + values.push(Some(v)); + } + } + let mut literals: Vec = Vec::new(); + for (col, lit) in spec.fixed { + columns.push(col.to_string()); + literals.push((*lit).to_string()); + } + columns.push("f_id".to_string()); + let mut placeholders: Vec = (1..=values.len()) + .map(|i| format!("${i}::text")) + .collect(); + placeholders.extend(literals.iter().cloned()); + values.push(Some(new_uuid())); + placeholders.push(format!("${}::text", values.len())); + let sql = format!( + "INSERT INTO {} ({}) VALUES ({})", + spec.table, + columns.join(", "), + placeholders.join(", ") + ); + match state.db.exec_params(&sql, ¶ms_of(&values)).await { + Ok(_) => Ok(()), + Err(e) => Err(format!("写入失败:{e}")), + } +} + +/// 导入落库(`ImportData` 的 `type=false` 分支:前端已经把行解析好了)。 +/// +/// 官方 `ExcelImportVO` = `{snum, fnum, resultType, failResult, headerRow}`: +/// - `snum` 成功条数 / `fnum` 失败条数; +/// - `resultType` = 1 有失败 / 0 全成功; +/// - `failResult` = 失败行(本仓给 `{row, msg, data}`,够前端列出来); +/// - `headerRow` = 表头(本仓没有 Excel 表头 ⇒ 空数组)。 +async fn import_rows(state: &AppState, spec: &ImportSpec, rows: &[Value]) -> Value { + let mut snum = 0i64; + let mut fail: Vec = Vec::new(); + for (idx, row) in rows.iter().enumerate() { + let Some(obj) = row.as_object() else { + fail.push(json!({ "row": idx + 1, "msg": "该行不是对象" })); + continue; + }; + match import_one_row(state, spec, obj).await { + Ok(()) => snum += 1, + Err(msg) => fail.push(json!({ "row": idx + 1, "msg": msg, "data": row })), + } + } + let fnum = fail.len() as i64; + json!({ + "snum": snum, + "fnum": fnum, + "resultType": if fnum > 0 { 1 } else { 0 }, + "failResult": fail, + "headerRow": [], + }) +} + +/// 解析 `ImportData` 的 body 并落库(三实体共用)。 +/// +/// 🔴 `type=true` 表示「先按 `fileName` 从**文件服务**读 Excel」⇒ 本仓没有文件服务 +/// ⇒ 明确业务失败。**不能静默当成 0 条** —— 那会让导入页显示「成功导入 0 条」。 +async fn import_data_common( + state: &AppState, + body: &Bytes, + spec: &ImportSpec, +) -> Json { + let obj = match parse_body(body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let by_file = obj.get("type").and_then(Value::as_bool).unwrap_or(false); + if by_file { + return fail( + code::FAIL, + "本仓未配置文件服务,无法按文件名导入;请把已解析的行数据放进 list 再导入", + ); + } + let rows: Vec = match obj.get("list") { + Some(Value::Array(items)) => items.clone(), + _ => Vec::new(), + }; + if rows.is_empty() { + return fail(code::FAIL, "没有可导入的数据"); + } + ok(import_rows(state, spec, &rows).await) +} + +/// `POST /api/permission/Users/ImportData`(官方 `UserController.java:2355`)。 +pub async fn user_import_data( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + import_data_common(&state, &body, &IMPORT_USER).await +} + +/// `POST /api/permission/Organize/ImportData`(官方 `OrganizeController.java:490`)。 +pub async fn organize_import_data( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ORGANIZE).await { + return resp; + } + import_data_common(&state, &body, &IMPORT_ORGANIZE).await +} + +/// `POST /api/permission/Position/ImportData`(官方 `PositionController.java:676`)。 +pub async fn position_import_data( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_POSITION).await { + return resp; + } + import_data_common(&state, &body, &IMPORT_POSITION).await +} + +/// `GET /api/permission/Users/TemplateDownload`(官方 `UserController.java:2297`)。 +pub async fn user_template_download( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + fail(code::FAIL, "本仓未配置文件服务,暂不支持下载导入模板") +} + +/// `GET /api/permission/Users/ImportPreview`(官方 `UserController.java:2323`)。 +pub async fn user_import_preview( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + fail(code::FAIL, "本仓未配置文件服务,暂不支持导入预览") +} + +/// `POST /api/permission/Users/ExportExceptionData`(官方 `UserController.java:2337`)。 +pub async fn user_export_exception_data( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + fail(code::FAIL, "本仓未配置文件服务,暂不支持导出异常报告") +} + +/// `GET /api/permission/Users/ExportData`(官方 `UserController.java:2398`)。 +pub async fn user_export_data( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + fail(code::FAIL, "本仓未配置文件服务,暂不支持导出") +} + +/// `GET /api/permission/Organize/TemplateDownload`(官方 `OrganizeController.java:438`)。 +pub async fn organize_template_download( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ORGANIZE).await { + return resp; + } + fail(code::FAIL, "本仓未配置文件服务,暂不支持下载导入模板") +} + +/// `GET /api/permission/Organize/ImportPreview`(官方 `OrganizeController.java:464`)。 +pub async fn organize_import_preview( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ORGANIZE).await { + return resp; + } + fail(code::FAIL, "本仓未配置文件服务,暂不支持导入预览") +} + +/// `POST /api/permission/Organize/ExportExceptionData`(官方 `OrganizeController.java:475`)。 +pub async fn organize_export_exception_data( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ORGANIZE).await { + return resp; + } + fail(code::FAIL, "本仓未配置文件服务,暂不支持导出异常报告") +} + +/// `GET /api/permission/Organize/ExportData`(官方 `OrganizeController.java:530`)。 +pub async fn organize_export_data( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ORGANIZE).await { + return resp; + } + fail(code::FAIL, "本仓未配置文件服务,暂不支持导出") +} + +/// `GET /api/permission/Position/TemplateDownload`(官方 `PositionController.java:624`)。 +pub async fn position_template_download( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_POSITION).await { + return resp; + } + fail(code::FAIL, "本仓未配置文件服务,暂不支持下载导入模板") +} + +/// `GET /api/permission/Position/ImportPreview`(官方 `PositionController.java:650`)。 +pub async fn position_import_preview( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_POSITION).await { + return resp; + } + fail(code::FAIL, "本仓未配置文件服务,暂不支持导入预览") +} + +/// `POST /api/permission/Position/ExportExceptionData`(官方 `PositionController.java:661`)。 +pub async fn position_export_exception_data( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_POSITION).await { + return resp; + } + fail(code::FAIL, "本仓未配置文件服务,暂不支持导出异常报告") +} + +/// `GET /api/permission/Position/ExportData`(官方 `PositionController.java:716`)。 +pub async fn position_export_data( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_POSITION).await { + return resp; + } + fail(code::FAIL, "本仓未配置文件服务,暂不支持导出") +} diff --git a/src/backend/src/platform/compat/scheduletask.rs b/src/backend/src/platform/compat/scheduletask.rs new file mode 100644 index 0000000..2c2420d --- /dev/null +++ b/src/backend/src/platform/compat/scheduletask.rs @@ -0,0 +1,427 @@ +//! scheduletask —— 官方面 B 的 **scheduletask** 端点集(`/api/scheduletask/*`)。 +//! +//! 真源:官方 Java `jnpf-scheduletask` + 官方前端 `src/api/system/task.ts`。 + + +use axum::body::Bytes; +use axum::extract::{Path, RawQuery, State}; +use axum::http::HeaderMap; +use axum::Json; +use serde_json::{json, Map, Value}; +use crate::platform::envelope::{code, fail, ok, ActionResult}; +use crate::platform::ids::new_uuid; +use crate::platform::state::AppState; +use super::helper::{Paging, db_error, guard, int_field, page_list, params_of, parse_body, text_field}; +/// 官方 `@SaCheckPermission("sysService.task")`(任务调度)。 +const EN_TASK: &str = "sysService.task"; + +/// 任务列表投影。 +const TASK_LIST_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ + COALESCE(f_en_code, '') AS \"enCode\", COALESCE(f_execute_type, 1)::bigint AS \"executeType\", \ + COALESCE(f_run_count, 0)::bigint AS \"runCount\", \ + COALESCE(f_enabled_mark, 0)::bigint AS \"enabledMark\", \ + COALESCE(f_sort_code, 0)::bigint AS \"sortCode\", f_description AS \"description\", \ + (EXTRACT(EPOCH FROM f_last_run_time) * 1000)::bigint AS \"lastRunTime\", \ + (EXTRACT(EPOCH FROM f_next_run_time) * 1000)::bigint AS \"nextRunTime\", \ + COALESCE(f_execute_content, '') AS \"executeContentRaw\""; + +/// `f_execute_content` 是 TEXT,内容约定是 JSON 对象(官方前端提交的就是对象)。 +/// +/// 解析不出来时**不丢数据**:包成 `{"cron": <原文>}`,至少还能回显。 +fn exec_content_object(raw: &str) -> Map { + let text = raw.trim(); + if text.is_empty() { + return Map::new(); + } + match serde_json::from_str::(text) { + Ok(Value::Object(obj)) => obj, + Ok(other) => { + let mut obj = Map::new(); + obj.insert("cron".to_string(), other); + obj + } + Err(_) => { + let mut obj = Map::new(); + obj.insert("cron".to_string(), json!(text)); + obj + } + } +} + +/// 把一行任务摊平成列表项:`executeContent` 里的 `startTime` / `endTime` **提到顶层**。 +/// +/// 🔴 官方列表的 `startTime` / `endTime` 来自 XXL-JOB 的调度配置;本仓登记在 +/// `executeContent` 里 ⇒ 必须提出来,否则前端那一列表头永远是空的。 +fn shape_task_row(mut row: Value) -> Value { + let Some(obj) = row.as_object_mut() else { + return row; + }; + let raw = obj + .remove("executeContentRaw") + .and_then(|v| v.as_str().map(str::to_string)) + .unwrap_or_default(); + let content = exec_content_object(&raw); + let start = content.get("startTime").cloned().unwrap_or(Value::Null); + let end = content.get("endTime").cloned().unwrap_or(Value::Null); + obj.insert("startTime".to_string(), start); + obj.insert("endTime".to_string(), end); + obj.insert("executeContent".to_string(), Value::Object(content)); + row +} + +/// `GET /api/scheduletask` —— 任务列表(分页 + 关键词)。 +pub async fn task_list( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_TASK).await { + return resp; + } + let page = Paging::of(&raw); + let keyword = crate::platform::sys::query_param(&raw, "keyword") + .trim() + .to_string(); + let mut conds = vec!["COALESCE(f_delete_mark, 0) = 0".to_string()]; + let mut values: Vec> = Vec::new(); + if !keyword.is_empty() { + values.push(Some(format!("%{keyword}%"))); + let n = values.len(); + conds.push(format!( + "(f_full_name ILIKE ${n}::text OR f_en_code ILIKE ${n}::text)" + )); + } + let where_sql = conds.join(" AND "); + + let total_sql = format!("SELECT COUNT(*)::bigint AS \"total\" FROM base_time_task WHERE {where_sql}"); + let total = match state + .db + .query_json_params(&total_sql, ¶ms_of(&values)) + .await + { + Ok(rows) => rows + .first() + .and_then(|r| r.get("total")) + .and_then(Value::as_i64) + .unwrap_or(0), + Err(e) => return db_error(e, "任务计数"), + }; + + values.push(Some(page.page_size.to_string())); + let limit_at = values.len(); + values.push(Some(page.offset.to_string())); + let offset_at = values.len(); + let sql = format!( + "SELECT {TASK_LIST_PROJECTION} FROM base_time_task WHERE {where_sql} \ + ORDER BY COALESCE(f_sort_code, 0) ASC, f_creator_time DESC NULLS LAST \ + LIMIT ${limit_at}::text::integer OFFSET ${offset_at}::text::integer" + ); + let rows = match state.db.query_json_params(&sql, ¶ms_of(&values)).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "任务列表查询"), + }; + let list: Vec = rows.into_iter().map(shape_task_row).collect(); + ok(page_list(page.current_page, page.page_size, total, list)) +} + +/// `GET /api/scheduletask/Info/{id}` —— 任务详情(`executeContent` 是**对象**)。 +pub async fn task_info( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_TASK).await { + return resp; + } + let rows = match state + .db + .query_json_params( + &format!( + "SELECT {TASK_LIST_PROJECTION} FROM base_time_task \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1" + ), + &[&id.trim()], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "任务详情查询"), + }; + let Some(row) = rows.into_iter().next() else { + return fail(code::FAIL, "任务不存在"); + }; + ok(shape_task_row(row)) +} + +/// `GET /api/scheduletask/TaskMethods` —— 本地任务方法清单。 +/// +/// 🔴 **官方这份清单来自 XXL-JOB 的执行器注册表**(`restScheduleTaskUtil.getHandlerList`), +/// 本仓没有执行器 ⇒ **空清单**。为什么不返 `fail`:任务表单的「方法选择」 +/// 下拉要靠它,返错会让整个新建表单红条;空数组只是**选项为空**(如实)。 +pub async fn task_methods( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_TASK).await { + return resp; + } + ok(json!({ "list": [] })) +} + +/// `GET /api/scheduletask/{id}/TaskLog` —— 任务执行日志(分页)。 +pub async fn task_log_list( + State(state): State, + headers: HeaderMap, + Path(id): Path, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_TASK).await { + return resp; + } + let page = Paging::of(&raw); + let task_id = id.trim().to_string(); + let total = match state + .db + .query_json_params( + "SELECT COUNT(*)::bigint AS \"total\" FROM base_time_task_log \ + WHERE f_task_id = $1::text AND COALESCE(f_delete_mark, 0) = 0", + &[&task_id], + ) + .await + { + Ok(rows) => rows + .first() + .and_then(|r| r.get("total")) + .and_then(Value::as_i64) + .unwrap_or(0), + Err(e) => return db_error(e, "任务日志计数"), + }; + let size = page.page_size.to_string(); + let offset = page.offset.to_string(); + let rows = match state + .db + .query_json_params( + "SELECT f_id AS \"id\", f_task_id AS \"taskId\", \ + (EXTRACT(EPOCH FROM f_run_time) * 1000)::bigint AS \"runTime\", \ + COALESCE(f_run_result, 0)::bigint AS \"runResult\", \ + f_description AS \"description\" \ + FROM base_time_task_log \ + WHERE f_task_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 \ + ORDER BY f_run_time DESC NULLS LAST \ + LIMIT $2::text::integer OFFSET $3::text::integer", + &[&task_id, &size, &offset], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "任务日志查询"), + }; + ok(page_list(page.current_page, page.page_size, total, rows)) +} + +/// `POST /api/scheduletask` —— 新建任务(**登记**,不执行)。 +pub async fn task_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_TASK).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let Some(full_name) = text_field(&obj, "fullName") else { + return fail(code::FAIL, "任务名称不能为空"); + }; + let Some(en_code) = text_field(&obj, "enCode") else { + return fail(code::FAIL, "任务编码不能为空"); + }; + let dup = state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_time_task \ + WHERE f_en_code = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", + &[&en_code], + ) + .await; + match dup { + Ok(rows) if !rows.is_empty() => return fail(code::FAIL, "任务编码已存在"), + Ok(_) => {} + Err(e) => return db_error(e, "任务编码查重"), + } + + // `executeContent` 缺省也给 `{}`(官方 `@Valid` 要求 cron/startTime,但本仓不执行 ⇒ 不强制) + let content = match obj.get("executeContent") { + Some(Value::Object(o)) => Value::Object(o.clone()), + _ => json!({}), + }; + let id = new_uuid(); + let execute_type = int_field(&obj, "executeType").unwrap_or(1).to_string(); + let enabled_mark = int_field(&obj, "enabledMark").unwrap_or(1).to_string(); + let sort_code = int_field(&obj, "sortCode").unwrap_or(0).to_string(); + let description = text_field(&obj, "description").unwrap_or_default(); + let content_text = content.to_string(); + let values: Vec> = vec![ + Some(id.clone()), + Some(en_code), + Some(full_name), + Some(execute_type), + Some(content_text), + Some(description), + Some(sort_code), + Some(enabled_mark), + Some(user.account.clone()), + ]; + if let Err(e) = state + .db + .exec_params( + "INSERT INTO base_time_task \ + (f_id, f_en_code, f_full_name, f_execute_type, f_execute_content, f_description, \ + f_run_count, f_sort_code, f_enabled_mark, f_delete_mark, f_tenant_id, \ + f_creator_time, f_creator_user_id) \ + VALUES ($1::text, $2::text, $3::text, $4::text::integer, $5::text, $6::text, \ + 0, $7::text::bigint, $8::text::integer, 0, '0', now(), $9::text)", + ¶ms_of(&values), + ) + .await + { + return db_error(e, "新建任务"); + } + ok(json!({ "id": id })) +} + +/// `PUT /api/scheduletask/{id}` —— 更新任务(只改 body 里出现的键)。 +pub async fn task_update( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_TASK).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let existed = match state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_time_task \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", + &[&id], + ) + .await + { + Ok(rows) => !rows.is_empty(), + Err(e) => return db_error(e, "任务查询"), + }; + if !existed { + return fail(code::FAIL, "任务不存在"); + } + if let Some(en_code) = text_field(&obj, "enCode") { + let dup = state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_time_task \ + WHERE f_en_code = $1::text AND f_id <> $2::text \ + AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", + &[&en_code, &id], + ) + .await; + match dup { + Ok(rows) if !rows.is_empty() => return fail(code::FAIL, "任务编码已存在"), + Ok(_) => {} + Err(e) => return db_error(e, "任务编码查重"), + } + } + + let mut sets: Vec = Vec::new(); + let mut values: Vec> = Vec::new(); + for (key, column) in [ + ("fullName", "f_full_name"), + ("enCode", "f_en_code"), + ("description", "f_description"), + ] { + if let Some(v) = text_field(&obj, key) { + values.push(Some(v)); + sets.push(format!("{column} = ${}::text", values.len())); + } + } + for (key, column) in [ + ("executeType", "f_execute_type"), + ("enabledMark", "f_enabled_mark"), + ("sortCode", "f_sort_code"), + ] { + if let Some(v) = int_field(&obj, key) { + values.push(Some(v.to_string())); + sets.push(format!("{column} = ${}::text::bigint", values.len())); + } + } + if let Some(Value::Object(content)) = obj.get("executeContent") { + values.push(Some(Value::Object(content.clone()).to_string())); + sets.push(format!("f_execute_content = ${}::text", values.len())); + } + if sets.is_empty() { + return fail(code::FAIL, "没有需要更新的字段"); + } + values.push(Some(user.account.clone())); + let user_at = values.len(); + values.push(Some(id.clone())); + let id_at = values.len(); + let sql = format!( + "UPDATE base_time_task SET {}, f_last_modify_time = now(), \ + f_last_modify_user_id = ${user_at}::text WHERE f_id = ${id_at}::text", + sets.join(", ") + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "更新任务"); + } + ok(json!({ "id": id })) +} + +/// `DELETE /api/scheduletask/{id}` —— 删除任务(软删)。 +pub async fn task_delete( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_TASK).await { + return resp; + } + let id = id.trim().to_string(); + let existed = match state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_time_task \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", + &[&id], + ) + .await + { + Ok(rows) => !rows.is_empty(), + Err(e) => return db_error(e, "任务查询"), + }; + if !existed { + return fail(code::FAIL, "任务不存在"); + } + if let Err(e) = state + .db + .exec_params( + "UPDATE base_time_task SET f_delete_mark = 1, f_delete_time = now() \ + WHERE f_id = $1::text", + &[&id], + ) + .await + { + return db_error(e, "删除任务"); + } + ok(Value::Null) +} diff --git a/src/backend/src/platform/face_b.rs b/src/backend/src/platform/compat/system.rs similarity index 64% rename from src/backend/src/platform/face_b.rs rename to src/backend/src/platform/compat/system.rs index 98cc3e7..0ff4568 100644 --- a/src/backend/src/platform/face_b.rs +++ b/src/backend/src/platform/compat/system.rs @@ -1,311 +1,35 @@ -//! jnpf —— **面 B**(官方 JNPF 契约面)的端点与响应形状。 +//! system —— 官方面 B 的 **system** 端点集(`/api/system/*`)。 //! -//! 规格:`JNPF_COMPAT_SURFACE.md`(§2.2 判别头 / §3 端点 / §4 码表 / §8 已知错位)。 -//! 官方真源:`~/Desktop/workspace/jnpf/`(Java 后端 + `jnpf-web-apps-main` 官方前端)。 +//! 🔴 **只放 `/api/system/*`**:应用中心 / 系统配置 / 标签 / 消息分类 / 站内消息 / +//! 系统公告 / 系统日志 / 审批常用语 / 单据规则 / 数据源 / 数据建模 / 数据集 / +//! 表单权限 / 高级查询 / 数据权限 / 行政区划 / 公有变量 / 基准数据类型 / +//! 多语言 / 表单套件 / 缓存管理 / 常用菜单 / 公式目录 / 我的应用 / 系统监控 / +//! 角色绑定 / 在线用户 / 自定义范围 / 用户工作详情 / 第三方账号 / 导入导出。 //! -//! 🔴 **面 A 一个字都不动** —— 本模块只**新增**官方形状的端点; -//! 与面 A 共用的路由(`CurrentUser` / `Authority/Data`)按**判别头**分流。 -//! -//! 🔴 **判别头 = `Vue-Version: 3`**: -//! - 官方前端 `jnpf-web-apps-main/src/api/request.ts:109-112` **无条件**携带 `Vue-Version: 3`; -//! - 本仓前端 `src/frontend/src/api/request.ts:35-37` **从不**携带 ⇒ **零歧义**。 -//! - `App-Code` / `Jnpf-Origin` **不作**判据(本仓前端**也**发这两个 ⇒ 判了必错)。 -//! -//! 🔴 **面 B 的「未登录」必须返 `602`(不是 600)** —— 官方前端 -//! `ResultEnum`(`jnpf-web-monorepo-framework/.../request-client/enum.ts`)只对 -//! `601`(TOKEN_LOGGED)/ `602`(TOKEN_ERROR)清 token ⇒ 返 `600` 会让页面卡住不跳登录。 -//! -//! 🔴 **点权限判据 = `base_module.f_en_code`**(官方 `@SaCheckPermission("permission.user")`), -//! 与面 A 的「菜单路径 `f_url_address`」是**两套并存**的判据,互不影响。 +//! 真源:官方 Java `jnpf-system` + 官方前端 `src/api/system/**` + 官方 DDL `base_*`。 + use std::collections::{HashMap, HashSet}; - use axum::body::Bytes; use axum::extract::{Path, RawQuery, State}; use axum::http::HeaderMap; use axum::Json; use serde_json::{json, Map, Value}; - -use crate::platform::auth::{require_login_face_b, resolve_user}; -use crate::platform::cipher::md5_hex; -use crate::platform::crud::value_to_text; -use crate::platform::db::{pglite, pglite::ToSql, Db}; use crate::platform::envelope::{code, fail, ok, ActionResult}; +use crate::platform::db::{pglite, pglite::ToSql, Db}; +use crate::platform::auth::require_login_face_b; +use crate::platform::crud::value_to_text; use crate::platform::ids::new_uuid; -use crate::platform::permission::{has_en_code_permission, resolve_user_module_ids}; use crate::platform::session::TokenUser; use crate::platform::state::AppState; -use crate::platform::system; - -// ---------------------------------------------------------------- 判别头 - -/// 🔴 **判别头名**(HTTP 头名大小写不敏感)。 -/// -/// 真值源在契约层 [`sspf_contract::headers`](MCP 适配器也要用同一个常量)。 -/// 这里 re-export 是为了让本文件的测试与既有引用路径不变。 -pub use sspf_contract::headers::VUE_VERSION; - -/// 本仓的系统 id(`currentSystemId` / `userInfo.systemId` / 菜单 `systemId` 的兜底值)。 -/// -/// 🔴 单一真源在 [`crate::platform::system`](`base_system.f_id`);这里只是别名, -/// **不要另写一份字面量**——否则主系统 id 改一处漏一处。 -pub const SYSTEM_ID: &str = system::MAIN_SYSTEM_ID; - -/// 本仓的系统编码(`userInfo.systemCode`)。 -/// -/// 🔴 官方常量 `JnpfConst.MAIN_SYSTEM_CODE = "mainSystem"`;前端也硬比较这个值 -/// (`systemCode === 'mainSystem'` 决定首页布局)⇒ 同样只做别名。 -pub const SYSTEM_CODE: &str = system::MAIN_SYSTEM_CODE; - -// ---------------------------------------------------------------- 官方点权限码 - -/// `@SaCheckPermission("permission.user")`。 -const EN_USER: &str = "permission.user"; -/// `@SaCheckPermission("permission.role")`。 -const EN_ROLE: &str = "permission.role"; -/// `@SaCheckPermission("permission.organize")`。 -const EN_ORGANIZE: &str = "permission.organize"; -/// `@SaCheckPermission("permission.menu")`。 -const EN_MENU: &str = "permission.menu"; -/// `@SaCheckPermission("permission.position")`。 -const EN_POSITION: &str = "permission.position"; -/// 🔴 `@SaCheckPermission("permission.identity")`(官方 `StandingController`)。 -const EN_IDENTITY: &str = "permission.identity"; -/// 🔴 `@SaCheckPermission("permission.authGroup")`(官方 `PermissionGroupController`)。 -const EN_AUTH_GROUP: &str = "permission.authGroup"; -/// 🔴 `@SaCheckPermission("permission.action")`。 -/// -/// 🔴 官方 `ActionController` 是 `{"permission.auth", "permission.role", "permission.action"}` -/// 的 **SaMode.OR** 三选一;本仓的 `guard()` 只吃**一个**点权限码 -/// ⇒ 取**动作自己的**那个(最贴近语义)。 -const EN_ACTION: &str = "permission.action"; -/// 🔴 `@SaCheckPermission("msgCenter.notice")`(官方 `NoticeController` 的公告那半截)。 -/// -/// 🔴 **只有公告守它**;消息列表 / 全部已读 / 读消息 / 删记录 / 回执 -/// **都不带** `@SaCheckPermission` —— 登录即可用(谁看自己的消息都不该要授权)。 -const EN_NOTICE: &str = "msgCenter.notice"; - -/// 菜单树的最大层数(防御 `f_parent_id` 被改成人为环时的无限递归)。 -const MAX_TREE_DEPTH: usize = 32; - -/// 🔴 **这个请求是不是「面 B」** —— 判别头 `Vue-Version: 3`。 -/// -/// **唯一的全局判别规则**(`JNPF_COMPAT_SURFACE.md` §2.2): -/// ```text -/// 请求头含 "Vue-Version: 3" ⇒ 走【面 B】官方形状 -/// 否则 ⇒ 走【面 A】ssw 形状 -/// ``` -pub fn is_face_b(headers: &HeaderMap) -> bool { - // 判据真值源在契约层:MCP 适配器、后续插件都要用同一份判断, - // 不许各自再写一遍 `Vue-Version == "3"`(写错一处就是两面串味)。 - sspf_contract::headers::is_face_b(headers) -} - -// ---------------------------------------------------------------- 通用小工具 - -/// DB 报错 ⇒ 面 B 的 `500`(官方 `EXCEPTION`);真因只进服务端日志,**不外泄**。 -fn db_error(e: pglite::Error, ctx: &str) -> Json { - eprintln!("[face-b] {ctx}失败: {e}"); - fail(code::EXCEPTION, "系统异常,请联系管理员") -} - -/// 解析 JSON body;失败 ⇒ `fail(400, "请求参数格式错误")`。 -/// -/// 🔴 **不用 axum 的 `Json`**:它的解析失败会返回 **422 + 非信封 body** ⇒ 契约破。 -fn parse_body(body: &Bytes) -> Result> { - match serde_json::from_slice::(body) { - Ok(v) => Ok(v), - Err(_) => Err(fail(code::FAIL, "请求参数格式错误")), - } -} - -/// 分页参数(官方 `Pagination.java`:`pageSize` 默认 `20` / `currentPage` 默认 `1`)。 -struct Paging { - current_page: i64, - page_size: i64, - offset: i64, -} - -impl Paging { - /// 从 query 取分页参数;**缺失 / 非法 ⇒ 用官方默认值**(不报错)。 - fn of(raw: &RawQuery) -> Self { - let current_page = crate::platform::sys::query_param(raw, "currentPage") - .trim() - .parse::() - .unwrap_or(1) - .max(1); - // 🔴 `pageSize` 夹在 `[1, 1000]` —— 防「pageSize=0」把 SQL 打成语法错、 - // 防超大值把整表拉进内存。 - let page_size = crate::platform::sys::query_param(raw, "pageSize") - .trim() - .parse::() - .unwrap_or(20) - .clamp(1, 1000); - Self { - current_page, - page_size, - offset: (current_page - 1) * page_size, - } - } - - /// 从 **JSON body** 取分页参数(官方好几个「列表」是 `POST`,分页在 body 里 —— - /// 例如 `POST /api/message/Notice/List`)。缺失 / 非法同样回落官方默认值。 - fn of_body(obj: &Map) -> Self { - let num = |key: &str| { - obj.get(key) - .and_then(|v| v.as_i64().or_else(|| v.as_str()?.trim().parse().ok())) - }; - let current_page = num("currentPage").unwrap_or(1).max(1); - // 🔴 同一道夹逼:`pageSize` 落在 `[1, 1000]`。 - let page_size = num("pageSize").unwrap_or(20).clamp(1, 1000); - Self { - current_page, - page_size, - offset: (current_page - 1) * page_size, - } - } -} - -/// 官方 `PageListVO` —— `{pagination:{currentPage,pageSize,total}, list:[…]}`。 -/// -/// 🔴 **`data` 必须是对象**(不是裸数组)—— 官方 `PageListVO` 有 `pagination` + `list` 两个字段。 -fn page_list(current_page: i64, page_size: i64, total: i64, list: Vec) -> Value { - json!({ - "pagination": { - "currentPage": current_page, - "pageSize": page_size, - "total": total, - }, - "list": list, - }) -} - -/// 官方 `ListVO` —— `{list:[…]}`(**只有 `list` 一个字段**)。 -fn list_vo(list: Vec) -> Value { - json!({ "list": list }) -} - -/// 绑定参数数组 ⇒ `&[&(dyn ToSql + Sync)]`(值一律按 text 传,类型转换交给 SQL 里的 CAST)。 -fn params_of(values: &[Option]) -> Vec<&(dyn ToSql + Sync)> { - values.iter().map(|v| v as &(dyn ToSql + Sync)).collect() -} - -/// 面 B 的守卫:**登录(602)** + **点权限(`f_en_code` ⇒ 403)**。 -async fn guard( - state: &AppState, - headers: &HeaderMap, - en_code: &str, -) -> Result> { - let user = require_login_face_b(state, headers).await?; - // 🔴 多应用:按 `App-Code` 解析当前系统 ⇒ 点权限判据限定在该系统。 - let system_id = - system::resolve_system_id(&state.db, system::app_code_of(headers).as_deref()).await; - if has_en_code_permission(&state.db, &user.user_id, user.is_admin, en_code, &system_id).await { - Ok(user) - } else { - Err(fail(code::NO_PERMISSION, "无权限")) - } -} - -// ---------------------------------------------------------------- 菜单(AllMenuSelectVO) - -/// 一行菜单(`AllMenuSelectVO` 那 15 个字段的原料)。 -struct MenuRow { - id: String, - full_name: String, - en_code: Option, - parent_id: String, - icon: Option, - url_address: Option, - page_address: Option, - link_target: Option, - menu_type: i64, - property_json: Option, - sort_code: i64, - system_id: Option, - is_data: bool, -} - -/// 菜单投影(面 B 专用)—— 🔴 **显式列出每一列并加 `AS ""` 别名** -/// (PG 会把未加引号的标识符折叠成小写 ⇒ `row_to_json` 的键会变样且**静默**)。 -const MENU_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ - f_en_code AS \"enCode\", COALESCE(f_parent_id, '0') AS \"parentId\", \ - f_icon AS \"icon\", f_url_address AS \"urlAddress\", \ - f_page_address AS \"pageAddress\", f_link_target AS \"linkTarget\", \ - COALESCE(f_type, 2) AS \"type\", f_property_json AS \"propertyJson\", \ - COALESCE(f_sort_code, 0) AS \"sortCode\", f_system_id AS \"systemId\", \ - COALESCE(f_is_data_authorize, 0) AS \"isData\""; - -/// 读当前用户**可见**的菜单行(未软删 + 四源合并过滤)。 -/// -/// 🔴 非管理员的可见集合来自 `resolve_user_module_ids`(四源合并:直授/角色/组织/岗位), -/// 与面 A 的 `build_menu_list` **同一套判据** ⇒ 两个面看到的菜单集合一致。 -async fn load_menus(db: &Db, user_id: &str, is_admin: i32, system_id: &str) -> Vec { - let sql = format!( - "SELECT {MENU_PROJECTION} FROM base_module WHERE f_delete_mark = 0 \ - AND f_system_id = $1::text \ - ORDER BY f_sort_code ASC, f_full_name ASC" - ); - let rows = match db.query_json_params(&sql, &[&system_id]).await { - Ok(rows) => rows, - Err(e) => { - eprintln!("[face-b] 菜单查询失败(按空菜单处理): {e}"); - return Vec::new(); - } - }; - let mut items: Vec = rows.iter().filter_map(parse_menu_row).collect(); - if is_admin != 1 { - let visible = resolve_user_module_ids(db, user_id).await; - items.retain(|m| visible.contains(&m.id)); - } - items -} - -/// 一行 JSON ⇒ [`MenuRow`]。 -fn parse_menu_row(row: &Value) -> Option { - let id = row["id"].as_str()?.to_string(); - if id.is_empty() { - return None; - } - Some(MenuRow { - id, - full_name: row["fullName"].as_str().unwrap_or_default().to_string(), - en_code: row["enCode"].as_str().map(str::to_string), - // 🔴 react: `parentId: m.parentId || '0'` —— 空 ⇒ `'0'`。 - parent_id: match row["parentId"].as_str() { - Some(p) if !p.is_empty() => p.to_string(), - _ => "0".to_string(), - }, - icon: row["icon"].as_str().map(str::to_string), - url_address: row["urlAddress"].as_str().map(str::to_string), - page_address: row["pageAddress"].as_str().map(str::to_string), - link_target: row["linkTarget"].as_str().map(str::to_string), - menu_type: row["type"].as_i64().unwrap_or(2), - property_json: row["propertyJson"].as_str().map(str::to_string), - sort_code: row["sortCode"].as_i64().unwrap_or(0), - system_id: row["systemId"].as_str().map(str::to_string), - is_data: row["isData"].as_i64().unwrap_or(0) != 0, - }) -} - -/// `f_property_json`(TEXT)⇒ JSON 值;空 / 非法 ⇒ `null`。 -fn parse_property_json(raw: Option<&str>) -> Value { - let Some(text) = raw else { - return Value::Null; - }; - let trimmed = text.trim(); - if trimmed.is_empty() { - return Value::Null; - } - serde_json::from_str::(trimmed).unwrap_or(Value::Null) -} - +use crate::platform::registry; +use super::helper::{EN_MENU, EN_USER, MAX_TREE_DEPTH, MENU_PROJECTION, MenuRow, Paging, SYSTEM_ID, USER_SELECTOR_PROJECTION, db_error, guard, guard_any, id_list_of, int_field, list_vo, menu_value, page_list, params_of, parse_body, parse_menu_row, placeholder, qv, text_field, user_labels}; /// 菜单在**面 B** 里对外的 `urlAddress` —— 官方前端的**视图路径**。 /// /// 规则(与官方前端 `generate-routes-backend.ts:57` 对目录的做法**同一条**): /// `f_en_code` 的点换斜杠(`permission.user` ⇒ `permission/user`)。 /// 🔴 库里的 `f_url_address` 是**面 A** 的守卫 key(`system/User`),**不能**直接给面 B。 -fn official_view_path(en_code: Option<&str>, fallback: Option<&str>) -> Option { +pub(super) fn official_view_path(en_code: Option<&str>, fallback: Option<&str>) -> Option { let code = en_code.map(str::trim).filter(|s| !s.is_empty())?; let path = code.replace('.', "/"); if path.is_empty() { @@ -314,78 +38,8 @@ fn official_view_path(en_code: Option<&str>, fallback: Option<&str>) -> Option, has_children: bool) -> Value { - let MenuRow { - id, - full_name, - en_code, - parent_id, - icon, - url_address, - page_address, - link_target, - menu_type, - property_json, - sort_code, - system_id, - is_data, - } = row; - json!({ - "id": id, - "fullName": full_name, - "enCode": en_code, - "parentId": parent_id, - "icon": icon, - "hasChildren": has_children, - // 🔴 **面 B 的 `urlAddress` 必须是「官方前端的视图路径」**,不是库里的 `f_url_address`。 - // 前端 `packages/utils/src/helpers/generate-routes-backend.ts:71-92`: - // `route.path = '/' + urlAddress`,且 `component = pageMap['/' + urlAddress + '/index.vue']` - // (`pageMap` = `import.meta.glob('../views/**/*.vue'`)⇒ 值必须指向**真实 .vue 文件**。 - // 而库里的 `f_url_address`(`system/User`)是**面 A** 的守卫 key,官方前端没有 - // `views/system/User/index.vue` ⇒ 点了菜单永远 404。 - // 官方自己的口径就是「编码 ⇒ 路径」(同一文件 `:57` 对目录/应用用的是 - // `/${enCode.replaceAll('.', '/')}`)⇒ 这里对**所有类型**统一用同一条规则: - // `permission.user` ⇒ `permission/user` ⇒ 命中 `views/permission/user/index.vue` ✅ - "urlAddress": official_view_path(en_code.as_deref(), url_address.as_deref()), - "pageAddress": page_address, - "linkTarget": link_target, - "children": children, - "type": menu_type, - "propertyJson": parse_property_json(property_json.as_deref()), - "sortCode": sort_code, - // 🔴 种子菜单的 `f_system_id` 是 NULL ⇒ 兜底成本仓系统 id(单系统)。 - "systemId": system_id - .filter(|s| !s.trim().is_empty()) - .unwrap_or_else(|| SYSTEM_ID.to_string()), - "isData": is_data, - }) -} - -/// 建菜单树(根 = `parentId` 为空 / `'0'` / **父不在可见集合内**)。 -fn build_menu_tree(rows: Vec) -> Vec { - let visible: HashSet = rows.iter().map(|m| m.id.clone()).collect(); - let mut by_parent: HashMap> = HashMap::new(); - let mut roots: Vec = Vec::new(); - for row in rows { - if row.parent_id != "0" && visible.contains(&row.parent_id) { - by_parent.entry(row.parent_id.clone()).or_default().push(row); - } else { - roots.push(row); - } - } - roots - .into_iter() - .map(|row| menu_node(row, &mut by_parent, 0)) - .collect() -} - /// 递归建一棵子树。 -fn menu_node( +pub(super) fn menu_node( row: MenuRow, by_parent: &mut HashMap>, depth: usize, @@ -405,416 +59,6 @@ fn menu_node( menu_value(row, children, has_children) } -/// 官方 `PermissionModel` 列表 —— **每个可见菜单一条**。 -/// -/// 🔴 **官方语义**:`modelId` = **菜单 id** -/// (官方前端 `views/common/dynamicModel/list/index.vue:739`: -/// `permissionList.find(o => o.modelId === searchInfo.menuId)`) -/// ⇒ 本仓按「菜单」给一条,`moduleName` = 菜单全名。 -/// -/// 🔴 `button` / `column` / `resource` / `form` **恒为空数组** —— 本仓**不实现** -/// 按钮级权限(`base_module_button` / `_column` / `_form` / `_data` 都不做) -/// ⇒ 官方前端的按钮会被过滤掉(**已知限制 B4**,`docs/known-limitations.md` §H)。 -fn build_permission_list(rows: &[MenuRow]) -> Vec { - rows.iter() - .map(|m| { - json!({ - "modelId": m.id, - "moduleName": m.full_name, - "button": [], - "column": [], - "resource": [], - "form": [], - }) - }) - .collect() -} - -// ---------------------------------------------------------------- CurrentUser(PcUserVO) - -/// `GET /api/oauth/CurrentUser` 的**面 B**分支 —— 官方 `PcUserVO` 形状。 -/// -/// 🔴 **顶层五个字段一个都不能少**(官方前端 `store/auth.ts:121` 逐个取用): -/// `menuList` / `permissionList` / `userInfo` / `currentSystemId` / `sysConfigInfo`。 -/// -/// 🔴 未登录 ⇒ **`602`**(官方前端只对 `601`/`602` 清 token ⇒ 返 `600` 会卡住不跳登录)。 -pub async fn current_user(state: &AppState, headers: &HeaderMap) -> Json { - let Some(user) = resolve_user(state, headers) else { - return fail(code::SESSION_ERROR, "登录状态已失效,请重新登录"); - }; - - // 🔴 多应用:按 `App-Code` 解析当前系统 ⇒ 菜单树 / userInfo / currentSystemId 都按该系统。 - let sys = system::resolve_system(&state.db, system::app_code_of(headers).as_deref()).await; - let menus = load_menus(&state.db, &user.user_id, user.is_admin, &sys.id).await; - let permission_list = build_permission_list(&menus); - let menu_list = build_menu_tree(menus); - let user_info = build_user_info(&state.db, &user, &sys.id, &sys.code).await; - - ok(json!({ - "menuList": menu_list.clone(), - "permissionList": permission_list, - // 🔴 官方 `GetUserInfoModel`(`basic.d.ts:94-100`)声明了 `routerList` 但 - // **前端一处都没读**(`grep routerList` 在 app/packages 里 0 命中); - // 为对齐类型仍给出同一棵树,避免将来有页面取值时拿到 undefined。 - "routerList": menu_list, - "userInfo": user_info, - "currentSystemId": sys.id, - // 🔴 `sysConfigInfo` 返 **空对象**(不是 null)⇒ 官方前端 `baseStore.setSysConfig` 不炸。 - "sysConfigInfo": {}, - })) -} - -/// 官方 `UserCommonInfoVO`(15 个字段)。 -/// -/// 🔴 `isAdministrator` 在这里是 **布尔**(官方 `UserCommonInfoVO.java:75` 是 `Boolean`)—— -/// 而**列表项**里它是**数字**(官方 `UserListVO.java:60` 是 `Integer`)⇒ 两处**故意不同**。 -async fn build_user_info(db: &Db, user: &TokenUser, system_id: &str, system_code: &str) -> Value { - let rows = match db - .query_json_params( - "SELECT f_real_name AS \"realName\", f_head_icon AS \"headIcon\", \ - f_organize_id AS \"organizeId\", f_position_id AS \"positionId\", \ - f_mobile_phone AS \"mobilePhone\", f_email AS \"email\", \ - f_gender AS \"gender\", f_role_id AS \"roleId\", f_group_id AS \"groupId\", \ - f_secretkey AS \"secretKey\", f_manager_id AS \"manager\", \ - (EXTRACT(EPOCH FROM f_birthday) * 1000)::bigint AS \"birthday\", \ - (EXTRACT(EPOCH FROM f_prev_log_time) * 1000)::bigint AS \"prevLoginTime\", \ - f_prev_log_ip AS \"prevLoginIp\" \ - FROM base_user WHERE f_id = $1::text AND f_delete_mark = 0 LIMIT 1", - &[&user.user_id], - ) - .await - { - Ok(rows) => rows, - Err(e) => { - eprintln!("[face-b] 读用户信息失败: {e}"); - Vec::new() - } - }; - let row = rows.first(); - let real_name = row - .and_then(|r| r["realName"].as_str()) - .filter(|s| !s.is_empty()) - .unwrap_or(user.account.as_str()) - .to_string(); - let head_icon = row.and_then(|r| r["headIcon"].as_str()).map(str::to_string); - let organize_id = row - .and_then(|r| r["organizeId"].as_str()) - .filter(|s| !s.is_empty()) - .map(str::to_string); - let position_id = row - .and_then(|r| r["positionId"].as_str()) - .filter(|s| !s.is_empty()) - .map(str::to_string); - let prev_login_time = row.and_then(|r| r["prevLoginTime"].as_i64()); - let prev_login_ip = row - .and_then(|r| r["prevLoginIp"].as_str()) - .filter(|s| !s.is_empty()) - .map(str::to_string); - let organize_name = match organize_id.as_deref() { - Some(id) => organize_name_of(db, id).await, - None => None, - }; - // 🔴 `f_role_id` / `f_group_id` 是 TEXT(官方历史遗留,逗号分隔)⇒ 拆成数组。 - // 官方 `UserInfo` 把 `roleIds` / `groupIds` / `organizeIds` 声明成**非可选数组**, - // 前端 store 会直接遍历 ⇒ 缺键或给 null 都可能崩,这里一律给空数组兜底。 - let text_of = |key: &str| { - row.and_then(|r| r[key].as_str()) - .filter(|s| !s.is_empty()) - .map(str::to_string) - }; - let split_ids = |key: &str| -> Vec { - text_of(key) - .map(|s| { - s.split(',') - .map(str::trim) - .filter(|x| !x.is_empty()) - .map(str::to_string) - .collect() - }) - .unwrap_or_default() - }; - let role_ids = split_ids("roleId"); - let group_ids = split_ids("groupId"); - let organize_ids: Vec = organize_id.iter().cloned().collect(); - let organize_list: Vec = organize_id - .as_ref() - .map(|id| { - vec![json!({ - "id": id, - "fullName": organize_name.clone().unwrap_or_default(), - })] - }) - .unwrap_or_default(); - - json!({ - "userId": user.user_id, - "userAccount": user.account, - "userName": real_name, - "headIcon": head_icon, - // ---- 以下为官方 `UserInfo`(`basic.d.ts:52-92`)的完整字段集 ---- - // 🔴 该类型里 `roleIds` / `groupIds` / `organizeIds` / `positionIds` / - // `organizeList` / `positionList` / `standingList` 都是**非可选数组** ⇒ - // 必须给 [](缺键会让前端 store 遍历时崩)。 - "gender": text_of("gender"), - "birthday": row.and_then(|r| r["birthday"].as_i64()), - "mobilePhone": text_of("mobilePhone"), - "email": text_of("email"), - "manager": text_of("manager"), - "organizeId": organize_id, - "organizeIds": organize_ids, - "organizeName": organize_name, - "organizeList": organize_list, - "positionId": position_id, - // 🔴 本仓**没有**岗位表(`base_position` 不在 v1 范围)⇒ 恒空。 - "positionIds": Vec::::new(), - "positionList": Vec::::new(), - "positionName": Value::Null, - "roleIds": role_ids, - "roleName": Value::Null, - "groupIds": group_ids, - "standingList": Vec::::new(), - "portalId": Value::Null, - "departmentId": Value::Null, - "departmentName": Value::Null, - "systemId": system_id, - "systemCode": system_code, - "systemName": if system_code == SYSTEM_CODE { "系统平台" } else { "" }, - "systemColor": "", - "systemIcon": "", - "securityKey": text_of("secretKey").unwrap_or_default(), - "signId": "", - "signImg": "", - "saasAppId": "", - "saasAppName": "", - // 🔴 前端 `store/auth.ts:143` 的 `handleUpdatePreferences`: - // `if (userInfo.preferenceJson) preferenceJson = JSON.parse(userInfo.preferenceJson)` - // ⇒ **空串会被判假** ⇒ 保留前端自带的 `defaultPreferencesConfig`; - // 而给 `"{}"` 会被 parse 成空对象 ⇒ `updatePreferences({})` 把整套偏好清空 - // ⇒ `app.locale` / `app.defaultHomePath` 全丢 ⇒ 抛错 ⇒ `fetchUserInfo` 进 catch - // ⇒ 立刻 logout(**登录页原地打转的真正原因**,排查了两个小时的那条)。 - // ⇒ 必须是**字符串**,且必须是**空串**(不是 `"{}"`)。 - "preferenceJson": "", - // 🔴 官方 `prevLogin`:1 = 上次登录 / 2 = 本次登录。本仓不区分 ⇒ 恒 1。 - "prevLogin": 1, - "prevLoginTime": prev_login_time, - "prevLoginIPAddress": prev_login_ip, - "prevLoginIPAddressName": Value::Null, - "isAdministrator": user.is_admin == 1, - }) -} - -/// 机构名(查不到 ⇒ `None`)。 -async fn organize_name_of(db: &Db, id: &str) -> Option { - let rows = match db - .query_json_params( - "SELECT f_full_name AS \"fullName\" FROM base_organize \ - WHERE f_id = $1::text AND f_delete_mark = 0 LIMIT 1", - &[&id], - ) - .await - { - Ok(rows) => rows, - Err(e) => { - eprintln!("[face-b] 读机构名失败: {e}"); - return None; - } - }; - rows.first() - .and_then(|r| r["fullName"].as_str()) - .map(str::to_string) -} - -// ---------------------------------------------------------------- 用户列表 - -/// `GET /api/permission/Users` —— 官方 `UserController.java:295` 的形状。 -/// -/// 🔴 **硬性要求**(`JNPF_COMPAT_SURFACE.md` §3.2): -/// 1. `data` 是**对象**(`pagination` + `list`),**不是**裸数组; -/// 2. 列表项**不含** `password` / `secretkey`(投影里根本不选那两列); -/// 3. `pagination.total` = **总条数**; -/// 4. `currentPage` / `pageSize` **原样回显**; -/// 5. `creatorTime` 是**毫秒时间戳(数字)**; -/// 6. `isAdministrator` 是**数字** `0|1`(官方 `UserListVO.java:60` 是 `Integer`)。 -pub async fn users_list( - State(state): State, - headers: HeaderMap, - raw: RawQuery, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - let page = Paging::of(&raw); - - // 🔴 `keyword`:用户管理页顶部搜索框。空 ⇒ 不参与 WHERE(与 `group_list` 同一套写法)。 - // 搜 `f_account` / `f_real_name` / `f_mobile_phone` 三列(官方 `UserController` 同口径)。 - let keyword = crate::platform::sys::query_param(&raw, "keyword"); - let keyword = keyword.trim().to_string(); - let like_values = [Some(format!("%{keyword}%"))]; - // 🔴 空关键词 ⇒ **一个参数都不传**(SQL 里没有 `$1`,多传一个就是 - // 「bind message supplies 1 parameters, but prepared statement requires 0」)。 - let kw_params: Vec<&(dyn ToSql + Sync)> = if keyword.is_empty() { - Vec::new() - } else { - params_of(&like_values) - }; - let kw_filter = if keyword.is_empty() { - String::new() - } else { - " AND (f_account ILIKE $1::text OR f_real_name ILIKE $1::text \ - OR COALESCE(f_mobile_phone,'') ILIKE $1::text)".to_string() - }; - - let total_sql = format!( - "SELECT count(*)::bigint AS \"c\" FROM base_user WHERE f_delete_mark = 0{}", - kw_filter - ); - let total = match state.db.query_json_params(&total_sql, &kw_params).await { - Ok(rows) => rows - .into_iter() - .next() - .and_then(|r| r["c"].as_i64()) - .unwrap_or(0), - Err(e) => return db_error(e, "用户总数查询"), - }; - - let limit = Some(page.page_size.to_string()); - let offset = Some(page.offset.to_string()); - let tail = [limit, offset]; - // 🔴 关键词占位符必须**排在分页之前**(`$1` = like,`$2`/`$3` = limit/offset)。 - let mut values: Vec> = Vec::new(); - if !keyword.is_empty() { - values.push(like_values[0].clone()); - } - values.extend(tail.iter().cloned()); - let params = params_of(&values); - let (p_limit, p_offset) = if keyword.is_empty() { - ("$1", "$2") - } else { - ("$2", "$3") - }; - let sql = format!( - "SELECT f_id AS \"id\", f_account AS \"account\", f_real_name AS \"realName\", \ - f_real_name AS \"fullName\", f_gender AS \"gender\", \ - f_mobile_phone AS \"mobilePhone\", f_email AS \"email\", \ - f_organize_id AS \"organize\", f_description AS \"description\", \ - COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ - (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\", \ - COALESCE(f_sort_code, 0) AS \"sortCode\", \ - COALESCE(f_lock_mark, 0) AS \"lockMark\", \ - COALESCE(f_handover_mark, 0) AS \"handoverMark\", \ - COALESCE(f_is_administrator, 0) AS \"isAdministrator\", \ - f_head_icon AS \"headIcon\", f_unlock_time AS \"unlockTime\", \ - f_position_id AS \"position\", 0 AS \"isDutyUser\", \ - NULL::text AS \"maxRelationId\" \ - FROM base_user WHERE f_delete_mark = 0{} \ - ORDER BY f_creator_time DESC, f_id ASC \ - LIMIT {p_limit}::text::integer OFFSET {p_offset}::text::integer", - kw_filter - ); - let rows = match state.db.query_json_params(&sql, ¶ms).await { - Ok(rows) => rows, - Err(e) => return db_error(e, "用户列表查询"), - }; - - ok(page_list(page.current_page, page.page_size, total, rows)) -} - -// ---------------------------------------------------------------- 角色列表 - -/// `GET /api/permission/Role` —— 官方 `RoleController.java:99-100` 的形状(PageListVO)。 -pub async fn roles_list( - State(state): State, - headers: HeaderMap, - raw: RawQuery, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_ROLE).await { - return resp; - } - let page = Paging::of(&raw); - - let total = match state - .db - .scalar_text("SELECT count(*) FROM base_role WHERE f_delete_mark = 0") - .await - { - Ok(Some(t)) => t.trim().parse::().unwrap_or(0), - Ok(None) => 0, - Err(e) => return db_error(e, "角色总数查询"), - }; - - let limit = Some(page.page_size.to_string()); - let offset = Some(page.offset.to_string()); - let values = [limit, offset]; - let params = params_of(&values); - let rows = match state - .db - .query_json_params( - "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ - f_type AS \"type\", f_description AS \"description\", \ - COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ - COALESCE(f_sort_code, 0) AS \"sortCode\", \ - (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\", \ - COALESCE(f_delete_mark, 0) AS \"deleteMark\" \ - FROM base_role WHERE f_delete_mark = 0 \ - ORDER BY f_sort_code ASC, f_full_name ASC \ - LIMIT $1::text::integer OFFSET $2::text::integer", - ¶ms, - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "角色列表查询"), - }; - - ok(page_list(page.current_page, page.page_size, total, rows)) -} - -// ---------------------------------------------------------------- 组织列表 - -/// `GET /api/permission/Organize/AsyncList/{id}` —— 官方 `OrganizeController.java:107-110`。 -/// -/// 🔴 **按 parentId 逐层取**(`id` = 父节点 id,根为 `0`)—— 官方前端就是靠这个接口 -/// 逐层展开机构树 ⇒ **不能**只有「全量列表」。 -/// -/// 🔴 响应是 `ActionResult>` ⇒ **`data` 是 `{pagination, list}`**。 -pub async fn organize_async_list( - State(state): State, - headers: HeaderMap, - Path(parent_id): Path, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_ORGANIZE).await { - return resp; - } - let parent = parent_id.trim(); - let parent = if parent.is_empty() { "0" } else { parent }.to_string(); - - let rows = match state - .db - .query_json_params( - "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ - COALESCE(f_parent_id, '0') AS \"parentId\", f_category AS \"category\", \ - f_manager_id AS \"managerId\", COALESCE(f_sort_code, 0) AS \"sortCode\", \ - COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ - f_description AS \"description\", f_organize_id_tree AS \"organizeIdTree\", \ - f_org_name_tree AS \"orgNameTree\", f_duty_position AS \"dutyPosition\", \ - (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\" \ - FROM base_organize WHERE f_delete_mark = 0 \ - AND COALESCE(f_parent_id, '0') = $1::text \ - ORDER BY f_sort_code ASC, f_full_name ASC", - &[&parent], - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "组织列表查询"), - }; - - let total = rows.len() as i64; - ok(page_list(1, total.max(1), total, rows)) -} - -// ---------------------------------------------------------------- 菜单列表 - /// `GET /api/system/Menu/ModuleBySystem` —— 官方 `ModuleController.java:121`。 /// /// 🔴 官方返回 `ActionResult>` ⇒ **`data` 是 `{list:[…]}`** @@ -829,7 +73,7 @@ pub async fn module_by_system( return resp; } // 🔴 多应用:按 `App-Code` 解析当前系统 ⇒ 菜单列表限定在该系统。 - let sys = system::resolve_system(&state.db, system::app_code_of(&headers).as_deref()).await; + let sys = registry::resolve_system(&state.db, registry::app_code_of(&headers).as_deref()).await; let sql = format!( "SELECT {MENU_PROJECTION} FROM base_module WHERE f_delete_mark = 0 \ AND f_system_id = $1::text \ @@ -858,658 +102,6 @@ pub async fn module_by_system( ok(list_vo(list)) } -// ---------------------------------------------------------------- 授权读取 - -/// `POST /api/permission/Authority/Data/{objectId}/Values` —— 官方 `AuthorizeController.java:99-100`。 -/// -/// **请求体**(官方 `DataValuesQuery.java:14-24`): -/// ```json -/// { "type":"module", "objectType":"role", "moduleIds":"" } -/// ``` -/// - `type` **不能为空**(官方直接返 `fail`)⇒ 本仓同样返 `fail(400)`; -/// - `moduleIds` 是**逗号分隔的字符串**(不是数组)—— 本仓读的是**已勾选**值, -/// 不靠 `moduleIds` 入参(那是「前端已勾选」的回传,官方用它做差集); -/// - `objectType` = `role` / `organize` / `position` / `user`。 -/// -/// **响应**(官方 `AuthorizeDataReturnVO.java:16-27`)= `{list, ids, all}`。 -/// -/// 🔴 **面 B v1 降级**(`JNPF_COMPAT_SURFACE.md` §3.6): -/// - `list` 恒 `[]` —— 本仓**不实现**官方那套权限树模型; -/// - `all` 返本仓**全部菜单 id**(官方的 `all` **不含**菜单 id)⇒ **已知错位 B1**; -/// - `ids` 语义**正确**(已勾选的菜单 id)。 -pub async fn authority_values( - State(state): State, - headers: HeaderMap, - Path(object_id): Path, - body: Bytes, -) -> Json { - if let Err(resp) = require_login_face_b(&state, &headers).await { - return resp; - } - let obj = match parse_body(&body) { - Ok(o) => o, - Err(resp) => return resp, - }; - - let type_ = obj.get("type").and_then(Value::as_str).unwrap_or(""); - if type_.trim().is_empty() { - // 🔴 官方:`type` 为空 ⇒ 直接 `fail`(`AuthorizeController.java:112-114`)。 - return fail(code::FAIL, "type 不能为空"); - } - let object_type = obj - .get("objectType") - .and_then(Value::as_str) - .map(str::trim) - .filter(|s| !s.is_empty()) - .unwrap_or("role") - .to_string(); - - let ids = match granted_module_ids(&state.db, &object_type, &object_id).await { - Ok(ids) => ids, - Err(e) => return db_error(e, "授权读取"), - }; - let all = match all_module_ids(&state.db).await { - Ok(ids) => ids, - Err(e) => return db_error(e, "菜单全集查询"), - }; - - ok(json!({ - "list": [], - "ids": ids, - "all": all, - })) -} - -/// 已勾选的菜单 id(`base_authorize`,`f_item_type='module'`)。 -async fn granted_module_ids( - db: &Db, - object_type: &str, - object_id: &str, -) -> Result, pglite::Error> { - let object_type = object_type.to_string(); - let object_id = object_id.to_string(); - let rows = db - .query_json_params( - "SELECT f_item_id AS \"itemId\" FROM base_authorize \ - WHERE f_object_type = $1::text AND f_object_id = $2::text \ - AND f_item_type = 'module' AND f_delete_mark = 0", - &[&object_type, &object_id], - ) - .await?; - Ok(rows - .iter() - .filter_map(|r| r["itemId"].as_str()) - .filter(|s| !s.is_empty()) - .map(str::to_string) - .collect()) -} - -/// 本仓全部菜单 id(`all`)。 -async fn all_module_ids(db: &Db) -> Result, pglite::Error> { - let rows = db - .query_json( - "SELECT f_id AS \"id\" FROM base_module WHERE f_delete_mark = 0 \ - ORDER BY f_sort_code ASC, f_full_name ASC", - ) - .await?; - Ok(rows - .iter() - .filter_map(|r| r["id"].as_str()) - .filter(|s| !s.is_empty()) - .map(str::to_string) - .collect()) -} - -// ================================================================ 用户 CRUD(面 B) -// -// 契约:`docs/contract.md` 附录 A `[OFFICIAL]` 里 `permission/Users` 那一族; -// 前端真源:`jnpf-web-apps-main/src/views/permission/user/{index,Form}.vue` -// 与 `src/api/permission/user.ts`。 -// -// 🔴 **写路径的三条硬律**(与 `sys.rs` 同一套,别在这里另立规矩): -// 1. 列名**只来自常量白名单** [`USER_WRITE_FIELDS`] —— 请求里的键永不进 SQL 文本; -// 2. 读回**永不选 `f_password` / `f_secretkey`**(不是「选了再删」); -// 3. 业务失败恒 `code=400`(HTTP 200),DB 报错统一 `500` 且真因只进日志。 - -/// 官方 `UserCrForm` 的写白名单:`(JSON 键, 列名, CAST)`。 -/// -/// 🔴 键名逐字对齐 `views/permission/user/Form.vue` 的 `field` -/// (`ranks` 对应列 `f_rank`,`certificatesType` 对应 `f_certificates_type`—— -/// 官方的驼峰与 DDL 的下划线**不是**机械对应,别想当然用下划线转换)。 -/// 表外的键**静默丢弃**(官方 Jackson 只收 DTO 声明的字段)。 -const USER_WRITE_FIELDS: &[(&str, &str, &str)] = &[ - ("account", "f_account", ""), - ("realName", "f_real_name", ""), - ("nickName", "f_nick_name", ""), - ("headIcon", "f_head_icon", ""), - ("gender", "f_gender", ""), - ("birthday", "f_birthday", "::timestamp"), - ("mobilePhone", "f_mobile_phone", ""), - ("telePhone", "f_tele_phone", ""), - ("landline", "f_landline", ""), - ("email", "f_email", ""), - ("nation", "f_nation", ""), - ("nativePlace", "f_native_place", ""), - ("entryDate", "f_entry_date", "::timestamp"), - ("certificatesType", "f_certificates_type", ""), - ("certificatesNumber", "f_certificates_number", ""), - ("education", "f_education", ""), - ("urgentContacts", "f_urgent_contacts", ""), - ("urgentTelePhone", "f_urgent_tele_phone", ""), - ("postalAddress", "f_postal_address", ""), - ("signature", "f_signature", ""), - ("description", "f_description", ""), - ("sortCode", "f_sort_code", "::bigint"), - ("enabledMark", "f_enabled_mark", "::integer"), - ("ranks", "f_rank", ""), - ("organizeId", "f_organize_id", ""), -]; - -/// 详情投影 —— 编辑弹窗 `setFieldsValue(res.data)` **直接吃这份**。 -/// -/// 🔴 少一个键 ⇒ 弹窗里那一格永远是空的,而且**不报错**(静默)。 -/// 🔴 `birthday` / `entryDate` 用 `to_char(…,'YYYY-MM-DD')`:官方 VO 是日期串, -/// `::text` 会带出 ` 00:00:00` ⇒ DatePicker 解析失败。 -const USER_DETAIL_COLUMNS: &str = "f_id AS \"id\", f_account AS \"account\", \ - f_real_name AS \"realName\", f_nick_name AS \"nickName\", f_head_icon AS \"headIcon\", \ - f_gender AS \"gender\", to_char(f_birthday, 'YYYY-MM-DD') AS \"birthday\", \ - f_mobile_phone AS \"mobilePhone\", f_tele_phone AS \"telePhone\", f_landline AS \"landline\", \ - f_email AS \"email\", f_nation AS \"nation\", f_native_place AS \"nativePlace\", \ - to_char(f_entry_date, 'YYYY-MM-DD') AS \"entryDate\", \ - f_certificates_type AS \"certificatesType\", \ - f_certificates_number AS \"certificatesNumber\", f_education AS \"education\", \ - f_urgent_contacts AS \"urgentContacts\", f_urgent_tele_phone AS \"urgentTelePhone\", \ - f_postal_address AS \"postalAddress\", f_signature AS \"signature\", \ - f_description AS \"description\", COALESCE(f_sort_code, 0) AS \"sortCode\", \ - COALESCE(f_enabled_mark, 0) AS \"enabledMark\", f_rank AS \"ranks\", \ - f_organize_id AS \"organizeId\", f_position_id AS \"positionId\", \ - COALESCE(f_is_administrator, 0) AS \"isAdministrator\", \ - COALESCE(f_lock_mark, 0) AS \"lockMark\", f_unlock_time AS \"unlockTime\", \ - (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\", \ - f_creator_user_id AS \"creatorUserId\", f_tenant_id AS \"tenantId\", \ - COALESCE(f_delete_mark, 0) AS \"deleteMark\""; - -/// body ⇒ 白名单内的 `(列, CAST, 值)`;**只收 body 里真出现的键**。 -fn user_write_fields(obj: &Map) -> Vec<(&'static str, &'static str, Option)> { - let mut out = Vec::new(); - for (json_key, column, cast) in USER_WRITE_FIELDS { - if obj.contains_key(*json_key) { - out.push((*column, *cast, value_to_text(obj.get(*json_key)))); - } - } - out -} - -/// JS 真值语义的布尔(`isAdministrator` 前端传布尔或数字都可能)。 -fn flag_of(v: Option<&Value>) -> &'static str { - match v { - Some(Value::Bool(true)) => "1", - Some(Value::Number(n)) if n.as_i64().unwrap_or(0) != 0 => "1", - Some(Value::String(s)) if s == "1" || s.eq_ignore_ascii_case("true") => "1", - _ => "0", - } -} - -/// 取 body 里的 id 数组(`{ids:[…]}` / `{ids:"a,b"}` 都认)。 -/// -/// 🔴 非数组 ⇒ **空集合**(官方批量接口对空集合返回成功,不报错)。 -/// 取 `obj[key]` 的字符串 id 数组(数组或逗号串都收;空 ⇒ 空数组)。 -fn id_list_of(obj: &Map, key: &str) -> Vec { - match obj.get(key) { - Some(Value::Array(items)) => items - .iter() - .filter_map(|v| match v { - Value::String(s) if !s.is_empty() => Some(s.clone()), - Value::Number(n) => Some(n.to_string()), - _ => None, - }) - .collect(), - Some(Value::String(s)) if !s.is_empty() => { - s.split(',').map(|x| x.trim().to_string()).collect() - } - _ => Vec::new(), - } -} - -fn id_list(obj: &Map) -> Vec { - match obj.get("ids") { - Some(Value::Array(items)) => items - .iter() - .filter_map(|v| match v { - Value::String(s) if !s.is_empty() => Some(s.clone()), - Value::Number(n) => Some(n.to_string()), - _ => None, - }) - .collect(), - Some(Value::String(s)) if !s.is_empty() => { - s.split(',').map(|x| x.trim().to_string()).collect() - } - _ => Vec::new(), - } -} - -/// `$1::text::integer` 这种占位符(**统一走 text 传值,类型交给 SQL 里的 CAST**)。 -fn placeholder(index: usize, cast: &str) -> String { - format!("${index}::text{cast}") -} - -/// 账号查重(`f_delete_mark = 0` 范围内)。 -/// -/// 🔴 官方 DDL 对 `f_account` **无 UNIQUE** ⇒ 唯一性只在应用层,必须显式查。 -async fn account_owner(db: &Db, account: &str) -> Result, pglite::Error> { - let rows = db - .query_json_params( - "SELECT f_id AS \"id\" FROM base_user \ - WHERE f_account = $1::text AND f_delete_mark = 0 LIMIT 1", - &[&account], - ) - .await?; - Ok(rows - .first() - .and_then(|r| r["id"].as_str()) - .map(str::to_string)) -} - -/// `GET /api/permission/Users/{id}` —— 单条详情(编辑弹窗)。 -/// -/// ⚠️ **`{id}` 会吞掉所有「`Users/` 下一段的静态 GET」**(`Selector` / `getWorkByUser` / -/// `getUserList` …):它们现在会落到这里、返 `400 用户不存在`,而不是 404。 -/// matchit 的口径是**静态段优先** ⇒ 一旦把那些路由注册进来,自动夺回,无需改这里。 -pub async fn user_info( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - let id = id.trim().to_string(); - let sql = format!( - "SELECT {USER_DETAIL_COLUMNS} FROM base_user \ - WHERE f_id = $1::text AND f_delete_mark = 0 LIMIT 1" - ); - let rows = match state.db.query_json_params(&sql, &[&id]).await { - Ok(rows) => rows, - Err(e) => return db_error(e, "用户详情查询"), - }; - match rows.into_iter().next() { - Some(row) => ok(row), - None => fail(code::FAIL, "用户不存在"), - } -} - -/// `POST /api/permission/Users` —— 官方建档(JSON body)。 -pub async fn user_create( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_USER).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - - let account = obj - .get("account") - .and_then(Value::as_str) - .unwrap_or_default() - .trim() - .to_string(); - if account.is_empty() { - return fail(code::FAIL, "账号不能为空"); - } - match account_owner(&state.db, &account).await { - Ok(Some(_)) => return fail(code::FAIL, format!("账号已存在:{account}")), - Ok(None) => {} - Err(e) => return db_error(e, "用户查重"), - } - - let new_id = new_uuid(); - let mut columns: Vec<&str> = vec!["f_id", "f_tenant_id"]; - let mut casts: Vec<&str> = vec!["", ""]; - let mut values: Vec> = vec![Some(new_id.clone()), Some("0".to_string())]; - - for (column, cast, value) in user_write_fields(&obj) { - // `account` 已在上面校验过,这里照常写入(白名单里本来就有它)。 - columns.push(column); - casts.push(cast); - values.push(value); - } - // 前端没给的口径走官方默认值(`enabledMark=1` / `sortCode=0`)。 - if !obj.contains_key("enabledMark") { - columns.push("f_enabled_mark"); - casts.push("::integer"); - values.push(Some("1".to_string())); - } - if !obj.contains_key("sortCode") { - columns.push("f_sort_code"); - casts.push("::bigint"); - values.push(Some("0".to_string())); - } - // 口令:body 里非空 ⇒ md5;否则官方默认 `123456`。 - let password = match obj.get("password").and_then(Value::as_str) { - Some(p) if !p.is_empty() => md5_hex(p), - _ => md5_hex("123456"), - }; - columns.push("f_password"); - casts.push(""); - values.push(Some(password)); - columns.push("f_is_administrator"); - casts.push("::integer"); - values.push(Some(flag_of(obj.get("isAdministrator")).to_string())); - columns.push("f_delete_mark"); - casts.push("::integer"); - values.push(Some("0".to_string())); - columns.push("f_creator_user_id"); - casts.push(""); - values.push(Some(user.account.clone())); - // 审计列直接用 SQL 自己的 `now()`,**不占参数位**(不受客户端时区影响,也少一个绑定)。 - columns.push("f_creator_time"); - let mut marks: Vec = (0..values.len()) - .map(|i| placeholder(i + 1, casts[i])) - .collect(); - marks.push("now()".to_string()); - let sql = format!( - "INSERT INTO base_user ({}) VALUES ({})", - columns.join(", "), - marks.join(", ") - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "新建用户"); - } - ok(json!({ "id": new_id })) -} - -/// `PUT /api/permission/Users/{id}` —— 官方改档(**只 SET body 里出现的键**)。 -pub async fn user_update( - State(state): State, - headers: HeaderMap, - Path(id): Path, - body: Bytes, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - let id = id.trim().to_string(); - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - - // 存在性:**不按 `f_delete_mark` 过滤**(软删过的行也算存在,与 sys.rs 一致)。 - let exists = match state - .db - .query_json_params( - "SELECT f_id AS \"id\" FROM base_user WHERE f_id = $1::text LIMIT 1", - &[&id], - ) - .await - { - Ok(rows) => !rows.is_empty(), - Err(e) => return db_error(e, "用户查询"), - }; - if !exists { - return fail(code::FAIL, "用户不存在"); - } - - // 账号改了就查重(改成自己不算冲突)。 - if let Some(account) = obj.get("account").and_then(Value::as_str) { - if !account.trim().is_empty() { - match account_owner(&state.db, account.trim()).await { - Ok(Some(owner)) if owner != id => { - return fail(code::FAIL, format!("账号已存在:{}", account.trim())) - } - Ok(_) => {} - Err(e) => return db_error(e, "用户查重"), - } - } - } - - let fields = user_write_fields(&obj); - let mut assignments: Vec = Vec::new(); - let mut values: Vec> = vec![Some(id.clone())]; - for (column, cast, value) in fields { - values.push(value); - assignments.push(format!("{column} = {}", placeholder(values.len(), cast))); - } - if assignments.is_empty() { - // 没有任何可写字段 ⇒ 视为成功(幂等),不要打一条空 SET 的语法错 SQL。 - return ok(Value::Null); - } - assignments.push("f_last_modify_time = now()".to_string()); - let sql = format!( - "UPDATE base_user SET {} WHERE f_id = $1::text", - assignments.join(", ") - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "更新用户"); - } - ok(Value::Null) -} - -/// `DELETE /api/permission/Users/{id}` —— 软删(**幂等**:不存在也返回成功)。 -pub async fn user_delete( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - let id = id.trim().to_string(); - if let Err(e) = state - .db - .exec_params( - "UPDATE base_user SET f_delete_mark = 1, f_delete_time = now() \ - WHERE f_id = $1::text", - &[&id], - ) - .await - { - return db_error(e, "删除用户"); - } - ok(Value::Null) -} - -/// `POST /api/permission/Users/BatchDelete` —— 批量软删(一条语句 ⇒ 原子)。 -pub async fn users_batch_delete( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let ids = id_list(&obj); - if ids.is_empty() { - return ok(Value::Null); - } - let mut values: Vec> = ids.iter().map(|s| Some(s.clone())).collect(); - let marks: Vec = (1..=values.len()).map(|i| format!("${i}::text")).collect(); - let sql = format!( - "UPDATE base_user SET f_delete_mark = 1, f_delete_time = now() \ - WHERE f_id IN ({})", - marks.join(", ") - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "批量删除用户"); - } - values.clear(); - ok(Value::Null) -} - -/// `POST /api/permission/Users/BatchUpdateState` —— 批量启停(`enabledMark` 0/1/2)。 -pub async fn users_batch_update_state( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let ids = id_list(&obj); - if ids.is_empty() { - return ok(Value::Null); - } - let enabled = match obj.get("enabledMark").and_then(Value::as_i64) { - Some(v) => v, - None => return fail(code::FAIL, "缺少 enabledMark"), - }; - // $1 = enabledMark,其余 = id - let mut values: Vec> = vec![Some(enabled.to_string())]; - values.extend(ids.iter().map(|s| Some(s.clone()))); - let marks: Vec = (2..=values.len()).map(|i| format!("${i}::text")).collect(); - let sql = format!( - "UPDATE base_user SET f_enabled_mark = $1::text::integer, f_last_modify_time = now() \ - WHERE f_id IN ({})", - marks.join(", ") - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "批量更新用户状态"); - } - ok(Value::Null) -} - -/// `POST /api/permission/Users/{id}/Actions/ResetPassword` —— 重置口令。 -/// -/// 🔴 官方表单字段是 `password`(`views/permission/user/ResetPassword.vue`), -/// 这里额外兼容 `newPassword`(部分版本的 DTO 用它)。 -pub async fn user_reset_password( - State(state): State, - headers: HeaderMap, - Path(id): Path, - body: Bytes, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - let id = id.trim().to_string(); - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let plain = obj - .get("password") - .or_else(|| obj.get("newPassword")) - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(); - if plain.is_empty() { - return fail(code::FAIL, "口令不能为空"); - } - let values = [Some(id), Some(md5_hex(&plain))]; - if let Err(e) = state - .db - .exec_params( - "UPDATE base_user SET f_password = $2::text, f_change_password_date = now(), \ - f_last_modify_time = now() WHERE f_id = $1::text", - ¶ms_of(&values), - ) - .await - { - return db_error(e, "重置口令"); - } - ok(Value::Null) -} - -/// `PUT /api/permission/Users/{id}/Actions/unlock` —— 解除锁定。 -pub async fn user_unlock( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - let id = id.trim().to_string(); - if let Err(e) = state - .db - .exec_params( - "UPDATE base_user SET f_lock_mark = 0, f_unlock_time = NULL, \ - f_log_error_count = 0, f_last_modify_time = now() WHERE f_id = $1::text", - &[&id], - ) - .await - { - return db_error(e, "解除锁定"); - } - ok(Value::Null) -} - -/// `GET /api/permission/Users/{id}/GetPosition` —— 用户岗位。 -/// -/// 🔴 **没有 `base_position` 表**(本仓 12 张表里没有)⇒ 岗位只能从 -/// `base_user.f_position_id` 反推。前端 `res.data.flatMap(o => o.id)` 要的是 -/// **对象数组**,所以这里必须包成 `[{ "id": … }]`,不能直接返字符串数组。 -pub async fn user_get_position( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - let id = id.trim().to_string(); - let rows = match state - .db - .query_json_params( - "SELECT f_position_id AS \"positionId\" FROM base_user \ - WHERE f_id = $1::text AND f_delete_mark = 0 LIMIT 1", - &[&id], - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "用户岗位查询"), - }; - let raw = rows - .first() - .and_then(|r| r["positionId"].as_str()) - .unwrap_or_default(); - let list: Vec = raw - .split(',') - .map(str::trim) - .filter(|s| !s.is_empty()) - .map(|pid| json!({ "id": pid })) - .collect(); - ok(Value::Array(list)) -} - -// ---------------------------------------------------------------- 会话与前端启动 - -/// `POST /api/oauth/Logout` —— 官方 `LoginController.java:155`。 -/// -/// 🔴 **未登录也返成功**:前端 `store/auth.ts:86` 把 `logoutApi()` 包在 -/// `try { … } catch { /* 不做任何处理 */ }` 里,**返回值完全被忽略**; -/// 但它一旦是 **HTTP 404**,会走 `errorMessageResponseInterceptor` 弹一个红条。 -/// ⇒ 这里恒 `ok(null)`,无论有没有 token。 -/// -/// 🔴 **不改变服务端会话状态**:本仓 token 是进程内内存表(`platform/session.rs`), -/// 没有 `revoke` 接口(接口 immutability 见 `SessionStore`)⇒ 登出即「客户端丢弃 token」, -/// 服务端不做失效登记。这是**已知限制 B5**(`docs/known-limitations.md`)。 -pub async fn logout_handler(State(state): State, headers: HeaderMap) -> Json { - // 鉴权结果刻意丢弃:有 token ⇒ 走一遍换取无效的分支也已经够了(无 remove 接口)。 - let _ = require_login_face_b(&state, &headers).await; - ok(Value::Null) -} - /// `GET /api/system/BaseLang/LangJson` —— 前端 i18n 远端词条包。 /// /// 官方真源:`jnpf-web-apps-main/src/api/system/baseLang.ts:28-30` @@ -1530,492 +122,6 @@ pub async fn base_lang_json(State(state): State, headers: HeaderMap) - ok(Value::Null) } -// ---------------------------------------------------------------- 用户分组(base_group) - -/// 分组投影(不含 `f_delete_time` / `f_delete_user_id` 等无人消费的审计列)。 -const GROUP_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ - f_en_code AS \"enCode\", f_description AS \"description\", \ - COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ - COALESCE(f_sort_code, 0) AS \"sortCode\", \ - (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\""; - -/// 🔴 **列名只来自这张白名单**(`JNPF-PostgreSQL.sql:1758` 的 14 列): -/// 驼峰 ≠ 下划线机械转换 ⇒ 别用 `snake_case()` 猜。 -const GROUP_WRITE_FIELDS: [(&str, &str, &str); 5] = [ - ("fullName", "f_full_name", ""), - ("enCode", "f_en_code", ""), - ("description", "f_description", ""), - ("enabledMark", "f_enabled_mark", "::integer"), - ("sortCode", "f_sort_code", "::bigint"), -]; - -/// `GET /api/permission/Group` —— 用户管理页左侧的**分组树**(`ListVO`)。 -/// -/// 🔴 前端 `views/permission/user/index.vue:338-341`: -/// `state.treeData = [{fullName:'全部用户', id:''}, ...(res.data.list || [])]` -/// ⇒ **`data` 必须是有 `list` 的对象**(裸数组会被 `|| []` 吞成空树)。 -pub async fn group_list( - State(state): State, - headers: HeaderMap, - raw: RawQuery, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - let keyword = crate::platform::sys::query_param(&raw, "keyword"); - let keyword = keyword.trim().to_string(); - // 空关键词 ⇒ 不参与 WHERE(`like '%%'` 也能过,但显式分开更好读、更好测)。 - let sql = if keyword.is_empty() { - format!( - "SELECT {GROUP_PROJECTION} FROM base_group WHERE COALESCE(f_delete_mark,0) = 0 \ - ORDER BY f_sort_code ASC, f_full_name ASC" - ) - } else { - format!( - "SELECT {GROUP_PROJECTION} FROM base_group WHERE COALESCE(f_delete_mark,0) = 0 \ - AND (f_full_name ILIKE $1::text OR f_en_code ILIKE $1::text) \ - ORDER BY f_sort_code ASC, f_full_name ASC" - ) - }; - // 🔴 `like` 必须**先绑定再取引用**:`params_of(&[like])` 里的临时数组活不过这条语句。 - let like_values = [Some(format!("%{keyword}%"))]; - let params: Vec<&(dyn ToSql + Sync)> = if keyword.is_empty() { - Vec::new() - } else { - params_of(&like_values) - }; - let rows = match state.db.query_json_params(&sql, ¶ms).await { - Ok(rows) => rows, - Err(e) => return db_error(e, "分组列表查询"), - }; - ok(list_vo(rows)) -} - -/// `GET /api/permission/Group/{id}` —— 分组详情(`GroupForm.vue:64` 直接 `setFieldsValue(res.data)`)。 -pub async fn group_info( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - let id = id.trim().to_string(); - let sql = format!( - "SELECT {GROUP_PROJECTION} FROM base_group \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1" - ); - let rows = match state.db.query_json_params(&sql, &[&id]).await { - Ok(rows) => rows, - Err(e) => return db_error(e, "分组详情查询"), - }; - match rows.into_iter().next() { - Some(row) => ok(row), - None => fail(code::FAIL, "分组不存在"), - } -} - -/// `POST /api/permission/Group` —— 建分组。 -pub async fn group_create( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_USER).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let full_name = obj - .get("fullName") - .and_then(Value::as_str) - .unwrap_or_default() - .trim() - .to_string(); - if full_name.is_empty() { - return fail(code::FAIL, "分组名称不能为空"); - } - - let new_id = new_uuid(); - let mut columns: Vec<&str> = vec!["f_id", "f_tenant_id", "f_full_name"]; - let mut casts: Vec<&str> = vec!["", "", ""]; - let mut values: Vec> = - vec![Some(new_id.clone()), Some("0".to_string()), Some(full_name)]; - - for (json_key, column, cast) in GROUP_WRITE_FIELDS { - // `fullName` 已写入首列,跳过(避免重复列)。 - if column == "f_full_name" { - continue; - } - if obj.contains_key(json_key) { - columns.push(column); - casts.push(cast); - values.push(value_to_text(obj.get(json_key))); - } - } - if !obj.contains_key("enabledMark") { - columns.push("f_enabled_mark"); - casts.push("::integer"); - values.push(Some("1".to_string())); - } - if !obj.contains_key("sortCode") { - columns.push("f_sort_code"); - casts.push("::bigint"); - values.push(Some("0".to_string())); - } - columns.push("f_creator_user_id"); - casts.push(""); - values.push(Some(user.account.clone())); - columns.push("f_delete_mark"); - casts.push("::integer"); - values.push(Some("0".to_string())); - // 🔴 `f_creator_time` 用 SQL `now()` ⇒ **不占参数位**(否则 `$n` 与 columns 错位)。 - columns.push("f_creator_time"); - let mut marks: Vec = (0..values.len()) - .map(|i| placeholder(i + 1, casts[i])) - .collect(); - marks.push("now()".to_string()); - let sql = format!( - "INSERT INTO base_group ({}) VALUES ({})", - columns.join(", "), - marks.join(", ") - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "新建分组"); - } - ok(json!({ "id": new_id })) -} - -/// `PUT /api/permission/Group/{id}` —— 改分组(**只 SET body 里出现的键**)。 -pub async fn group_update( - State(state): State, - headers: HeaderMap, - Path(id): Path, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_USER).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let rows = match state - .db - .query_json_params( - "SELECT f_id AS \"id\" FROM base_group \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", - &[&id], - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "分组查询"), - }; - if rows.is_empty() { - return fail(code::FAIL, "分组不存在"); - } - - let mut sets: Vec = Vec::new(); - let mut values: Vec> = Vec::new(); - for (json_key, column, cast) in GROUP_WRITE_FIELDS { - if !obj.contains_key(json_key) { - continue; - } - values.push(value_to_text(obj.get(json_key))); - sets.push(format!("{} = ${}::text{}", column, values.len(), cast)); - } - if sets.is_empty() { - return ok(Value::Null); - } - values.push(Some(user.account.clone())); - sets.push(format!("f_last_modify_user_id = ${}::text", values.len())); - sets.push("f_last_modify_time = now()".to_string()); - values.push(Some(id)); - let sql = format!( - "UPDATE base_group SET {} WHERE f_id = ${}::text", - sets.join(", "), - values.len() - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "修改分组"); - } - ok(Value::Null) -} - -/// `DELETE /api/permission/Group/{id}` —— 删分组(软删 + 解绑成员)。 -pub async fn group_delete( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - let user = match guard(&state, &headers, EN_USER).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let values = [Some(user.account.clone()), Some(id.clone())]; - if let Err(e) = state - .db - .exec_params( - "UPDATE base_group SET f_delete_mark = 1, f_delete_time = now(), \ - f_delete_user_id = $1::text WHERE f_id = $2::text", - ¶ms_of(&values), - ) - .await - { - return db_error(e, "删除分组"); - } - // 关系行同步软删(否则树删了、成员还在 ⇒ 下次同 id 建组会「复活」旧成员)。 - let rel = [Some(user.account.clone()), Some(id)]; - if let Err(e) = state - .db - .exec_params( - "UPDATE base_user_relation SET f_delete_mark = 1, f_delete_time = now() \ - WHERE f_object_type = 'Group' AND f_object_id = $2::text \ - AND f_delete_user_id = $1::text", - ¶ms_of(&rel), - ) - .await - { - return db_error(e, "删除分组关系"); - } - ok(Value::Null) -} - -/// 分组—用户关系的**软删/插回**(`AddUser` / `DeleteUser` 共用)。 -/// -/// 🔴 关系落在 `base_user_relation`(`f_object_type = 'Group'`),**不**在 `base_group`。 -async fn group_toggle_members( - state: &AppState, - user: &str, - group_id: &str, - ids: Vec, - add: bool, -) -> Result<(), pglite::Error> { - for user_id in ids { - if add { - // 幂等:同一 (用户, 分组) 只留一条未删的关系行。 - let exists = state - .db - .query_json_params( - "SELECT f_id AS \"id\" FROM base_user_relation \ - WHERE f_user_id = $1::text AND f_object_type = 'Group' \ - AND f_object_id = $2::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", - ¶ms_of(&[Some(user_id.clone()), Some(group_id.to_string())]), - ) - .await?; - if exists.is_empty() { - let new_id = new_uuid(); - let values = [ - Some(new_id), - Some(user_id), - Some(group_id.to_string()), - Some(user.to_string()), - ]; - state - .db - .exec_params( - "INSERT INTO base_user_relation \ - (f_id, f_tenant_id, f_user_id, f_object_type, f_object_id, \ - f_creator_user_id, f_creator_time, f_delete_mark) \ - VALUES ($1::text, '0', $2::text, 'Group', $3::text, $4::text, now(), 0)", - ¶ms_of(&values), - ) - .await?; - } - } else { - let values = [Some(user.to_string()), Some(user_id), Some(group_id.to_string())]; - state - .db - .exec_params( - "UPDATE base_user_relation SET f_delete_mark = 1, f_delete_time = now(), \ - f_delete_user_id = $1::text \ - WHERE f_user_id = $2::text AND f_object_type = 'Group' \ - AND f_object_id = $3::text", - ¶ms_of(&values), - ) - .await?; - } - } - Ok(()) -} - -/// `POST /api/permission/Group/{id}/Actions/AddUser` —— 分组加成员(body `{ids:[…]}`)。 -pub async fn group_add_user( - State(state): State, - headers: HeaderMap, - Path(id): Path, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_USER).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let ids = id_list(&obj); - if ids.is_empty() { - return ok(Value::Null); - } - if let Err(e) = group_toggle_members(&state, &user.account, &id, ids, true).await { - return db_error(e, "分组添加用户"); - } - ok(Value::Null) -} - -/// `POST /api/permission/Group/{id}/Actions/DeleteUser` —— 分组移出成员。 -pub async fn group_remove_user( - State(state): State, - headers: HeaderMap, - Path(id): Path, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_USER).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let ids = id_list(&obj); - if ids.is_empty() { - return ok(Value::Null); - } - if let Err(e) = group_toggle_members(&state, &user.account, &id, ids, false).await { - return db_error(e, "分组移除用户"); - } - ok(Value::Null) -} - -// ---------------------------------------------------------------- 岗位 / 交接 / 第三方 - -/// 用户选择器的投影(`QueryUserSelect` 要 `id` + `fullName`,多选还要 `headIcon`)。 -const USER_SELECTOR_PROJECTION: &str = "f_id AS \"id\", f_real_name AS \"fullName\", \ - f_account AS \"account\", f_head_icon AS \"headIcon\", \ - f_organize_id AS \"organizeId\", f_gender AS \"gender\""; - -/// `POST /api/permission/Users/{id}/SetPosition` —— 给单个用户设岗位。 -/// -/// 🔴 **没有 `base_position` 表** ⇒ 岗位只能落在 `base_user.f_position_id`(逗号分隔), -/// 与 `GET .../GetPosition` 的读法(同一个字段反推)成一对。 -pub async fn user_set_position( - State(state): State, - headers: HeaderMap, - Path(id): Path, - body: Bytes, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - let id = id.trim().to_string(); - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let ids = id_list(&obj); - let values = [Some(ids.join(",")), Some(id)]; - if let Err(e) = state - .db - .exec_params( - "UPDATE base_user SET f_position_id = $1::text, f_last_modify_time = now() \ - WHERE f_id = $2::text", - ¶ms_of(&values), - ) - .await - { - return db_error(e, "设置用户岗位"); - } - ok(Value::Null) -} - -/// `POST /api/permission/Users/SetPositionBatch` —— 批量设岗位(body `{userIds:[…], ids:[…]}`)。 -/// -/// 🔴 **同路径不能挂在 `/Users/{id}` 上**:那条路由会把 `SetPositionBatch` 当 id 吃掉。 -/// matchit 静态段优先 ⇒ 单独注册 `/Users/SetPositionBatch` 即可正确分流。 -pub async fn users_set_position_batch( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - // 🔴 批量接口的**用户**集合是 `userIds`(不是 `ids`)—— `ids` 在这里是**岗位**集合 - // (`views/permission/user/index.vue:380`:`batchSetUserPosition({ userIds, ids })`)。 - let user_ids = match obj.get("userIds") { - Some(Value::Array(items)) => items - .iter() - .filter_map(Value::as_str) - .map(str::to_string) - .collect::>(), - _ => Vec::new(), - }; - if user_ids.is_empty() { - return ok(Value::Null); - } - let positions = id_list(&obj).join(","); - let values = [Some(positions), Some(user_ids.join(","))]; - // 一条 SQL 覆盖全部用户(用 `= ANY(string_to_array(...))` ⇒ 原子,不用循环)。 - if let Err(e) = state - .db - .exec_params( - "UPDATE base_user SET f_position_id = $1::text, f_last_modify_time = now() \ - WHERE f_id = ANY(string_to_array($2::text, ','))", - ¶ms_of(&values), - ) - .await - { - return db_error(e, "批量设置用户岗位"); - } - ok(Value::Null) -} - -/// `GET /api/permission/Users/{id}/SelectorByUserPosId` —— 同岗位用户(离职交接的接收人选)。 -pub async fn user_selector_by_pos_id( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - let id = id.trim().to_string(); - let sql = format!( - "SELECT {USER_SELECTOR_PROJECTION} FROM base_user \ - WHERE f_delete_mark = 0 AND f_id <> $1::text \ - AND COALESCE(f_position_id, '') <> '' \ - AND COALESCE(f_position_id, '') = \ - (SELECT COALESCE(f_position_id, '') FROM base_user WHERE f_id = $1::text LIMIT 1) \ - ORDER BY f_real_name ASC" - ); - let rows = match state.db.query_json_params(&sql, &[&id]).await { - Ok(rows) => rows, - Err(e) => return db_error(e, "同岗位用户查询"), - }; - ok(list_vo(rows)) -} - /// `GET /api/system/System/getDevUser` —— 开发账号下拉(`QueryUserSelect` 的 `:api`)。 /// /// 🔴 官方语义是「有开发权限的用户」;本仓没有 `base_user.f_is_developer` 之类的列 @@ -2038,67 +144,6 @@ pub async fn system_get_dev_user( ok(list_vo(rows)) } -/// `DELETE /api/permission/socials/{id}?userId=` —— 第三方账号解绑。 -/// -/// 🔴 本仓没有 `base_socials_users` 表(`JNPF-PostgreSQL.sql:4038`)⇒ **无绑可解** -/// ⇒ 恒返成功(前端 `createMessage.success(res.msg)`,不读 `data`)。 -pub async fn socials_delete( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - // 路径参数读了但不落库:留着是为了让「未注册路径」与「已注册但无表」可区分。 - let _ = id.trim(); - ok(Value::Null) -} - -/// `POST /api/permission/Users/workHandover` —— 离职交接(写接口)。 -/// -/// 🔴 本仓**不落**工作流/流程任务 ⇒ 只做「能落库的那部分」: -/// `handoverMark` 置 1(离职)与 `f_last_modify_time`;其余交给调用方页面。 -/// body 形如 `{ fromId, toUserId, … }`(`WorkHandoverModal.vue`)。 -pub async fn users_work_handover( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let from_id = obj - .get("fromId") - .and_then(Value::as_str) - .unwrap_or_default() - .trim() - .to_string(); - if from_id.is_empty() { - return fail(code::FAIL, "交接人不能为空"); - } - let values = [Some(from_id)]; - if let Err(e) = state - .db - .exec_params( - "UPDATE base_user SET f_handover_mark = 1, f_last_modify_time = now() \ - WHERE f_id = $1::text", - ¶ms_of(&values), - ) - .await - { - return db_error(e, "离职交接"); - } - ok(Value::Null) -} - -// ---------------------------------------------------------------- 前端公共拉取(本仓无对应能力 ⇒ 保守空形状) - /// `GET /api/system/DictionaryData/All` —— 数据字典全量(**每进一个页面都会拉一次**)。 /// /// 🔴 前端 `store/base.ts:48`:`this.dictionaryList = res.data.list` ⇒ `data` 必须是 @@ -2219,1081 +264,6 @@ pub async fn menu_data_use_module_num( ok(Value::Null) } -/// `GET /api/oauth/getLoginConfig` —— 登录页配置(**登录前**就拉 ⇒ 不能要 token)。 -/// -/// 🔴 前端 `views/_core/login/LoginForm.vue:160-163`:`res.data.redirect` ⇒ `data` -/// 必须是**对象**(给 `null` 会 `Cannot read properties of null`)。 -pub async fn get_login_config() -> Json { - ok(json!({})) -} - -/// `GET /api/oauth/getConfig/{account}` —— 帐号的登录/锁屏配置(`user.ts:31`)。 -pub async fn get_user_config(Path(account): Path) -> Json { - let _ = account.trim(); - ok(json!({})) -} - -// ---------------------------------------------------------------- 机构管理(base_organize) - -/// 机构投影(对齐 `organize_async_list` 的字段集,两处必须一致)。 -const ORGANIZE_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ - f_en_code AS \"enCode\", COALESCE(f_parent_id, '0') AS \"parentId\", \ - f_category AS \"category\", f_manager_id AS \"managerId\", \ - COALESCE(f_sort_code, 0) AS \"sortCode\", \ - COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ - f_description AS \"description\", f_organize_id_tree AS \"organizeIdTree\", \ - f_org_name_tree AS \"orgNameTree\", f_duty_position AS \"dutyPosition\", \ - (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\""; - -/// 🔴 **列名只来自这张白名单**(`db/schema.sql:53` 的 21 列): -/// 驼峰 ≠ 下划线机械转换 ⇒ 别用 `snake_case()` 猜。 -/// 表单实际提交的键(`OrganizeForm.vue:33-68`):parentId/category/fullName/enCode/sortCode/description。 -const ORGANIZE_WRITE_FIELDS: [(&str, &str, &str); 8] = [ - ("parentId", "f_parent_id", ""), - ("category", "f_category", ""), - ("fullName", "f_full_name", ""), - ("enCode", "f_en_code", ""), - ("description", "f_description", ""), - ("managerId", "f_manager_id", ""), - ("enabledMark", "f_enabled_mark", "::integer"), - ("sortCode", "f_sort_code", "::bigint"), -]; - -/// `GET /api/permission/Organize` —— 机构全量列表(`ListVO`)。 -pub async fn organize_list( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_ORGANIZE).await { - return resp; - } - let sql = format!( - "SELECT {ORGANIZE_PROJECTION} FROM base_organize WHERE COALESCE(f_delete_mark,0) = 0 \ - ORDER BY f_sort_code ASC, f_full_name ASC" - ); - let rows = match state.db.query_json_params(&sql, &[]).await { - Ok(rows) => rows, - Err(e) => return db_error(e, "机构列表查询"), - }; - ok(list_vo(rows)) -} - -/// `GET /api/permission/Organize/{id}` —— 机构详情(`OrganizeForm.vue:103` 直接 `setFieldsValue(res.data)`)。 -pub async fn organize_info( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_ORGANIZE).await { - return resp; - } - let id = id.trim().to_string(); - let sql = format!( - "SELECT {ORGANIZE_PROJECTION} FROM base_organize \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1" - ); - let rows = match state.db.query_json_params(&sql, &[&id]).await { - Ok(rows) => rows, - Err(e) => return db_error(e, "机构详情查询"), - }; - match rows.into_iter().next() { - Some(row) => ok(row), - None => fail(code::FAIL, "机构不存在"), - } -} - -/// `POST /api/permission/Organize` —— 建机构。 -/// -/// 🔴 `f_organize_id_tree` / `f_org_name_tree`:官方是「父树 + 自己」的拼接, -/// 这里按同样的语义落库(父不存在 ⇒ 自己就是根)。 -pub async fn organize_create( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_ORGANIZE).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let full_name = obj - .get("fullName") - .and_then(Value::as_str) - .unwrap_or_default() - .trim() - .to_string(); - if full_name.is_empty() { - return fail(code::FAIL, "机构名称不能为空"); - } - let parent_id = obj - .get("parentId") - .and_then(Value::as_str) - .unwrap_or_default() - .trim(); - let parent_id: String = if parent_id.is_empty() { - "0".to_string() - } else { - parent_id.to_string() - }; - - // 父树:查父节点的 id_tree / name_tree,没有就视为根。 - let (id_tree_prefix, name_tree_prefix) = if parent_id == "0" { - (String::new(), String::new()) - } else { - let prow = state - .db - .query_json_params( - "SELECT COALESCE(f_organize_id_tree, f_id) AS \"t\", \ - COALESCE(f_org_name_tree, f_full_name) AS \"n\" \ - FROM base_organize WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", - &[&parent_id], - ) - .await - .unwrap_or_default(); - match prow.into_iter().next() { - Some(r) => ( - r["t"].as_str().unwrap_or_default().to_string(), - r["n"].as_str().unwrap_or_default().to_string(), - ), - None => (String::new(), String::new()), - } - }; - - let new_id = new_uuid(); - let id_tree = if id_tree_prefix.is_empty() { - new_id.clone() - } else { - format!("{id_tree_prefix},{new_id}") - }; - let name_tree = if name_tree_prefix.is_empty() { - full_name.clone() - } else { - format!("{name_tree_prefix},{full_name}") - }; - - let mut columns: Vec<&str> = vec![ - "f_id", - "f_tenant_id", - "f_full_name", - "f_parent_id", - "f_organize_id_tree", - "f_org_name_tree", - ]; - let mut casts: Vec<&str> = vec!["", "", "", "", "", ""]; - let mut values: Vec> = vec![ - Some(new_id.clone()), - Some("0".to_string()), - Some(full_name), - Some(parent_id), - Some(id_tree), - Some(name_tree), - ]; - - for (json_key, column, cast) in ORGANIZE_WRITE_FIELDS { - // `fullName` / `parentId` 已作为首四列写入,跳过(避免重复列)。 - if column == "f_full_name" || column == "f_parent_id" { - continue; - } - if obj.contains_key(json_key) { - columns.push(column); - casts.push(cast); - values.push(value_to_text(obj.get(json_key))); - } - } - if !obj.contains_key("enabledMark") { - columns.push("f_enabled_mark"); - casts.push("::integer"); - values.push(Some("1".to_string())); - } - if !obj.contains_key("sortCode") { - columns.push("f_sort_code"); - casts.push("::bigint"); - values.push(Some("0".to_string())); - } - columns.push("f_creator_user_id"); - casts.push(""); - values.push(Some(user.account.clone())); - columns.push("f_delete_mark"); - casts.push("::integer"); - values.push(Some("0".to_string())); - // 🔴 `f_creator_time` 用 SQL `now()` ⇒ **不占参数位**(否则 `$n` 与 columns 错位)。 - columns.push("f_creator_time"); - let mut marks: Vec = (0..values.len()) - .map(|i| placeholder(i + 1, casts[i])) - .collect(); - marks.push("now()".to_string()); - let sql = format!( - "INSERT INTO base_organize ({}) VALUES ({})", - columns.join(", "), - marks.join(", ") - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "新建机构"); - } - ok(json!({ "id": new_id })) -} - -/// `PUT /api/permission/Organize/{id}` —— 改机构(**只 SET body 里出现的键**)。 -pub async fn organize_update( - State(state): State, - headers: HeaderMap, - Path(id): Path, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_ORGANIZE).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let rows = match state - .db - .query_json_params( - "SELECT f_id AS \"id\" FROM base_organize \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", - &[&id], - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "机构查询"), - }; - if rows.is_empty() { - return fail(code::FAIL, "机构不存在"); - } - - let mut sets: Vec = Vec::new(); - let mut values: Vec> = Vec::new(); - for (json_key, column, cast) in ORGANIZE_WRITE_FIELDS { - if !obj.contains_key(json_key) { - continue; - } - values.push(value_to_text(obj.get(json_key))); - sets.push(format!("{} = ${}::text{}", column, values.len(), cast)); - } - if sets.is_empty() { - return ok(Value::Null); - } - values.push(Some(user.account.clone())); - sets.push(format!("f_last_modify_user_id = ${}::text", values.len())); - sets.push("f_last_modify_time = now()".to_string()); - values.push(Some(id)); - let sql = format!( - "UPDATE base_organize SET {} WHERE f_id = ${}::text", - sets.join(", "), - values.len() - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "修改机构"); - } - ok(Value::Null) -} - -/// `DELETE /api/permission/Organize/{id}` —— 删机构(软删)。 -/// -/// 🔴 **不级联**:官方删父机构会连带子机构,本仓只软删本行(子机构会「悬挂」)。 -/// 这是**已知限制**,写进 `docs/known-limitations.md`,避免误以为级联已实现。 -pub async fn organize_delete( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - let user = match guard(&state, &headers, EN_ORGANIZE).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let values = [Some(user.account.clone()), Some(id)]; - let sql = "UPDATE base_organize SET f_delete_mark = 1, f_delete_time = now(), \ - f_delete_user_id = $1::text WHERE f_id = $2::text \ - AND COALESCE(f_delete_mark,0) = 0"; - if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { - return db_error(e, "删除机构"); - } - ok(Value::Null) -} - -/// `GET /api/permission/Organize/Selector` —— 机构下拉(`ListVO`)。 -/// -/// 🔴 前端 `getOrganizeSelector()` 默认 `{parentId:'0'}`,但**本仓不做逐层剪枝**: -/// 权限页的组织选择器要能一次看到全树 ⇒ 恒返全部机构,`parentId` 仅做兼容占位。 -pub async fn organize_selector( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_ORGANIZE).await { - return resp; - } - let sql = format!( - "SELECT f_id AS \"id\", f_full_name AS \"fullName\", \ - COALESCE(f_parent_id, '0') AS \"parentId\", f_category AS \"category\", \ - COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ - COALESCE(f_sort_code, 0) AS \"sortCode\", \ - f_organize_id_tree AS \"organizeIdTree\" \ - FROM base_organize WHERE COALESCE(f_delete_mark,0) = 0 \ - ORDER BY f_sort_code ASC, f_full_name ASC" - ); - let rows = match state.db.query_json_params(&sql, &[]).await { - Ok(rows) => rows, - Err(e) => return db_error(e, "机构下拉查询"), - }; - ok(list_vo(rows)) -} - -// ---------------------------------------------------------------- 岗位管理(base_position) - -/// 岗位投影(对齐官方 `base_position` 的 23 列里被消费的那部分)。 -const POSITION_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ - f_en_code AS \"enCode\", f_type AS \"type\", \ - COALESCE(f_organize_id, '') AS \"organizeId\", \ - COALESCE(f_parent_id, '0') AS \"parentId\", \ - f_description AS \"description\", \ - COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ - COALESCE(f_sort_code, 0) AS \"sortCode\", \ - COALESCE(f_is_condition, 0) AS \"isCondition\", \ - COALESCE(f_default_mark, 0) AS \"defaultMark\", \ - f_duty_user AS \"dutyUser\", f_position_id_tree AS \"positionIdTree\", \ - (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\""; - -/// 🔴 **列名只来自这张白名单**(`db/schema.sql` 的 `base_position`,官方 DDL 逐字)。 -const POSITION_WRITE_FIELDS: [(&str, &str, &str); 8] = [ - ("fullName", "f_full_name", ""), - ("enCode", "f_en_code", ""), - ("type", "f_type", ""), - ("organizeId", "f_organize_id", ""), - ("parentId", "f_parent_id", ""), - ("description", "f_description", ""), - ("enabledMark", "f_enabled_mark", "::integer"), - ("sortCode", "f_sort_code", "::bigint"), -]; - -/// `GET /api/permission/Organize/AsyncPosList` —— 组织 + 岗位混合下拉(官方 `organize.ts:68`)。 -/// -/// 🔴 前端 `getOrgAndPosSelector({id, type})`:机构管理页「组织/岗位」两个面板都用它。 -/// 本仓**岗位与组织是两张表**,没有官方那种「一个接口混出两种节点」的模型 -/// ⇒ 按 `type` 分流:`organize` 返机构、`position` 返岗位、其他返机构(默认)。 -pub async fn organize_async_pos_list( - State(state): State, - headers: HeaderMap, - raw: RawQuery, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_ORGANIZE).await { - return resp; - } - let kind = crate::platform::sys::query_param(&raw, "type"); - let kind = kind.trim().to_string(); - let rows = if kind == "position" { - let sql = format!( - "SELECT {POSITION_PROJECTION} FROM base_position \ - WHERE COALESCE(f_delete_mark,0) = 0 \ - ORDER BY f_sort_code ASC, f_full_name ASC" - ); - state.db.query_json_params(&sql, &[]).await - } else { - let parent = crate::platform::sys::query_param(&raw, "id"); - let parent = parent.trim(); - let parent = if parent.is_empty() { "0" } else { parent }.to_string(); - let sql = format!( - "SELECT {ORGANIZE_PROJECTION} FROM base_organize WHERE f_delete_mark = 0 \ - AND COALESCE(f_parent_id, '0') = $1::text \ - ORDER BY f_sort_code ASC, f_full_name ASC" - ); - state.db.query_json_params(&sql, &[&parent]).await - }; - match rows { - Ok(rows) => ok(list_vo(rows)), - Err(e) => db_error(e, "组织岗位下拉查询"), - } -} - -/// `GET /api/permission/Position` —— 岗位列表(`ListVO`)。 -pub async fn position_list( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_POSITION).await { - return resp; - } - let sql = format!( - "SELECT {POSITION_PROJECTION} FROM base_position WHERE COALESCE(f_delete_mark,0) = 0 \ - ORDER BY f_sort_code ASC, f_full_name ASC" - ); - match state.db.query_json_params(&sql, &[]).await { - Ok(rows) => ok(list_vo(rows)), - Err(e) => db_error(e, "岗位列表查询"), - } -} - -/// `GET /api/permission/Position/{id}` —— 岗位详情。 -pub async fn position_info( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_POSITION).await { - return resp; - } - let id = id.trim().to_string(); - let sql = format!( - "SELECT {POSITION_PROJECTION} FROM base_position \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1" - ); - match state.db.query_json_params(&sql, &[&id]).await { - Ok(rows) => match rows.into_iter().next() { - Some(row) => ok(row), - None => fail(code::FAIL, "岗位不存在"), - }, - Err(e) => db_error(e, "岗位详情查询"), - } -} - -/// `POST /api/permission/Position` —— 建岗位。 -pub async fn position_create( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_POSITION).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let full_name = obj - .get("fullName") - .and_then(Value::as_str) - .unwrap_or_default() - .trim() - .to_string(); - if full_name.is_empty() { - return fail(code::FAIL, "岗位名称不能为空"); - } - - let new_id = new_uuid(); - let mut columns: Vec<&str> = vec!["f_id", "f_tenant_id", "f_full_name"]; - let mut casts: Vec<&str> = vec!["", "", ""]; - let mut values: Vec> = - vec![Some(new_id.clone()), Some("0".to_string()), Some(full_name)]; - - for (json_key, column, cast) in POSITION_WRITE_FIELDS { - if column == "f_full_name" { - continue; - } - if obj.contains_key(json_key) { - columns.push(column); - casts.push(cast); - values.push(value_to_text(obj.get(json_key))); - } - } - if !obj.contains_key("enabledMark") { - columns.push("f_enabled_mark"); - casts.push("::integer"); - values.push(Some("1".to_string())); - } - if !obj.contains_key("sortCode") { - columns.push("f_sort_code"); - casts.push("::bigint"); - values.push(Some("0".to_string())); - } - // `f_position_id_tree`:本仓岗位只有一层(无父子树)⇒ 就是自己。 - columns.push("f_position_id_tree"); - casts.push(""); - values.push(Some(new_id.clone())); - columns.push("f_creator_user_id"); - casts.push(""); - values.push(Some(user.account.clone())); - columns.push("f_delete_mark"); - casts.push("::integer"); - values.push(Some("0".to_string())); - columns.push("f_creator_time"); - let mut marks: Vec = (0..values.len()) - .map(|i| placeholder(i + 1, casts[i])) - .collect(); - marks.push("now()".to_string()); - let sql = format!( - "INSERT INTO base_position ({}) VALUES ({})", - columns.join(", "), - marks.join(", ") - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "新建岗位"); - } - ok(json!({ "id": new_id })) -} - -/// `PUT /api/permission/Position/{id}` —— 改岗位(**只 SET body 里出现的键**)。 -pub async fn position_update( - State(state): State, - headers: HeaderMap, - Path(id): Path, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_POSITION).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let rows = match state - .db - .query_json_params( - "SELECT f_id AS \"id\" FROM base_position \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", - &[&id], - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "岗位查询"), - }; - if rows.is_empty() { - return fail(code::FAIL, "岗位不存在"); - } - - let mut sets: Vec = Vec::new(); - let mut values: Vec> = Vec::new(); - for (json_key, column, cast) in POSITION_WRITE_FIELDS { - if !obj.contains_key(json_key) { - continue; - } - values.push(value_to_text(obj.get(json_key))); - sets.push(format!("{} = ${}::text{}", column, values.len(), cast)); - } - if sets.is_empty() { - return ok(Value::Null); - } - values.push(Some(user.account.clone())); - sets.push(format!("f_last_modify_user_id = ${}::text", values.len())); - sets.push("f_last_modify_time = now()".to_string()); - values.push(Some(id)); - let sql = format!( - "UPDATE base_position SET {} WHERE f_id = ${}::text", - sets.join(", "), - values.len() - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "修改岗位"); - } - ok(Value::Null) -} - -/// `DELETE /api/permission/Position/{id}` —— 删岗位(软删)。 -pub async fn position_delete( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - let user = match guard(&state, &headers, EN_POSITION).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let values = [Some(user.account.clone()), Some(id)]; - let sql = "UPDATE base_position SET f_delete_mark = 1, f_delete_time = now(), \ - f_delete_user_id = $1::text WHERE f_id = $2::text \ - AND COALESCE(f_delete_mark,0) = 0"; - if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { - return db_error(e, "删除岗位"); - } - ok(Value::Null) -} - -/// `GET /api/permission/Position/Selector` —— 岗位下拉(`ListVO`)。 -pub async fn position_selector( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_POSITION).await { - return resp; - } - let sql = format!( - "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ - f_type AS \"type\", COALESCE(f_organize_id, '') AS \"organizeId\", \ - COALESCE(f_sort_code, 0) AS \"sortCode\", \ - COALESCE(f_enabled_mark, 0) AS \"enabledMark\" \ - FROM base_position WHERE COALESCE(f_delete_mark,0) = 0 \ - ORDER BY f_sort_code ASC, f_full_name ASC" - ); - match state.db.query_json_params(&sql, &[]).await { - Ok(rows) => ok(list_vo(rows)), - Err(e) => db_error(e, "岗位下拉查询"), - } -} - -/// `GET /api/permission/Position/SelectorTree` —— 岗位下拉**树**(按 `organizeId` 分组)。 -/// -/// 🔴 前端 `getPositionSelectorTree({organizeId})` 要的是「机构下挂岗位」的两层结构; -/// 本仓岗位表**没有层级**(`f_parent_id` 未建模)⇒ 退化为「按机构分组的平铺树」, -/// `organizeId` 命中就只返该机构的岗位。 -pub async fn position_selector_tree( - State(state): State, - headers: HeaderMap, - raw: RawQuery, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_POSITION).await { - return resp; - } - let org = crate::platform::sys::query_param(&raw, "organizeId"); - let org = org.trim().to_string(); - let (sql, params): (String, Vec>) = if org.is_empty() { - ( - format!( - "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ - COALESCE(f_organize_id, '') AS \"organizeId\", \ - COALESCE(f_sort_code, 0) AS \"sortCode\" \ - FROM base_position WHERE COALESCE(f_delete_mark,0) = 0 \ - ORDER BY f_sort_code ASC, f_full_name ASC" - ), - Vec::new(), - ) - } else { - ( - format!( - "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ - COALESCE(f_organize_id, '') AS \"organizeId\", \ - COALESCE(f_sort_code, 0) AS \"sortCode\" \ - FROM base_position WHERE COALESCE(f_delete_mark,0) = 0 \ - AND COALESCE(f_organize_id,'') = $1::text \ - ORDER BY f_sort_code ASC, f_full_name ASC" - ), - vec![Some(org)], - ) - }; - match state.db.query_json_params(&sql, ¶ms_of(¶ms)).await { - Ok(rows) => ok(list_vo(rows)), - Err(e) => db_error(e, "岗位下拉树查询"), - } -} - -/// `POST /api/permission/Position/PositionCondition` —— 按 id 集取岗位(body `{ids:[…]}`)。 -pub async fn position_condition( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_POSITION).await { - return resp; - } - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return ok(list_vo(Vec::new())), - Err(resp) => return resp, - }; - let ids = id_list(&obj); - if ids.is_empty() { - return ok(list_vo(Vec::new())); - } - let joined = ids.join(","); - let sql = format!( - "SELECT {POSITION_PROJECTION} FROM base_position \ - WHERE COALESCE(f_delete_mark,0) = 0 \ - AND f_id = ANY(string_to_array($1::text, ',')) \ - ORDER BY f_sort_code ASC, f_full_name ASC" - ); - match state - .db - .query_json_params(&sql, ¶ms_of(&[Some(joined)])) - .await - { - Ok(rows) => ok(list_vo(rows)), - Err(e) => db_error(e, "岗位条件查询"), - } -} - -/// `POST /api/permission/Position/SelectedList` —— 已选岗位基本信息(body `{ids:[…]}`)。 -/// -/// 🔴 **刻意不复用 `position_condition`**:契约扫描器是**静态**推守卫的, -/// 委托调用会让它「推不出守卫」(CC6 判「推不出 ≠ 一致」)⇒ 这里自立一份。 -pub async fn position_selected_list( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_POSITION).await { - return resp; - } - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return ok(list_vo(Vec::new())), - Err(resp) => return resp, - }; - let ids = id_list(&obj); - if ids.is_empty() { - return ok(list_vo(Vec::new())); - } - let joined = ids.join(","); - let sql = format!( - "SELECT {POSITION_PROJECTION} FROM base_position \ - WHERE COALESCE(f_delete_mark,0) = 0 \ - AND f_id = ANY(string_to_array($1::text, ',')) \ - ORDER BY f_sort_code ASC, f_full_name ASC" - ); - match state - .db - .query_json_params(&sql, ¶ms_of(&[Some(joined)])) - .await - { - Ok(rows) => ok(list_vo(rows)), - Err(e) => db_error(e, "已选岗位查询"), - } -} - -/// `POST /api/permission/Position/{id}/Actions/DutyPosition` —— 设为机构责任岗位。 -pub async fn position_duty_position( - State(state): State, - headers: HeaderMap, - Path(id): Path, - raw: RawQuery, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_POSITION).await { - return resp; - } - let id = id.trim().to_string(); - let org = crate::platform::sys::query_param(&raw, "organizeId"); - let org = org.trim().to_string(); - if org.is_empty() { - return fail(code::FAIL, "organizeId 不能为空"); - } - let values = [Some(id), Some(org)]; - let sql = "UPDATE base_organize SET f_duty_position = $1::text WHERE f_id = $2::text \ - AND COALESCE(f_delete_mark,0) = 0"; - if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { - return db_error(e, "设置责任岗位"); - } - ok(Value::Null) -} - -/// `POST /api/permission/Position/{id}/Actions/DutyUser` —— 设为岗位责任人。 -pub async fn position_duty_user( - State(state): State, - headers: HeaderMap, - Path(id): Path, - raw: RawQuery, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_POSITION).await { - return resp; - } - let id = id.trim().to_string(); - let user_id = crate::platform::sys::query_param(&raw, "userId"); - let user_id = user_id.trim().to_string(); - if user_id.is_empty() { - return fail(code::FAIL, "userId 不能为空"); - } - let values = [Some(user_id), Some(id)]; - let sql = "UPDATE base_position SET f_duty_user = $1::text WHERE f_id = $2::text \ - AND COALESCE(f_delete_mark,0) = 0"; - if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { - return db_error(e, "设置岗位责任人"); - } - ok(Value::Null) -} - -// ---------------------------------------------------------------- 角色管理(base_role) - -/// 🔴 **列名只来自这张白名单**(`db/schema.sql` 的 `base_role`,官方 DDL 逐字)。 -const ROLE_WRITE_FIELDS: [(&str, &str, &str); 7] = [ - ("fullName", "f_full_name", ""), - ("enCode", "f_en_code", ""), - ("type", "f_type", ""), - ("globalMark", "f_global_mark", "::integer"), - ("description", "f_description", ""), - ("enabledMark", "f_enabled_mark", "::integer"), - ("sortCode", "f_sort_code", "::bigint"), -]; - -const ROLE_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ - f_en_code AS \"enCode\", f_type AS \"type\", \ - COALESCE(f_global_mark, 0) AS \"globalMark\", f_description AS \"description\", \ - COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ - COALESCE(f_sort_code, 0) AS \"sortCode\", \ - COALESCE(f_is_condition, 0) AS \"isCondition\", \ - (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\""; - -/// `GET /api/permission/Role/{id}` —— 角色详情。 -pub async fn role_info( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_ROLE).await { - return resp; - } - let id = id.trim().to_string(); - let sql = format!( - "SELECT {ROLE_PROJECTION} FROM base_role \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1" - ); - match state.db.query_json_params(&sql, &[&id]).await { - Ok(rows) => match rows.into_iter().next() { - Some(row) => ok(row), - None => fail(code::FAIL, "角色不存在"), - }, - Err(e) => db_error(e, "角色详情查询"), - } -} - -/// `POST /api/permission/Role` —— 建角色。 -pub async fn role_create( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_ROLE).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let full_name = obj - .get("fullName") - .and_then(Value::as_str) - .unwrap_or_default() - .trim() - .to_string(); - if full_name.is_empty() { - return fail(code::FAIL, "角色名称不能为空"); - } - - let new_id = new_uuid(); - let mut columns: Vec<&str> = vec!["f_id", "f_tenant_id", "f_full_name"]; - let mut casts: Vec<&str> = vec!["", "", ""]; - let mut values: Vec> = - vec![Some(new_id.clone()), Some("0".to_string()), Some(full_name)]; - - for (json_key, column, cast) in ROLE_WRITE_FIELDS { - if column == "f_full_name" { - continue; - } - if obj.contains_key(json_key) { - columns.push(column); - casts.push(cast); - values.push(value_to_text(obj.get(json_key))); - } - } - if !obj.contains_key("enabledMark") { - columns.push("f_enabled_mark"); - casts.push("::integer"); - values.push(Some("1".to_string())); - } - if !obj.contains_key("sortCode") { - columns.push("f_sort_code"); - casts.push("::bigint"); - values.push(Some("0".to_string())); - } - columns.push("f_creator_user_id"); - casts.push(""); - values.push(Some(user.account.clone())); - columns.push("f_delete_mark"); - casts.push("::integer"); - values.push(Some("0".to_string())); - columns.push("f_creator_time"); - let mut marks: Vec = (0..values.len()) - .map(|i| placeholder(i + 1, casts[i])) - .collect(); - marks.push("now()".to_string()); - let sql = format!( - "INSERT INTO base_role ({}) VALUES ({})", - columns.join(", "), - marks.join(", ") - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "新建角色"); - } - ok(json!({ "id": new_id })) -} - -/// `PUT /api/permission/Role/{id}` —— 改角色(**只 SET body 里出现的键**)。 -pub async fn role_update( - State(state): State, - headers: HeaderMap, - Path(id): Path, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_ROLE).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let rows = match state - .db - .query_json_params( - "SELECT f_id AS \"id\" FROM base_role \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", - &[&id], - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "角色查询"), - }; - if rows.is_empty() { - return fail(code::FAIL, "角色不存在"); - } - - let mut sets: Vec = Vec::new(); - let mut values: Vec> = Vec::new(); - for (json_key, column, cast) in ROLE_WRITE_FIELDS { - if !obj.contains_key(json_key) { - continue; - } - values.push(value_to_text(obj.get(json_key))); - sets.push(format!("{} = ${}::text{}", column, values.len(), cast)); - } - if sets.is_empty() { - return ok(Value::Null); - } - values.push(Some(user.account.clone())); - sets.push(format!("f_last_modify_user_id = ${}::text", values.len())); - sets.push("f_last_modify_time = now()".to_string()); - values.push(Some(id)); - let sql = format!( - "UPDATE base_role SET {} WHERE f_id = ${}::text", - sets.join(", "), - values.len() - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "修改角色"); - } - ok(Value::Null) -} - -/// `DELETE /api/permission/Role/{id}` —— 删角色(软删)。 -pub async fn role_delete( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - let user = match guard(&state, &headers, EN_ROLE).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let values = [Some(user.account.clone()), Some(id)]; - let sql = "UPDATE base_role SET f_delete_mark = 1, f_delete_time = now(), \ - f_delete_user_id = $1::text WHERE f_id = $2::text \ - AND COALESCE(f_delete_mark,0) = 0"; - if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { - return db_error(e, "删除角色"); - } - ok(Value::Null) -} - -/// `GET /api/permission/Role/Selector` —— 角色下拉(`ListVO`)。 -pub async fn role_selector( - State(state): State, - headers: HeaderMap, - raw: RawQuery, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_ROLE).await { - return resp; - } - let type_filter = crate::platform::sys::query_param(&raw, "type"); - let type_filter = type_filter.trim().to_string(); - let (sql, params): (String, Vec>) = if type_filter.is_empty() { - ( - format!( - "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ - f_type AS \"type\", COALESCE(f_sort_code, 0) AS \"sortCode\" \ - FROM base_role WHERE COALESCE(f_delete_mark,0) = 0 \ - ORDER BY f_sort_code ASC, f_full_name ASC" - ), - Vec::new(), - ) - } else { - ( - format!( - "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ - f_type AS \"type\", COALESCE(f_sort_code, 0) AS \"sortCode\" \ - FROM base_role WHERE COALESCE(f_delete_mark,0) = 0 AND f_type = $1::text \ - ORDER BY f_sort_code ASC, f_full_name ASC" - ), - vec![Some(type_filter)], - ) - }; - match state.db.query_json_params(&sql, ¶ms_of(¶ms)).await { - Ok(rows) => ok(list_vo(rows)), - Err(e) => db_error(e, "角色下拉查询"), - } -} - -/// `POST /api/permission/Role/RoleCondition` —— 按 id 集取角色(body `{ids:[…]}`)。 -pub async fn role_condition( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_ROLE).await { - return resp; - } - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return ok(list_vo(Vec::new())), - Err(resp) => return resp, - }; - let ids = id_list(&obj); - if ids.is_empty() { - return ok(list_vo(Vec::new())); - } - let joined = ids.join(","); - let sql = format!( - "SELECT {ROLE_PROJECTION} FROM base_role \ - WHERE COALESCE(f_delete_mark,0) = 0 \ - AND f_id = ANY(string_to_array($1::text, ',')) \ - ORDER BY f_sort_code ASC, f_full_name ASC" - ); - match state - .db - .query_json_params(&sql, ¶ms_of(&[Some(joined)])) - .await - { - Ok(rows) => ok(list_vo(rows)), - Err(e) => db_error(e, "角色条件查询"), - } -} - -/// `GET /api/permission/Group/Selector` —— 分组下拉(`ListVO`)。 -pub async fn group_selector( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - let sql = format!( - "SELECT {GROUP_PROJECTION} FROM base_group WHERE COALESCE(f_delete_mark,0) = 0 \ - ORDER BY f_sort_code ASC, f_full_name ASC" - ); - match state.db.query_json_params(&sql, &[]).await { - Ok(rows) => ok(list_vo(rows)), - Err(e) => db_error(e, "分组下拉查询"), - } -} - -// ---------------------------------------------------------------- 菜单管理(base_module) - /// 🔴 **列名只来自这张白名单**(`db/schema.sql` 的 `base_module`,29 列)。 /// 驼峰 ≠ 下划线机械转换(如 `urlAddress` ↔ `f_url_address`)。 const MENU_WRITE_FIELDS: [(&str, &str, &str); 13] = [ @@ -3361,7 +331,7 @@ pub async fn menu_create( } // 🔴 菜单**必须落在某个系统**下(`f_system_id`),否则 `ModuleBySystem` 查不到它 // ⇒ 不传就落到当前 `App-Code` 解析出的系统。 - let sys = system::resolve_system(&state.db, system::app_code_of(&headers).as_deref()).await; + let sys = registry::resolve_system(&state.db, registry::app_code_of(&headers).as_deref()).await; let new_id = new_uuid(); let mut columns: Vec<&str> = vec!["f_id", "f_tenant_id", "f_full_name", "f_system_id"]; @@ -3509,7 +479,7 @@ pub async fn menu_selector( return resp; } let id = id.trim().to_string(); - let sys = system::resolve_system(&state.db, system::app_code_of(&headers).as_deref()).await; + let sys = registry::resolve_system(&state.db, registry::app_code_of(&headers).as_deref()).await; let sql = format!( "SELECT {MENU_PROJECTION} FROM base_module WHERE f_delete_mark = 0 \ AND f_system_id = $1::text \ @@ -3531,7 +501,7 @@ pub async fn menu_selector_all( if let Err(resp) = guard(&state, &headers, EN_MENU).await { return resp; } - let sys = system::resolve_system(&state.db, system::app_code_of(&headers).as_deref()).await; + let sys = registry::resolve_system(&state.db, registry::app_code_of(&headers).as_deref()).await; let sql = format!( "SELECT {MENU_PROJECTION} FROM base_module WHERE f_delete_mark = 0 \ AND f_system_id = $1::text \ @@ -3555,7 +525,7 @@ pub async fn menu_selector_filter( return resp; } let id = id.trim().to_string(); - let sys = system::resolve_system(&state.db, system::app_code_of(&headers).as_deref()).await; + let sys = registry::resolve_system(&state.db, registry::app_code_of(&headers).as_deref()).await; let sql = format!( "SELECT {MENU_PROJECTION} FROM base_module WHERE f_delete_mark = 0 \ AND f_system_id = $1::text \ @@ -3577,7 +547,7 @@ pub async fn menu_selector_form( if let Err(resp) = guard(&state, &headers, EN_MENU).await { return resp; } - let sys = system::resolve_system(&state.db, system::app_code_of(&headers).as_deref()).await; + let sys = registry::resolve_system(&state.db, registry::app_code_of(&headers).as_deref()).await; let sql = format!( "SELECT {MENU_PROJECTION} FROM base_module WHERE f_delete_mark = 0 \ AND f_system_id = $1::text \ @@ -3597,7 +567,7 @@ pub async fn menu_get_system_menu( if let Err(resp) = guard(&state, &headers, EN_MENU).await { return resp; } - let sys = system::resolve_system(&state.db, system::app_code_of(&headers).as_deref()).await; + let sys = registry::resolve_system(&state.db, registry::app_code_of(&headers).as_deref()).await; let sql = format!( "SELECT {MENU_PROJECTION} FROM base_module WHERE f_delete_mark = 0 \ AND f_system_id = $1::text \ @@ -3619,7 +589,7 @@ pub async fn menu_selector_page( return resp; } let page = Paging::of(&raw); - let sys = system::resolve_system(&state.db, system::app_code_of(&headers).as_deref()).await; + let sys = registry::resolve_system(&state.db, registry::app_code_of(&headers).as_deref()).await; let type_filter = crate::platform::sys::query_param(&raw, "type"); let type_filter = type_filter.trim().to_string(); @@ -3709,8 +679,6 @@ pub async fn menu_permission_info( ok(json!({ "list": [] })) } -// ---------------------------------------------------------------- 数据字典(base_dictionary_*) - /// 🔴 字典**没有**官方 `permission.*` 点权限码(官方靠菜单路径鉴权) /// ⇒ 本仓自定 `permission.dictionary`,与面 B 的 `has_en_code_permission` 同一套判据。 const EN_DICTIONARY: &str = "permission.dictionary"; @@ -4223,2939 +1191,6 @@ pub async fn dict_data_export( ok(Value::Null) } -// ---------------------------------------------------------------- 用户选人 / 授权 / 关系 - -/// `GET /api/permission/Users/Selector` —— 用户下拉(**用户选择器**,`ListVO`)。 -/// -/// 🔴 几乎所有「选人」控件都走它(工作流、授权、交接)。本仓只有 `base_user` 一张表 -/// ⇒ 恒返未软删用户;`organizeId`/`positionId`/`roleId` 暂不做过滤(本仓无对应关系表)。 -pub async fn users_selector( - State(state): State, - headers: HeaderMap, - raw: RawQuery, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - let keyword = crate::platform::sys::query_param(&raw, "keyword"); - let keyword = keyword.trim().to_string(); - let sql = if keyword.is_empty() { - format!( - "SELECT f_id AS \"id\", f_account AS \"account\", f_real_name AS \"realName\", \ - f_real_name AS \"fullName\", f_gender AS \"gender\", \ - f_mobile_phone AS \"mobilePhone\", f_email AS \"email\", \ - f_head_icon AS \"headIcon\", \ - COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ - COALESCE(f_sort_code, 0) AS \"sortCode\" \ - FROM base_user WHERE f_delete_mark = 0 \ - ORDER BY f_sort_code ASC, f_account ASC" - ) - } else { - format!( - "SELECT f_id AS \"id\", f_account AS \"account\", f_real_name AS \"realName\", \ - f_real_name AS \"fullName\", f_gender AS \"gender\", \ - f_mobile_phone AS \"mobilePhone\", f_email AS \"email\", \ - f_head_icon AS \"headIcon\", \ - COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ - COALESCE(f_sort_code, 0) AS \"sortCode\" \ - FROM base_user WHERE f_delete_mark = 0 \ - AND (f_account ILIKE $1::text OR f_real_name ILIKE $1::text) \ - ORDER BY f_sort_code ASC, f_account ASC" - ) - }; - let like_values = [Some(format!("%{keyword}%"))]; - let params: Vec<&(dyn ToSql + Sync)> = if keyword.is_empty() { - Vec::new() - } else { - params_of(&like_values) - }; - match state.db.query_json_params(&sql, ¶ms).await { - Ok(rows) => ok(list_vo(rows)), - Err(e) => db_error(e, "用户下拉查询"), - } -} - -/// `POST /api/permission/Users/getUserList` —— 按 id 集取用户基本信息(body `{ids:[…]}`)。 -pub async fn users_get_user_list( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return ok(list_vo(Vec::new())), - Err(resp) => return resp, - }; - let ids = id_list(&obj); - if ids.is_empty() { - return ok(list_vo(Vec::new())); - } - let joined = ids.join(","); - let sql = "SELECT f_id AS \"id\", f_account AS \"account\", f_real_name AS \"realName\", \ - f_real_name AS \"fullName\", f_gender AS \"gender\", \ - f_mobile_phone AS \"mobilePhone\", f_email AS \"email\", \ - f_head_icon AS \"headIcon\", f_organize_id AS \"organizeId\", \ - f_position_id AS \"positionId\", \ - COALESCE(f_enabled_mark, 0) AS \"enabledMark\" \ - FROM base_user WHERE f_delete_mark = 0 \ - AND f_id = ANY(string_to_array($1::text, ',')) \ - ORDER BY f_account ASC"; - match state - .db - .query_json_params(sql, ¶ms_of(&[Some(joined)])) - .await - { - Ok(rows) => ok(list_vo(rows)), - Err(e) => db_error(e, "用户基本信息查询"), - } -} - -/// `POST /api/permission/Users/getSelectedList` —— 已选用户(**刻意不复用 `getUserList`**)。 -pub async fn users_get_selected_list( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return ok(list_vo(Vec::new())), - Err(resp) => return resp, - }; - let ids = id_list(&obj); - if ids.is_empty() { - return ok(list_vo(Vec::new())); - } - let joined = ids.join(","); - let sql = "SELECT f_id AS \"id\", f_account AS \"account\", f_real_name AS \"realName\", \ - f_real_name AS \"fullName\", f_head_icon AS \"headIcon\", \ - f_organize_id AS \"organizeId\", f_position_id AS \"positionId\" \ - FROM base_user WHERE f_delete_mark = 0 \ - AND f_id = ANY(string_to_array($1::text, ','))"; - match state - .db - .query_json_params(sql, ¶ms_of(&[Some(joined)])) - .await - { - Ok(rows) => ok(list_vo(rows)), - Err(e) => db_error(e, "已选用户查询"), - } -} - -/// `POST /api/permission/Users/getSelectedUserList` —— 已选用户(**组织维度**,恒同 `getSelectedList`)。 -pub async fn users_get_selected_user_list( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return ok(list_vo(Vec::new())), - Err(resp) => return resp, - }; - let ids = id_list(&obj); - if ids.is_empty() { - return ok(list_vo(Vec::new())); - } - let joined = ids.join(","); - let sql = "SELECT f_id AS \"id\", f_account AS \"account\", f_real_name AS \"realName\", \ - f_real_name AS \"fullName\", f_head_icon AS \"headIcon\", \ - f_organize_id AS \"organizeId\", f_position_id AS \"positionId\" \ - FROM base_user WHERE f_delete_mark = 0 \ - AND f_id = ANY(string_to_array($1::text, ','))"; - match state - .db - .query_json_params(sql, ¶ms_of(&[Some(joined)])) - .await - { - Ok(rows) => ok(list_vo(rows)), - Err(e) => db_error(e, "已选用户(组织维度)查询"), - } -} - -/// `GET /api/permission/Users/ReceiveUserList` —— 工作交接的**接收人**候选(`ListVO`)。 -pub async fn users_receive_user_list( - State(state): State, - headers: HeaderMap, -) -> Json { - // 🔴 守卫**先自己判一遍**:契约扫描器静态推守卫,纯委托会「推不出」。 - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - users_selector(State(state), headers, RawQuery(None)).await -} - -/// `GET /api/permission/Users/getAllPermission` —— 当前用户的**全部点权限**(`ListVO`)。 -/// -/// 🔴 本仓**只做菜单级**权限(已知限制 (ag))⇒ 点权限集合 = 可见菜单的 `f_en_code` 列表。 -pub async fn users_get_all_permission( - State(state): State, - headers: HeaderMap, -) -> Json { - let user = match guard(&state, &headers, EN_USER).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let sys = system::resolve_system(&state.db, system::app_code_of(&headers).as_deref()).await; - let rows = load_menus(&state.db, &user.user_id, user.is_admin, &sys.id).await; - let list: Vec = rows - .into_iter() - .filter_map(|m| { - let code = m.en_code.clone().unwrap_or_default().trim().to_string(); - if code.is_empty() { - None - } else { - Some(json!({ "enCode": code, "id": m.id, "fullName": m.full_name })) - } - }) - .collect(); - ok(list_vo(list)) -} - -/// `GET /api/permission/Users/Authorize` —— 用户授权页的**已授权集合**(`ListVO`)。 -/// -/// 🔴 本仓授权只到菜单级 ⇒ 返该用户可见菜单 id 列表,形状与 `getAllPermission` 同源。 -pub async fn users_authorize( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - users_get_all_permission(State(state), headers).await -} - -/// `GET /api/permission/Authority/{type}/{objectId}` —— 通用权限树(门户/流程/打印模板)。 -/// -/// 🔴 本仓**没有** Portal / 流程 / 打印模板三类对象 ⇒ 恒返空权限模型 -/// (`ids:[]` + `all:false`),与面 B 的 `AuthorityDataReturnVO` 同形。 -pub async fn authority_common_values( - State(state): State, - headers: HeaderMap, - Path((kind, object_id)): Path<(String, String)>, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_ROLE).await { - return resp; - } - let _ = (kind.trim(), object_id.trim()); - ok(json!({ "ids": [], "all": false, "list": [] })) -} - -/// `POST /api/permission/Authority/{type}/{objectId}` —— 更新通用权限(**恒成功**)。 -pub async fn authority_common_update( - State(state): State, - headers: HeaderMap, - Path((kind, object_id)): Path<(String, String)>, - body: Bytes, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_ROLE).await { - return resp; - } - let _ = (kind.trim(), object_id.trim(), body); - ok(Value::Null) -} - -/// `GET /api/permission/RoleRelation/roleList` —— 某对象已绑定的角色(`ListVO`)。 -/// -/// 🔴 官方是「按 objectId 查角色关系」;本仓 `base_role_relation` 只记**用户↔角色** -/// ⇒ `objectId` 当**用户 id** 用;查不到就返空(不是错误)。 -pub async fn role_relation_role_list( - State(state): State, - headers: HeaderMap, - raw: RawQuery, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_ROLE).await { - return resp; - } - let object_id = crate::platform::sys::query_param(&raw, "objectId"); - let object_id = object_id.trim().to_string(); - if object_id.is_empty() { - return ok(list_vo(Vec::new())); - } - // 🔴 `base_role_relation` 是**通用对象关系**(`f_object_type` + `f_object_id`), - // 没有 `f_user_id` 这一列 —— 官方同构(`RoleRelation` 可挂用户/机构/岗位/分组)。 - let sql = "SELECT r.f_id AS \"id\", r.f_full_name AS \"fullName\", \ - r.f_en_code AS \"enCode\", r.f_type AS \"type\", \ - COALESCE(r.f_sort_code, 0) AS \"sortCode\" \ - FROM base_role_relation rr \ - JOIN base_role r ON r.f_id = rr.f_role_id \ - WHERE COALESCE(rr.f_delete_mark,0) = 0 AND COALESCE(r.f_delete_mark,0) = 0 \ - AND rr.f_object_id = $1::text \ - ORDER BY r.f_sort_code ASC, r.f_full_name ASC"; - match state - .db - .query_json_params(sql, ¶ms_of(&[Some(object_id)])) - .await - { - Ok(rows) => ok(list_vo(rows)), - Err(e) => db_error(e, "角色关系查询"), - } -} - -/// `POST /api/permission/RoleRelation/addRoles` —— 给对象批量**加**角色(body `{objectId, roleIds}`)。 -pub async fn role_relation_add_roles( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_ROLE).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let object_id = obj - .get("objectId") - .and_then(Value::as_str) - .unwrap_or_default() - .trim() - .to_string(); - let ids = id_list_of(&obj, "roleIds"); - if object_id.is_empty() || ids.is_empty() { - return ok(Value::Null); - } - let object_type = obj - .get("objectType") - .and_then(Value::as_str) - .unwrap_or_default() - .trim(); - // 🔴 默认值必须是**小写** `user`(官方 `PermissionConst.USER`)—— - // 写成 `User` 会让这一行对授权引擎(只认 `f_object_type='user'`)**永久不可见**。 - // 前端实际总传小写(`organize/index.vue` `type: … ? 'position' : 'organize'`), - // 这里只是兜底。 - let object_type = if object_type.is_empty() { - "user".to_string() - } else { - object_type.to_string() - }; - for role_id in ids { - let values = [ - Some(new_uuid()), - Some(user.account.clone()), - Some(object_id.clone()), - Some(object_type.clone()), - Some(role_id), - ]; - let sql = "INSERT INTO base_role_relation \ - (f_id, f_creator_user_id, f_object_id, f_object_type, f_role_id, \ - f_creator_time, f_delete_mark) \ - VALUES ($1::text, $2::text, $3::text, $4::text, $5::text, now(), 0) \ - ON CONFLICT DO NOTHING"; - if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { - return db_error(e, "添加角色关系"); - } - } - ok(Value::Null) -} - -/// `POST /api/permission/RoleRelation/deleteRoles` —— 批量**解绑**角色(body `{objectId, roleIds}`)。 -pub async fn role_relation_delete_roles( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_ROLE).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let object_id = obj - .get("objectId") - .and_then(Value::as_str) - .unwrap_or_default() - .trim() - .to_string(); - let ids = id_list_of(&obj, "roleIds"); - if object_id.is_empty() || ids.is_empty() { - return ok(Value::Null); - } - for role_id in ids { - let values = [ - Some(user.account.clone()), - Some(object_id.clone()), - Some(role_id), - ]; - let sql = "UPDATE base_role_relation SET f_delete_mark = 1, f_delete_time = now(), \ - f_delete_user_id = $1::text \ - WHERE f_object_id = $2::text AND f_role_id = $3::text"; - if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { - return db_error(e, "删除角色关系"); - } - } - ok(Value::Null) -} - -/// `POST /api/permission/RoleRelation/delete` —— 解绑(body `{objectId, ids}`,恒等价 `deleteRoles`)。 -pub async fn role_relation_delete( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_ROLE).await { - return resp; - } - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return ok(Value::Null), - Err(resp) => return resp, - }; - let object_id = obj - .get("objectId") - .and_then(Value::as_str) - .unwrap_or_default() - .trim() - .to_string(); - let ids = id_list_of(&obj, "ids"); - if object_id.is_empty() || ids.is_empty() { - return ok(Value::Null); - } - for role_id in ids { - let values = [Some(object_id.clone()), Some(role_id)]; - let sql = "UPDATE base_role_relation SET f_delete_mark = 1, f_delete_time = now() \ - WHERE f_object_id = $1::text AND f_role_id = $2::text"; - if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { - return db_error(e, "删除角色关系"); - } - } - ok(Value::Null) -} - -/// `POST /api/permission/UserRelation` —— 建用户↔对象关系(body `{objectType, objectId, userIds}`)。 -pub async fn user_relation_create( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_USER).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let object_type = obj - .get("objectType") - .and_then(Value::as_str) - .unwrap_or_default() - .trim() - .to_string(); - let object_id = obj - .get("objectId") - .and_then(Value::as_str) - .unwrap_or_default() - .trim() - .to_string(); - let ids = id_list_of(&obj, "userIds"); - if object_id.is_empty() || ids.is_empty() { - return ok(Value::Null); - } - let object_type = if object_type.is_empty() { - "Group".to_string() - } else { - object_type - }; - for uid in ids { - let values = [ - Some(new_uuid()), - Some(user.account.clone()), - Some(uid), - Some(object_type.clone()), - Some(object_id.clone()), - ]; - let sql = "INSERT INTO base_user_relation \ - (f_id, f_creator_user_id, f_user_id, f_object_type, f_object_id, \ - f_creator_time, f_delete_mark) \ - VALUES ($1::text, $2::text, $3::text, $4::text, $5::text, now(), 0) \ - ON CONFLICT DO NOTHING"; - if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { - return db_error(e, "新建用户关系"); - } - } - ok(Value::Null) -} - -/// `POST /api/permission/UserRelation/delete` —— 删用户↔对象关系(body `{objectType, objectId, userIds}`)。 -pub async fn user_relation_delete( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_USER).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let object_id = obj - .get("objectId") - .and_then(Value::as_str) - .unwrap_or_default() - .trim() - .to_string(); - let ids = id_list_of(&obj, "userIds"); - if object_id.is_empty() || ids.is_empty() { - return ok(Value::Null); - } - for uid in ids { - let values = [ - Some(user.account.clone()), - Some(uid), - Some(object_id.clone()), - ]; - let sql = "UPDATE base_user_relation SET f_delete_mark = 1, f_delete_time = now(), \ - f_delete_user_id = $1::text \ - WHERE f_user_id = $2::text AND f_object_id = $3::text"; - if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { - return db_error(e, "删除用户关系"); - } - } - ok(Value::Null) -} - -/// `GET /api/permission/UserRelation/userList` —— 某对象下的用户(`ListVO`)。 -pub async fn user_relation_user_list( - State(state): State, - headers: HeaderMap, - raw: RawQuery, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - let object_id = crate::platform::sys::query_param(&raw, "objectId"); - let object_id = object_id.trim().to_string(); - if object_id.is_empty() { - return ok(list_vo(Vec::new())); - } - let sql = "SELECT u.f_id AS \"id\", u.f_account AS \"account\", \ - u.f_real_name AS \"realName\", u.f_real_name AS \"fullName\", \ - u.f_head_icon AS \"headIcon\", \ - COALESCE(u.f_enabled_mark, 0) AS \"enabledMark\" \ - FROM base_user_relation ur \ - JOIN base_user u ON u.f_id = ur.f_user_id \ - WHERE COALESCE(ur.f_delete_mark,0) = 0 AND COALESCE(u.f_delete_mark,0) = 0 \ - AND ur.f_object_id = $1::text"; - match state - .db - .query_json_params(sql, ¶ms_of(&[Some(object_id)])) - .await - { - Ok(rows) => ok(list_vo(rows)), - Err(e) => db_error(e, "用户关系列表查询"), - } -} - -// ---------------------------------------------------------------- 个人设置(Users/Current) - -/// 个人资料的**写白名单** —— 只收这些键,其余(`appSecret` 等)一律忽略。 -/// -/// 🔴 与 `USER_WRITE_FIELDS` 的差别:这里**不含** `account` / `organizeId` / `enabledMark` -/// —— 个人中心不许自己改账号、机构、启用状态(那是管理员页面的权力)。 -const SELF_WRITE_FIELDS: &[(&str, &str, &str)] = &[ - ("realName", "f_real_name", ""), - ("nickName", "f_nick_name", ""), - ("gender", "f_gender", ""), - ("birthday", "f_birthday", "::timestamp"), - ("mobilePhone", "f_mobile_phone", ""), - ("telePhone", "f_tele_phone", ""), - ("landline", "f_landline", ""), - ("email", "f_email", ""), - ("nation", "f_nation", ""), - ("nativePlace", "f_native_place", ""), - ("certificatesType", "f_certificates_type", ""), - ("certificatesNumber", "f_certificates_number", ""), - ("education", "f_education", ""), - ("urgentContacts", "f_urgent_contacts", ""), - ("urgentTelePhone", "f_urgent_tele_phone", ""), - ("postalAddress", "f_postal_address", ""), - ("signature", "f_signature", ""), -]; - -/// 逗号分隔的 id 串 ⇒ 去空去重的 `Vec`。 -fn split_id_text(text: Option<&str>) -> Vec { - let mut out: Vec = Vec::new(); - for part in text.unwrap_or("").split(',') { - let t = part.trim(); - if !t.is_empty() && !out.iter().any(|x| x == t) { - out.push(t.to_string()); - } - } - out -} - -/// `GET /api/permission/Users/Current/BaseInfo` —— 个人资料(官方 `UserBaseInfoVO`)。 -/// -/// 🔴 前端 `views/_core/profile/index.vue` 用 `user.avatar` 渲染头像(**不是** `headIcon`) -/// ⇒ 两个键都给,值相同。 -/// 🔴 `preferenceJson` 必须是**字符串**(`index.vue` 直接 `JSON.parse`)。 -pub async fn self_base_info( - State(state): State, - headers: HeaderMap, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let sql = "SELECT f_account AS \"account\", f_real_name AS \"realName\", \ - f_nick_name AS \"nickName\", f_head_icon AS \"headIcon\", \ - f_gender AS \"gender\", to_char(f_birthday, 'YYYY-MM-DD') AS \"birthday\", \ - f_mobile_phone AS \"mobilePhone\", f_tele_phone AS \"telePhone\", \ - f_landline AS \"landline\", f_email AS \"email\", f_nation AS \"nation\", \ - f_native_place AS \"nativePlace\", \ - to_char(f_entry_date, 'YYYY-MM-DD') AS \"entryDate\", \ - f_certificates_type AS \"certificatesType\", \ - f_certificates_number AS \"certificatesNumber\", f_education AS \"education\", \ - f_urgent_contacts AS \"urgentContacts\", \ - f_urgent_tele_phone AS \"urgentTelePhone\", \ - f_postal_address AS \"postalAddress\", f_signature AS \"signature\", \ - f_organize_id AS \"organizeId\", f_position_id AS \"positionId\", \ - f_manager_id AS \"managerId\", f_role_id AS \"roleId\", \ - COALESCE(f_is_administrator, 0) AS \"isAdministrator\", \ - COALESCE(f_language, 'zh-CN') AS \"language\", \ - COALESCE(f_theme, 'W-001') AS \"theme\", \ - COALESCE(f_log_success_count, 0) AS \"logSuccessCount\", \ - COALESCE(f_log_error_count, 0) AS \"logErrorCount\" \ - FROM base_user WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1"; - let rows = match state - .db - .query_json_params(sql, ¶ms_of(&[Some(user.user_id.clone())])) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "个人资料查询"), - }; - let Some(mut row) = rows.into_iter().next() else { - return fail(code::SESSION_ERROR, "登录状态已失效,请重新登录"); - }; - - let head_icon = row["headIcon"].as_str().unwrap_or_default().to_string(); - // 头像:官方 VO 的 `avatar` 就是用户头像地址。 - row["avatar"] = json!(head_icon); - - // 上级:`realName/account`(官方拼法);查不到 ⇒ 空串。 - let manager_id = row["managerId"].as_str().unwrap_or_default().to_string(); - let manager = if manager_id.is_empty() { - String::new() - } else { - match state - .db - .query_json_params( - "SELECT f_real_name AS \"realName\", f_account AS \"account\" FROM base_user \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", - ¶ms_of(&[Some(manager_id.clone())]), - ) - .await - { - Ok(rows) => rows.first().map_or(String::new(), |r| { - format!( - "{}/{}", - r["realName"].as_str().unwrap_or_default(), - r["account"].as_str().unwrap_or_default() - ) - }), - Err(_) => String::new(), - } - }; - row["manager"] = json!(manager); - - // 组织名 + 岗位名(逗号拼接)—— 都是**展示字段**,查不到就是空串,绝不让整页 500。 - let organize_id = row["organizeId"].as_str().unwrap_or_default().to_string(); - row["organize"] = json!(organize_name_of(&state.db, &organize_id).await.unwrap_or_default()); - let position_ids = split_id_text(row["positionId"].as_str()); - let mut position_names: Vec = Vec::new(); - for pid in &position_ids { - if let Ok(rows) = state - .db - .query_json_params( - "SELECT f_full_name AS \"fullName\" FROM base_position \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", - ¶ms_of(&[Some(pid.clone())]), - ) - .await - { - if let Some(name) = rows.first().and_then(|r| r["fullName"].as_str()) { - position_names.push(name.to_string()); - } - } - } - row["position"] = json!(position_names.join(",")); - - // 偏好设置 + AppSecret 都在 `base_user_extra`。 - let extra = read_user_extra(&state.db, &user.user_id).await; - row["preferenceJson"] = json!(extra.0); - row["appSecret"] = json!(extra.1); - // 多租户:本仓单租户 ⇒ false(前端拿它决定要不要显示「企业信息」页签)。 - row["isTenant"] = json!(false); - // 在线设备列表:本仓 session 是进程内内存表,可给可空;前端 `v-for` 对空数组安全。 - row["pcOnlineModelList"] = json!([]); - row["appOnlineModelList"] = json!([]); - row["ranks"] = Value::Null; - row["saasAppId"] = Value::Null; - ok(row) -} - -/// 读 `base_user_extra`:`(preferenceJson, appSecret)`;没有行 ⇒ `("", "")`。 -async fn read_user_extra(db: &Db, user_id: &str) -> (String, String) { - let rows = match db - .query_json_params( - "SELECT f_preference_json AS \"preferenceJson\", f_property_json AS \"propertyJson\" \ - FROM base_user_extra WHERE f_user_id = $1::text \ - AND COALESCE(f_delete_mark,0) = 0 ORDER BY f_creator_time ASC LIMIT 1", - ¶ms_of(&[Some(user_id.to_string())]), - ) - .await - { - Ok(rows) => rows, - Err(e) => { - eprintln!("[face-b] 读用户额外信息失败: {e}"); - return (String::new(), String::new()); - } - }; - let row = match rows.first() { - Some(r) => r, - None => return (String::new(), String::new()), - }; - let pref = row["preferenceJson"].as_str().unwrap_or_default().to_string(); - // 🔴 `f_property_json` 存的是 `{"appSecret":"…"}`;解析失败就当空(不抛错)。 - let secret = row["propertyJson"] - .as_str() - .and_then(|s| serde_json::from_str::(s).ok()) - .and_then(|v| v.get("appSecret").and_then(Value::as_str).map(str::to_string)) - .unwrap_or_default(); - (pref, secret) -} - -/// 写 `base_user_extra`(有行则 UPDATE,无行则 INSERT)。 -async fn upsert_user_extra( - db: &Db, - user_id: &str, - account: &str, - pref: Option<&str>, - secret: Option<&str>, -) -> Result<(), pglite::Error> { - let existing = db - .query_json_params( - "SELECT f_id AS \"id\" FROM base_user_extra WHERE f_user_id = $1::text \ - AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", - ¶ms_of(&[Some(user_id.to_string())]), - ) - .await?; - match existing.first().and_then(|r| r["id"].as_str()) { - Some(id) => { - let mut sets: Vec = Vec::new(); - let mut values: Vec> = Vec::new(); - if let Some(p) = pref { - values.push(Some(p.to_string())); - sets.push(format!("f_preference_json = {}", placeholder(values.len(), ""))); - } - if let Some(s) = secret { - values.push(Some(json!({ "appSecret": s }).to_string())); - sets.push(format!("f_property_json = {}", placeholder(values.len(), ""))); - } - if sets.is_empty() { - return Ok(()); - } - // 🔴 追加顺序必须与 SQL 占位符对齐:`f_last_modify_user_id` 先、`f_id` 后。 - values.push(Some(account.to_string())); - values.push(Some(id.to_string())); - let sql = format!( - "UPDATE base_user_extra SET {}, f_last_modify_time = now(), \ - f_last_modify_user_id = {} WHERE f_id = {} AND f_tenant_id = '0'", - sets.join(", "), - placeholder(values.len() - 1, ""), - placeholder(values.len(), "") - ); - db.exec_params(&sql, ¶ms_of(&values)).await - } - None => { - let new_id = new_uuid(); - let mut columns: Vec<&str> = vec![ - "f_id", - "f_tenant_id", - "f_user_id", - "f_creator_user_id", - "f_enabled_mark", - "f_delete_mark", - ]; - let mut casts: Vec<&str> = vec!["", "", "", "", "::integer", "::integer"]; - let mut values: Vec> = vec![ - Some(new_id), - Some("0".to_string()), - Some(user_id.to_string()), - Some(account.to_string()), - Some("1".to_string()), - Some("0".to_string()), - ]; - if let Some(p) = pref { - columns.push("f_preference_json"); - casts.push(""); - values.push(Some(p.to_string())); - } - if let Some(s) = secret { - columns.push("f_property_json"); - casts.push(""); - values.push(Some(json!({ "appSecret": s }).to_string())); - } - columns.push("f_creator_time"); - let mut marks: Vec = (0..values.len()) - .map(|i| placeholder(i + 1, casts[i])) - .collect(); - marks.push("now()".to_string()); - let sql = format!( - "INSERT INTO base_user_extra ({}) VALUES ({})", - columns.join(", "), - marks.join(", ") - ); - db.exec_params(&sql, ¶ms_of(&values)).await - } - } -} - -/// `PUT /api/permission/Users/Current/BaseInfo` —— 改个人资料(**只 SET body 里出现的键**)。 -/// -/// 🔴 `preferenceJson` 单独走 `base_user_extra`(官方表就叫这个),不进 `base_user`。 -pub async fn self_update_base_info( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - - let mut sets: Vec = Vec::new(); - let mut values: Vec> = Vec::new(); - for (json_key, column, cast) in SELF_WRITE_FIELDS { - let Some(v) = obj.get(*json_key) else { continue }; - // 姓名不许清空(官方 `UserInfoForm.realName` 是 `@NotBlank`)。 - if *json_key == "realName" && v.as_str().map(str::trim).unwrap_or("").is_empty() { - return fail(code::FAIL, "姓名不能为空"); - } - values.push(value_to_text(Some(v))); - sets.push(format!("{column} = {}", placeholder(values.len(), cast))); - } - if !sets.is_empty() { - // 🔴 参数顺序必须与 SQL 占位符**逐字对齐**: - // `f_last_modify_user_id` 先、`f_id` 后 ⇒ 追加顺序也是「账号 → 用户 id」。 - values.push(Some(user.account.clone())); - values.push(Some(user.user_id.clone())); - let sql = format!( - "UPDATE base_user SET {}, f_last_modify_time = now(), \ - f_last_modify_user_id = {} WHERE f_id = {} AND f_tenant_id = '0'", - sets.join(", "), - placeholder(values.len() - 1, ""), - placeholder(values.len(), "") - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "修改个人资料"); - } - } - - if let Some(pref) = obj.get("preferenceJson").and_then(Value::as_str) { - if let Err(e) = - upsert_user_extra(&state.db, &user.user_id, &user.account, Some(pref), None).await - { - return db_error(e, "保存偏好设置"); - } - } - ok(json!("修改成功")) -} - -/// `PUT /api/permission/Users/Current/Avatar` —— 改头像(body `{headIcon}`)。 -pub async fn self_update_avatar( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let head_icon = obj - .get("headIcon") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(); - let sql = "UPDATE base_user SET f_head_icon = $1::text, f_last_modify_time = now(), \ - f_last_modify_user_id = $2::text WHERE f_id = $3::text AND f_tenant_id = '0'"; - match state - .db - .exec_params( - sql, - ¶ms_of(&[ - Some(head_icon), - Some(user.account.clone()), - Some(user.user_id.clone()), - ]), - ) - .await - { - Ok(_) => ok(json!("更新成功")), - Err(e) => db_error(e, "修改头像"), - } -} - -/// `PUT /api/permission/Users/Current/SystemTheme` —— 改主题(body `{theme}`)。 -pub async fn self_update_theme( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let theme = obj - .get("theme") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(); - let sql = "UPDATE base_user SET f_theme = $1::text, f_last_modify_time = now(), \ - f_last_modify_user_id = $2::text WHERE f_id = $3::text AND f_tenant_id = '0'"; - match state - .db - .exec_params( - sql, - ¶ms_of(&[ - Some(theme), - Some(user.account.clone()), - Some(user.user_id.clone()), - ]), - ) - .await - { - Ok(_) => ok(json!("更新成功")), - Err(e) => db_error(e, "修改主题"), - } -} - -/// `PUT /api/permission/Users/Current/SystemLanguage` —— 改语言(body `{language}`)。 -pub async fn self_update_language( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let language = obj - .get("language") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(); - let sql = "UPDATE base_user SET f_language = $1::text, f_last_modify_time = now(), \ - f_last_modify_user_id = $2::text WHERE f_id = $3::text AND f_tenant_id = '0'"; - match state - .db - .exec_params( - sql, - ¶ms_of(&[ - Some(language), - Some(user.account.clone()), - Some(user.user_id.clone()), - ]), - ) - .await - { - Ok(_) => ok(json!("更新成功")), - Err(e) => db_error(e, "修改语言"), - } -} - -/// `POST /api/permission/Users/Current/Actions/ModifyPassword` —— 改密码。 -/// -/// 🔴 本仓口令存储 = `md5(明文)`(`platform/auth.rs`)⇒ 前端发来的 -/// `oldPassword` / `password` **本身已是 md5 串**,直接比、直接存。 -/// 🔴 官方那条 `md5(old + secretkey)` 与图形验证码校验本仓**不做** -/// (无 `ImageCode` 服务)⇒ 记入已知限制,不静默伪成功:旧密码错了照样返失败。 -pub async fn self_modify_password( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let old = obj - .get("oldPassword") - .and_then(Value::as_str) - .unwrap_or_default() - .to_lowercase(); - let new = obj - .get("password") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(); - if old.is_empty() || new.is_empty() { - return fail(code::FAIL, "旧密码和新密码不能为空"); - } - let rows = match state - .db - .query_json_params( - "SELECT COALESCE(f_password, '') AS \"password\" FROM base_user \ - WHERE f_id = $1::text AND f_tenant_id = '0' LIMIT 1", - ¶ms_of(&[Some(user.user_id.clone())]), - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "读旧密码"), - }; - let stored = rows - .first() - .and_then(|r| r["password"].as_str()) - .unwrap_or_default() - .to_lowercase(); - if stored.is_empty() || stored != old { - return fail(code::FAIL, "旧密码错误,请重新输入"); - } - let sql = "UPDATE base_user SET f_password = $1::text, f_change_password_date = now(), \ - f_last_modify_time = now(), f_last_modify_user_id = $2::text \ - WHERE f_id = $3::text AND f_tenant_id = '0'"; - match state - .db - .exec_params( - sql, - ¶ms_of(&[ - Some(new), - Some(user.account.clone()), - Some(user.user_id.clone()), - ]), - ) - .await - { - Ok(_) => ok(json!("密码修改成功,请重新登录")), - Err(e) => db_error(e, "修改密码"), - } -} - -/// `GET /api/permission/Users/Current/Subordinate/{id}` —— 我的下属。 -/// -/// `id = "0"` ⇒ 直属当前用户的下属;否则该用户的下属。 -pub async fn self_subordinate( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let manager_id = if id.trim().is_empty() || id.trim() == "0" { - user.user_id.clone() - } else { - id.trim().to_string() - }; - let sql = "SELECT u.f_id AS \"id\", u.f_head_icon AS \"avatar\", \ - COALESCE(u.f_real_name, u.f_account) AS \"userName\", \ - COALESCE(o.f_full_name, '') AS \"department\", \ - COALESCE(p.f_full_name, '') AS \"position\" \ - FROM base_user u \ - LEFT JOIN base_organize o ON o.f_id = u.f_organize_id \ - LEFT JOIN base_position p ON p.f_id = u.f_position_id \ - WHERE u.f_manager_id = $1::text AND COALESCE(u.f_delete_mark,0) = 0 \ - ORDER BY u.f_sort_code ASC, u.f_account ASC"; - match state - .db - .query_json_params(sql, ¶ms_of(&[Some(manager_id)])) - .await - { - Ok(mut rows) => { - for r in rows.iter_mut() { - r["isLeaf"] = json!(false); - } - ok(Value::Array(rows)) - } - Err(e) => db_error(e, "我的下属查询"), - } -} - -/// `GET /api/permission/Users/Current/SystemLog` —— **我的**登录日志。 -/// -/// 🔴 与 `GET /api/system/Log?category=1` 共用 [`log_page`](官方也是同一个 `LogService`), -/// 区别只有一个:这里**强制 `f_user_id = 当前用户`**(个人中心不该看到别人的登录记录)。 -/// 🔴 数据来源是 `base_sys_log`(登录成功/失败都落一行,见 `auth::write_login_log`) -/// —— 早先这里是恒空分页,页面形状对但永远没内容。 -pub async fn self_system_log( - State(state): State, - headers: HeaderMap, - raw: RawQuery, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - match log_page(&state, &raw, 1, Some(&user.user_id)).await { - Ok(data) => ok(data), - Err(resp) => resp, - } -} - -/// `GET /api/permission/Users/Current/getUserOrganizes` —— 我所属的组织(含祖先链)。 -pub async fn self_organizes( - State(state): State, - headers: HeaderMap, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let rows = match state - .db - .query_json_params( - "SELECT f_organize_id AS \"organizeId\" FROM base_user \ - WHERE f_id = $1::text AND f_tenant_id = '0' LIMIT 1", - ¶ms_of(&[Some(user.user_id.clone())]), - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "读用户机构"), - }; - let organize_id = rows - .first() - .and_then(|r| r["organizeId"].as_str()) - .unwrap_or_default() - .to_string(); - if organize_id.is_empty() { - return ok(Value::Array(Vec::new())); - } - // `f_organize_id_tree` 形如 `parent,self`(官方语义);用它一次性取整条链。 - let sql = "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_parent_id AS \"parentId\", \ - COALESCE(f_organize_id_tree, '') AS \"organizeIdTree\" \ - FROM base_organize WHERE COALESCE(f_delete_mark,0) = 0 AND \ - (f_id = $1::text OR f_organize_id_tree LIKE '%' || $1::text || '%') \ - ORDER BY f_sort_code ASC"; - match state - .db - .query_json_params(sql, ¶ms_of(&[Some(organize_id)])) - .await - { - Ok(rows) => ok(Value::Array(rows)), - Err(e) => db_error(e, "我的组织查询"), - } -} - -/// `GET /api/permission/Users/Current/getUserPositions` —— 我的岗位(`PosistionCurrentModel`)。 -pub async fn self_positions( - State(state): State, - headers: HeaderMap, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let rows = match state - .db - .query_json_params( - "SELECT COALESCE(f_position_id, '') AS \"positionId\" FROM base_user \ - WHERE f_id = $1::text AND f_tenant_id = '0' LIMIT 1", - ¶ms_of(&[Some(user.user_id.clone())]), - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "读用户岗位"), - }; - let ids = split_id_text(rows.first().and_then(|r| r["positionId"].as_str())); - let mut list: Vec = Vec::new(); - for (i, pid) in ids.iter().enumerate() { - let sql = "SELECT p.f_id AS \"id\", p.f_full_name AS \"fullName\", \ - p.f_organize_id AS \"organizeId\", \ - COALESCE(o.f_full_name, '') AS \"orgTreeName\", \ - COALESCE(par.f_full_name, '') AS \"parentName\", \ - COALESCE(mgr.f_real_name, '') AS \"managerName\" \ - FROM base_position p \ - LEFT JOIN base_organize o ON o.f_id = p.f_organize_id \ - LEFT JOIN base_position par ON par.f_id = p.f_parent_id \ - LEFT JOIN base_user mgr ON mgr.f_id = o.f_manager_id \ - WHERE p.f_id = $1::text LIMIT 1"; - let Ok(rows) = state - .db - .query_json_params(sql, ¶ms_of(&[Some(pid.clone())])) - .await - else { - continue; - }; - let Some(mut row) = rows.into_iter().next() else { - continue; - }; - // 第一个岗位视为默认(本仓 `f_position_id` 首位即主岗)。 - row["isDefault"] = json!(i == 0); - list.push(row); - } - ok(Value::Array(list)) -} - -/// `GET /api/permission/Users/Current/getUserRoles` —— 我的角色。 -pub async fn self_roles(State(state): State, headers: HeaderMap) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let rows = match state - .db - .query_json_params( - "SELECT COALESCE(f_role_id, '') AS \"roleId\" FROM base_user \ - WHERE f_id = $1::text AND f_tenant_id = '0' LIMIT 1", - ¶ms_of(&[Some(user.user_id.clone())]), - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "读用户角色"), - }; - let ids = split_id_text(rows.first().and_then(|r| r["roleId"].as_str())); - let mut list: Vec = Vec::new(); - for rid in ids { - if let Ok(rows) = state - .db - .query_json_params( - "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\" \ - FROM base_role WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", - ¶ms_of(&[Some(rid)]), - ) - .await - { - list.extend(rows); - } - } - ok(Value::Array(list)) -} - -/// `PUT /api/permission/Users/Current/major` —— 设默认岗位 / 切换身份 / 切换系统。 -/// -/// `majorType` 官方常量见 `PermissionConst`:`position` / `stand` / `system`。 -pub async fn self_major( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let major_id = obj - .get("majorId") - .and_then(Value::as_str) - .unwrap_or_default() - .trim() - .to_string(); - let major_type = obj - .get("majorType") - .and_then(Value::as_str) - .unwrap_or_default() - .to_lowercase(); - if major_id.is_empty() { - return fail(code::FAIL, "参数不能为空"); - } - match major_type.as_str() { - // 切岗位(组织跟着岗位走) - "position" | "pos" => { - let rows = match state - .db - .query_json_params( - "SELECT f_organize_id AS \"organizeId\" FROM base_position \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", - ¶ms_of(&[Some(major_id.clone())]), - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "读岗位"), - }; - let Some(row) = rows.first() else { - return fail(code::FAIL, "岗位不存在"); - }; - let organize_id = row["organizeId"].as_str().unwrap_or_default().to_string(); - let sql = "UPDATE base_user SET f_position_id = $1::text, f_organize_id = $2::text, \ - f_last_modify_time = now(), f_last_modify_user_id = $3::text \ - WHERE f_id = $4::text AND f_tenant_id = '0'"; - match state - .db - .exec_params( - sql, - ¶ms_of(&[ - Some(major_id), - Some(organize_id), - Some(user.account.clone()), - Some(user.user_id.clone()), - ]), - ) - .await - { - Ok(_) => ok(json!("设置成功")), - Err(e) => db_error(e, "设置默认岗位"), - } - } - // 切身份:本仓无多身份体系 ⇒ 只记字段,不影响权限(`known-limitations` B6) - "stand" | "standing" => { - let sql = "UPDATE base_user SET f_standing = $1::text, f_last_modify_time = now(), \ - f_last_modify_user_id = $2::text WHERE f_id = $3::text AND f_tenant_id = '0'"; - match state - .db - .exec_params( - sql, - ¶ms_of(&[ - Some(major_id), - Some(user.account.clone()), - Some(user.user_id.clone()), - ]), - ) - .await - { - Ok(_) => ok(json!("设置成功")), - Err(e) => db_error(e, "切换身份"), - } - } - // 切系统(多应用) - "system" => { - let sql = "UPDATE base_user SET f_app_system_id = $1::text, \ - f_last_modify_time = now(), f_last_modify_user_id = $2::text \ - WHERE f_id = $3::text AND f_tenant_id = '0'"; - match state - .db - .exec_params( - sql, - ¶ms_of(&[ - Some(major_id), - Some(user.account.clone()), - Some(user.user_id.clone()), - ]), - ) - .await - { - Ok(_) => ok(json!("设置成功")), - Err(e) => db_error(e, "切换系统"), - } - } - _ => fail(code::FAIL, "不支持的切换类型"), - } -} - -/// 个性签名投影(官方 `SignListVO`)。 -const SIGN_PROJECTION: &str = "f_id AS \"id\", f_sign_img AS \"signImg\", \ - COALESCE(f_is_default, 0) AS \"isDefault\", f_description AS \"description\", \ - (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\""; - -/// `GET /api/permission/Users/Current/SignImg` —— 个性签名列表。 -pub async fn self_sign_list( - State(state): State, - headers: HeaderMap, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let sql = format!( - "SELECT {SIGN_PROJECTION} FROM base_sign_img \ - WHERE f_creator_user_id = $1::text AND COALESCE(f_delete_mark,0) = 0 \ - ORDER BY f_is_default DESC, f_creator_time ASC" - ); - match state - .db - .query_json_params(&sql, ¶ms_of(&[Some(user.account.clone())])) - .await - { - Ok(rows) => ok(Value::Array(rows)), - Err(e) => db_error(e, "个性签名列表"), - } -} - -/// `POST /api/permission/Users/Current/SignImg` —— 新建个性签名。 -pub async fn self_sign_create( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let sign_img = obj - .get("signImg") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(); - if sign_img.trim().is_empty() { - return fail(code::FAIL, "签名图片不能为空"); - } - let new_id = new_uuid(); - // 🔴 `$N::integer` **不行**:本仓所有参数都按 **text** 绑定(`Option`), - // PG 报「cannot convert between the Rust type Option and the Postgres type int4」。 - // ⇒ 整仓统一走 `$N::text::integer`(类型交给 SQL 里的 CAST)。 - let sql = "INSERT INTO base_sign_img \ - (f_id, f_tenant_id, f_sign_img, f_is_default, f_description, \ - f_enabled_mark, f_sort_code, f_creator_time, f_creator_user_id, f_delete_mark) \ - VALUES ($1::text, '0', $2::text, $3::text::integer, $4::text, 1, 0, now(), $5::text, 0)"; - if let Err(e) = state - .db - .exec_params( - sql, - ¶ms_of(&[ - Some(new_id.clone()), - Some(sign_img), - value_to_text(obj.get("isDefault")), - value_to_text(obj.get("description")), - Some(user.account.clone()), - ]), - ) - .await - { - return db_error(e, "新建个性签名"); - } - ok(json!({ "id": new_id })) -} - -/// `DELETE /api/permission/Users/Current/{id}/SignImg` —— 删个性签名(软删,只能删自己的)。 -pub async fn self_sign_delete( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let sql = "UPDATE base_sign_img SET f_delete_mark = 1, f_delete_time = now(), \ - f_delete_user_id = $1::text WHERE f_id = $2::text \ - AND f_creator_user_id = $1::text AND f_tenant_id = '0'"; - match state - .db - .exec_params(sql, ¶ms_of(&[Some(user.account.clone()), Some(id)])) - .await - { - Ok(_) => ok(json!("删除成功")), - Err(e) => db_error(e, "删除个性签名"), - } -} - -/// `PUT /api/permission/Users/Current/{id}/SignImg` —— 设为默认签名(同用户其余置 0)。 -pub async fn self_sign_default( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - // 先确认这条签名属于自己(否则就是越权改别人的)。 - let owned = match state - .db - .query_json_params( - "SELECT f_id AS \"id\" FROM base_sign_img WHERE f_id = $1::text \ - AND f_creator_user_id = $2::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", - ¶ms_of(&[Some(id.clone()), Some(user.account.clone())]), - ) - .await - { - Ok(rows) => !rows.is_empty(), - Err(e) => return db_error(e, "读个性签名"), - }; - if !owned { - return fail(code::FAIL, "签名不存在"); - } - let clear = "UPDATE base_sign_img SET f_is_default = 0 WHERE f_creator_user_id = $1::text \ - AND f_tenant_id = '0' AND COALESCE(f_delete_mark,0) = 0"; - if let Err(e) = state - .db - .exec_params(clear, ¶ms_of(&[Some(user.account.clone())])) - .await - { - return db_error(e, "重置默认签名"); - } - let set = "UPDATE base_sign_img SET f_is_default = 1, f_last_modify_time = now(), \ - f_last_modify_user_id = $1::text WHERE f_id = $2::text AND f_tenant_id = '0'"; - match state - .db - .exec_params(set, ¶ms_of(&[Some(user.account.clone()), Some(id)])) - .await - { - Ok(_) => ok(json!("设置成功")), - Err(e) => db_error(e, "设置默认签名"), - } -} - -/// `GET /api/permission/Users/Current/getAppSecret` —— AppSecret(没有 ⇒ 空串)。 -pub async fn self_get_app_secret( - State(state): State, - headers: HeaderMap, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let (_, secret) = read_user_extra(&state.db, &user.user_id).await; - ok(json!(secret)) -} - -/// `PUT /api/permission/Users/Current/saveAppSecret` —— 重新生成 AppSecret。 -/// -/// 🔴 生成规则:两段 `new_uuid()` 去掉横线拼起来(32 位十六进制), -/// **不落日志**(`eprintln` 里也不打),否则等于把密钥写进 `/tmp/*.log`。 -pub async fn self_save_app_secret( - State(state): State, - headers: HeaderMap, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let secret = format!( - "{}{}", - new_uuid().replace('-', ""), - new_uuid().replace('-', "") - ); - if let Err(e) = - upsert_user_extra(&state.db, &user.user_id, &user.account, None, Some(&secret)).await - { - return db_error(e, "生成 AppSecret"); - } - ok(json!(secret)) -} - -/// `GET /api/permission/Users/Current/saasList` —— 可切换租户列表。 -/// -/// 🔴 本仓**单租户**(`base_tenant` 只有 `'0'`)⇒ 恒空数组。恒空 stderr -/// 比「返 404 让前端弹红条」好,且形状与官方一致。 -pub async fn self_saas_list( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = require_login_face_b(&state, &headers).await { - return resp; - } - ok(Value::Array(Vec::new())) -} - -/// `GET /api/permission/Users/Current/saasinfo` —— 当前租户信息(本仓恒空对象)。 -pub async fn self_saas_info( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = require_login_face_b(&state, &headers).await { - return resp; - } - ok(json!({})) -} - -/// `GET /api/permission/Users/Current/saasTenantName/{id}` —— 租户名(本仓恒空串)。 -pub async fn self_saas_tenant_name( - State(state): State, - headers: HeaderMap, - Path(_id): Path, -) -> Json { - if let Err(resp) = require_login_face_b(&state, &headers).await { - return resp; - } - ok(json!("")) -} - -/// `POST /api/permission/Users/Current/saasjoin` —— 加入企业(本仓单租户 ⇒ 明确失败)。 -/// -/// 🔴 **不返成功**:返成功会让前端以为切过去了,后面全都是空数据; -/// 明确 `400` + 可读原因,前端弹一条红条比默默错更好查。 -pub async fn self_saas_join( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = require_login_face_b(&state, &headers).await { - return resp; - } - fail(code::FAIL, "本系统为单租户部署,不支持加入其他企业") -} - -/// `DELETE /api/permission/Users/Current/{id}/saas` —— 退出企业(单租户 ⇒ 同上)。 -pub async fn self_saas_exit( - State(state): State, - headers: HeaderMap, - Path(_id): Path, - _raw: RawQuery, -) -> Json { - if let Err(resp) = require_login_face_b(&state, &headers).await { - return resp; - } - fail(code::FAIL, "本系统为单租户部署,不存在可退出的企业") -} - -// ================================================================ 权限组(base_permission_group) - -/// 🔴 **列名只来自这张白名单**(官方 `JNPF-PostgreSQL.sql:3278` 的 16 列逐字)。 -/// -/// 🔴 `f_permission_member` 存的是**逗号分隔的用户 id 串**(官方 -/// `PermissionGroupController.permissionMember`:`entity.getPermissionMember().split(",")`)。 -const PERMISSION_GROUP_WRITE_FIELDS: [(&str, &str, &str); 5] = [ - ("fullName", "f_full_name", ""), - ("enCode", "f_en_code", ""), - ("description", "f_description", ""), - ("enabledMark", "f_enabled_mark", "::integer"), - ("sortCode", "f_sort_code", "::bigint"), -]; - -/// 权限组投影(官方 `PermissionGroupListVO` 的字段)。 -/// -/// 🔴 官方 `PermissionGroupController.list` 会把 `f_permission_member` 里的 -/// **用户 id 串**换成**用户名串**(`userService.getFullNameByIds`)⇒ -/// 这里用子查询做同样的替换(**不是** id 串)。 -const PERMISSION_GROUP_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ - f_en_code AS \"enCode\", f_description AS \"description\", \ - COALESCE(f_sort_code, 0) AS \"sortCode\", \ - COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ - COALESCE(f_type, 0) AS \"type\", \ - COALESCE((SELECT string_agg(COALESCE(NULLIF(u.f_real_name, ''), u.f_account, ''), ',') \ - FROM base_user u \ - WHERE u.f_id = ANY(string_to_array(COALESCE(base_permission_group.f_permission_member, ''), ',')) \ - AND COALESCE(u.f_delete_mark,0) = 0), '') AS \"permissionMember\", \ - (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\""; - -/// `GET /api/permission/PermissionGroup` —— 权限组列表(官方 `ActionResult.page`)。 -pub async fn permission_group_list( - State(state): State, - headers: HeaderMap, - raw: RawQuery, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_AUTH_GROUP).await { - return resp; - } - let keyword = crate::platform::sys::query_param(&raw, "keyword"); - let keyword = keyword.trim().to_string(); - let page = Paging::of(&raw); - let (count_sql, list_sql, mut params): (String, String, Vec>) = if keyword.is_empty() { - ( - "SELECT count(*)::bigint AS \"c\" FROM base_permission_group \ - WHERE COALESCE(f_delete_mark,0) = 0".to_string(), - format!( - "SELECT {PERMISSION_GROUP_PROJECTION} FROM base_permission_group \ - WHERE COALESCE(f_delete_mark,0) = 0 \ - ORDER BY f_sort_code ASC, f_full_name ASC \ - LIMIT $1::text::integer OFFSET $2::text::integer" - ), - vec![], - ) - } else { - ( - "SELECT count(*)::bigint AS \"c\" FROM base_permission_group \ - WHERE COALESCE(f_delete_mark,0) = 0 \ - AND (f_full_name ILIKE $1::text OR f_en_code ILIKE $1::text)" - .to_string(), - format!( - "SELECT {PERMISSION_GROUP_PROJECTION} FROM base_permission_group \ - WHERE COALESCE(f_delete_mark,0) = 0 \ - AND (f_full_name ILIKE $1::text OR f_en_code ILIKE $1::text) \ - ORDER BY f_sort_code ASC, f_full_name ASC \ - LIMIT $2::text::integer OFFSET $3::text::integer" - ), - vec![Some(format!("%{keyword}%"))], - ) - }; - let total = match state.db.query_json_params(&count_sql, ¶ms_of(¶ms)).await { - Ok(rows) => rows - .into_iter() - .next() - .and_then(|r| r["c"].as_i64()) - .unwrap_or(0), - Err(e) => return db_error(e, "权限组总数查询"), - }; - params.push(Some(page.page_size.to_string())); - params.push(Some(page.offset.to_string())); - match state.db.query_json_params(&list_sql, ¶ms_of(¶ms)).await { - Ok(rows) => ok(page_list(page.current_page, page.page_size, total, rows)), - Err(e) => db_error(e, "权限组列表查询"), - } -} - -/// `GET /api/permission/PermissionGroup/{id}` —— 权限组详情。 -pub async fn permission_group_info( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_AUTH_GROUP).await { - return resp; - } - let id = id.trim().to_string(); - let sql = format!( - "SELECT {PERMISSION_GROUP_PROJECTION} FROM base_permission_group \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1" - ); - match state.db.query_json_params(&sql, &[&id]).await { - Ok(rows) => match rows.into_iter().next() { - Some(row) => ok(row), - None => fail(code::FAIL, "权限组不存在"), - }, - Err(e) => db_error(e, "权限组详情查询"), - } -} - -/// `POST /api/permission/PermissionGroup` —— 新建权限组。 -pub async fn permission_group_create( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_AUTH_GROUP).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let full_name = obj - .get("fullName") - .and_then(Value::as_str) - .unwrap_or_default() - .trim() - .to_string(); - if full_name.is_empty() { - return fail(code::FAIL, "名称不能为空"); - } - - let new_id = new_uuid(); - let mut columns: Vec<&str> = vec!["f_id", "f_tenant_id", "f_full_name"]; - let mut casts: Vec<&str> = vec!["", "", ""]; - let mut values: Vec> = - vec![Some(new_id.clone()), Some("0".to_string()), Some(full_name)]; - - for (json_key, column, cast) in PERMISSION_GROUP_WRITE_FIELDS { - if column == "f_full_name" { - continue; - } - if obj.contains_key(json_key) { - columns.push(column); - casts.push(cast); - values.push(value_to_text(obj.get(json_key))); - } - } - if !obj.contains_key("enabledMark") { - columns.push("f_enabled_mark"); - casts.push("::integer"); - values.push(Some("1".to_string())); - } - if !obj.contains_key("sortCode") { - columns.push("f_sort_code"); - casts.push("::bigint"); - values.push(Some("0".to_string())); - } - // 🔴 `f_type`:官方注释「权限类型 1.自定义 0.全部」⇒ 默认 1(自定义)。 - if !obj.contains_key("type") { - columns.push("f_type"); - casts.push("::integer"); - values.push(Some("1".to_string())); - } else if let Some(t) = value_to_text(obj.get("type")) { - columns.push("f_type"); - casts.push("::integer"); - values.push(Some(t)); - } - columns.push("f_creator_user_id"); - casts.push(""); - values.push(Some(user.account.clone())); - columns.push("f_delete_mark"); - casts.push("::integer"); - values.push(Some("0".to_string())); - columns.push("f_creator_time"); - let mut marks: Vec = (0..values.len()) - .map(|i| placeholder(i + 1, casts[i])) - .collect(); - marks.push("now()".to_string()); - let sql = format!( - "INSERT INTO base_permission_group ({}) VALUES ({})", - columns.join(", "), - marks.join(", ") - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "新建权限组"); - } - ok(json!({ "id": new_id })) -} - -/// `PUT /api/permission/PermissionGroup/{id}` —— 改权限组(**只 SET body 里出现的键**)。 -pub async fn permission_group_update( - State(state): State, - headers: HeaderMap, - Path(id): Path, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_AUTH_GROUP).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let rows = match state - .db - .query_json_params( - "SELECT f_id AS \"id\" FROM base_permission_group \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", - &[&id], - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "权限组查询"), - }; - if rows.is_empty() { - return fail(code::FAIL, "权限组不存在"); - } - - let mut sets: Vec = Vec::new(); - let mut values: Vec> = Vec::new(); - for (json_key, column, cast) in PERMISSION_GROUP_WRITE_FIELDS { - if !obj.contains_key(json_key) { - continue; - } - values.push(value_to_text(obj.get(json_key))); - sets.push(format!("{} = ${}::text{}", column, values.len(), cast)); - } - if obj.contains_key("type") { - values.push(value_to_text(obj.get("type"))); - sets.push(format!("f_type = ${}::text::integer", values.len())); - } - if sets.is_empty() { - return ok(Value::Null); - } - values.push(Some(user.account.clone())); - sets.push(format!("f_last_modify_user_id = ${}::text", values.len())); - sets.push("f_last_modify_time = now()".to_string()); - values.push(Some(id)); - let sql = format!( - "UPDATE base_permission_group SET {} WHERE f_id = ${}::text", - sets.join(", "), - values.len() - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "修改权限组"); - } - ok(Value::Null) -} - -/// `DELETE /api/permission/PermissionGroup/{id}` —— 删权限组(软删 + 解绑授权)。 -pub async fn permission_group_delete( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - let user = match guard(&state, &headers, EN_AUTH_GROUP).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let values = [Some(user.account.clone()), Some(id.clone())]; - if let Err(e) = state - .db - .exec_params( - "UPDATE base_permission_group SET f_delete_mark = 1, f_delete_time = now(), \ - f_delete_user_id = $1::text WHERE f_id = $2::text \ - AND COALESCE(f_delete_mark,0) = 0", - ¶ms_of(&values), - ) - .await - { - return db_error(e, "删除权限组"); - } - // 官方 `PermissionGroupController.delete` 还会删掉该组的授权关系。 - // 🔴 `$1` 必须**真的被用到**(PG 会拒「无法确定 $1 类型」)⇒ - // 这里把 `f_delete_user_id = $1` 一起写上(既是审计列,也用掉了参数)。 - let rel = [Some(user.account.clone()), Some(id)]; - if let Err(e) = state - .db - .exec_params( - "UPDATE base_authorize SET f_delete_mark = 1, f_delete_time = now(), \ - f_delete_user_id = $1::text \ - WHERE f_object_id = $2::text AND COALESCE(f_delete_mark,0) = 0", - ¶ms_of(&rel), - ) - .await - { - return db_error(e, "删除权限组授权关系"); - } - ok(Value::Null) -} - -/// `POST /api/permission/PermissionGroup/{id}/Actions/Copy` —— 复制权限组。 -/// -/// 🔴 官方 `PermissionGroupController.actionsCopy`: -/// - `fullName` 加 `.副本<5 位随机>`、`enCode` 加同样 5 位; -/// - **清空** `f_permission_member`; -/// - 授权关系逐条复制(`f_object_id` 换成新 id)。 -pub async fn permission_group_copy( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - let user = match guard(&state, &headers, EN_AUTH_GROUP).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let rows = match state - .db - .query_json_params( - "SELECT f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ - f_description AS \"description\", COALESCE(f_sort_code,0) AS \"sortCode\", \ - COALESCE(f_enabled_mark,0) AS \"enabledMark\", COALESCE(f_type,0) AS \"type\" \ - FROM base_permission_group \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", - &[&id], - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "权限组查询"), - }; - let Some(row) = rows.into_iter().next() else { - return fail(code::FAIL, "权限组不存在"); - }; - let full_name = row["fullName"].as_str().unwrap_or_default().to_string(); - let en_code = row["enCode"].as_str().unwrap_or_default().to_string(); - - // 🔴 5 位随机后缀(官方 `UUID.randomUUID().toString().substring(0, 5)`)。 - let suffix = &new_uuid()[..5]; - let new_full_name = format!("{full_name}.副本{suffix}"); - let new_en_code = format!("{en_code}{suffix}"); - if new_full_name.chars().count() > 50 || new_en_code.chars().count() > 50 { - return fail(code::FAIL, "名称或编码长度超过 50 个字符"); - } - - let new_id = new_uuid(); - let values = [ - Some(new_id.clone()), - Some(new_full_name), - Some(new_en_code), - value_to_text(row.get("description")), - value_to_text(row.get("sortCode")), - value_to_text(row.get("enabledMark")), - value_to_text(row.get("type")), - Some(user.account.clone()), - ]; - // 🔴 `f_permission_member` **清空**(官方 `entity.setPermissionMember(null)`)。 - let sql = "INSERT INTO base_permission_group \ - (f_id, f_full_name, f_en_code, f_description, f_sort_code, f_enabled_mark, \ - f_type, f_creator_user_id, f_creator_time, f_delete_mark, f_tenant_id) \ - VALUES ($1::text, $2::text, $3::text, $4::text, $5::text::bigint, \ - $6::text::integer, $7::text::integer, $8::text, now(), 0, '0')"; - if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { - return db_error(e, "复制权限组"); - } - - // 复制授权关系(`f_object_id` 换成新 id)。 - let auths = match state - .db - .query_json_params( - "SELECT f_id AS \"id\", f_item_type AS \"itemType\", f_item_id AS \"itemId\", \ - f_object_type AS \"objectType\", f_sort_code AS \"sortCode\" \ - FROM base_authorize WHERE f_object_id = $1::text \ - AND COALESCE(f_delete_mark,0) = 0", - &[&id], - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "权限组授权查询"), - }; - for auth in auths { - let row_id = new_uuid(); - let values = [ - Some(row_id), - value_to_text(auth.get("itemType")), - value_to_text(auth.get("itemId")), - Some(new_id.clone()), - value_to_text(auth.get("objectType")), - value_to_text(auth.get("sortCode")), - Some(user.account.clone()), - ]; - let sql = "INSERT INTO base_authorize \ - (f_id, f_item_type, f_item_id, f_object_id, f_object_type, f_sort_code, \ - f_creator_user_id, f_creator_time, f_delete_mark, f_tenant_id) \ - VALUES ($1::text, $2::text, $3::text, $4::text, $5::text, \ - $6::text::bigint, $7::text, now(), 0, '0')"; - if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { - return db_error(e, "复制权限组授权关系"); - } - } - ok(json!({ "id": new_id })) -} - -/// `GET /api/permission/PermissionGroup/PermissionMember/{id}` —— 权限组成员。 -/// -/// 🔴 官方返回 `ListVO`(`{list:[…]}`),成员是**用户**的简要信息 -/// (`UserIdListVo`:`id` / `fullName` / `headIcon` / `gender` / `mobilePhone` / `organize` / `type`)。 -pub async fn permission_group_member_list( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_AUTH_GROUP).await { - return resp; - } - let id = id.trim().to_string(); - let rows = match state - .db - .query_json_params( - "SELECT COALESCE(f_permission_member, '') AS \"member\" FROM base_permission_group \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", - &[&id], - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "权限组成员查询"), - }; - let Some(row) = rows.into_iter().next() else { - return fail(code::FAIL, "权限组不存在"); - }; - let member = row["member"].as_str().unwrap_or_default().to_string(); - let ids = split_id_text(Some(member.as_str())); - if ids.is_empty() { - return ok(list_vo(Vec::new())); - } - // 🔴 `= ANY($1::text[])` **不行**:本仓参数一律按 text 绑定(`Option`), - // PG 会把 `$1::text[]` 当成 `_text`(数组类型)⇒ 协议错 - // ("cannot convert between the Rust type String and the Postgres type _text")。 - // ⇒ 改成 `string_to_array($1::text, ',')`(**函数在 SQL 里做** ⇒ 参数仍是 text)。 - let sql = "SELECT f_id AS \"id\", COALESCE(f_real_name, f_account, '') AS \"fullName\", \ - f_head_icon AS \"headIcon\", f_gender AS \"gender\", \ - f_mobile_phone AS \"mobilePhone\", '' AS \"organize\", 'user' AS \"type\" \ - FROM base_user \ - WHERE f_id = ANY(string_to_array($1::text, ',')) \ - AND COALESCE(f_delete_mark,0) = 0"; - let id_csv = ids.join(","); - match state.db.query_json_params(sql, &[&id_csv]).await { - Ok(rows) => ok(list_vo(rows)), - Err(e) => db_error(e, "权限组成员列表查询"), - } -} - -/// `POST /api/permission/PermissionGroup/PermissionMember/{id}` —— 保存权限组成员。 -/// -/// 🔴 官方 `savePermissionMember`:body `{ids:[…]}` ⇒ 逗号串写 `f_permission_member`。 -pub async fn permission_group_member_save( - State(state): State, - headers: HeaderMap, - Path(id): Path, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_AUTH_GROUP).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let rows = match state - .db - .query_json_params( - "SELECT f_id AS \"id\" FROM base_permission_group \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", - &[&id], - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "权限组查询"), - }; - if rows.is_empty() { - return fail(code::FAIL, "权限组不存在"); - } - let ids = id_list(&obj); - let member = ids.join(","); - let values = [ - Some(member), - Some(user.account.clone()), - Some(id), - ]; - let sql = "UPDATE base_permission_group SET f_permission_member = $1::text, \ - f_last_modify_user_id = $2::text, f_last_modify_time = now() \ - WHERE f_id = $3::text"; - if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { - return db_error(e, "保存权限组成员"); - } - ok(Value::Null) -} - -// ================================================================ 动作管理(base_action) - -/// 🔴 **列名只来自这张白名单**(官方 `JNPF-PostgreSQL.sql:1` 的 15 列逐字)。 -/// -/// 🔴🔴 **官方陷阱**:`base_action.f_enabled_mark` 是 **VARCHAR(11)**(不是 INTEGER), -/// 官方注释「启用0,禁用1」⇒ 存的是**字符串** `'0'` / `'1'`。 -const ACTION_WRITE_FIELDS: [(&str, &str, &str); 4] = [ - ("fullName", "f_full_name", ""), - ("enCode", "f_en_code", ""), - ("description", "f_description", ""), - ("sortCode", "f_sort_code", "::bigint"), -]; - -/// 动作投影(官方 `ActionEntity` 的字段)。 -/// -/// 🔴 `type`:**1=自定义 / 其它=系统**(前端 `action/index.vue`: -/// `record.type == 1 ? '自定义' : '系统'`)⇒ 原样透传,不做归一化。 -const ACTION_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ - f_en_code AS \"enCode\", f_description AS \"description\", \ - COALESCE(f_sort_code, 0) AS \"sortCode\", \ - COALESCE(f_type, 0) AS \"type\", \ - COALESCE(f_enabled_mark, '0') AS \"enabledMark\""; - -/// `GET /api/permission/Action` —— 动作列表(官方 `ActionResult.page`)。 -pub async fn action_list( - State(state): State, - headers: HeaderMap, - raw: RawQuery, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_ACTION).await { - return resp; - } - let keyword = crate::platform::sys::query_param(&raw, "keyword"); - let keyword = keyword.trim().to_string(); - let page = Paging::of(&raw); - let (count_sql, list_sql, mut params): (String, String, Vec>) = if keyword.is_empty() { - ( - "SELECT count(*)::bigint AS \"c\" FROM base_action \ - WHERE COALESCE(f_delete_mark,0) = 0".to_string(), - format!( - "SELECT {ACTION_PROJECTION} FROM base_action \ - WHERE COALESCE(f_delete_mark,0) = 0 \ - ORDER BY f_sort_code ASC, f_full_name ASC \ - LIMIT $1::text::integer OFFSET $2::text::integer" - ), - vec![], - ) - } else { - ( - "SELECT count(*)::bigint AS \"c\" FROM base_action \ - WHERE COALESCE(f_delete_mark,0) = 0 \ - AND (f_full_name ILIKE $1::text OR f_en_code ILIKE $1::text \ - OR f_description ILIKE $1::text)".to_string(), - format!( - "SELECT {ACTION_PROJECTION} FROM base_action \ - WHERE COALESCE(f_delete_mark,0) = 0 \ - AND (f_full_name ILIKE $1::text OR f_en_code ILIKE $1::text \ - OR f_description ILIKE $1::text) \ - ORDER BY f_sort_code ASC, f_full_name ASC \ - LIMIT $2::text::integer OFFSET $3::text::integer" - ), - vec![Some(format!("%{keyword}%"))], - ) - }; - let total = match state.db.query_json_params(&count_sql, ¶ms_of(¶ms)).await { - Ok(rows) => rows - .into_iter() - .next() - .and_then(|r| r["c"].as_i64()) - .unwrap_or(0), - Err(e) => return db_error(e, "动作总数查询"), - }; - params.push(Some(page.page_size.to_string())); - params.push(Some(page.offset.to_string())); - match state.db.query_json_params(&list_sql, ¶ms_of(¶ms)).await { - Ok(rows) => ok(page_list(page.current_page, page.page_size, total, rows)), - Err(e) => db_error(e, "动作列表查询"), - } -} - -/// `GET /api/permission/Action/{id}` —— 动作详情。 -pub async fn action_info( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_ACTION).await { - return resp; - } - let id = id.trim().to_string(); - let sql = format!( - "SELECT {ACTION_PROJECTION} FROM base_action \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1" - ); - match state.db.query_json_params(&sql, &[&id]).await { - Ok(rows) => match rows.into_iter().next() { - Some(row) => ok(row), - None => fail(code::FAIL, "动作不存在"), - }, - Err(e) => db_error(e, "动作详情查询"), - } -} - -/// `POST /api/permission/Action` —— 新建动作。 -/// -/// 🔴 官方 `ActionServiceImpl.insertOrUpdate`:**新建一律 `type=1`(自定义)**。 -pub async fn action_create( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_ACTION).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let full_name = obj - .get("fullName") - .and_then(Value::as_str) - .unwrap_or_default() - .trim() - .to_string(); - if full_name.is_empty() { - return fail(code::FAIL, "动作名称不能为空"); - } - let en_code = obj - .get("enCode") - .and_then(Value::as_str) - .unwrap_or_default() - .trim() - .to_string(); - if en_code.is_empty() { - return fail(code::FAIL, "动作编码不能为空"); - } - - let new_id = new_uuid(); - let mut columns: Vec<&str> = vec!["f_id", "f_tenant_id", "f_full_name", "f_en_code"]; - let mut casts: Vec<&str> = vec!["", "", "", ""]; - let mut values: Vec> = vec![ - Some(new_id.clone()), - Some("0".to_string()), - Some(full_name), - Some(en_code), - ]; - - for (json_key, column, cast) in ACTION_WRITE_FIELDS { - if column == "f_full_name" || column == "f_en_code" { - continue; - } - if obj.contains_key(json_key) { - columns.push(column); - casts.push(cast); - values.push(value_to_text(obj.get(json_key))); - } - } - if !obj.contains_key("sortCode") { - columns.push("f_sort_code"); - casts.push("::bigint"); - values.push(Some("0".to_string())); - } - // 🔴 `f_type` = 1(自定义)—— 官方 `insertOrUpdate` 强制。 - columns.push("f_type"); - casts.push("::integer"); - values.push(Some("1".to_string())); - // 🔴 `f_enabled_mark` 是 **VARCHAR(11)** ⇒ 不加 CAST,直接传字符串。 - if !obj.contains_key("enabledMark") { - columns.push("f_enabled_mark"); - casts.push(""); - values.push(Some("0".to_string())); - } else if let Some(v) = value_to_text(obj.get("enabledMark")) { - columns.push("f_enabled_mark"); - casts.push(""); - values.push(Some(v)); - } - columns.push("f_creator_user_id"); - casts.push(""); - values.push(Some(user.account.clone())); - columns.push("f_delete_mark"); - casts.push("::integer"); - values.push(Some("0".to_string())); - columns.push("f_creator_time"); - let mut marks: Vec = (0..values.len()) - .map(|i| placeholder(i + 1, casts[i])) - .collect(); - marks.push("now()".to_string()); - let sql = format!( - "INSERT INTO base_action ({}) VALUES ({})", - columns.join(", "), - marks.join(", ") - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "新建动作"); - } - ok(json!({ "id": new_id })) -} - -/// `PUT /api/permission/Action/{id}` —— 改动作(**只 SET body 里出现的键**)。 -pub async fn action_update( - State(state): State, - headers: HeaderMap, - Path(id): Path, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_ACTION).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let rows = match state - .db - .query_json_params( - "SELECT f_id AS \"id\" FROM base_action \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", - &[&id], - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "动作查询"), - }; - if rows.is_empty() { - return fail(code::FAIL, "动作不存在"); - } - - let mut sets: Vec = Vec::new(); - let mut values: Vec> = Vec::new(); - for (json_key, column, cast) in ACTION_WRITE_FIELDS { - if !obj.contains_key(json_key) { - continue; - } - values.push(value_to_text(obj.get(json_key))); - sets.push(format!("{} = ${}::text{}", column, values.len(), cast)); - } - // 🔴 `f_enabled_mark` 是 VARCHAR(11) ⇒ 不加 CAST。 - if obj.contains_key("enabledMark") { - values.push(value_to_text(obj.get("enabledMark"))); - sets.push(format!("f_enabled_mark = ${}::text", values.len())); - } - if sets.is_empty() { - return ok(Value::Null); - } - values.push(Some(user.account.clone())); - sets.push(format!("f_last_modify_user_id = ${}::text", values.len())); - sets.push("f_last_modify_time = now()".to_string()); - values.push(Some(id)); - let sql = format!( - "UPDATE base_action SET {} WHERE f_id = ${}::text", - sets.join(", "), - values.len() - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "修改动作"); - } - ok(Value::Null) -} - -/// `DELETE /api/permission/Action/{id}` —— 删动作(软删)。 -pub async fn action_delete( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - let user = match guard(&state, &headers, EN_ACTION).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let values = [Some(user.account.clone()), Some(id)]; - let sql = "UPDATE base_action SET f_delete_mark = 1, f_delete_time = now(), \ - f_delete_user_id = $1::text WHERE f_id = $2::text \ - AND COALESCE(f_delete_mark,0) = 0"; - if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { - return db_error(e, "删除动作"); - } - ok(Value::Null) -} - -// ================================================================ 身份管理(base_standing) - -/// 🔴 **列名只来自这张白名单**(官方 `JNPF-PostgreSQL.sql:4071` 的 15 列逐字)。 -/// -/// 🔴 官方 `f_is_system` 的语义是 **1=系统身份 / 2=自定义** -/// (`COMMENT ON COLUMN base_standing.f_is_system IS '是否系统(1-系统,2-自定义)'`) -/// ⇒ **新建默认写 2(自定义)**,不是 1。 -const STANDING_WRITE_FIELDS: [(&str, &str, &str); 5] = [ - ("fullName", "f_full_name", ""), - ("enCode", "f_en_code", ""), - ("description", "f_description", ""), - ("enabledMark", "f_enabled_mark", "::integer"), - ("sortCode", "f_sort_code", "::bigint"), -]; - -/// 身份投影(`StandingVO` / `StandingInfoVO` 用到的字段)。 -/// -/// 🔴 `isSystem` **归一化成 1/0**(官方 `StandingController.list`: -/// `item.setIsSystem(Objects.equals(item.getIsSystem(), 1) ? 1 : 0)`) -/// ⇒ 前端 `!node.isSystem` 判断「系统身份不可编辑/不可删」才成立。 -const STANDING_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ - f_en_code AS \"enCode\", f_description AS \"description\", \ - COALESCE(f_sort_code, 0) AS \"sortCode\", \ - CASE WHEN COALESCE(f_is_system, 0) = 1 THEN 1 ELSE 0 END AS \"isSystem\", \ - COALESCE(f_enabled_mark, 0) AS \"enabledMark\""; - -/// 🔴 官方 `PermissionConst` 的取值(`jnpf-common-core/.../constant/PermissionConst.java`): -/// `ROLE="role"` / `POSITION="position"` / `STAND="standing"`。 -const STANDING_ITEM_TYPE: &str = "standing"; -const STANDING_OBJECT_TYPE_ROLE: &str = "role"; -const STANDING_OBJECT_TYPE_POSITION: &str = "position"; - -/// `GET /api/permission/Standing` —— 身份列表(官方 `ActionResult.page` ⇒ `PageListVO`)。 -/// -/// 🔴 前端 `views/permission/identity/index.vue`: -/// `state.treeData = res.data.list || []` ⇒ **`data` 必须是有 `list` 的对象**。 -pub async fn standing_list( - State(state): State, - headers: HeaderMap, - raw: RawQuery, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_IDENTITY).await { - return resp; - } - let keyword = crate::platform::sys::query_param(&raw, "keyword"); - let keyword = keyword.trim().to_string(); - let page = Paging::of(&raw); - let (count_sql, list_sql, mut params): (String, String, Vec>) = if keyword.is_empty() { - ( - "SELECT count(*)::bigint AS \"c\" FROM base_standing \ - WHERE COALESCE(f_delete_mark,0) = 0".to_string(), - format!( - "SELECT {STANDING_PROJECTION} FROM base_standing \ - WHERE COALESCE(f_delete_mark,0) = 0 \ - ORDER BY f_sort_code ASC, f_full_name ASC \ - LIMIT $1::text::integer OFFSET $2::text::integer" - ), - vec![], - ) - } else { - ( - "SELECT count(*)::bigint AS \"c\" FROM base_standing \ - WHERE COALESCE(f_delete_mark,0) = 0 \ - AND (f_full_name ILIKE $1::text OR f_en_code ILIKE $1::text)" - .to_string(), - format!( - "SELECT {STANDING_PROJECTION} FROM base_standing \ - WHERE COALESCE(f_delete_mark,0) = 0 \ - AND (f_full_name ILIKE $1::text OR f_en_code ILIKE $1::text) \ - ORDER BY f_sort_code ASC, f_full_name ASC \ - LIMIT $2::text::integer OFFSET $3::text::integer" - ), - vec![Some(format!("%{keyword}%"))], - ) - }; - let total = match state.db.query_json_params(&count_sql, ¶ms_of(¶ms)).await { - Ok(rows) => rows - .into_iter() - .next() - .and_then(|r| r["c"].as_i64()) - .unwrap_or(0), - Err(e) => return db_error(e, "身份总数查询"), - }; - params.push(Some(page.page_size.to_string())); - params.push(Some(page.offset.to_string())); - match state.db.query_json_params(&list_sql, ¶ms_of(¶ms)).await { - Ok(rows) => ok(page_list(page.current_page, page.page_size, total, rows)), - Err(e) => db_error(e, "身份列表查询"), - } -} - -/// `GET /api/permission/Standing/{id}` —— 身份详情(官方 `StandingInfoVO`)。 -pub async fn standing_info( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_IDENTITY).await { - return resp; - } - let id = id.trim().to_string(); - let sql = format!( - "SELECT {STANDING_PROJECTION} FROM base_standing \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1" - ); - match state.db.query_json_params(&sql, &[&id]).await { - Ok(rows) => match rows.into_iter().next() { - Some(row) => ok(row), - None => fail(code::FAIL, "身份不存在"), - }, - Err(e) => db_error(e, "身份详情查询"), - } -} - -/// `POST /api/permission/Standing` —— 新建身份。 -/// -/// 🔴 官方 `StandingController.create` 返 `ActionResult.success(msg)`(**无 id**), -/// 但本仓面 B 的惯例是返 `{id}`(前端 `Form.vue` 不用返回值,返 `{id}` 更通用)。 -pub async fn standing_create( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_IDENTITY).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let full_name = obj - .get("fullName") - .and_then(Value::as_str) - .unwrap_or_default() - .trim() - .to_string(); - if full_name.is_empty() { - return fail(code::FAIL, "名称不能为空"); - } - - let new_id = new_uuid(); - let mut columns: Vec<&str> = vec!["f_id", "f_tenant_id", "f_full_name"]; - let mut casts: Vec<&str> = vec!["", "", ""]; - let mut values: Vec> = - vec![Some(new_id.clone()), Some("0".to_string()), Some(full_name)]; - - for (json_key, column, cast) in STANDING_WRITE_FIELDS { - if column == "f_full_name" { - continue; - } - if obj.contains_key(json_key) { - columns.push(column); - casts.push(cast); - values.push(value_to_text(obj.get(json_key))); - } - } - if !obj.contains_key("enabledMark") { - columns.push("f_enabled_mark"); - casts.push("::integer"); - values.push(Some("1".to_string())); - } - if !obj.contains_key("sortCode") { - columns.push("f_sort_code"); - casts.push("::bigint"); - values.push(Some("0".to_string())); - } - // 🔴 `f_is_system` = 2(**自定义**)—— 官方 DDL 注释:1=系统,2=自定义。 - columns.push("f_is_system"); - casts.push("::integer"); - values.push(Some("2".to_string())); - columns.push("f_creator_user_id"); - casts.push(""); - values.push(Some(user.account.clone())); - columns.push("f_delete_mark"); - casts.push("::integer"); - values.push(Some("0".to_string())); - // 🔴 `f_creator_time` 用 SQL `now()` ⇒ **不占参数位**。 - columns.push("f_creator_time"); - let mut marks: Vec = (0..values.len()) - .map(|i| placeholder(i + 1, casts[i])) - .collect(); - marks.push("now()".to_string()); - let sql = format!( - "INSERT INTO base_standing ({}) VALUES ({})", - columns.join(", "), - marks.join(", ") - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "新建身份"); - } - ok(json!({ "id": new_id })) -} - -/// `PUT /api/permission/Standing/{id}` —— 改身份(**只 SET body 里出现的键**)。 -pub async fn standing_update( - State(state): State, - headers: HeaderMap, - Path(id): Path, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_IDENTITY).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let rows = match state - .db - .query_json_params( - "SELECT f_id AS \"id\" FROM base_standing \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", - &[&id], - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "身份查询"), - }; - if rows.is_empty() { - return fail(code::FAIL, "身份不存在"); - } - - let mut sets: Vec = Vec::new(); - let mut values: Vec> = Vec::new(); - for (json_key, column, cast) in STANDING_WRITE_FIELDS { - if !obj.contains_key(json_key) { - continue; - } - values.push(value_to_text(obj.get(json_key))); - sets.push(format!("{} = ${}::text{}", column, values.len(), cast)); - } - if sets.is_empty() { - return ok(Value::Null); - } - values.push(Some(user.account.clone())); - sets.push(format!("f_last_modify_user_id = ${}::text", values.len())); - sets.push("f_last_modify_time = now()".to_string()); - values.push(Some(id)); - let sql = format!( - "UPDATE base_standing SET {} WHERE f_id = ${}::text", - sets.join(", "), - values.len() - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "修改身份"); - } - ok(Value::Null) -} - -/// `DELETE /api/permission/Standing/{id}` —— 删身份(软删 + 解绑关联关系)。 -pub async fn standing_delete( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - let user = match guard(&state, &headers, EN_IDENTITY).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let values = [Some(user.account.clone()), Some(id.clone())]; - if let Err(e) = state - .db - .exec_params( - "UPDATE base_standing SET f_delete_mark = 1, f_delete_time = now(), \ - f_delete_user_id = $1::text WHERE f_id = $2::text \ - AND COALESCE(f_delete_mark,0) = 0", - ¶ms_of(&values), - ) - .await - { - return db_error(e, "删除身份"); - } - // 关联关系同步软删(官方 `StandingServiceImpl.delete` 也删 `authorize`)。 - // 🔴 **参数必须与占位符逐字对齐**:`$1`=f_item_type('standing')、`$2`=f_item_id、 - // `$3`=删除人(写进审计列 `f_delete_user_id`,否则 PG 拒「无法确定参数类型」)。 - let rel = [ - Some(STANDING_ITEM_TYPE.to_string()), - Some(id), - Some(user.account.clone()), - ]; - if let Err(e) = state - .db - .exec_params( - "UPDATE base_authorize SET f_delete_mark = 1, f_delete_time = now(), \ - f_delete_user_id = $3::text \ - WHERE f_item_type = $1::text AND f_item_id = $2::text \ - AND COALESCE(f_delete_mark,0) = 0", - ¶ms_of(&rel), - ) - .await - { - return db_error(e, "删除身份关联关系"); - } - ok(Value::Null) -} - -/// `GET /api/permission/Standing/list` —— 身份**关联列表**(该身份下挂的角色/岗位)。 -/// -/// 🔴 官方 `StandingController.lists`: -/// - `type=position` ⇒ 岗位(`base_position`);否则 ⇒ 角色(`base_role`); -/// - 关联关系落在 `base_authorize`:`f_item_id`=身份 id、`f_item_type`='standing'、 -/// `f_object_type`='role'/'position'、`f_object_id`=角色/岗位 id。 -pub async fn standing_relation_list( - State(state): State, - headers: HeaderMap, - raw: RawQuery, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_IDENTITY).await { - return resp; - } - let standing_id = crate::platform::sys::query_param(&raw, "id"); - let standing_id = standing_id.trim().to_string(); - let kind = crate::platform::sys::query_param(&raw, "type"); - let kind = kind.trim().to_string(); - let keyword = crate::platform::sys::query_param(&raw, "keyword"); - let keyword = keyword.trim().to_string(); - let page = Paging::of(&raw); - - if kind == STANDING_OBJECT_TYPE_POSITION { - // 岗位:本仓 `base_position` 已有 ⇒ 直接按 `base_authorize` 的关系取。 - let sql = format!( - "SELECT p.f_id AS \"id\", p.f_full_name AS \"fullName\", p.f_en_code AS \"enCode\", \ - p.f_description AS \"description\", \ - COALESCE(p.f_sort_code, 0) AS \"sortCode\", \ - 0 AS \"globalMark\", \ - COALESCE(p.f_enabled_mark, 0) AS \"enabledMark\", \ - 0 AS \"isSystem\", \ - 0 AS \"disable\" \ - FROM base_position p \ - JOIN base_authorize a \ - ON a.f_object_id = p.f_id AND a.f_object_type = '{STANDING_OBJECT_TYPE_POSITION}' \ - AND a.f_item_type = '{STANDING_ITEM_TYPE}' AND a.f_item_id = $1::text \ - AND COALESCE(a.f_delete_mark,0) = 0 \ - WHERE COALESCE(p.f_delete_mark,0) = 0 \ - ORDER BY p.f_sort_code ASC, p.f_full_name ASC" - ); - return match state.db.query_json_params(&sql, &[&standing_id]).await { - Ok(rows) => ok(page_list(1, rows.len().max(1) as i64, rows.len() as i64, rows)), - Err(e) => db_error(e, "身份岗位关联查询"), - }; - } - - // 角色:官方按 `base_role` 的 `f_global_mark` 判「系统身份」。 - let mut filters = vec![ - "a.f_item_type = 'standing'".to_string(), - "a.f_item_id = $1::text".to_string(), - "a.f_object_type = 'role'".to_string(), - "COALESCE(a.f_delete_mark,0) = 0".to_string(), - "COALESCE(r.f_delete_mark,0) = 0".to_string(), - ]; - let mut params: Vec> = vec![Some(standing_id.clone())]; - if !keyword.is_empty() { - filters.push("(r.f_full_name ILIKE $2::text OR r.f_en_code ILIKE $2::text)".to_string()); - params.push(Some(format!("%{keyword}%"))); - } - let where_sql = filters.join(" AND "); - let sql = format!( - "SELECT r.f_id AS \"id\", r.f_full_name AS \"fullName\", r.f_en_code AS \"enCode\", \ - r.f_description AS \"description\", \ - COALESCE(r.f_sort_code, 0) AS \"sortCode\", \ - COALESCE(r.f_global_mark, 0) AS \"globalMark\", \ - COALESCE(r.f_enabled_mark, 0) AS \"enabledMark\", \ - CASE WHEN COALESCE(r.f_global_mark, 0) = 1 THEN 1 ELSE 0 END AS \"isSystem\", \ - 0 AS \"disable\" \ - FROM base_role r JOIN base_authorize a ON a.f_object_id = r.f_id \ - WHERE {where_sql} \ - ORDER BY r.f_global_mark ASC, r.f_full_name ASC" - ); - match state.db.query_json_params(&sql, ¶ms_of(¶ms)).await { - Ok(rows) => ok(page_list( - page.current_page, - page.page_size, - rows.len() as i64, - rows, - )), - Err(e) => db_error(e, "身份角色关联查询"), - } -} - -/// `POST /api/permission/Standing/{id}/Actions/AddObject` —— 给身份加角色/岗位。 -/// -/// 🔴 官方 `StandingController.addObject`:body `{ids:[…], type:'role'|'position'}`; -/// 关系写 `base_authorize`(`f_item_id`=身份 id、`f_item_type`='standing')。 -pub async fn standing_add_object( - State(state): State, - headers: HeaderMap, - Path(id): Path, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_IDENTITY).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let ids = id_list(&obj); - if ids.is_empty() { - return ok(Value::Null); - } - let kind = obj - .get("type") - .and_then(Value::as_str) - .unwrap_or(STANDING_OBJECT_TYPE_ROLE) - .trim() - .to_string(); - let object_type = if kind == STANDING_OBJECT_TYPE_POSITION { - STANDING_OBJECT_TYPE_POSITION.to_string() - } else { - STANDING_OBJECT_TYPE_ROLE.to_string() - }; - - // 幂等:已存在的关联跳过(官方 `addObject` 也是 `!authorizeList.contains(thisId)`)。 - let existing = match state - .db - .query_json_params( - "SELECT f_object_id AS \"id\" FROM base_authorize \ - WHERE f_item_type = $1::text AND f_item_id = $2::text \ - AND f_object_type = $3::text AND COALESCE(f_delete_mark,0) = 0", - &[&STANDING_ITEM_TYPE, &id, &object_type], - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "身份关联查询"), - }; - let existing_ids: HashSet = existing - .iter() - .filter_map(|r| r["id"].as_str()) - .map(str::to_string) - .collect(); - - for object_id in ids { - if existing_ids.contains(&object_id) { - continue; - } - let new_row_id = new_uuid(); - let values = [ - Some(new_row_id), - Some(STANDING_ITEM_TYPE.to_string()), - Some(id.clone()), - Some(object_type.clone()), - Some(object_id), - Some(user.account.clone()), - ]; - // 🔴 `f_creator_time` 用 `now()` ⇒ 不占参数位。 - let sql = "INSERT INTO base_authorize \ - (f_id, f_item_type, f_item_id, f_object_type, f_object_id, \ - f_creator_user_id, f_creator_time, f_delete_mark, f_tenant_id) \ - VALUES ($1::text, $2::text, $3::text, $4::text, $5::text, $6::text, \ - now(), 0, '0')"; - if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { - return db_error(e, "新增身份关联"); - } - } - ok(Value::Null) -} - -/// `POST /api/permission/Standing/{id}/Actions/DeleteObject` —— 从身份移除角色/岗位。 -pub async fn standing_delete_object( - State(state): State, - headers: HeaderMap, - Path(id): Path, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_IDENTITY).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let ids = id_list(&obj); - if ids.is_empty() { - return ok(Value::Null); - } - let kind = obj - .get("type") - .and_then(Value::as_str) - .unwrap_or(STANDING_OBJECT_TYPE_ROLE) - .trim() - .to_string(); - let object_type = if kind == STANDING_OBJECT_TYPE_POSITION { - STANDING_OBJECT_TYPE_POSITION.to_string() - } else { - STANDING_OBJECT_TYPE_ROLE.to_string() - }; - - for object_id in ids { - let values = [ - Some(user.account.clone()), - Some(STANDING_ITEM_TYPE.to_string()), - Some(id.clone()), - Some(object_type.clone()), - Some(object_id), - ]; - let sql = "UPDATE base_authorize SET f_delete_mark = 1, f_delete_time = now(), \ - f_delete_user_id = $1::text \ - WHERE f_item_type = $2::text AND f_item_id = $3::text \ - AND f_object_type = $4::text AND f_object_id = $5::text \ - AND COALESCE(f_delete_mark,0) = 0"; - if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { - return db_error(e, "删除身份关联"); - } - } - ok(Value::Null) -} - -// ---------------------------------------------------------------- 应用中心(/api/system/System) -// -// 官方真源:`SystemController.java`(`@RequestMapping("/api/system/System")`)。 -// 形状真源:`SystemListVO.java` / `SystemVO.java` / `AppAuthorizeVo.java` / `SystemTopModel.java`。 -// -// 🔴 **应用中心页(`views/appCenter/index.vue`)只读三件事**: -// `data.list`(列表)/ `res.msg`(提示)/ `res.data.url`(导出下载)⇒ 形状错一个就白屏。 -// 🔴 **列表项的 `isAdministrator` 一类字段一律数字**(官方 VO 是 Integer),本文件的 -// `hasUpdate` / `hasDelete` 也照官方给 `0|1`。 - /// `@SaCheckPermission("appCenter")`(官方 `SystemController` create/delete/copy)。 const EN_APP_CENTER: &str = "appCenter"; @@ -7169,7 +1204,7 @@ const EN_SYS_CONFIG: &str = "sysConfig.parameter"; /// /// 🔴 `creatorUserId` 与 `isMain` 是**内部字段**(算 `hasDelete` / 过滤主系统用), /// 出参前会摘掉 —— 官方 VO 里没有它们。 -const SYSTEM_LIST_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ +pub(super) const SYSTEM_LIST_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ f_en_code AS \"enCode\", f_icon AS \"icon\", COALESCE(f_sort_code, 0) AS \"sortCode\", \ f_background_color AS \"backgroundColor\", f_user_id AS \"userId\", \ f_creator_user_id AS \"creatorUserId\", COALESCE(f_is_main, 0) AS \"isMain\""; @@ -7202,7 +1237,7 @@ const SYSTEM_WRITE_FIELDS: [(&str, &str, &str); 12] = [ ]; /// 当前用户在当前应用中心置顶的 id 集合。 -async fn load_system_tops(state: &AppState, user: &TokenUser) -> HashSet { +pub(super) async fn load_system_tops(state: &AppState, user: &TokenUser) -> HashSet { let sql = "SELECT f_object_id AS \"id\" FROM base_system_top \ WHERE COALESCE(f_delete_mark, 0) = 0 AND f_user_id = $1::text AND f_type = 'appCenter'"; match state.db.query_json_params(sql, &[&user.user_id]).await { @@ -7306,7 +1341,7 @@ pub async fn system_list( } /// 列表项 ⇒ 官方 `SystemListVO`(**摘掉内部字段** + 按用户算 `hasUpdate/hasDelete/isTop`)。 -fn shape_system_list_item(mut row: Value, user: &TokenUser, tops: &HashSet) -> Value { +pub(super) fn shape_system_list_item(mut row: Value, user: &TokenUser, tops: &HashSet) -> Value { { let Some(obj) = row.as_object_mut() else { return row; @@ -8049,12 +2084,6 @@ async fn system_app_auth_write( ok(Value::Null) } -// ---------------------------------------------------------------- 系统配置(/api/system/SysConfig) -// -// 官方把 `SysConfigModel`(72 个字段)**拆成键值行**存在 `base_sys_config`: -// `f_category='SysConfig'`,`f_key` = 字段名,`f_value` = 值。 -// ⇒ 本仓不做「逐字段建列」,GET 时按行拼回对象、PUT 时逐键 upsert。 - /// 系统参数的分类标识(官方 `sysconfigService.getList("SysConfig")`)。 const SYS_CONFIG_CATEGORY: &str = "SysConfig"; @@ -8485,14 +2514,6 @@ pub async fn syn_third_info_handle_num( ok(page_list(paging.current_page, paging.page_size, 0, Vec::new())) } -// ---------------------------------------------------------------- 标签(/api/system/Tag) -// -// 官方真源:`TagController.java`(`@RequestMapping("/api/system/Tag")`)。 -// 应用中心页**一进页面就调** `GET /api/system/Tag/selector?enCode=AppTags` -// (`views/appCenter/index.vue:45`)⇒ 不实现就必闪一条 404。 -// -// 🔴 官方列表是 `ListVO`(`{list:[…]}`),不是 `PageListVO` —— 没有 `pagination`。 - /// `TagListModel` / `TagSelectorVo` 的原料。 const TAG_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ COALESCE(f_type, 1) AS \"type\", COALESCE(f_parent_id, '0') AS \"parentId\", \ @@ -8808,17 +2829,6 @@ pub async fn tag_delete( ok(Value::Null) } -// ================================================================ 消息业务分类(base_business_category) -// -// 官方真源:`BusinessCategoryController.java`(`@RequestMapping("/api/system/BusinessCategory")`)。 -// -// 🔴 **这个控制器一条 `@SaCheckPermission` 都没有** —— 登录即可用。别自己加守卫, -// 加了会把「消息记录页左侧页签」打成 403。 -// 🔴 列表/下拉都是 `ListVO`(`{list:[…]}`),**不是**分页。`GET /api/system/BusinessCategory` -// 返回的是**树**(根节点带 `children`),不是平铺数组。 -// 🔴 数据来自平台种子(`platform/seed.rs::BUSINESS_CATEGORIES`,官方 38 行), -// 不是用户自己录的 —— 但增删改端点照做(官方页面有「分类管理」)。 - /// `BusinessCategoryTreeModel` / `BusinessSelectorVo` 的原料。 const CATEGORY_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ COALESCE(f_parent_id, '-1') AS \"parentId\", f_en_code AS \"enCode\", \ @@ -8836,14 +2846,6 @@ const CATEGORY_WRITE_FIELDS: [(&str, &str, &str); 6] = [ ("description", "f_description", ""), ]; -/// 🔴 业务分类里「公告」一级 / 「公告提醒」二级的**官方雪花 id**。 -/// -/// 公告发布时要往 `base_message.f_category` 拼这两个 id(官方存的就是 id 串: -/// `t.getCategory().contains(id)` / `.like(category)` 两处都是子串匹配) -/// ⇒ 页签过滤(按二级 id 子串)和类型名(按一级 id ⇒ enCode)才能同时成立。 -const CATEGORY_ANNOUNCE: &str = "2046494646179336192"; -const CATEGORY_ANNOUNCE_REMIND: &str = "2046498549667074048"; - /// 分类扁平行 ⇒ 树(父不存在的行**提升为根**,绝不丢行)。 fn category_tree(rows: Vec) -> Vec { let ids: HashSet = rows @@ -9374,1067 +3376,6 @@ async fn ensure_category_unique( } } -// ================================================================ 站内消息(base_message) -// -// 官方真源:`NoticeController.java`(`@RequestMapping("/api/message")`)的「消息中心」那半截。 -// -// 🔴 **`base_message` 一行 = 一个收件人的一条消息**(`f_user_id` 是收件人); -// 发件人在 `f_creator_user_id`。所有查询**必须**带 `f_user_id = 当前用户` -// —— 漏了就是「能看到别人的消息」。 -// 🔴 `f_type`:1 公告 / 2 流程 / 3 系统 / 4 日程 / 5 表单 / 6 应用 -// (官方 `BusinessCategoryEnum`;前端 `_core/messageRecord/index.vue:145` 按它分派详情)。 -// 🔴 `f_is_read`:0 未读 / 1 已读 / 2 已回执(官方 `reply()` 写 2)。 - -/// `MessageInfoVO` 的原料。 -const MESSAGE_PROJECTION: &str = "f_id AS \"id\", f_title AS \"title\", \ - COALESCE(f_type, 0) AS \"type\", COALESCE(f_is_read, 0) AS \"isRead\", \ - f_flow_type AS \"flowType\", f_category AS \"category\", \ - (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"releaseTime\", \ - f_creator_user_id AS \"creatorUserId\""; - -/// `f_type` ⇒ 一级分类 `enCode`(官方 `BusinessCategoryEnum.getTypeByEnCode` 的反向)。 -/// -/// 前端 `getTypeName(enCode)` 拿它去一级分类列表里找 `fullName` -/// (`_core/messageRecord/index.vue:204`)⇒ 必须是一级的 enCode,不能是 `flow_todo` 这种。 -fn message_type_en_code(kind: Option) -> &'static str { - match kind { - Some(1) => "announce", - Some(2) | Some(5) => "flow", - Some(3) | Some(4) => "sys", - Some(6) => "app", - _ => "other", - } -} - -/// `f_type` ⇒ 中文类型名(官方 `BusinessCategoryEnum.categoryName`)。 -fn message_type_name(kind: Option) -> &'static str { - match kind { - Some(1) => "公告", - Some(2) => "流程", - Some(3) => "系统", - Some(4) => "日程", - Some(5) => "表单", - Some(6) => "应用", - _ => "其他", - } -} - -/// 批量取「姓名/账号」标签(官方 `realName + "/" + account`)。 -/// -/// 🔴 **按 `f_id` 与 `f_account` 双键建表**:本仓写 `f_creator_user_id` 时用的是**账号** -/// (见 `seed.rs` 的 `ADMIN_ACCOUNT`),而官方的历史数据里是 **id** -/// ⇒ 只按其中一种查,另一种就永远显示空。两种都收,key 也两样都放。 -async fn user_labels(state: &AppState, ids: &[String]) -> HashMap { - let mut unique: Vec = ids.iter().filter(|s| !s.is_empty()).cloned().collect(); - unique.sort(); - unique.dedup(); - if unique.is_empty() { - return HashMap::new(); - } - let joined = unique.join(","); - match state - .db - .query_json_params( - "SELECT f_id AS \"id\", f_real_name AS \"realName\", f_account AS \"account\" \ - FROM base_user \ - WHERE f_id = ANY(string_to_array($1::text, ',')) \ - OR f_account = ANY(string_to_array($1::text, ','))", - &[&joined], - ) - .await - { - Ok(rows) => { - let mut map = HashMap::new(); - for row in rows { - let id = row - .get("id") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(); - let account = row.get("account").and_then(Value::as_str).unwrap_or(""); - let name = row - .get("realName") - .and_then(Value::as_str) - .filter(|s| !s.is_empty()) - .unwrap_or(account); - let label = if account.is_empty() || name == account { - name.to_string() - } else { - format!("{name}/{account}") - }; - if !id.is_empty() { - map.insert(id, label.clone()); - } - if !account.is_empty() { - map.insert(account.to_string(), label); - } - } - map - } - Err(e) => { - eprintln!("[face-b] 用户标签查询失败(降级为空): {e}"); - HashMap::new() - } - } -} - -/// 给消息行补 `releaseUser` / `creatorUser` / `enCode` / `typeName` / `lastModifyTime`。 -fn shape_message_row(row: &mut Value, labels: &HashMap) { - let Some(obj) = row.as_object_mut() else { - return; - }; - let creator_id = obj - .get("creatorUserId") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(); - let label = labels.get(&creator_id).cloned().unwrap_or_default(); - let kind = obj.get("type").and_then(Value::as_i64); - let release_time = obj.get("releaseTime").cloned().unwrap_or(Value::Null); - obj.insert("releaseUser".to_string(), Value::String(label.clone())); - obj.insert("creatorUser".to_string(), Value::String(label)); - obj.insert("lastModifyTime".to_string(), release_time); - obj.insert( - "enCode".to_string(), - Value::String(message_type_en_code(kind).to_string()), - ); - obj.insert( - "typeName".to_string(), - Value::String(message_type_name(kind).to_string()), - ); - obj.remove("creatorUserId"); -} - -/// `GET /api/message` —— 消息中心列表(`PageListVO`,按当前收件人过滤)。 -/// -/// 参数(官方 `PaginationMessage`):`type` / `notType` / `category`(二级分类 id,*子串匹配*) -/// / `isRead` / `keyword`(标题)+ `currentPage` / `pageSize`。 -pub async fn message_list( - State(state): State, - headers: HeaderMap, - raw: RawQuery, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let paging = Paging::of(&raw); - let mut conds = vec![ - "COALESCE(f_delete_mark, 0) = 0".to_string(), - "f_user_id = $1::text".to_string(), - ]; - let mut values: Vec> = vec![Some(user.user_id.clone())]; - let q = |name: &str| { - crate::platform::sys::query_param(&raw, name) - .trim() - .to_string() - }; - let (kind, not_type, category, is_read, keyword) = ( - q("type"), - q("notType"), - q("category"), - q("isRead"), - q("keyword"), - ); - if !kind.is_empty() { - values.push(Some(kind)); - conds.push(format!("COALESCE(f_type, 0) = ${}::text::integer", values.len())); - } - if !not_type.is_empty() { - values.push(Some(not_type)); - conds.push(format!("COALESCE(f_type, 0) <> ${}::text::integer", values.len())); - } - if !category.is_empty() && category != "-1" { - values.push(Some(format!("%{category}%"))); - conds.push(format!("COALESCE(f_category, '') LIKE ${}::text", values.len())); - } - if !is_read.is_empty() { - values.push(Some(is_read)); - conds.push(format!("COALESCE(f_is_read, 0) = ${}::text::integer", values.len())); - } - if !keyword.is_empty() { - values.push(Some(format!("%{keyword}%"))); - conds.push(format!("COALESCE(f_title, '') ILIKE ${}::text", values.len())); - } - let where_sql = conds.join(" AND "); - let count_sql = format!("SELECT COUNT(*)::text AS \"n\" FROM base_message WHERE {where_sql}"); - let total: i64 = match state.db.query_json_params(&count_sql, ¶ms_of(&values)).await { - Ok(rows) => rows - .first() - .and_then(|r| r.get("n")) - .and_then(Value::as_str) - .and_then(|s| s.parse::().ok()) - .unwrap_or(0), - Err(e) => return db_error(e, "消息计数"), - }; - let mut list_values = values.clone(); - list_values.push(Some(paging.page_size.to_string())); - let limit_n = list_values.len(); - list_values.push(Some(paging.offset.to_string())); - let offset_n = list_values.len(); - let sql = format!( - "SELECT {MESSAGE_PROJECTION} FROM base_message WHERE {where_sql} \ - ORDER BY f_creator_time DESC NULLS LAST, f_id DESC \ - LIMIT ${limit_n}::text::integer OFFSET ${offset_n}::text::integer" - ); - let rows = match state.db.query_json_params(&sql, ¶ms_of(&list_values)).await { - Ok(rows) => rows, - Err(e) => return db_error(e, "消息列表查询"), - }; - let creator_ids: Vec = rows - .iter() - .filter_map(|r| r.get("creatorUserId").and_then(Value::as_str).map(str::to_string)) - .collect(); - let labels = user_labels(&state, &creator_ids).await; - let list: Vec = rows - .into_iter() - .map(|mut row| { - shape_message_row(&mut row, &labels); - row - }) - .collect(); - ok(page_list(paging.current_page, paging.page_size, total, list)) -} - -/// `GET /api/message/ReadInfo/{id}` —— 读一条消息(**顺带置已读**)。 -/// -/// 🔴 官方 `messageRead` 会写库(`f_is_read = 1` + `f_read_time`)—— 这不是纯查询, -/// 前端「点开就变已读」全靠它。`f_is_read` 已经是 `2`(已回执)时**不回退**。 -pub async fn message_read_info( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let sql = "SELECT f_id AS \"id\", f_title AS \"title\", COALESCE(f_type, 0) AS \"type\", \ - COALESCE(f_is_read, 0) AS \"isRead\", f_flow_type AS \"flowType\", \ - COALESCE(f_body_text, '') AS \"bodyText\", f_category AS \"category\", \ - (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"releaseTime\", \ - f_creator_user_id AS \"creatorUserId\" \ - FROM base_message WHERE f_id = $1::text AND f_user_id = $2::text \ - AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1"; - let rows = match state - .db - .query_json_params(sql, &[&id, &user.user_id]) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "消息详情查询"), - }; - let Some(mut row) = rows.into_iter().next() else { - return fail(code::FAIL, "消息不存在"); - }; - let is_read = row.get("isRead").and_then(Value::as_i64).unwrap_or(0); - if is_read != 2 { - let values = [Some(id.clone()), Some(user.user_id.clone())]; - if let Err(e) = state - .db - .exec_params( - "UPDATE base_message SET f_is_read = 1, f_read_time = now() \ - WHERE f_id = $1::text AND f_user_id = $2::text", - ¶ms_of(&values), - ) - .await - { - eprintln!("[face-b] 消息置已读失败(不影响读取): {e}"); - } - if let Some(obj) = row.as_object_mut() { - obj.insert("isRead".to_string(), json!(1)); - } - } - // 公告类消息的 `f_body_text` 是**公告快照 JSON**(官方同款)⇒ 能把公告正文/封面/附件 - // 直接摊平到 VO 上。解析失败就当普通文本,别报错。 - let raw_body = row - .get("bodyText") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(); - if let Ok(Value::Object(inner)) = serde_json::from_str::(&raw_body) { - if let Some(obj) = row.as_object_mut() { - for key in [ - "bodyText", - "coverImage", - "files", - "excerpt", - "category", - "expirationTime", - ] { - if let Some(v) = inner.get(key) { - obj.insert(key.to_string(), v.clone()); - } - } - } - } - let creator_id = row - .get("creatorUserId") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(); - let labels = user_labels(&state, &[creator_id]).await; - let label = labels - .values() - .next() - .cloned() - .unwrap_or_default(); - let kind = row.get("type").and_then(Value::as_i64); - if let Some(obj) = row.as_object_mut() { - obj.insert("creatorUser".to_string(), Value::String(label.clone())); - obj.insert("releaseUser".to_string(), Value::String(label)); - obj.insert( - "typeName".to_string(), - Value::String(message_type_name(kind).to_string()), - ); - obj.insert("isReply".to_string(), Value::Bool(false)); - obj.remove("creatorUserId"); - } - ok(row) -} - -/// `POST /api/message/Actions/ReadAll` —— 全部已读(可带 `ids` / `category` 收窄)。 -pub async fn message_read_all( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => Map::new(), - Err(resp) => return resp, - }; - let ids = id_list(&obj); - let category = obj - .get("category") - .and_then(Value::as_str) - .unwrap_or_default() - .trim() - .to_string(); - let mut values: Vec> = vec![Some(user.user_id.clone())]; - let mut conds = vec![ - "COALESCE(f_delete_mark, 0) = 0".to_string(), - "f_user_id = $1::text".to_string(), - "COALESCE(f_is_read, 0) = 0".to_string(), - ]; - if !ids.is_empty() { - values.push(Some(ids.join(","))); - conds.push(format!( - "f_id = ANY(string_to_array(${}::text, ','))", - values.len() - )); - } - if !category.is_empty() && category != "-1" { - values.push(Some(format!("%{category}%"))); - conds.push(format!("COALESCE(f_category, '') LIKE ${}::text", values.len())); - } - let sql = format!( - "UPDATE base_message SET f_is_read = 1, f_read_time = now() WHERE {}", - conds.join(" AND ") - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "标记消息已读"); - } - ok(Value::Null) -} - -/// `DELETE /api/message/Record` —— 删消息记录(body `{ids: "a,b"}`,只删自己的)。 -pub async fn message_record_delete( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => Map::new(), - Err(resp) => return resp, - }; - let ids = id_list(&obj); - if ids.is_empty() { - return fail(code::FAIL, "请选择要删除的消息"); - } - let values = [Some(user.account.clone()), Some(ids.join(",")), Some(user.user_id)]; - if let Err(e) = state - .db - .exec_params( - "UPDATE base_message SET f_delete_mark = 1, f_delete_time = now(), \ - f_delete_user_id = $1::text \ - WHERE f_id = ANY(string_to_array($2::text, ',')) AND f_user_id = $3::text", - ¶ms_of(&values), - ) - .await - { - return db_error(e, "删除消息记录"); - } - ok(Value::Null) -} - -/// `POST /api/message/Reply/{id}` —— 手动回执(`f_is_read = 2`,官方同款)。 -pub async fn message_reply( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let values = [Some(id.trim().to_string()), Some(user.user_id)]; - if let Err(e) = state - .db - .exec_params( - "UPDATE base_message SET f_is_read = 2, f_read_time = now() \ - WHERE f_id = $1::text AND f_user_id = $2::text", - ¶ms_of(&values), - ) - .await - { - return db_error(e, "消息回执"); - } - ok(Value::Null) -} - -// ================================================================ 系统公告(base_notice) -// -// 官方真源:`NoticeController.java` 的「通知公告」那半截。 -// -// 🔴 所有公告端点都守 `@SaCheckPermission("msgCenter.notice")`(与消息列表不同!)。 -// 🔴 列表 `POST /api/message/Notice/List`(**POST 不是 GET**)—— body 是 `NoticePagination`。 -// 🔴 `MessageNoticeVO.category` 是**字典中文名**(官方把 `enCode` 换成 `NoticeType` 的 -// `fullName`)⇒ 本仓没有 `NoticeType` 字典表,直接回传 `f_category` 原值(前端列宽只有 60px)。 - -/// `MessageNoticeVO` 的原料。 -const NOTICE_PROJECTION: &str = "f_id AS \"id\", f_title AS \"title\", \ - COALESCE(f_enabled_mark, 0) AS \"enabledMark\", f_category AS \"category\", \ - (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\", \ - (EXTRACT(EPOCH FROM f_last_modify_time) * 1000)::bigint AS \"lastModifyTime\", \ - (EXTRACT(EPOCH FROM f_expiration_time) * 1000)::bigint AS \"expirationTime\", \ - f_creator_user_id AS \"creatorUserId\", f_last_modify_user_id AS \"lastModifyUserId\""; - -/// `NoticeCrForm` / `NoticeUpForm` ⇒ 列。 -const NOTICE_WRITE_FIELDS: [(&str, &str, &str); 10] = [ - ("title", "f_title", ""), - ("bodyText", "f_body_text", ""), - ("toUserIds", "f_to_user_ids", ""), - ("coverImage", "f_cover_image", ""), - ("files", "f_files", ""), - ("category", "f_category", ""), - ("type", "f_type", "::integer"), - ("sendConfigId", "f_send_config_id", ""), - ("description", "f_description", ""), - ("replyType", "f_reply_type", "::integer"), -]; - -/// 正文抽摘要(官方 `NoticeEntity.getExcerpt()` 是 getter,不落列)。 -fn notice_excerpt(html: &str) -> String { - let mut out = String::new(); - let mut in_tag = false; - for ch in html.chars() { - match ch { - '<' => in_tag = true, - '>' => in_tag = false, - c if !in_tag => out.push(c), - _ => {} - } - if out.chars().count() >= 120 { - break; - } - } - out.trim().to_string() -} - -/// `POST /api/message/Notice/List` —— 公告列表(`PageListVO`)。 -/// -/// 支持 `keyword`(标题)、`type`(分类 enCode 数组 / 逗号串)、`enabledMark`(状态数组)、 -/// `releaseUser`(发布人 id 数组)。时间区间过滤(`releaseTime` / `creatorTime` / -/// `expirationTime`)**暂不实现** —— 见 `docs/contract.md` 的 `partial` 标注。 -pub async fn notice_list( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_NOTICE).await { - return resp; - } - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => Map::new(), - Err(resp) => return resp, - }; - let paging = Paging::of_body(&obj); - let mut conds = vec!["COALESCE(f_delete_mark, 0) = 0".to_string()]; - let mut values: Vec> = Vec::new(); - if let Some(keyword) = obj - .get("keyword") - .and_then(Value::as_str) - .map(str::trim) - .filter(|s| !s.is_empty()) - { - values.push(Some(format!("%{keyword}%"))); - conds.push(format!("COALESCE(f_title, '') ILIKE ${}::text", values.len())); - } - let types = id_list_of(&obj, "type"); - if !types.is_empty() { - values.push(Some(types.join(","))); - conds.push(format!( - "f_category = ANY(string_to_array(${}::text, ','))", - values.len() - )); - } - let marks = id_list_of(&obj, "enabledMark"); - if !marks.is_empty() { - values.push(Some(marks.join(","))); - conds.push(format!( - "COALESCE(f_enabled_mark, 0)::text = ANY(string_to_array(${}::text, ','))", - values.len() - )); - } - let releasers = id_list_of(&obj, "releaseUser"); - if !releasers.is_empty() { - values.push(Some(releasers.join(","))); - conds.push(format!( - "f_last_modify_user_id = ANY(string_to_array(${}::text, ','))", - values.len() - )); - } - let where_sql = conds.join(" AND "); - let count_sql = format!("SELECT COUNT(*)::text AS \"n\" FROM base_notice WHERE {where_sql}"); - let total: i64 = match state.db.query_json_params(&count_sql, ¶ms_of(&values)).await { - Ok(rows) => rows - .first() - .and_then(|r| r.get("n")) - .and_then(Value::as_str) - .and_then(|s| s.parse::().ok()) - .unwrap_or(0), - Err(e) => return db_error(e, "公告计数"), - }; - let mut list_values = values.clone(); - list_values.push(Some(paging.page_size.to_string())); - let limit_n = list_values.len(); - list_values.push(Some(paging.offset.to_string())); - let offset_n = list_values.len(); - let sql = format!( - "SELECT {NOTICE_PROJECTION}, COALESCE(f_body_text, '') AS \"bodyText\" \ - FROM base_notice WHERE {where_sql} \ - ORDER BY f_creator_time DESC NULLS LAST, f_id DESC \ - LIMIT ${limit_n}::text::integer OFFSET ${offset_n}::text::integer" - ); - let rows = match state.db.query_json_params(&sql, ¶ms_of(&list_values)).await { - Ok(rows) => rows, - Err(e) => return db_error(e, "公告列表查询"), - }; - let mut ids: Vec = Vec::new(); - for row in &rows { - for key in ["creatorUserId", "lastModifyUserId"] { - if let Some(v) = row.get(key).and_then(Value::as_str) { - ids.push(v.to_string()); - } - } - } - let labels = user_labels(&state, &ids).await; - let list: Vec = rows - .into_iter() - .map(|row| shape_notice_row(row, &labels)) - .collect(); - ok(page_list(paging.current_page, paging.page_size, total, list)) -} - -/// 给公告行补 `creatorUser` / `releaseUser` / `excerpt` 并摘掉内部 id。 -fn shape_notice_row(mut row: Value, labels: &HashMap) -> Value { - let body = row - .get("bodyText") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(); - let Some(obj) = row.as_object_mut() else { - return row; - }; - let creator_id = obj - .get("creatorUserId") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(); - let modify_id = obj - .get("lastModifyUserId") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(); - let creator = labels.get(&creator_id).cloned().unwrap_or_default(); - obj.insert("creatorUser".to_string(), Value::String(creator)); - // 官方 `releaseUser` 取的是 `lastModifyUserId`(= 发布人)的姓名/账号。 - let releaser = if modify_id.is_empty() { - String::new() - } else { - labels.get(&modify_id).cloned().unwrap_or_default() - }; - obj.insert("releaseUser".to_string(), Value::String(releaser)); - obj.insert("excerpt".to_string(), Value::String(notice_excerpt(&body))); - obj.remove("bodyText"); - obj.remove("creatorUserId"); - obj.remove("lastModifyUserId"); - row -} - -/// `POST /api/message/Notice` —— 新建公告(草稿:`f_enabled_mark = 0`)。 -pub async fn notice_create( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_NOTICE).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let title = obj - .get("title") - .and_then(Value::as_str) - .unwrap_or_default() - .trim() - .to_string(); - if title.is_empty() { - return fail(code::FAIL, "公告标题缺失"); - } - let new_id = new_uuid(); - let mut columns: Vec = vec![ - "f_id".into(), - "f_tenant_id".into(), - "f_title".into(), - "f_enabled_mark".into(), - "f_delete_mark".into(), - "f_creator_user_id".into(), - ]; - let mut casts: Vec<&str> = vec!["", "", "", "::integer", "::integer", ""]; - let mut values: Vec> = vec![ - Some(new_id), - Some("0".to_string()), - Some(title), - Some("0".to_string()), - Some("0".to_string()), - Some(user.account.clone()), - ]; - for (json_key, column, cast) in NOTICE_WRITE_FIELDS { - if column == "f_title" { - continue; - } - if !obj.contains_key(json_key) { - continue; - } - columns.push(column.to_string()); - casts.push(cast); - values.push(value_to_text(obj.get(json_key))); - } - if !obj.contains_key("replyType") { - // 官方:`replyType` 为空时写 0(不回执)。 - columns.push("f_reply_type".to_string()); - casts.push("::integer"); - values.push(Some("0".to_string())); - } - columns.push("f_creator_time".to_string()); - let mut marks: Vec = (0..values.len()) - .map(|i| placeholder(i + 1, casts[i])) - .collect(); - marks.push("now()".to_string()); - let sql = format!( - "INSERT INTO base_notice ({}) VALUES ({})", - columns.join(", "), - marks.join(", ") - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "新建公告"); - } - ok(Value::Null) -} - -/// `PUT /api/message/Notice/{id}` —— 改公告(只 SET body 里出现的键)。 -pub async fn notice_update( - State(state): State, - headers: HeaderMap, - Path(id): Path, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_NOTICE).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let mut sets: Vec = Vec::new(); - let mut values: Vec> = Vec::new(); - for (json_key, column, cast) in NOTICE_WRITE_FIELDS { - if !obj.contains_key(json_key) { - continue; - } - values.push(value_to_text(obj.get(json_key))); - sets.push(format!("{} = ${}::text{}", column, values.len(), cast)); - } - if sets.is_empty() { - return ok(Value::Null); - } - values.push(Some(user.account.clone())); - sets.push(format!("f_last_modify_user_id = ${}::text", values.len())); - sets.push("f_last_modify_time = now()".to_string()); - values.push(Some(id)); - let sql = format!( - "UPDATE base_notice SET {} WHERE f_id = ${}::text AND COALESCE(f_delete_mark, 0) = 0", - sets.join(", "), - values.len() - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "修改公告"); - } - ok(Value::Null) -} - -/// `GET /api/message/Notice/{id}` —— 公告详情(`NoticeInfoVO`)。 -pub async fn notice_info( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_NOTICE).await { - return resp; - } - let id = id.trim().to_string(); - let sql = format!( - "SELECT {NOTICE_PROJECTION}, COALESCE(f_body_text, '') AS \"bodyText\", \ - f_to_user_ids AS \"toUserIds\", f_cover_image AS \"coverImage\", f_files AS \"files\", \ - COALESCE(f_reply_type, 0) AS \"replyType\" \ - FROM base_notice WHERE f_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1" - ); - let rows = match state.db.query_json_params(&sql, &[&id]).await { - Ok(rows) => rows, - Err(e) => return db_error(e, "公告详情查询"), - }; - let Some(mut row) = rows.into_iter().next() else { - return fail(code::FAIL, "公告不存在"); - }; - let body = row - .get("bodyText") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(); - let creator_id = row - .get("creatorUserId") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(); - let modify_id = row - .get("lastModifyUserId") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(); - let labels = user_labels(&state, &[creator_id, modify_id]).await; - let creator = row - .get("creatorUserId") - .and_then(Value::as_str) - .and_then(|id| labels.get(id).cloned()) - .unwrap_or_default(); - let releaser = row - .get("lastModifyUserId") - .and_then(Value::as_str) - .and_then(|id| labels.get(id).cloned()) - .unwrap_or_default(); - let reply_type = row.get("replyType").and_then(Value::as_i64).unwrap_or(0); - if let Some(obj) = row.as_object_mut() { - obj.insert("creatorUser".to_string(), Value::String(creator)); - obj.insert( - "releaseUser".to_string(), - Value::String(if releaser.is_empty() { - String::new() - } else { - releaser - }), - ); - obj.insert("excerpt".to_string(), Value::String(notice_excerpt(&body))); - obj.insert( - "isReply".to_string(), - Value::Bool(reply_type != 0), - ); - obj.remove("creatorUserId"); - obj.remove("lastModifyUserId"); - } - ok(row) -} - -/// `DELETE /api/message/Notice/{id}` —— 删公告(软删 + `enabledMark = -1`,同官方语义)。 -pub async fn notice_delete( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - let user = match guard(&state, &headers, EN_NOTICE).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let values = [Some(user.account.clone()), Some(id.trim().to_string())]; - if let Err(e) = state - .db - .exec_params( - "UPDATE base_notice SET f_enabled_mark = -1, f_delete_mark = 1, \ - f_delete_time = now(), f_delete_user_id = $1::text WHERE f_id = $2::text", - ¶ms_of(&values), - ) - .await - { - return db_error(e, "删除公告"); - } - ok(Value::Null) -} - -/// `PUT /api/message/Notice/{id}/Actions/Release` —— 发布公告 ⇒ **真的给收件人各落一条站内消息**。 -/// -/// 🔴 这是全链路的关键一步:不落 `base_message`,消息记录页永远是空的。 -/// 官方 `sendFlowMsgUtil.sentNotice` 走的就是这条(按 `f_to_user_ids` 逐人插 -/// `base_message`,为空则发给全部用户)。本仓同样「为空 ⇒ 全体用户」。 -/// 🔴 `f_category` 拼「公告一级 id,公告提醒二级 id」(官方就是 id 串,两处都是子串匹配) -/// ⇒ 消息记录页按二级页签过滤、按一级 enCode 显示类型名,两者同时成立。 -pub async fn notice_release( - State(state): State, - headers: HeaderMap, - Path(id): Path, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_NOTICE).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => Map::new(), - Err(resp) => return resp, - }; - let sql = "SELECT f_title AS \"title\", COALESCE(f_body_text, '') AS \"bodyText\", \ - f_to_user_ids AS \"toUserIds\", COALESCE(f_cover_image, '') AS \"coverImage\", \ - COALESCE(f_files, '') AS \"files\", COALESCE(f_category, '') AS \"category\", \ - COALESCE(f_expiration_time::text, '') AS \"expirationText\", \ - (EXTRACT(EPOCH FROM f_expiration_time) * 1000)::bigint AS \"expirationTime\" \ - FROM base_notice WHERE f_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1"; - let rows = match state.db.query_json_params(sql, &[&id]).await { - Ok(rows) => rows, - Err(e) => return db_error(e, "公告发布前查询"), - }; - let Some(row) = rows.into_iter().next() else { - return fail(code::FAIL, "公告不存在"); - }; - let title = row - .get("title") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(); - let body_text = row - .get("bodyText") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(); - let to_user_ids = row - .get("toUserIds") - .and_then(Value::as_str) - .unwrap_or_default() - .trim() - .to_string(); - let snapshot = json!({ - "id": id, - "title": title, - "bodyText": body_text, - "coverImage": row.get("coverImage").cloned().unwrap_or(Value::Null), - "files": row.get("files").cloned().unwrap_or(Value::Null), - "category": row.get("category").cloned().unwrap_or(Value::Null), - "expirationTime": row.get("expirationTime").cloned().unwrap_or(Value::Null), - "excerpt": notice_excerpt(&body_text), - }) - .to_string(); - - // 1) 公告本体置「已发送」。 - let send_time = obj.get("sendTime").and_then(Value::as_i64); - let mut sets: Vec = vec![ - "f_enabled_mark = 1".to_string(), - "f_last_modify_user_id = $1::text".to_string(), - "f_last_modify_time = now()".to_string(), - ]; - let mut values: Vec> = vec![Some(user.account.clone())]; - match send_time { - Some(ts) => { - values.push(Some(ts.to_string())); - sets.push(format!("f_send_time = to_timestamp(${}::text::bigint / 1000.0)", values.len())); - } - None => sets.push("f_send_time = now()".to_string()), - } - if !to_user_ids.is_empty() { - // 发布时带上收件人(官方 release 不写 toUserIds,本仓允许「发布即定收件人」)。 - values.push(Some(to_user_ids.clone())); - sets.push(format!("f_to_user_ids = ${}::text", values.len())); - } - values.push(Some(id.clone())); - let update_sql = format!( - "UPDATE base_notice SET {} WHERE f_id = ${}::text", - sets.join(", "), - values.len() - ); - if let Err(e) = state.db.exec_params(&update_sql, ¶ms_of(&values)).await { - return db_error(e, "公告置已发送"); - } - - // 2) 收件人:`f_to_user_ids` 为空 ⇒ 全体启用用户。 - let targets: Vec = if to_user_ids.is_empty() { - match state - .db - .query_json_params( - "SELECT f_id AS \"id\" FROM base_user \ - WHERE COALESCE(f_delete_mark, 0) = 0 AND COALESCE(f_enabled_mark, 1) = 1", - &[], - ) - .await - { - Ok(rows) => rows - .into_iter() - .filter_map(|r| r.get("id").and_then(Value::as_str).map(str::to_string)) - .collect(), - Err(e) => return db_error(e, "公告收件人查询"), - } - } else { - to_user_ids - .split(',') - .map(|s| s.trim().to_string()) - .filter(|s| !s.is_empty()) - .collect() - }; - - // 3) 逐人落 `base_message`(一条 INSERT 多组 VALUES ⇒ 一次往返)。 - let category = format!("{CATEGORY_ANNOUNCE},{CATEGORY_ANNOUNCE_REMIND}"); - let mut tuples: Vec = Vec::new(); - let mut msg_values: Vec> = Vec::new(); - for target in &targets { - let base = msg_values.len(); - msg_values.push(Some(new_uuid())); - msg_values.push(Some("1".to_string())); // f_type = 公告 - msg_values.push(Some(title.clone())); - msg_values.push(Some(target.clone())); - msg_values.push(Some("0".to_string())); // f_is_read - msg_values.push(Some(user.account.clone())); - msg_values.push(Some("0".to_string())); // f_delete_mark - msg_values.push(Some("0".to_string())); // f_tenant_id - msg_values.push(Some(snapshot.clone())); - msg_values.push(Some(category.clone())); - tuples.push(format!( - "(${}::text, ${}::text::integer, ${}::text, ${}::text, ${}::text::integer, \ - now(), ${}::text, ${}::text::integer, ${}::text, ${}::text, ${}::text)", - base + 1, - base + 2, - base + 3, - base + 4, - base + 5, - base + 6, - base + 7, - base + 8, - base + 9, - base + 10 - )); - } - if !tuples.is_empty() { - let insert_sql = format!( - "INSERT INTO base_message \ - (f_id, f_type, f_title, f_user_id, f_is_read, f_creator_time, f_creator_user_id, \ - f_delete_mark, f_tenant_id, f_body_text, f_category) VALUES {}", - tuples.join(", ") - ); - if let Err(e) = state.db.exec_params(&insert_sql, ¶ms_of(&msg_values)).await { - return db_error(e, "公告推送站内消息"); - } - } - ok(Value::Null) -} - -/// `GET /api/message/Notice/{id}/ReplyUserList` —— 回执人员列表(`ListVO`)。 -/// -/// 官方口径:`f_body_text LIKE %noticeId%` + `f_is_read = 2` 的消息 ⇒ 去重成人。 -pub async fn notice_reply_user_list( - State(state): State, - headers: HeaderMap, - Path(id): Path, - raw: RawQuery, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_NOTICE).await { - return resp; - } - let keyword = crate::platform::sys::query_param(&raw, "keyword") - .trim() - .to_string(); - let mut values: Vec> = vec![Some(format!("%{}%", id.trim()))]; - let mut conds = vec![ - "COALESCE(f_delete_mark, 0) = 0".to_string(), - "COALESCE(f_is_read, 0) = 2".to_string(), - "COALESCE(f_body_text, '') LIKE $1::text".to_string(), - ]; - if !keyword.is_empty() { - values.push(Some(format!("%{keyword}%"))); - conds.push(format!( - "f_user_id = ANY(string_to_array(${}::text, ','))", - values.len() - )); - } - let sql = format!( - "SELECT f_user_id AS \"userId\", \ - (EXTRACT(EPOCH FROM MAX(f_read_time)) * 1000)::bigint AS \"replyTime\" \ - FROM base_message WHERE {} GROUP BY f_user_id", - conds.join(" AND ") - ); - let rows = match state.db.query_json_params(&sql, ¶ms_of(&values)).await { - Ok(rows) => rows, - Err(e) => return db_error(e, "回执人员查询"), - }; - let ids: Vec = rows - .iter() - .filter_map(|r| r.get("userId").and_then(Value::as_str).map(str::to_string)) - .collect(); - let labels = user_labels(&state, &ids).await; - let list: Vec = rows - .into_iter() - .filter_map(|row| { - let user_id = row.get("userId").and_then(Value::as_str)?.to_string(); - let reply = labels.get(&user_id).cloned().unwrap_or_default(); - Some(json!({ - "id": user_id, - "replyUser": reply, - "headIcon": Value::Null, - "replyTime": row.get("replyTime").cloned().unwrap_or(Value::Null), - })) - }) - .collect(); - ok(list_vo(list)) -} - -// ================================================================ 系统日志(base_sys_log) -// -// 官方真源:`jnpf-exception/.../LogController.java`(`@RequestMapping("/api/system/Log")`)。 -// 吃它的是**五个页面**:`views/sysLog/{loginLog,operateLog,requestLog,errorLog}` + -// 个人中心「登录日志」(`_core/profile/components/SysLog.vue`,走 -// `permission/Users/Current/SystemLog`,与这里同一套数据)。 -// -// 🔴 **一张表装五种日志**,靠 `f_type` 区分:1 登录 / 2 访问 / 3 操作 / 4 异常 / 5 请求。 -// 官方 `switch(pagination.getCategory())` 只给 1 / 3 / 4 / 5 出数据, -// 其余(含 2)走 `default ⇒ fail(FA012 获取失败,数据不存在)` —— 照抄,不自己发挥。 -// 🔴 `creatorTime` 在官方 `LoginLogVO` / `HandleLogVO` 里是 **Long(毫秒)**, -// 不是日期串 ⇒ 必须按毫秒返回,否则四个页面的「时间」列全空。 - /// 官方 `@SaCheckPermission({"sysLog.loginLog", "sysLog.requestLog", "sysLog.operateLog", /// "sysLog.errorLog"}, mode = SaMode.OR)` 四选一;本仓 `guard()` 只吃一个 ⇒ /// 取**登录日志**那个(页面默认 tab 就是登录日志,最贴近)。 @@ -10476,7 +3417,7 @@ fn looks_like_time(s: &str) -> bool { /// 分页查日志 —— `/api/system/Log` 与 `Users/Current/SystemLog` **共用**这一条。 /// /// `only_user`:`Some(id)` ⇒ 只看这个人的(个人中心「登录日志」+ `/deleteLoginLog` 的口径)。 -async fn log_page( +pub(super) async fn log_page( state: &AppState, raw: &RawQuery, category: i64, @@ -10729,16 +3670,6 @@ pub async fn log_module_name( } } -// ================================================================ 审批常用语(base_common_words) -// -// 官方真源:`CommonWordsController.java`(`@RequestMapping("/api/system/CommonWords")`)。 -// 页面:`views/templateCenter/commonWords/{index,Form}.vue`。 -// -// 🔴 `f_common_words_type`:**0 公共 / 1 个人**。列表页固定 `searchInfo: {commonWordsType: 0}` -// ⇒ 这一页只看公共的;个人常用语是工作流意见框那侧在用(同一张表,靠 type 分)。 -// 🔴 `type = 1` 时官方**额外**加 `f_creator_user_id = 当前用户`,并按 `f_uses_num` 倒序 -// (「我常用」排前面)⇒ 这两个条件必须一起加,只加一个就把别人的个人常用语露出来。 - /// 🔴 官方 `CommonWordsController` **一个 `@SaCheckPermission` 都没有** —— /// 常用语是「登录即可用」的功能(工作流意见框里随手点)⇒ 本仓**故意不挂 `guard()`**, /// 只做 `require_login_face_b`。别顺手加个权限码,那会让普通员工打不开意见框的常用语。 @@ -11154,17 +4085,6 @@ pub async fn common_words_uses_num( ok(Value::Null) } -// ================================================================ 单据规则(base_bill_rule) -// -// 官方真源:`BillRuleController.java` + `BillRuleMapper.java::getNumber`。 -// 页面:`views/templateCenter/billRule/{index,Form}.vue`(列表/表单), -// `BillNumber/{enCode}` 则由**任何要单号的表单**调用。 -// -// 🔴 生成器是**有状态的**:`f_this_number` + `f_output_number` 每次发号都回写, -// 所以「删规则」被官方加了闸(`f_output_number` 非空 ⇒ `SYS003 单据已经被使用`)。 -// 🔴 三种方式(`f_type`):1 时间格式 / 2 随机数 / 3 UUID。时间格式那支还要 -// 「**跨天归零**」——从上一号的日期段里把日期抠出来跟今天比,不同就从 0 重来。 - /// 官方 `@SaCheckPermission("templateCenter.billRule")`。 const EN_BILL_RULE: &str = "templateCenter.billRule"; @@ -11931,34 +4851,16 @@ pub async fn bill_rule_import( fail(code::FAIL, "本仓未配置文件服务,暂不支持导入") } -// ---------------------------------------------------------------- 数据连接(DataSource) - /// 官方 `@SaCheckPermission("dataCenter.dataSource")`。 const EN_DATA_SOURCE: &str = "dataCenter.dataSource"; + /// 官方 `@SaCheckPermission("dataCenter.dataModel")`。 const EN_DATA_MODEL: &str = "dataCenter.dataModel"; + /// 官方 `DbTableController.get` / `addField` 的 **OR 分支之一** /// (`@SaCheckPermission(value={"onlineDev.formDesign","dataCenter.dataModel"}, mode=OR)`)。 const EN_FORM_DESIGN: &str = "onlineDev.formDesign"; -/// 面 B 的「任一权限」守卫 —— 官方用 `@SaCheckPermission(..., mode = SaMode.OR)` 的地方。 -async fn guard_any( - state: &AppState, - headers: &HeaderMap, - en_codes: &[&str], -) -> Result> { - let user = require_login_face_b(state, headers).await?; - let system_id = - system::resolve_system_id(&state.db, system::app_code_of(headers).as_deref()).await; - for en_code in en_codes { - if has_en_code_permission(&state.db, &user.user_id, user.is_admin, en_code, &system_id).await - { - return Ok(user); - } - } - Err(fail(code::NO_PERMISSION, "无权限")) -} - /// `base_db_link` 的**可写**字段(camelCase ⇒ 列 + CAST)。 /// /// 🔴 `enabledMark` **故意不在清单里**:`base_db_link` 没有 `f_enabled_mark` 列。 @@ -12442,8 +5344,6 @@ pub async fn data_source_test( fail(code::FAIL, "本仓仅内置数据库,不支持连接外部数据源") } -// ---------------------------------------------------------------- 基准数据类型 / 常用字段 - /// `GET /api/system/BasicDataType` —— 基准数据类型列表(`ListVO`,官方 7 行)。 /// /// 🔴 官方 `DataTypeController.list()` **没有** `@SaCheckPermission`(登录即可)。 @@ -12531,8 +5431,6 @@ pub async fn common_fields_list( ok(list_vo(list)) } -// ---------------------------------------------------------------- 数据建模(DataModel) - /// 表/列名白名单(**比 [`crate::platform::db::valid_table`] 宽一点**)。 /// /// 官方允许表名以 `_` 开头(前端校验正则 `/(^_([A-Z0-9]_?)*$)|(^[A-Z](_?[A-Z0-9])*_?$)/i`), @@ -12974,26 +5872,6 @@ pub async fn data_model_preview( ok(page_list(paging.current_page, paging.page_size, total, rows)) } -// ---------------------------------------------------------------- 数据建模写面 -// -// 🔴 本组是**全仓唯一执行真 DDL** 的地方(`CREATE` / `ALTER` / `DROP TABLE`)。 -// 两道护栏缺一不可: -// ① [`db_ident`] 白名单 —— 表名/列名只收 `[A-Za-z_][A-Za-z0-9_]*`,拼进 SQL 前再双引号包裹; -// ② [`is_builtin_table`](`schema.sql` 里 `CREATE TABLE` 过的 35 张)—— 内置表**只给看**, -// 禁改禁删。少这道闸,用户在数据建模页点一下「删除」就能把 `base_user` 干掉, -// 之后连登录都进不来(种子只在空库上跑)。 -// -// 官方语义对照(`DbTableController` + `DbTableServiceImpl`): -// - `create`:表名已存在 ⇒ `EXIST001`「名称不能重复」;`checkPrimary` 要求自增只能是 -// `int/bigint` 且必须是主键、主键只能是 `varchar/int/bigint` —— 文案逐字照抄; -// - `update`:官方是「建临时表 → 删旧表 → 临时表改名」;本仓用一批 `DROP + CREATE` -// ([`Db::exec`] 走 simple protocol,整批是**隐式事务**,中途失败全回滚)—— -// 比官方那三步更安全:它删旧表之后才改名,改失败就两头空; -// - `update` / `delete` 前的 `checkTab` 两道闸:内置表(`DB101`/`DB102`)、 -// 表里**有数据**(`DB201`/`DB202`)—— 文案逐字照抄; -// - `addFields` 只 `ADD COLUMN`,**不动**已有列(前端只在 `hasTableData` 时走它, -// 见 `Form.vue:239`:有数据的表只允许追加字段)。 - /// 内置表判据 —— `schema.sql` 里 `CREATE TABLE` 过的**全部**表名(当前 35 张)。 /// /// 🔴 判据取自 DDL 真源([`sspf_store::db::ddl_tables`])而不是在这里再抄一份清单: @@ -13644,20 +6522,6 @@ pub async fn data_model_import( fail(code::FAIL, "本仓未启用文件上传,暂不支持导入") } -// ---------------------------------------------------------------- 数据集(Dataset) -// -// 官方 `DataSetController`(`jnpf-system-controller`)。数据集 = 一条**命名查询** -// (一段可带变量的 SQL / 一个 HTTP / 一份静态 JSON),前端几十个通用组件都靠它取数: -// `AutoComplete` / `PopupSelect` / `InputTable` / `SelectModal` / 报表 / 打印 / 大屏。 -// -// 🔴 **本仓只真执行 `type=1` + `sqlData.sqlType=1`(手写 SQL)这一条路**。 -// 图形化配置式(`sqlType=2`)、HTTP(`type=2`)、静态(`type=3`)一律 400 + 人话: -// 那条路要在本仓重写整套查询构建器(官方 `CallAssembleUtil`),拼出来的 SQL -// 用户看不见,风险和收益不成比例。 -// -// 🔴 **SQL 护栏(三道,缺一不可)**:见 [`dataset_sql_guard`]。 -// 🔴 **变量一律走绑定**:`${xxx}` / `@xxx` 只转成 `$N` + 参数数组,**绝不拼进文本**。 - /// 官方 `@SaCheckPermission("dataCenter.dataset")`。 const EN_DATASET: &str = "dataCenter.dataset"; @@ -14411,11 +7275,6 @@ pub async fn dataset_fields( ok(Value::Array(out)) } -// ---------------------------------------------------------------- 数据集:SQL 执行 -// -// 🔴 这是全仓**唯一**执行用户手写 SQL 的地方(数据连接那条只是存配置)。 -// 三道护栏见 [`dataset_sql_guard`];变量只走 `$N` 绑定,不拼文本。 - /// 允许出现在数据集 SQL 里的**危险动词**(按词边界匹配)。 /// /// 🔴 按「整词」判,不按子串 —— 否则 `update_time` / `f_delete_mark` 这类 @@ -15320,12 +8179,6 @@ pub async fn dataset_import( fail(code::FAIL, "本仓未启用文件上传,暂不支持导入") } -// ---------------------------------------------------------------- 数据接口(DataInterface) -// -// 官方 `DataInterfaceController.java`,权限 `dataCenter.dataService`。 -// `Actions/Preview` 复用数据集的 SQL 护栏 + 绑定引擎(`dataset_run` / `dataset_execute`): -// 配置结构 `{sqlData:{sqlType,sql}}` 与数据集完全一致。 - const EN_DATA_INTERFACE: &str = "dataCenter.dataService"; /// 列表 / 详情投影(毫秒时间戳;与官方 `Vue-Version:3` 契约一致)。 @@ -16079,14 +8932,6 @@ pub async fn data_interface_preview( } } -// === DATA INTERFACE SECTION END === - -// ---------------------------------------------------------------- 接口认证(InterfaceOauth) -// -// 官方 `InterfaceOauthController.java`,权限 `integrationCenter.openApi`。 -// 关联表:`base_data_interface_oauth`(本体)、`base_data_interface_user`(授权用户)、 -// `base_data_interface_log`(调用日志)。 - const EN_INTERFACE_OAUTH: &str = "integrationCenter.openApi"; const INTERFACE_OAUTH_COLUMNS: &str = "f_id AS \"id\", f_app_id AS \"appId\", \ @@ -16734,13 +9579,6 @@ pub async fn interface_oauth_save_user_list( ok(Value::Null) } -// === INTERFACE OAUTH SECTION END === - -// === PRINT DEV (打印模板) SECTION START === -// 官方 `PrintDevController.java`,权限 `onlineDev.printDev`。 -// 🔴 本仓无打印渲染引擎 ⇒ `Actions/Export` / `BatchData` 返回业务失败(契约 partial); -// 其余端点按官方形状实现,`Save`/`Version/*` 只存 JSON 不渲染。 - const EN_PRINT_DEV: &str = "onlineDev.printDev"; /// 模板列表/详情列(毫秒时间戳;`state` 默认 0 未发布)。 @@ -17891,27 +10729,15 @@ pub async fn print_dev_get_list_options( ok(json!(rows)) } -// === PRINT DEV (打印模板) SECTION END === - -// === PERMISSION CONFIG (权限配置族) SECTION START === -// 批次 10:电子签章 / 按钮权限 / 列表权限 / 表单权限 / 高级查询方案。 -// 官方控制器:`SignatureController` / `ModuleButtonController` / `ModuleColumnController` -// / `ModuleFormController` / `AdvancedQueryController`。 -// 官方表:`base_signature` / `base_signature_user` / `base_module_button` -// / `base_module_column` / `base_module_form` / `base_advanced_query_scheme`。 -// -// 🔴 **点权限判据**: -// - 按钮/列表/表单权限 ⇒ 官方 `@SaCheckPermission(value={"permission.resource", -// "appConfig.appResource"}, mode=SaMode.OR)` ⇒ 本仓 `guard_any(&[...])`。 -// - 电子签章 / 高级查询方案 ⇒ 官方**没有** `@SaCheckPermission` ⇒ 只需登录(`require_login_face_b`)。 - /// 官方 `@SaCheckPermission(value={"permission.resource","appConfig.appResource"}, mode=OR)`。 const EN_PERMISSION_RESOURCE: &str = "permission.resource"; + /// 同上的 OR 分支之一。 const EN_APP_RESOURCE: &str = "appConfig.appResource"; /// 官方 `JnpfConst.SIDE_MARK_PRE`。 const SIDE_MARK_PRE: &str = "jnpf_"; + /// 官方 `JnpfConst.SIDE_MARK`。 const SIDE_MARK: &str = "_jnpf_"; @@ -18047,8 +10873,6 @@ fn b10_error(e: String, ctx: &str) -> Json { fail(code::EXCEPTION, "系统异常,请联系管理员") } -// ---------------------------------------------------------------- 电子签章(Signature) - /// 官方 `SignatureController.java` —— **无 `@SaCheckPermission`** ⇒ 只需登录。 const SIGNATURE_COLUMNS: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ f_en_code AS \"enCode\", f_icon AS \"icon\", \ @@ -18533,8 +11357,6 @@ pub async fn signature_delete( ok(Value::Null) } -// ---------------------------------------------------------------- 按钮权限(ModuleButton) - /// 官方 `ButtonListVO` 投影。 const MODULE_BUTTON_COLUMNS: &str = "f_id AS \"id\", f_parent_id AS \"parentId\", \ f_full_name AS \"fullName\", f_en_code AS \"enCode\", f_icon AS \"icon\", \ @@ -18989,8 +11811,6 @@ pub async fn module_button_select_actions( ok(Value::Null) } -// ---------------------------------------------------------------- 列表权限(ModuleColumn) - /// 官方 `ColumnListVO` 投影。 const MODULE_COLUMN_COLUMNS: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ f_en_code AS \"enCode\", f_bind_table AS \"bindTable\", f_bind_table_name AS \"bindTableName\", \ @@ -19457,8 +12277,6 @@ pub async fn module_column_batch_create( ok(Value::Null) } -// ---------------------------------------------------------------- 表单权限(ModuleForm) - /// 官方 `ModuleFormListVO` 投影。 const MODULE_FORM_COLUMNS: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ f_en_code AS \"enCode\", f_module_id AS \"moduleId\", \ @@ -19849,8 +12667,6 @@ pub async fn module_form_batch_create( ok(Value::Null) } -// ---------------------------------------------------------------- 高级查询方案(AdvancedQuery) - /// 官方 `AdvancedQueryListVO`(继承 `AdvancedQuerySchemeForm` ⇒ 多了 `id`)。 const ADVANCED_QUERY_COLUMNS: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ f_match_logic AS \"matchLogic\", f_condition_json AS \"conditionJson\", \ @@ -20072,13 +12888,6 @@ pub async fn advanced_query_delete( ok(Value::Null) } -// ============================================================ 数据权限三件套(批次 11) -// 官方表:base_module_authorize / base_module_scheme / base_module_link -// 官方控制器:ModuleDataAuthorizeController / ModuleDataAuthorizeSchemeController / -// ModuleDataAuthorizeLinkController -// 🔴 点权限判据:除「方案列表」只需登录外,其余均 OR 两码 `{"permission.resource","appConfig.appResource"}`。 -// 🔴 表名与控制器名不一致:控制器 `ModuleDataAuthorize*` ⇒ 实体 `base_module_authorize/scheme/link`。 - const MODULE_DATA_AUTHORIZE_COLUMNS: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ f_format AS \"format\", f_en_code AS \"enCode\", f_type AS \"type\", \ f_condition_symbol AS \"conditionSymbol\", f_condition_text AS \"conditionText\", \ @@ -20311,8 +13120,6 @@ async fn b11_authorize_scheme_references( Ok(None) } -// ---- 数据权限字段(ModuleDataAuthorize)---- - /// 数据权限字段列表(官方 `GET /{moduleId}/List` ⇒ `ListVO`)。 pub async fn module_data_authorize_list( State(state): State, @@ -20518,8 +13325,6 @@ pub async fn module_data_authorize_delete( ok(Value::Null) } -// ---- 数据权限方案(ModuleDataAuthorizeScheme)---- - /// 数据权限方案列表(官方 `GET /{moduleId}/List` ⇒ `PageListVO`)。 /// 🔴 官方该端点**无** `@SaCheckPermission`,只需登录。 pub async fn module_data_authorize_scheme_list( @@ -20729,8 +13534,6 @@ pub async fn module_data_authorize_scheme_delete( ok(Value::Null) } -// ---- 数据权限连接(ModuleDataAuthorizeLink)---- - /// 保存/编辑数据连接(官方 `POST /saveLinkData` ⇒ `SU002 / SU004`)。 pub async fn module_data_authorize_link_save( State(state): State, @@ -20882,8 +13685,6 @@ pub async fn module_data_authorize_link_table_fields( ok(page_list(paging.current_page, paging.page_size, 0, vec![])) } -// === PERMISSION CONFIG (权限配置族) SECTION END === - /// INSERT 语句的累加器 —— **参数编号与列顺序不可能错位**。 /// /// 🔴 为什么要它:本仓所有值都按 text 绑定 ⇒ 必须写成 `$N::cast`;而时间列要写 `now()` @@ -20920,8 +13721,6 @@ impl Inserts { } } -// ---------------------------------------------------------------- 行政区划(base_province) - /// `@SaCheckPermission("sysData.area")`(官方 `AreaController` 的 6 处写/读)。 const EN_AREA: &str = "sysData.area"; @@ -21425,8 +14224,6 @@ pub async fn area_get_by_ids( ok(Value::Array(out)) } -// ---------------------------------------------------------------- 公有变量(base_common_variate) - /// 列表投影(官方 `CommonVariateVO` 的 11 个字段)。 /// /// 🔴 `type` 在官方 VO 里是 **`String`**(DB 是 `INTEGER`)⇒ Jackson 序列化成 `"1"`。 @@ -21752,17 +14549,6 @@ pub async fn variate_sys_func_category( ok(list_vo(list)) } -// === SYSTEM DATA (系统数据族) SECTION END === - -// === DATA CENTER (数据中心族) SECTION BEGIN === -// -// 覆盖 `systemData` 目录下「基准数据类型 / 控件映射 / 数据库 / 字段类型映射 / 常用字段」 -// 五族共 25 条端点 + 数据同步 4 条 + 接口变量下拉 1 条。 -// -// 🔴 这五族的形状完全一样(扁平表 + 分页/不分页 + 判重 + 软删),所以**不再逐族手抄** -// —— 每族只写一份 [`Flat`] 声明 + 五个薄壳 handler。声明里的表名/列名/权限码 -// 全是编译期常量,SQL 拼接面里没有任何请求可控的标识符。 - /// SQL / Java 保留字(官方 `GenerateConstant.getSqlKeyword() + getJavaKeyword()` 的常用子集)。 /// /// 🔴 常用字段是**建表用的列名模板** ⇒ 叫 `select` / `order` / `class` 会让后续 DDL 直接失败, @@ -22134,8 +14920,6 @@ fn label_of_key(spec: &Flat, key: &str) -> &'static str { } } -// ---- 基准数据类型(`system/BasicDataType`,`base_data_type`)---- - const EN_BASIC_DATA_TYPE: &str = "dataCenter.basicDataType"; const BASIC_DATA_TYPE: Flat = Flat { @@ -22282,8 +15066,6 @@ async fn data_type_in_use(db: &Db, id: &str) -> Result { Ok(!rows.is_empty()) } -// ---- 控件映射(`system/DataTypeMapping`,`base_data_type_mapping`)---- - const EN_DATA_TYPE_MAPPING: &str = "dataCenter.dataTypeMapping"; const DATA_TYPE_MAPPING: Flat = Flat { @@ -22431,8 +15213,6 @@ pub async fn data_type_mapping_key_list( ok(Value::Array(list)) } -// ---- 数据库管理(`system/DataBase`,`base_data_base`)---- - const EN_DATABASE: &str = "dataCenter.database"; const DATA_BASE: Flat = Flat { @@ -22527,8 +15307,6 @@ pub async fn data_base_delete( flat_delete(&state, &user, &id, &DATA_BASE).await } -// ---- 字段类型映射(`system/DataTypeRelation`,`base_data_type_relation`)---- - const DATA_TYPE_RELATION: Flat = Flat { table: "base_data_type_relation", label: "字段类型映射", @@ -22639,8 +15417,6 @@ pub async fn data_type_relation_delete( flat_delete(&state, &user, &id, &DATA_TYPE_RELATION).await } -// ---- 常用字段(`system/CommonFields`,`base_common_fields`)---- - const EN_COMMON_FIELDS: &str = "dataCenter.basicField"; const COMMON_FIELDS: Flat = Flat { @@ -22755,18 +15531,6 @@ pub async fn common_fields_delete( flat_delete(&state, &user, &id, &COMMON_FIELDS).await } -// ---- 数据同步(`system/DataSync`)---- -// -// 🔴 **本仓不具备跨库能力,四条端点一律明确拒绝(不是假成功)**。 -// 官方这四条走 JDBC:`PrepSqlDTO.getConn(dbLink)` 拿真实 `Connection`,再 -// `getMetaData()` 读表结构、`CREATE TABLE` + 批量 `INSERT` 搬数据。 -// 本仓的数据库是**进程内嵌 PG(pglite/WASM)**:没有 libpq、没有驱动层、 -// 连不到任何外部实例 ⇒ 「同步到 B 库」在物理上无法发生。 -// -// 这与 `data_source_test`(`POST /api/system/DataSource/Actions/Test`)**同一档处理**: -// 端点必须有、必须能应答,但**绝不能假装成功** —— 假装成功会让用户以为数据搬过去了。 -// 契约 `[OFFICIAL]` 里这四条标 `partial`,理由写在这里。 - const EN_DATA_SYNC: &str = "systemData.dataSync"; /// 四条数据同步端点的统一拒绝。 @@ -22825,8 +15589,6 @@ pub async fn data_sync_batch_execute( data_sync_unsupported() } -// ---- 数据接口变量下拉(`system/DataInterfaceVariate/Selector`)---- - /// `GET /api/system/DataInterfaceVariate/Selector` —— 两级树: /// 数据集(`type=0`,`parentId="-1"`)→ 它下面的变量(`type=1`,`parentId` = 数据集 id)。 /// @@ -22900,69 +15662,14 @@ pub async fn data_interface_variate_selector( ok(Value::Array(list)) } -// === DATA CENTER (数据中心族) SECTION END === - -// === SYSTEM SERVICES (系统服务族) SECTION BEGIN === -// -// 覆盖 `system` 目录 41 条缺口里的 **39 条**。另 2 条是 `fe-gap.py` 把前端模板 -// 字符串截断出来的**畸形路径**(`DELETE /Log/{param}${interfaceId` 与 -// `GET /Menu/Selector/${`)—— 真实端点 `DELETE /api/system/Log/{id}` 与 -// `GET /api/system/Menu/Selector/{id}` 早在批次 5/13 就落地了,**零工作量**。 -// -// 族 ↔ 官方控制器: -// BaseLang(7) → `BaseLangController` 权限 `sysData.language` -// Kit(8) → `VisualKitController` 权限 `templateCenter.kit` -// CacheManage(4) → `CacheManageController` 权限 `sysService.cache` -// scheduletask(7) → `TimeTaskController` 权限 `sysService.task` -// imreply(3) → `ImReplyController` 登录即可 -// MenuData(3) → `ModuleDataController` 登录即可 -// Variate(3) → `CommonVariateController` 登录即可(官方无注解) -// Monitor(1) → `SystemMonitorController` 登录即可 -// HomeData(1) → `HomeDataController:379` 登录即可 -// Export(3) → Kit / System / Tag 的 `Actions/Export`(无文件服务 ⇒ 明确拒绝) -// -// 🔴 本段**只**用 `guard` / `guard_any` 两个既有守卫,且守卫一律写在 handler -// 函数体第一行 —— `check-contract-scan.py` 是静态扫描,藏在 helper 里推不出。 - /// 官方 `@SaCheckPermission("sysData.language")`(多语言配置)。 const EN_LANGUAGE: &str = "sysData.language"; + /// 官方 `@SaCheckPermission("templateCenter.kit")`(表单套件)。 const EN_KIT: &str = "templateCenter.kit"; + /// 官方 `@SaCheckPermission("sysService.cache")`(缓存管理)。 const EN_CACHE: &str = "sysService.cache"; -/// 官方 `@SaCheckPermission("sysService.task")`(任务调度)。 -const EN_TASK: &str = "sysService.task"; - -/// JSON 对象里取文本(**去首尾空白**,空串 ⇒ `None`)。 -fn text_field(obj: &Map, key: &str) -> Option { - let raw = value_to_text(obj.get(key))?; - let trimmed = raw.trim(); - if trimmed.is_empty() { - None - } else { - Some(trimmed.to_string()) - } -} - -/// JSON 对象里取整数(`1` / `"1"` / `true` 都认)—— 用于 `::text::integer` 参数位。 -/// -/// 🔴 不能把 JSON 数字直接 `value_to_text` 后当参数:`1.0` 会变成 `"1.0"`, -/// `'1.0'::text::integer` 在 PG 里是**硬错误**(`invalid input syntax`)。 -fn int_field(obj: &Map, key: &str) -> Option { - match obj.get(key)? { - Value::Number(n) => n.as_i64().or_else(|| n.as_f64().map(|f| f as i64)), - Value::String(s) => s.trim().parse::().ok(), - Value::Bool(b) => Some(i64::from(*b)), - _ => None, - } -} - -// ---------------------------------------------------------------- 多语言(BaseLang) -// -// 官方数据模型很特别:**一行 = 一个语种**,同一翻译标记用 `f_group_id` 聚组。 -// 所以「列表」是按组返回的二维表: -// `{id: groupId, code: enCode, typeName, : <文本>, …}` -// `tableHead` 给出列定义(`code` + 每个语种一列)—— 前端直接拿它渲染动态表头。 /// 语种列表 `[(enCode, fullName)]` —— 来自字典 `Language`(官方 `JnpfConst.BASE_LANGUAGE`)。 /// @@ -23492,12 +16199,6 @@ pub async fn base_lang_import_data( fail(code::FAIL, "本仓未启用文件上传,暂不支持导入") } -// ---------------------------------------------------------------- 表单套件(Kit) -// -// 官方 `VisualKitController`(`/api/system/Kit`)。 -// 🔴 与批次 14 的「控件映射」同一个套路:**列表的 `category` 给名称、详情的给真 id** -// (列表要显示分类名,编辑表单的 Select 要的是 id)。 - /// 套件列表投影(`category` = 字典**名称**;用户列按官方 `realName/account` 拼)。 const KIT_LIST_PROJECTION: &str = "t.f_id AS \"id\", t.f_full_name AS \"fullName\", \ t.f_en_code AS \"enCode\", COALESCE(d.f_full_name, '') AS \"category\", \ @@ -24047,14 +16748,6 @@ pub async fn tag_export( fail(code::FAIL, "本仓未配置文件服务,暂不支持导出") } -// ---------------------------------------------------------------- 缓存管理(CacheManage) -// -// 🔴 官方这一族面对的是 **Redis 键空间**;本仓没有 Redis,但有**真实的内存缓存**: -// token 会话表(`SessionStore`)。所以这里**不假装、也不拒绝** —— -// 列表把「谁在线 / 几条会话 / 占多少字节」如实列出来,删除会真的把该账号踢下线。 -// -// 🔴 **绝不把 token 本身放进响应**:缓存名是 `lite:session:<账号>`,只暴露账号。 - /// 缓存名前缀(明示这是本仓内嵌缓存,不是 Redis 键)。 const CACHE_SESSION_PREFIX: &str = "lite:session:"; @@ -24209,649 +16902,6 @@ pub async fn cache_manage_clear_all( ok(json!({ "removed": removed })) } -// ---------------------------------------------------------------- 任务调度(scheduletask) -// -// 🔴 **官方这一族是 XXL-JOB 的薄代理**(`ScheduleServiceImpl` 全部转 -// `RestScheduleTaskUtil`,任务不存在本库的 `base_time_task` 里)。 -// 本仓没有调度器 ⇒ **只做登记**:CRUD 落 `base_time_task`(数据真实、可编辑、 -// 重启不丢),但**不会自动执行** —— `runCount` / `lastRunTime` / `nextRunTime` -// 永远是表里的真实值(不编造递增或未来时间)。 -// 契约标 `partial`,note 写明这一点。 - -/// 任务列表投影。 -const TASK_LIST_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ - COALESCE(f_en_code, '') AS \"enCode\", COALESCE(f_execute_type, 1)::bigint AS \"executeType\", \ - COALESCE(f_run_count, 0)::bigint AS \"runCount\", \ - COALESCE(f_enabled_mark, 0)::bigint AS \"enabledMark\", \ - COALESCE(f_sort_code, 0)::bigint AS \"sortCode\", f_description AS \"description\", \ - (EXTRACT(EPOCH FROM f_last_run_time) * 1000)::bigint AS \"lastRunTime\", \ - (EXTRACT(EPOCH FROM f_next_run_time) * 1000)::bigint AS \"nextRunTime\", \ - COALESCE(f_execute_content, '') AS \"executeContentRaw\""; - -/// `f_execute_content` 是 TEXT,内容约定是 JSON 对象(官方前端提交的就是对象)。 -/// -/// 解析不出来时**不丢数据**:包成 `{"cron": <原文>}`,至少还能回显。 -fn exec_content_object(raw: &str) -> Map { - let text = raw.trim(); - if text.is_empty() { - return Map::new(); - } - match serde_json::from_str::(text) { - Ok(Value::Object(obj)) => obj, - Ok(other) => { - let mut obj = Map::new(); - obj.insert("cron".to_string(), other); - obj - } - Err(_) => { - let mut obj = Map::new(); - obj.insert("cron".to_string(), json!(text)); - obj - } - } -} - -/// 把一行任务摊平成列表项:`executeContent` 里的 `startTime` / `endTime` **提到顶层**。 -/// -/// 🔴 官方列表的 `startTime` / `endTime` 来自 XXL-JOB 的调度配置;本仓登记在 -/// `executeContent` 里 ⇒ 必须提出来,否则前端那一列表头永远是空的。 -fn shape_task_row(mut row: Value) -> Value { - let Some(obj) = row.as_object_mut() else { - return row; - }; - let raw = obj - .remove("executeContentRaw") - .and_then(|v| v.as_str().map(str::to_string)) - .unwrap_or_default(); - let content = exec_content_object(&raw); - let start = content.get("startTime").cloned().unwrap_or(Value::Null); - let end = content.get("endTime").cloned().unwrap_or(Value::Null); - obj.insert("startTime".to_string(), start); - obj.insert("endTime".to_string(), end); - obj.insert("executeContent".to_string(), Value::Object(content)); - row -} - -/// `GET /api/scheduletask` —— 任务列表(分页 + 关键词)。 -pub async fn task_list( - State(state): State, - headers: HeaderMap, - raw: RawQuery, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_TASK).await { - return resp; - } - let page = Paging::of(&raw); - let keyword = crate::platform::sys::query_param(&raw, "keyword") - .trim() - .to_string(); - let mut conds = vec!["COALESCE(f_delete_mark, 0) = 0".to_string()]; - let mut values: Vec> = Vec::new(); - if !keyword.is_empty() { - values.push(Some(format!("%{keyword}%"))); - let n = values.len(); - conds.push(format!( - "(f_full_name ILIKE ${n}::text OR f_en_code ILIKE ${n}::text)" - )); - } - let where_sql = conds.join(" AND "); - - let total_sql = format!("SELECT COUNT(*)::bigint AS \"total\" FROM base_time_task WHERE {where_sql}"); - let total = match state - .db - .query_json_params(&total_sql, ¶ms_of(&values)) - .await - { - Ok(rows) => rows - .first() - .and_then(|r| r.get("total")) - .and_then(Value::as_i64) - .unwrap_or(0), - Err(e) => return db_error(e, "任务计数"), - }; - - values.push(Some(page.page_size.to_string())); - let limit_at = values.len(); - values.push(Some(page.offset.to_string())); - let offset_at = values.len(); - let sql = format!( - "SELECT {TASK_LIST_PROJECTION} FROM base_time_task WHERE {where_sql} \ - ORDER BY COALESCE(f_sort_code, 0) ASC, f_creator_time DESC NULLS LAST \ - LIMIT ${limit_at}::text::integer OFFSET ${offset_at}::text::integer" - ); - let rows = match state.db.query_json_params(&sql, ¶ms_of(&values)).await { - Ok(rows) => rows, - Err(e) => return db_error(e, "任务列表查询"), - }; - let list: Vec = rows.into_iter().map(shape_task_row).collect(); - ok(page_list(page.current_page, page.page_size, total, list)) -} - -/// `GET /api/scheduletask/Info/{id}` —— 任务详情(`executeContent` 是**对象**)。 -pub async fn task_info( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_TASK).await { - return resp; - } - let rows = match state - .db - .query_json_params( - &format!( - "SELECT {TASK_LIST_PROJECTION} FROM base_time_task \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1" - ), - &[&id.trim()], - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "任务详情查询"), - }; - let Some(row) = rows.into_iter().next() else { - return fail(code::FAIL, "任务不存在"); - }; - ok(shape_task_row(row)) -} - -/// `GET /api/scheduletask/TaskMethods` —— 本地任务方法清单。 -/// -/// 🔴 **官方这份清单来自 XXL-JOB 的执行器注册表**(`restScheduleTaskUtil.getHandlerList`), -/// 本仓没有执行器 ⇒ **空清单**。为什么不返 `fail`:任务表单的「方法选择」 -/// 下拉要靠它,返错会让整个新建表单红条;空数组只是**选项为空**(如实)。 -pub async fn task_methods( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_TASK).await { - return resp; - } - ok(json!({ "list": [] })) -} - -/// `GET /api/scheduletask/{id}/TaskLog` —— 任务执行日志(分页)。 -pub async fn task_log_list( - State(state): State, - headers: HeaderMap, - Path(id): Path, - raw: RawQuery, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_TASK).await { - return resp; - } - let page = Paging::of(&raw); - let task_id = id.trim().to_string(); - let total = match state - .db - .query_json_params( - "SELECT COUNT(*)::bigint AS \"total\" FROM base_time_task_log \ - WHERE f_task_id = $1::text AND COALESCE(f_delete_mark, 0) = 0", - &[&task_id], - ) - .await - { - Ok(rows) => rows - .first() - .and_then(|r| r.get("total")) - .and_then(Value::as_i64) - .unwrap_or(0), - Err(e) => return db_error(e, "任务日志计数"), - }; - let size = page.page_size.to_string(); - let offset = page.offset.to_string(); - let rows = match state - .db - .query_json_params( - "SELECT f_id AS \"id\", f_task_id AS \"taskId\", \ - (EXTRACT(EPOCH FROM f_run_time) * 1000)::bigint AS \"runTime\", \ - COALESCE(f_run_result, 0)::bigint AS \"runResult\", \ - f_description AS \"description\" \ - FROM base_time_task_log \ - WHERE f_task_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 \ - ORDER BY f_run_time DESC NULLS LAST \ - LIMIT $2::text::integer OFFSET $3::text::integer", - &[&task_id, &size, &offset], - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "任务日志查询"), - }; - ok(page_list(page.current_page, page.page_size, total, rows)) -} - -/// `POST /api/scheduletask` —— 新建任务(**登记**,不执行)。 -pub async fn task_create( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_TASK).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let Some(full_name) = text_field(&obj, "fullName") else { - return fail(code::FAIL, "任务名称不能为空"); - }; - let Some(en_code) = text_field(&obj, "enCode") else { - return fail(code::FAIL, "任务编码不能为空"); - }; - let dup = state - .db - .query_json_params( - "SELECT f_id AS \"id\" FROM base_time_task \ - WHERE f_en_code = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", - &[&en_code], - ) - .await; - match dup { - Ok(rows) if !rows.is_empty() => return fail(code::FAIL, "任务编码已存在"), - Ok(_) => {} - Err(e) => return db_error(e, "任务编码查重"), - } - - // `executeContent` 缺省也给 `{}`(官方 `@Valid` 要求 cron/startTime,但本仓不执行 ⇒ 不强制) - let content = match obj.get("executeContent") { - Some(Value::Object(o)) => Value::Object(o.clone()), - _ => json!({}), - }; - let id = new_uuid(); - let execute_type = int_field(&obj, "executeType").unwrap_or(1).to_string(); - let enabled_mark = int_field(&obj, "enabledMark").unwrap_or(1).to_string(); - let sort_code = int_field(&obj, "sortCode").unwrap_or(0).to_string(); - let description = text_field(&obj, "description").unwrap_or_default(); - let content_text = content.to_string(); - let values: Vec> = vec![ - Some(id.clone()), - Some(en_code), - Some(full_name), - Some(execute_type), - Some(content_text), - Some(description), - Some(sort_code), - Some(enabled_mark), - Some(user.account.clone()), - ]; - if let Err(e) = state - .db - .exec_params( - "INSERT INTO base_time_task \ - (f_id, f_en_code, f_full_name, f_execute_type, f_execute_content, f_description, \ - f_run_count, f_sort_code, f_enabled_mark, f_delete_mark, f_tenant_id, \ - f_creator_time, f_creator_user_id) \ - VALUES ($1::text, $2::text, $3::text, $4::text::integer, $5::text, $6::text, \ - 0, $7::text::bigint, $8::text::integer, 0, '0', now(), $9::text)", - ¶ms_of(&values), - ) - .await - { - return db_error(e, "新建任务"); - } - ok(json!({ "id": id })) -} - -/// `PUT /api/scheduletask/{id}` —— 更新任务(只改 body 里出现的键)。 -pub async fn task_update( - State(state): State, - headers: HeaderMap, - Path(id): Path, - body: Bytes, -) -> Json { - let user = match guard(&state, &headers, EN_TASK).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let id = id.trim().to_string(); - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let existed = match state - .db - .query_json_params( - "SELECT f_id AS \"id\" FROM base_time_task \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", - &[&id], - ) - .await - { - Ok(rows) => !rows.is_empty(), - Err(e) => return db_error(e, "任务查询"), - }; - if !existed { - return fail(code::FAIL, "任务不存在"); - } - if let Some(en_code) = text_field(&obj, "enCode") { - let dup = state - .db - .query_json_params( - "SELECT f_id AS \"id\" FROM base_time_task \ - WHERE f_en_code = $1::text AND f_id <> $2::text \ - AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", - &[&en_code, &id], - ) - .await; - match dup { - Ok(rows) if !rows.is_empty() => return fail(code::FAIL, "任务编码已存在"), - Ok(_) => {} - Err(e) => return db_error(e, "任务编码查重"), - } - } - - let mut sets: Vec = Vec::new(); - let mut values: Vec> = Vec::new(); - for (key, column) in [ - ("fullName", "f_full_name"), - ("enCode", "f_en_code"), - ("description", "f_description"), - ] { - if let Some(v) = text_field(&obj, key) { - values.push(Some(v)); - sets.push(format!("{column} = ${}::text", values.len())); - } - } - for (key, column) in [ - ("executeType", "f_execute_type"), - ("enabledMark", "f_enabled_mark"), - ("sortCode", "f_sort_code"), - ] { - if let Some(v) = int_field(&obj, key) { - values.push(Some(v.to_string())); - sets.push(format!("{column} = ${}::text::bigint", values.len())); - } - } - if let Some(Value::Object(content)) = obj.get("executeContent") { - values.push(Some(Value::Object(content.clone()).to_string())); - sets.push(format!("f_execute_content = ${}::text", values.len())); - } - if sets.is_empty() { - return fail(code::FAIL, "没有需要更新的字段"); - } - values.push(Some(user.account.clone())); - let user_at = values.len(); - values.push(Some(id.clone())); - let id_at = values.len(); - let sql = format!( - "UPDATE base_time_task SET {}, f_last_modify_time = now(), \ - f_last_modify_user_id = ${user_at}::text WHERE f_id = ${id_at}::text", - sets.join(", ") - ); - if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { - return db_error(e, "更新任务"); - } - ok(json!({ "id": id })) -} - -/// `DELETE /api/scheduletask/{id}` —— 删除任务(软删)。 -pub async fn task_delete( - State(state): State, - headers: HeaderMap, - Path(id): Path, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_TASK).await { - return resp; - } - let id = id.trim().to_string(); - let existed = match state - .db - .query_json_params( - "SELECT f_id AS \"id\" FROM base_time_task \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", - &[&id], - ) - .await - { - Ok(rows) => !rows.is_empty(), - Err(e) => return db_error(e, "任务查询"), - }; - if !existed { - return fail(code::FAIL, "任务不存在"); - } - if let Err(e) = state - .db - .exec_params( - "UPDATE base_time_task SET f_delete_mark = 1, f_delete_time = now() \ - WHERE f_id = $1::text", - &[&id], - ) - .await - { - return db_error(e, "删除任务"); - } - ok(Value::Null) -} - -// ---------------------------------------------------------------- IM 会话(imreply) -// -// 官方 `ImReplyController`(`/api/message/imreply`)。表:`base_im_reply`(会话) -// + `base_im_content`(消息)。本仓没有 IM 前端入口,但**数据模型是真的**: -// 列表按「我与谁有会话」出,未读数/最新消息都从 `base_im_content` 真算。 - -/// `GET /api/message/imreply` —— 会话列表。 -/// -/// 形状对齐官方 `ImReplyListVo`:`{id: 对方userId, realName, account, headIcon, -/// latestMessage, latestDate, unreadMessage, messageType}`。 -pub async fn im_reply_list( - State(state): State, - headers: HeaderMap, - raw: RawQuery, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let keyword = crate::platform::sys::query_param(&raw, "keyword") - .trim() - .to_lowercase(); - // 会话 + 对方用户信息(对方已被禁用/删除的会话官方也会过滤掉) - let rows = match state - .db - .query_json_params( - "SELECT COALESCE(r.f_receive_user_id, '') AS \"id\", \ - COALESCE(u.f_real_name, '') AS \"realName\", \ - COALESCE(u.f_account, '') AS \"account\", \ - COALESCE(u.f_head_icon, '') AS \"headIcon\" \ - FROM base_im_reply r \ - JOIN base_user u ON u.f_id = r.f_receive_user_id \ - WHERE COALESCE(r.f_delete_mark, 0) = 0 AND r.f_user_id = $1::text \ - AND COALESCE(u.f_delete_mark, 0) = 0 AND COALESCE(u.f_enabled_mark, 1) = 1", - &[&user.user_id], - ) - .await - { - Ok(rows) => rows, - Err(e) => return db_error(e, "会话列表查询"), - }; - - // 未读数:按发信人分组一次算完(避免 N+1) - let unread: HashMap = match state - .db - .query_json_params( - "SELECT COALESCE(f_send_user_id, '') AS \"sender\", COUNT(*)::bigint AS \"total\" \ - FROM base_im_content \ - WHERE f_receive_user_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 \ - GROUP BY f_send_user_id", - &[&user.user_id], - ) - .await - { - Ok(rows) => rows - .into_iter() - .map(|r| { - ( - r.get("sender") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(), - r.get("total").and_then(Value::as_i64).unwrap_or(0), - ) - }) - .collect(), - Err(e) => return db_error(e, "未读消息统计"), - }; - - // 每个对方的最新一条消息:`DISTINCT ON` 取最近 - let latest: HashMap = match state - .db - .query_json_params( - "SELECT DISTINCT ON (peer) peer, content, ts, content_type FROM ( \ - SELECT CASE WHEN f_send_user_id = $1::text THEN f_receive_user_id ELSE f_send_user_id END AS peer, \ - COALESCE(f_content, '') AS content, \ - COALESCE((EXTRACT(EPOCH FROM f_send_time) * 1000)::bigint, 0) AS ts, \ - COALESCE(f_content_type, '') AS content_type \ - FROM base_im_content \ - WHERE COALESCE(f_delete_mark, 0) = 0 \ - AND (f_send_user_id = $1::text OR f_receive_user_id = $1::text) \ - ) m ORDER BY peer, ts DESC", - &[&user.user_id], - ) - .await - { - Ok(rows) => rows - .into_iter() - .map(|r| { - ( - r.get("peer") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(), - ( - r.get("content") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(), - r.get("ts").and_then(Value::as_i64).unwrap_or(0), - r.get("content_type") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(), - ), - ) - }) - .collect(), - Err(e) => return db_error(e, "最新消息查询"), - }; - - let mut list: Vec = rows - .into_iter() - .map(|row| { - let id = row - .get("id") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(); - let (latest_message, latest_date, message_type) = - latest.get(&id).cloned().unwrap_or_default(); - json!({ - "id": id, - "realName": row.get("realName").cloned().unwrap_or(Value::Null), - "account": row.get("account").cloned().unwrap_or(Value::Null), - "headIcon": row.get("headIcon").cloned().unwrap_or(Value::Null), - "latestMessage": latest_message, - "latestDate": latest_date, - "messageType": message_type, - "unreadMessage": unread.get(&id).copied().unwrap_or(0), - }) - }) - .filter(|item| { - if keyword.is_empty() { - return true; - } - let account = item - .get("account") - .and_then(Value::as_str) - .unwrap_or_default() - .to_lowercase(); - let real_name = item - .get("realName") - .and_then(Value::as_str) - .unwrap_or_default() - .to_lowercase(); - account.contains(&keyword) || real_name.contains(&keyword) - }) - .collect(); - // 按最新消息时间倒序(官方同一排序) - list.sort_by_key(|item| { - std::cmp::Reverse(item.get("latestDate").and_then(Value::as_i64).unwrap_or(0)) - }); - ok(list_vo(list)) -} - -/// `DELETE /api/message/imreply/deleteChatRecord/{id}` —— 删除与某人的聊天记录。 -/// -/// 官方 `imContentService.deleteChatRecord(我, 对方)`:只删**双方之间**的消息。 -pub async fn im_reply_delete_chat( - State(state): State, - headers: HeaderMap, - Path(peer): Path, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let peer = peer.trim().to_string(); - if peer.is_empty() { - return fail(code::FAIL, "缺少会话对象"); - } - if let Err(e) = state - .db - .exec_params( - "UPDATE base_im_content SET f_delete_mark = 1, f_delete_time = now() \ - WHERE COALESCE(f_delete_mark, 0) = 0 AND ( \ - (f_send_user_id = $1::text AND f_receive_user_id = $2::text) \ - OR (f_send_user_id = $2::text AND f_receive_user_id = $1::text) )", - &[&user.user_id, &peer], - ) - .await - { - return db_error(e, "删除聊天记录"); - } - ok(json!("")) -} - -/// `DELETE /api/message/imreply/relocation/{id}` —— 把会话从「我的列表」移除。 -/// -/// 官方 `imReplyService.relocation(我, 对方)`:只动 `base_im_reply`(消息还在)。 -pub async fn im_reply_relocation( - State(state): State, - headers: HeaderMap, - Path(peer): Path, -) -> Json { - let user = match require_login_face_b(&state, &headers).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let peer = peer.trim().to_string(); - if peer.is_empty() { - return fail(code::FAIL, "缺少会话对象"); - } - if let Err(e) = state - .db - .exec_params( - "UPDATE base_im_reply SET f_delete_mark = 1, f_delete_time = now() \ - WHERE f_user_id = $1::text AND f_receive_user_id = $2::text \ - AND COALESCE(f_delete_mark, 0) = 0", - &[&user.user_id, &peer], - ) - .await - { - return db_error(e, "移除会话"); - } - ok(json!("")) -} - -// ---------------------------------------------------------------- 常用菜单(MenuData) -// -// 官方 `ModuleDataController`(`/api/system/MenuData`)。一行 = 「我」收藏了一个菜单。 - /// `GET /api/system/MenuData` —— 我收藏的菜单(`MenuModel` 形状)。 /// /// 🔴 `isBackend` 恒 `0`:官方靠 `JnpfConst.APP_CONFIG_MODULE / ONLINE_DEV_MODULE` @@ -25012,12 +17062,6 @@ pub async fn menu_data_delete( ok(Value::Null) } -// ---------------------------------------------------------------- 公式目录(Variate 补 3 条) -// -// 官方 `CommonVariateController` 的三条**纯目录**接口:系统变量 / 按分类取函数 / 函数树。 -// 🔴 数据源是 [`crate::platform::variate_catalog`](**生成物**,从官方 Java 枚举逐条转出) -// —— 手抄 53 条不会有任何编译错,只会让某个函数在帮助里点不开。 - /// `GET /api/system/Variate/sysvariate` —— 系统变量清单(18 条,`{field, description}`)。 pub async fn variate_sys_variate( State(state): State, @@ -25159,8 +17203,6 @@ pub async fn variate_sys_func_tree( ok(list_vo(list)) } -// ---------------------------------------------------------------- 我的应用(HomeData/mySystem) - /// `GET /api/system/HomeData/mySystem` —— 首页「我的应用」(`data` 是**裸数组**)。 /// /// 官方 `HomeDataController.mySystem`:授权给我的应用,**排除主系统**(`isMain = 1`), @@ -25203,8 +17245,6 @@ pub async fn home_my_system( ok(Value::Array(list)) } -// ---------------------------------------------------------------- 系统监控(Monitor) - /// `GET /api/system/Monitor` —— 系统监控(官方 `SystemMonitorController.java:35`)。 /// /// 官方 `MonitorUtil` 为了算 CPU 占空比会 **sleep 1 秒**;本仓不这么干 @@ -25219,26 +17259,9 @@ pub async fn monitor( ok(crate::platform::monitor::payload()) } -// === SYSTEM SERVICES (系统服务族) SECTION END === - -// === PERMISSION RELATION (权限关系族) SECTION BEGIN === -// -// 批次 16(2026-11-02):角色绑定关系(2) + 在线用户(3) + 自定义范围(3) + 用户工作详情(1) -// + 第三方账号(2) + 三实体导入导出(15) = **26 条**。 -// -// 🔴 **本族的四条判据**(沿用批次 14/15,遇到同类问题照着办): -// ① **能力不存在 ⇒ 明确业务失败**,不返假 url / 假数据(本仓无文件服务、 -// 无第三方登录、无工作流引擎、未建模数据接口变量); -// ② 官方的 `@SaCheckPermission` **逐条照抄** —— 本仓没有的 `f_en_code` 未映射 ⇒ 放行 -// (known-limitations (ae)),所以照抄不会误伤普通用户; -// ③ 分页统一 `PageListVO` 形状(`data.pagination` + `data.list`); -// ④ 本族两条列表接口就是最终展示页 ⇒ 给**名称**不是 id(与批次 14/15 的 -// 「列表给名称 / 详情给 id」不冲突,那两条是编辑表单)。 - -/// 官方 `RoleRelationController` 的 OR 守卫之一(本仓没有这个 `f_en_code` ⇒ 实际放行)。 -const EN_AUTH: &str = "permission.auth"; /// 官方 `UserOnlineController` 的 OR 守卫(本仓没有这两个 `f_en_code` ⇒ 实际放行)。 const EN_USER_ONLINE: &str = "permission.userOnline"; + const EN_MONITOR_ONLINE: &str = "monitor.userOnline"; /// 毫秒时间戳 ⇒ `yyyy-MM-dd HH:mm:ss`(本机时区)。 @@ -25252,300 +17275,6 @@ fn fmt_ms(ms: i64) -> String { .unwrap_or_default() } -/// 取 query 里的字符串参数(去空白)。 -fn qv(raw: &RawQuery, key: &str) -> String { - crate::platform::sys::query_param(raw, key).trim().to_string() -} - -// ---------------------------------------------------------------- 角色绑定关系 - -/// `GET /api/permission/RoleRelation` —— 角色已绑定的对象列表 -/// (官方 `RoleRelationController.java:80`)。 -/// -/// 官方按 `type` 分三条查询:`user`(补岗位名 / 组织名 / 性别名)、`organize` -/// (`fullName` = 组织全路径)、`position`(`fullName` = 组织全路径 + `/` + 岗位名)。 -/// 🔴 本仓**不做性别字典翻译**(`SEX_TYPE` 字典没种子化)⇒ `gender` 返回原码, -/// 契约标 `partial`;其余字段都是真读。 -pub async fn role_relation_list( - State(state): State, - headers: HeaderMap, - raw: RawQuery, -) -> Json { - if let Err(resp) = guard_any(&state, &headers, &[EN_AUTH, EN_ORGANIZE, EN_ROLE]).await { - return resp; - } - let role_id = qv(&raw, "roleId"); - if role_id.is_empty() { - return fail(code::FAIL, "缺少角色 id"); - } - let ty = qv(&raw, "type").to_lowercase(); - let keyword = qv(&raw, "keyword").to_lowercase(); - let page = Paging::of(&raw); - - // 🔴 `f_object_type` 必须**全小写**(`user` / `organize` / `position`): - // ① 官方 `PermissionConst.USER/ORGANIZE/POSITION` 就是小写 - // (`jnpf-common-core/.../PermissionConst.java`),`setEntity` 落的是前端传的 `type`, - // 而前端 tab 的 key 也是小写(`views/permission/role/index.vue:259` `key="user"`); - // ② 本仓授权引擎 `permission.rs::query_user_role_ids` 也只认 `f_object_type='user'` - // ⇒ 这里写成首字母大写的话,绑定会**显示成功但权限永不生效**(静默失效)。 - let object_type = match ty.as_str() { - "organize" => "organize", - "position" => "position", - _ => "user", - }; - - let (select_cols, from_sql, kw_cond, order_sql) = match object_type { - "organize" => ( - "t.f_id AS \"id\", COALESCE(t.f_en_code, '') AS \"enCode\", \ - COALESCE(t.f_full_name, '') AS \"fullName\", \ - COALESCE(t.f_org_name_tree, t.f_full_name, '') AS \"orgNameTree\", \ - COALESCE(t.f_category, '') AS \"category\"", - "base_role_relation r JOIN base_organize t ON t.f_id = r.f_object_id", - "t.f_full_name ILIKE $2::text OR t.f_en_code ILIKE $2::text", - "COALESCE(t.f_sort_code, 0) ASC, t.f_creator_time ASC NULLS LAST", - ), - "position" => ( - "t.f_id AS \"id\", COALESCE(t.f_en_code, '') AS \"enCode\", \ - COALESCE(t.f_full_name, '') AS \"fullName\", \ - COALESCE(o.f_org_name_tree, o.f_full_name, '') AS \"orgNameTree\", \ - COALESCE(t.f_organize_id, '') AS \"organizeId\"", - "base_role_relation r JOIN base_position t ON t.f_id = r.f_object_id \ - LEFT JOIN base_organize o ON o.f_id = t.f_organize_id", - "t.f_full_name ILIKE $2::text OR t.f_en_code ILIKE $2::text", - "COALESCE(t.f_sort_code, 0) ASC, t.f_creator_time ASC NULLS LAST", - ), - _ => ( - "t.f_id AS \"id\", COALESCE(t.f_account, '') AS \"account\", \ - COALESCE(t.f_real_name, '') AS \"realName\", \ - COALESCE(t.f_gender, '') AS \"gender\", \ - COALESCE(t.f_mobile_phone, '') AS \"mobilePhone\", \ - COALESCE(o.f_full_name, '') AS \"organize\", \ - COALESCE((SELECT string_agg(p.f_full_name, ',' \ - ORDER BY COALESCE(p.f_sort_code, 0)) \ - FROM base_position p \ - WHERE p.f_id = ANY(string_to_array(COALESCE(t.f_position_id, ''), ',')) \ - AND COALESCE(p.f_delete_mark, 0) = 0), '') AS \"position\"", - "base_role_relation r JOIN base_user t ON t.f_id = r.f_object_id \ - LEFT JOIN base_organize o ON o.f_id = t.f_organize_id", - "t.f_account ILIKE $2::text OR t.f_real_name ILIKE $2::text", - "COALESCE(t.f_sort_code, 0) ASC, t.f_creator_time ASC NULLS LAST", - ), - }; - - let mut values: Vec> = vec![Some(role_id.clone())]; - let mut conds = vec![ - "r.f_role_id = $1::text".to_string(), - format!("r.f_object_type = '{object_type}'"), - "COALESCE(r.f_delete_mark, 0) = 0".to_string(), - "COALESCE(t.f_delete_mark, 0) = 0".to_string(), - ]; - if !keyword.is_empty() { - values.push(Some(format!("%{keyword}%"))); - conds.push(format!("({kw_cond})")); - } - let where_sql = conds.join(" AND "); - - let count_sql = - format!("SELECT COUNT(*)::bigint AS \"total\" FROM {from_sql} WHERE {where_sql}"); - let total = match state - .db - .query_json_params(&count_sql, ¶ms_of(&values)) - .await - { - Ok(rows) => rows - .first() - .and_then(|r| r.get("total")) - .and_then(Value::as_i64) - .unwrap_or(0), - Err(e) => return db_error(e, "角色绑定对象计数"), - }; - - let mut page_values = values.clone(); - page_values.push(Some(page.page_size.to_string())); - let n = page_values.len(); - page_values.push(Some(page.offset.to_string())); - let m = page_values.len(); - let sql = format!( - "SELECT {select_cols} FROM {from_sql} WHERE {where_sql} \ - ORDER BY {order_sql} LIMIT ${n}::text::integer OFFSET ${m}::text::integer" - ); - let list = match state.db.query_json_params(&sql, ¶ms_of(&page_values)).await { - Ok(rows) => rows, - Err(e) => return db_error(e, "角色绑定对象查询"), - }; - ok(page_list(page.current_page, page.page_size, total, list)) -} - -/// `POST /api/permission/RoleRelation` —— 给角色批量绑定对象 -/// (官方 `RoleRelationController.java:153`)。 -/// -/// 官方语义(`RoleRelationServiceImpl.roleAddObjectIds`)逐条对齐: -/// ① `ids` 空 ⇒ 失败「请选择要绑定的对象」(`SYS134`); -/// ② 角色不存在 ⇒ 失败; -/// ③ `type=user` 时先把**停用/已删**的用户过滤掉(`getRelUserEnable`); -/// ④ **已绑定过的跳过**(官方用 `roleSet` 差集); -/// ⑤ **超管不能添加**(官方 `adminIds` ⇒ 记进 errList,不落库); -/// ⑥ 结果三分支:有成功有失败 ⇒ 成功(`部分成功`);全失败 ⇒ 失败;全成功 ⇒ 成功; -/// ⑦ 绑完把**相关用户踢下线**(官方 `delCurUser`)—— 否则新权限要等重新登录才生效。 -pub async fn role_relation_add( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - let user = match guard_any(&state, &headers, &[EN_AUTH, EN_ORGANIZE, EN_ROLE]).await { - Ok(u) => u, - Err(resp) => return resp, - }; - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let role_id = text_field(&obj, "roleId").unwrap_or_default(); - if role_id.is_empty() { - return fail(code::FAIL, "缺少角色 id"); - } - // 🔴 与 `role_relation_list` 同一口径:`f_object_type` **全小写** - // (官方 `PermissionConst` 是 `user`/`organize`/`position`;授权引擎只认小写)。 - let ty = text_field(&obj, "type").unwrap_or_else(|| "user".to_string()); - let object_type = match ty.to_lowercase().as_str() { - "organize" => "organize", - "position" => "position", - _ => "user", - }; - let mut ids = id_list_of(&obj, "ids"); - if ids.is_empty() { - return fail(code::FAIL, "请选择要绑定的对象"); - } - - let role = match state - .db - .query_json_params( - "SELECT f_id AS \"id\" FROM base_role \ - WHERE f_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", - &[&role_id], - ) - .await - { - Ok(rows) => rows.into_iter().next(), - Err(e) => return db_error(e, "角色查询"), - }; - if role.is_none() { - return fail(code::FAIL, "角色不存在"); - } - - // ③ 停用/已删的用户不绑(官方 `getRelUserEnable`)。 - if object_type == "user" { - let placeholders: Vec = - (0..ids.len()).map(|i| format!("${}::text", i + 1)).collect(); - let sql = format!( - "SELECT f_id AS \"id\" FROM base_user WHERE f_id IN ({}) \ - AND COALESCE(f_delete_mark, 0) = 0 AND COALESCE(f_enabled_mark, 1) = 1", - placeholders.join(", ") - ); - let owned: Vec = ids.clone(); - let refs: Vec<&(dyn ToSql + Sync)> = - owned.iter().map(|s| s as &(dyn ToSql + Sync)).collect(); - match state.db.query_json_params(&sql, &refs).await { - Ok(rows) => { - let enabled: Vec = rows - .iter() - .filter_map(|r| r.get("id").and_then(Value::as_str).map(str::to_string)) - .collect(); - ids.retain(|id| enabled.contains(id)); - } - Err(e) => return db_error(e, "用户可用性查询"), - } - } - if ids.is_empty() { - return fail(code::FAIL, "所选对象都不可用(已停用或已删除)"); - } - - // ④ 已绑定的跳过。 - let bound = match state - .db - .query_json_params( - "SELECT f_object_id AS \"objectId\" FROM base_role_relation \ - WHERE f_role_id = $1::text AND f_object_type = $2::text \ - AND COALESCE(f_delete_mark, 0) = 0", - &[&role_id, &object_type.to_string()], - ) - .await - { - Ok(rows) => rows - .iter() - .filter_map(|r| { - r.get("objectId") - .and_then(Value::as_str) - .map(str::to_string) - }) - .collect::>(), - Err(e) => return db_error(e, "角色已绑定对象查询"), - }; - ids.retain(|id| !bound.contains(id)); - - // ⑤ 超管不能添加。 - let mut err_list: Vec = Vec::new(); - if object_type == "user" && !ids.is_empty() { - let placeholders: Vec = - (0..ids.len()).map(|i| format!("${}::text", i + 1)).collect(); - let sql = format!( - "SELECT f_id AS \"id\" FROM base_user WHERE f_id IN ({}) \ - AND COALESCE(f_is_administrator, 0) = 1", - placeholders.join(", ") - ); - let owned: Vec = ids.clone(); - let refs: Vec<&(dyn ToSql + Sync)> = - owned.iter().map(|s| s as &(dyn ToSql + Sync)).collect(); - match state.db.query_json_params(&sql, &refs).await { - Ok(rows) => { - for r in &rows { - if let Some(id) = r.get("id").and_then(Value::as_str) { - err_list.push(format!("超管不能添加:{id}")); - ids.retain(|x| x != id); - } - } - } - Err(e) => return db_error(e, "超管查询"), - } - } - - let mut added: Vec = Vec::new(); - for object_id in &ids { - let values = [ - Some(new_uuid()), - Some(user.account.clone()), - Some(object_id.clone()), - Some(object_type.to_string()), - Some(role_id.clone()), - ]; - let sql = "INSERT INTO base_role_relation \ - (f_id, f_creator_user_id, f_object_id, f_object_type, f_role_id, \ - f_creator_time, f_delete_mark) \ - VALUES ($1::text, $2::text, $3::text, $4::text, $5::text, now(), 0)"; - match state.db.exec_params(sql, ¶ms_of(&values)).await { - Ok(_) => added.push(object_id.clone()), - Err(e) => return db_error(e, "角色绑定写入"), - } - } - - // ⑦ 相关用户踢下线(官方 `delCurUser`)。 - if object_type == "user" { - state.sessions.revoke_user_ids(&added); - } - - if !err_list.is_empty() && !added.is_empty() { - // 官方这里返 `success("部分成功")` ⇒ 200,但有一条提示。 - return ok(json!({ "partial": true, "errList": err_list })); - } - if !err_list.is_empty() { - return fail(code::FAIL, &err_list.join(";")); - } - ok(Value::Null) -} - -// ---------------------------------------------------------------- 在线用户 - /// `GET /api/system/OnlineUser` —— 在线用户列表(官方 `UserOnlineController.java:53`)。 /// /// 🔴 **`userId` 给的是「会话指纹」不是 token**:官方直接把 Sa-Token 的 token 当 @@ -25687,892 +17416,3 @@ pub async fn online_user_batch_delete( } ok(Value::Null) } - -// ---------------------------------------------------------------- 自定义范围(条件 / 回显) - -/// `POST /api/permission/Group/GroupCondition` —— 按 id 集合取分组下拉 -/// (官方 `GroupController.java:219`)。 -/// -/// 官方给每个 VO 盖一个常量 `icon`(`PermissionConst.GROUP_ICON`);本仓没有这个 -/// 图标常量 ⇒ `icon` 返空串(前端有默认图标),契约 note 写明。 -pub async fn group_condition( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - if let Err(resp) = require_login_face_b(&state, &headers).await { - return resp; - } - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let ids = id_list_of(&obj, "ids"); - if ids.is_empty() { - return ok(Value::Array(Vec::new())); - } - let placeholders: Vec = (0..ids.len()).map(|i| format!("${}::text", i + 1)).collect(); - let sql = format!( - "SELECT f_id AS \"id\", COALESCE(f_full_name, '') AS \"fullName\", \ - COALESCE(f_en_code, '') AS \"enCode\", '' AS \"icon\" \ - FROM base_group WHERE f_id IN ({}) AND COALESCE(f_delete_mark, 0) = 0 \ - ORDER BY COALESCE(f_sort_code, 0) ASC", - placeholders.join(", ") - ); - let owned: Vec = ids; - let refs: Vec<&(dyn ToSql + Sync)> = owned.iter().map(|s| s as &(dyn ToSql + Sync)).collect(); - match state.db.query_json_params(&sql, &refs).await { - Ok(rows) => ok(Value::Array(rows)), - Err(e) => db_error(e, "分组下拉查询"), - } -} - -/// `POST /api/permission/Organize/SelectedList` —— 自定义范围**回显** -/// (官方 `OrganizeController.java:341`)。 -/// -/// 🔴 `ids` 的每个元素是 **`<组织id>--<类型后缀>`**(官方 `split("--")`): -/// 返回的 `id` 必须**原样带回**(前端拿它做删除),`orgNameTree` 按后缀追加说明。 -/// 本仓没有 `SysParamEnum` 的后缀表 ⇒ **不追加任何文字**,但 id 原样保留。 -pub async fn organize_selected_list( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - if let Err(resp) = require_login_face_b(&state, &headers).await { - return resp; - } - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let id_strs = id_list_of(&obj, "ids"); - if id_strs.is_empty() { - return ok(list_vo(Vec::new())); - } - // 只取 `--` 前的真 id(后缀是前端的选择语义,不是主键的一部分)。 - let real_ids: Vec = id_strs - .iter() - .map(|s| s.split("--").next().unwrap_or("").to_string()) - .filter(|s| !s.is_empty()) - .collect(); - if real_ids.is_empty() { - return ok(list_vo(Vec::new())); - } - let placeholders: Vec = (0..real_ids.len()) - .map(|i| format!("${}::text", i + 1)) - .collect(); - let sql = format!( - "SELECT f_id AS \"id\", COALESCE(f_en_code, '') AS \"enCode\", \ - COALESCE(f_full_name, '') AS \"fullName\", \ - COALESCE(f_org_name_tree, f_full_name, '') AS \"orgNameTree\", \ - COALESCE(f_category, '') AS \"category\" \ - FROM base_organize WHERE f_id IN ({}) AND COALESCE(f_delete_mark, 0) = 0", - placeholders.join(", ") - ); - let owned: Vec = real_ids.clone(); - let refs: Vec<&(dyn ToSql + Sync)> = owned.iter().map(|s| s as &(dyn ToSql + Sync)).collect(); - let rows = match state.db.query_json_params(&sql, &refs).await { - Ok(rows) => rows, - Err(e) => return db_error(e, "自定义范围回显查询"), - }; - let mut by_id: HashMap = HashMap::new(); - for r in rows { - let id = r - .get("id") - .and_then(Value::as_str) - .unwrap_or("") - .to_string(); - by_id.insert(id, r); - } - // **按入参顺序**回填(官方就是这么干的),查不到的直接丢弃。 - let mut list: Vec = Vec::new(); - for id_str in &id_strs { - let real = id_str.split("--").next().unwrap_or(""); - if let Some(row) = by_id.get(real) { - let mut item = row.clone(); - if let Some(o) = item.as_object_mut() { - o.insert("id".to_string(), json!(id_str)); - } - list.push(item); - } - } - ok(list_vo(list)) -} - -/// `POST /api/permission/Organize/OrganizeCondition` —— 自定义范围**下拉树** -/// (官方 `OrganizeController.java:351`)。 -/// -/// 🔴 官方这里会把 `$ORG` / `$ORGANDSUB` / `$ORGANIZEANDPROGENY` 三个**数据接口变量** -/// 展开成「我所在的机构 / 我及下级 / 我及后代」。本仓没有建模数据接口变量 -/// (`DataInterfaceVarConst` 不在官方快照里,取值无法逐字对齐)⇒ 遇到 `$` / `@` -/// 开头的标记**明确业务失败**,让调用方传具体机构 id。**能力不存在就不假装。** -pub async fn organize_condition( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - if let Err(resp) = require_login_face_b(&state, &headers).await { - return resp; - } - let obj = match parse_body(&body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let id_strs = id_list_of(&obj, "ids"); - if id_strs.is_empty() { - return ok(list_vo(Vec::new())); - } - let mut real_ids: Vec = Vec::new(); - for id_str in &id_strs { - let head = id_str.split("--").next().unwrap_or("").trim(); - if head.is_empty() { - continue; - } - if head.starts_with('$') || head.starts_with('@') { - return fail( - code::FAIL, - "本仓未建模数据接口变量($ORG / $ORGANDSUB / $ORGANIZEANDPROGENY),请传具体机构 id", - ); - } - real_ids.push(head.to_string()); - } - if real_ids.is_empty() { - return ok(list_vo(Vec::new())); - } - let placeholders: Vec = (0..real_ids.len()) - .map(|i| format!("${}::text", i + 1)) - .collect(); - let sql = format!( - "SELECT f_id AS \"id\", COALESCE(f_parent_id, '0') AS \"parentId\", \ - COALESCE(f_full_name, '') AS \"fullName\", \ - COALESCE(f_org_name_tree, f_full_name, '') AS \"orgNameTree\", \ - COALESCE(f_category, '') AS \"category\" \ - FROM base_organize WHERE f_id IN ({}) AND COALESCE(f_delete_mark, 0) = 0 \ - ORDER BY COALESCE(f_sort_code, 0) ASC, f_full_name ASC", - placeholders.join(", ") - ); - let owned: Vec = real_ids.clone(); - let refs: Vec<&(dyn ToSql + Sync)> = owned.iter().map(|s| s as &(dyn ToSql + Sync)).collect(); - let rows = match state.db.query_json_params(&sql, &refs).await { - Ok(rows) => rows, - Err(e) => return db_error(e, "自定义范围下拉查询"), - }; - // 按 `f_parent_id` 组成树:父不在集合内的当根(官方 `convertListToTreeDot` 同义)。 - let in_set: Vec = rows - .iter() - .filter_map(|r| r.get("id").and_then(Value::as_str).map(str::to_string)) - .collect(); - let mut children: HashMap> = HashMap::new(); - let mut roots: Vec = Vec::new(); - for r in rows { - let id = r - .get("id") - .and_then(Value::as_str) - .unwrap_or("") - .to_string(); - let parent = r - .get("parentId") - .and_then(Value::as_str) - .unwrap_or("0") - .to_string(); - let mut node = r.clone(); - if let Some(o) = node.as_object_mut() { - o.insert("icon".to_string(), json!("")); - o.insert("children".to_string(), json!([])); - } - if parent != id && in_set.contains(&parent) { - children.entry(parent).or_default().push(node); - } else { - roots.push(node); - } - } - fn attach(node: &mut Value, children: &HashMap>) { - let id = node - .get("id") - .and_then(Value::as_str) - .unwrap_or("") - .to_string(); - if let Some(kids) = children.get(&id) { - let mut kids = kids.clone(); - for kid in kids.iter_mut() { - attach(kid, children); - } - if let Some(o) = node.as_object_mut() { - o.insert("children".to_string(), Value::Array(kids)); - } - } - } - for root in roots.iter_mut() { - attach(root, &children); - } - ok(list_vo(roots)) -} - -// ---------------------------------------------------------------- 用户工作详情 - -/// `GET /api/permission/Users/getWorkByUser?fromId=` —— 用户工作详情 -/// (官方 `UserController.java:2174`)。 -/// -/// 官方返回 `WorkHandoverVo {flow, flowTask, app, isAppShow}`: -/// - `flow` / `flowTask` 来自**工作流引擎**(`templateApi.flowWork`)⇒ 本仓没有 -/// 工作流 ⇒ 恒空数组(**不编待办条数**); -/// - `app` 是该用户**有权限的应用系统**列表 ⇒ 真查; -/// - `isAppShow` = `app` 非空(官方同义)。 -pub async fn user_get_work_by_user( - State(state): State, - headers: HeaderMap, - raw: RawQuery, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - let from_id = qv(&raw, "fromId"); - if from_id.is_empty() { - return fail(code::FAIL, "缺少 userId"); - } - let target = match state - .db - .query_json_params( - "SELECT f_id AS \"id\", COALESCE(f_account, '') AS \"account\", \ - COALESCE(f_is_administrator, 0)::bigint AS \"isAdmin\" \ - FROM base_user WHERE f_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", - &[&from_id], - ) - .await - { - Ok(rows) => rows.into_iter().next(), - Err(e) => return db_error(e, "用户查询"), - }; - let Some(target) = target else { - return fail(code::FAIL, "用户不存在"); - }; - let user = TokenUser { - user_id: from_id.clone(), - account: target - .get("account") - .and_then(Value::as_str) - .unwrap_or("") - .to_string(), - is_admin: target - .get("isAdmin") - .and_then(Value::as_i64) - .and_then(|v| i32::try_from(v).ok()) - .unwrap_or(0), - issued_at_ms: 0, - ip: String::new(), - user_agent: String::new(), - }; - let mut conds = vec![ - "COALESCE(f_delete_mark, 0) = 0".to_string(), - "COALESCE(f_is_main, 0) = 0".to_string(), - ]; - let mut values: Vec> = Vec::new(); - if user.is_admin != 1 { - values.push(Some(format!("%{}%", user.user_id))); - let n = values.len(); - conds.push(format!( - "(COALESCE(f_user_id, '') LIKE ${n}::text OR COALESCE(f_authorize_id, '') LIKE ${n}::text)" - )); - } - let sql = format!( - "SELECT {SYSTEM_LIST_PROJECTION} FROM base_system WHERE {} \ - ORDER BY COALESCE(f_sort_code, 0) ASC", - conds.join(" AND ") - ); - let rows = match state.db.query_json_params(&sql, ¶ms_of(&values)).await { - Ok(rows) => rows, - Err(e) => return db_error(e, "用户可访问系统查询"), - }; - let tops = load_system_tops(&state, &user).await; - let app: Vec = rows - .into_iter() - .map(|row| shape_system_list_item(row, &user, &tops)) - .collect(); - let is_app_show = !app.is_empty(); - ok(json!({ - "flow": [], - "flowTask": [], - "app": app, - "isAppShow": is_app_show, - })) -} - -// ---------------------------------------------------------------- 第三方账号 - -/// `GET /api/permission/socials` —— 第三方账号绑定列表 -/// (官方 `SocialsUserController.java:94`)。 -/// -/// 🔴 官方在 `socialsConfig.getConfig() == null` 时**直接失败**(`PS019`)—— -/// 本仓根本没有第三方登录配置 ⇒ **走的正是官方这条失败分支**,不是偷懒: -/// 没有 provider 就返空数组,页面会显示「没有可绑定的平台」; -/// 而真实情况是「未开启」,后者才对。 -pub async fn socials_list( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = require_login_face_b(&state, &headers).await { - return resp; - } - fail(code::FAIL, "未开启第三方登录配置,无法绑定第三方账号") -} - -/// `GET /api/permission/socials/render/{source}` —— 第三方授权的跳转地址 -/// (官方 `SocialsUserController.java:129`)。 -/// -/// 官方返回 OAuth 授权 URL(`authRequest.authorize(...)`)。本仓没有 OAuth 客户端 -/// 注册表 ⇒ **明确业务失败**,绝不返假 URL(前端会直接跳转,跳到 404 页更难查)。 -pub async fn socials_render( - State(state): State, - headers: HeaderMap, - Path(source): Path, -) -> Json { - if let Err(resp) = require_login_face_b(&state, &headers).await { - return resp; - } - let source = source.trim(); - fail( - code::FAIL, - &format!("未开启第三方登录配置,无法发起 {source} 授权"), - ) -} - -// ---------------------------------------------------------------- 导入导出(三实体 × 5) - -/// 一条导入的落库规格(三实体共用一套流程:校验必填 → 判重 → 落库 → 统计)。 -struct ImportSpec { - /// 目标表 - table: &'static str, - /// 判重列(账号 / 编码) - key_col: &'static str, - /// body 里必填的键(缺 ⇒ 该行失败) - required: &'static [&'static str], - /// (body 键, 列名):**只写 body 里出现的键**,没出现的不进 INSERT - cols: &'static [(&'static str, &'static str)], - /// 固定列(列名, SQL 字面量)—— 例如新用户的默认口令 - fixed: &'static [(&'static str, &'static str)], - /// 判重时的中文名(「账号」/「编码」) - key_label: &'static str, -} - -const IMPORT_USER: ImportSpec = ImportSpec { - table: "base_user", - key_col: "f_account", - required: &["account", "realName"], - cols: &[ - ("account", "f_account"), - ("realName", "f_real_name"), - ("gender", "f_gender"), - ("mobilePhone", "f_mobile_phone"), - ("telePhone", "f_tele_phone"), - ("email", "f_email"), - ("organizeId", "f_organize_id"), - ("positionId", "f_position_id"), - ("description", "f_description"), - ], - fixed: &[ - ("f_password", "md5('123456')"), - ("f_is_administrator", "0"), - ("f_enabled_mark", "1"), - ("f_delete_mark", "0"), - ], - key_label: "账号", -}; - -const IMPORT_ORGANIZE: ImportSpec = ImportSpec { - table: "base_organize", - key_col: "f_en_code", - required: &["fullName", "enCode"], - cols: &[ - ("parentId", "f_parent_id"), - ("fullName", "f_full_name"), - ("enCode", "f_en_code"), - ("category", "f_category"), - ("description", "f_description"), - ], - fixed: &[("f_enabled_mark", "1"), ("f_delete_mark", "0")], - key_label: "编码", -}; - -const IMPORT_POSITION: ImportSpec = ImportSpec { - table: "base_position", - key_col: "f_en_code", - required: &["fullName", "enCode"], - cols: &[ - ("organizeId", "f_organize_id"), - ("fullName", "f_full_name"), - ("enCode", "f_en_code"), - ("description", "f_description"), - ], - fixed: &[("f_enabled_mark", "1"), ("f_delete_mark", "0")], - key_label: "编码", -}; - -/// 单行落库。返回 `Ok(())` 或失败原因(人话)。 -async fn import_one_row(state: &AppState, spec: &ImportSpec, obj: &Map) -> Result<(), String> { - // ① 必填校验 - let mut missing: Vec<&str> = Vec::new(); - for key in spec.required { - if text_field(obj, key).is_none() { - missing.push(key); - } - } - if !missing.is_empty() { - return Err(format!("缺少必填字段:{}", missing.join(" / "))); - } - // ② 判重(表内唯一;`key_col` 一定在 `cols` 里) - let key_value = spec - .cols - .iter() - .find(|(_, c)| *c == spec.key_col) - .and_then(|(k, _)| text_field(obj, k)); - if let Some(value) = key_value.as_ref() { - let sql = format!( - "SELECT 1 AS \"hit\" FROM {} WHERE {} = $1::text LIMIT 1", - spec.table, spec.key_col - ); - match state.db.query_json_params(&sql, &[value]).await { - Ok(hit) => { - if !hit.is_empty() { - return Err(format!("{}已存在:{value}", spec.key_label)); - } - } - Err(e) => return Err(format!("判重失败:{e}")), - } - } - // ③ 组装 INSERT:body 里出现的键 → 固定字面量 → uuid - let mut columns: Vec = Vec::new(); - let mut values: Vec> = Vec::new(); - for (key, col) in spec.cols { - if let Some(v) = text_field(obj, key) { - columns.push(col.to_string()); - values.push(Some(v)); - } - } - let mut literals: Vec = Vec::new(); - for (col, lit) in spec.fixed { - columns.push(col.to_string()); - literals.push((*lit).to_string()); - } - columns.push("f_id".to_string()); - let mut placeholders: Vec = (1..=values.len()) - .map(|i| format!("${i}::text")) - .collect(); - placeholders.extend(literals.iter().cloned()); - values.push(Some(new_uuid())); - placeholders.push(format!("${}::text", values.len())); - let sql = format!( - "INSERT INTO {} ({}) VALUES ({})", - spec.table, - columns.join(", "), - placeholders.join(", ") - ); - match state.db.exec_params(&sql, ¶ms_of(&values)).await { - Ok(_) => Ok(()), - Err(e) => Err(format!("写入失败:{e}")), - } -} - -/// 导入落库(`ImportData` 的 `type=false` 分支:前端已经把行解析好了)。 -/// -/// 官方 `ExcelImportVO` = `{snum, fnum, resultType, failResult, headerRow}`: -/// - `snum` 成功条数 / `fnum` 失败条数; -/// - `resultType` = 1 有失败 / 0 全成功; -/// - `failResult` = 失败行(本仓给 `{row, msg, data}`,够前端列出来); -/// - `headerRow` = 表头(本仓没有 Excel 表头 ⇒ 空数组)。 -async fn import_rows(state: &AppState, spec: &ImportSpec, rows: &[Value]) -> Value { - let mut snum = 0i64; - let mut fail: Vec = Vec::new(); - for (idx, row) in rows.iter().enumerate() { - let Some(obj) = row.as_object() else { - fail.push(json!({ "row": idx + 1, "msg": "该行不是对象" })); - continue; - }; - match import_one_row(state, spec, obj).await { - Ok(()) => snum += 1, - Err(msg) => fail.push(json!({ "row": idx + 1, "msg": msg, "data": row })), - } - } - let fnum = fail.len() as i64; - json!({ - "snum": snum, - "fnum": fnum, - "resultType": if fnum > 0 { 1 } else { 0 }, - "failResult": fail, - "headerRow": [], - }) -} - -/// 解析 `ImportData` 的 body 并落库(三实体共用)。 -/// -/// 🔴 `type=true` 表示「先按 `fileName` 从**文件服务**读 Excel」⇒ 本仓没有文件服务 -/// ⇒ 明确业务失败。**不能静默当成 0 条** —— 那会让导入页显示「成功导入 0 条」。 -async fn import_data_common( - state: &AppState, - body: &Bytes, - spec: &ImportSpec, -) -> Json { - let obj = match parse_body(body) { - Ok(Value::Object(o)) => o, - Ok(_) => return fail(code::FAIL, "请求参数格式错误"), - Err(resp) => return resp, - }; - let by_file = obj.get("type").and_then(Value::as_bool).unwrap_or(false); - if by_file { - return fail( - code::FAIL, - "本仓未配置文件服务,无法按文件名导入;请把已解析的行数据放进 list 再导入", - ); - } - let rows: Vec = match obj.get("list") { - Some(Value::Array(items)) => items.clone(), - _ => Vec::new(), - }; - if rows.is_empty() { - return fail(code::FAIL, "没有可导入的数据"); - } - ok(import_rows(state, spec, &rows).await) -} - -/// `POST /api/permission/Users/ImportData`(官方 `UserController.java:2355`)。 -pub async fn user_import_data( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - import_data_common(&state, &body, &IMPORT_USER).await -} - -/// `POST /api/permission/Organize/ImportData`(官方 `OrganizeController.java:490`)。 -pub async fn organize_import_data( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_ORGANIZE).await { - return resp; - } - import_data_common(&state, &body, &IMPORT_ORGANIZE).await -} - -/// `POST /api/permission/Position/ImportData`(官方 `PositionController.java:676`)。 -pub async fn position_import_data( - State(state): State, - headers: HeaderMap, - body: Bytes, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_POSITION).await { - return resp; - } - import_data_common(&state, &body, &IMPORT_POSITION).await -} - -// 下面 12 个是「模板下载 / 导入预览 / 导出 / 导出异常报告」× 三实体。 -// 🔴 它们都要**文件服务**(上传 + 下载地址),本仓没有 ⇒ 一律**明确业务失败**。 -// 🔴 尤其**不能返 `data:null`**:官方前端拿到 `DownloadVO` 就 `downloadByUrl({url})`, -// `null` 会抛 JS 异常(批次 15 的 `Kit/{id}/Actions/Export` 已踩过一次)。 - -/// `GET /api/permission/Users/TemplateDownload`(官方 `UserController.java:2297`)。 -pub async fn user_template_download( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - fail(code::FAIL, "本仓未配置文件服务,暂不支持下载导入模板") -} - -/// `GET /api/permission/Users/ImportPreview`(官方 `UserController.java:2323`)。 -pub async fn user_import_preview( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - fail(code::FAIL, "本仓未配置文件服务,暂不支持导入预览") -} - -/// `POST /api/permission/Users/ExportExceptionData`(官方 `UserController.java:2337`)。 -pub async fn user_export_exception_data( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - fail(code::FAIL, "本仓未配置文件服务,暂不支持导出异常报告") -} - -/// `GET /api/permission/Users/ExportData`(官方 `UserController.java:2398`)。 -pub async fn user_export_data( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_USER).await { - return resp; - } - fail(code::FAIL, "本仓未配置文件服务,暂不支持导出") -} - -/// `GET /api/permission/Organize/TemplateDownload`(官方 `OrganizeController.java:438`)。 -pub async fn organize_template_download( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_ORGANIZE).await { - return resp; - } - fail(code::FAIL, "本仓未配置文件服务,暂不支持下载导入模板") -} - -/// `GET /api/permission/Organize/ImportPreview`(官方 `OrganizeController.java:464`)。 -pub async fn organize_import_preview( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_ORGANIZE).await { - return resp; - } - fail(code::FAIL, "本仓未配置文件服务,暂不支持导入预览") -} - -/// `POST /api/permission/Organize/ExportExceptionData`(官方 `OrganizeController.java:475`)。 -pub async fn organize_export_exception_data( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_ORGANIZE).await { - return resp; - } - fail(code::FAIL, "本仓未配置文件服务,暂不支持导出异常报告") -} - -/// `GET /api/permission/Organize/ExportData`(官方 `OrganizeController.java:530`)。 -pub async fn organize_export_data( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_ORGANIZE).await { - return resp; - } - fail(code::FAIL, "本仓未配置文件服务,暂不支持导出") -} - -/// `GET /api/permission/Position/TemplateDownload`(官方 `PositionController.java:624`)。 -pub async fn position_template_download( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_POSITION).await { - return resp; - } - fail(code::FAIL, "本仓未配置文件服务,暂不支持下载导入模板") -} - -/// `GET /api/permission/Position/ImportPreview`(官方 `PositionController.java:650`)。 -pub async fn position_import_preview( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_POSITION).await { - return resp; - } - fail(code::FAIL, "本仓未配置文件服务,暂不支持导入预览") -} - -/// `POST /api/permission/Position/ExportExceptionData`(官方 `PositionController.java:661`)。 -pub async fn position_export_exception_data( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_POSITION).await { - return resp; - } - fail(code::FAIL, "本仓未配置文件服务,暂不支持导出异常报告") -} - -/// `GET /api/permission/Position/ExportData`(官方 `PositionController.java:716`)。 -pub async fn position_export_data( - State(state): State, - headers: HeaderMap, -) -> Json { - if let Err(resp) = guard(&state, &headers, EN_POSITION).await { - return resp; - } - fail(code::FAIL, "本仓未配置文件服务,暂不支持导出") -} - -// === PERMISSION RELATION (权限关系族) SECTION END === - -#[cfg(test)] -mod tests { - use super::*; - - fn headers_with(vue_version: Option<&str>) -> HeaderMap { - let mut headers = HeaderMap::new(); - if let Some(v) = vue_version { - headers.insert( - VUE_VERSION, - axum::http::HeaderValue::from_str(v).expect("头值必须是合法 ASCII"), - ); - } - headers - } - - /// 🔴 **判别规则只有一条**:头 `Vue-Version: 3` ⇒ 面 B;否则面 A。 - #[test] - fn discriminator_is_vue_version_header() { - assert!(is_face_b(&headers_with(Some("3")))); - assert!(!is_face_b(&headers_with(None))); - // 🔴 本仓前端也发 `App-Code` / `Jnpf-Origin` ⇒ **不能**拿它们当判据。 - let mut headers = headers_with(None); - headers.insert("app-code", axum::http::HeaderValue::from_static("mainSystem")); - headers.insert("jnpf-origin", axum::http::HeaderValue::from_static("pc")); - assert!(!is_face_b(&headers), "App-Code / Jnpf-Origin 绝不能当判别头"); - } - - /// 头值带空格也应识别(HTTP 头值两侧空白无意义)。 - #[test] - fn discriminator_ignores_surrounding_whitespace() { - assert!(is_face_b(&headers_with(Some(" 3 ")))); - } - - /// 头值不是 `3`(如 `2`)⇒ 不是面 B。 - #[test] - fn discriminator_rejects_other_values() { - assert!(!is_face_b(&headers_with(Some("2")))); - assert!(!is_face_b(&headers_with(Some("")))); - } - - /// 🔴 **官方 `PageListVO` 形状**:`{pagination:{currentPage,pageSize,total}, list:[…]}`。 - #[test] - fn page_list_vo_has_pagination_and_list() { - let v = page_list(2, 20, 42, vec![json!({"id": "u1"})]); - assert_eq!(v["pagination"]["currentPage"], 2); - assert_eq!(v["pagination"]["pageSize"], 20); - assert_eq!(v["pagination"]["total"], 42); - assert!(v["list"].is_array()); - assert_eq!(v["list"][0]["id"], "u1"); - } - - /// 🔴 **官方 `ListVO` 形状**:`{list:[…]}`(**只有** `list` 一个字段)。 - #[test] - fn list_vo_has_only_list() { - let v = list_vo(vec![json!({"id": "m1"})]); - assert!(v.get("list").is_some()); - assert!(v.get("pagination").is_none()); - assert_eq!(v.as_object().map(|o| o.len()), Some(1)); - } - - /// 分页参数:缺省 ⇒ 官方默认(`pageSize=20` / `currentPage=1`)。 - #[test] - fn paging_defaults_to_official_values() { - let raw = RawQuery(None); - let p = Paging::of(&raw); - assert_eq!(p.current_page, 1); - assert_eq!(p.page_size, 20); - assert_eq!(p.offset, 0); - } - - /// 分页参数:回显请求值;`pageSize=0` / 负数 ⇒ 夹到 1(不生成非法 SQL)。 - #[test] - fn paging_echoes_and_clamps() { - let raw = RawQuery(Some("currentPage=3&pageSize=5".to_string())); - let p = Paging::of(&raw); - assert_eq!(p.current_page, 3); - assert_eq!(p.page_size, 5); - assert_eq!(p.offset, 10); - - let raw = RawQuery(Some("pageSize=0¤tPage=-1".to_string())); - let p = Paging::of(&raw); - assert_eq!(p.current_page, 1); - assert_eq!(p.page_size, 1); - } - - /// 🔴 **菜单节点必须齐 15 个官方字段**(`AllMenuSelectVO.java:12-50`)。 - #[test] - fn menu_node_has_all_15_official_keys() { - let row = MenuRow { - id: "m1".to_string(), - full_name: "用户管理".to_string(), - en_code: Some("permission.user".to_string()), - parent_id: "0".to_string(), - icon: None, - url_address: Some("system/User".to_string()), - page_address: None, - link_target: None, - menu_type: 2, - property_json: None, - sort_code: 2, - system_id: None, - is_data: false, - }; - let v = menu_value(row, Vec::new(), false); - for key in [ - "id", - "fullName", - "enCode", - "parentId", - "icon", - "hasChildren", - "urlAddress", - "pageAddress", - "linkTarget", - "children", - "type", - "propertyJson", - "sortCode", - "systemId", - "isData", - ] { - assert!(v.get(key).is_some(), "面 B 菜单节点必须含键 {key}"); - } - // 🔴 `systemId` 为 NULL ⇒ 兜底成本仓系统 id(单系统)。 - assert_eq!(v["systemId"], SYSTEM_ID); - assert_eq!(v["isData"], false); - assert_eq!(v["children"].as_array().map(|a| a.len()), Some(0)); - } - - /// `propertyJson`:空 ⇒ `null`;合法 JSON ⇒ 解析;非法 ⇒ `null`。 - #[test] - fn property_json_is_parsed_or_null() { - assert_eq!(parse_property_json(None), Value::Null); - assert_eq!(parse_property_json(Some(" ")), Value::Null); - assert_eq!(parse_property_json(Some("{\"a\":1}"))["a"], 1); - assert_eq!(parse_property_json(Some("not json")), Value::Null); - } - - /// 🔴 **`permissionList` 的 `modelId` 是菜单 id**(官方语义:`find(o => o.modelId === menuId)`)。 - #[test] - fn permission_list_model_id_is_menu_id() { - let rows = vec![MenuRow { - id: "m_user".to_string(), - full_name: "用户管理".to_string(), - en_code: Some("permission.user".to_string()), - parent_id: "m_sys".to_string(), - icon: None, - url_address: None, - page_address: None, - link_target: None, - menu_type: 2, - property_json: None, - sort_code: 2, - system_id: None, - is_data: false, - }]; - let list = build_permission_list(&rows); - assert_eq!(list.len(), 1); - assert_eq!(list[0]["modelId"], "m_user"); - assert_eq!(list[0]["moduleName"], "用户管理"); - for key in ["button", "column", "resource", "form"] { - assert_eq!(list[0][key].as_array().map(|a| a.len()), Some(0)); - } - } -} diff --git a/src/backend/src/platform/crud.rs b/src/backend/src/platform/crud.rs index 3957802..e1c24d8 100644 --- a/src/backend/src/platform/crud.rs +++ b/src/backend/src/platform/crud.rs @@ -50,11 +50,11 @@ use crate::platform::db::{self, pglite, pglite::ToSql, Db}; use crate::platform::envelope::{code, fail, ok, ActionResult}; use crate::platform::entity::{ColumnSpec, EntitySpec}; use crate::platform::ids::new_uuid; -use crate::platform::permission::has_en_code_permission; +use crate::platform::authorization::has_en_code_permission; use crate::platform::route::{HttpMethod, PackRoute, RouteAction, RouteGuard}; use crate::platform::session::TokenUser; use crate::platform::state::AppState; -use crate::platform::system; +use crate::platform::registry; /// `f_creator_user_id` 的兜底账号(**账号字符串,不是 uuid**)。 /// @@ -470,7 +470,7 @@ async fn guard_face_b( ) -> Result> { let user = require_login_face_b(state, headers).await?; let system_id = - system::resolve_system_id(&state.db, system::app_code_of(headers).as_deref()).await; + registry::resolve_system_id(&state.db, registry::app_code_of(headers).as_deref()).await; if has_en_code_permission(&state.db, &user.user_id, user.is_admin, en_code, &system_id).await { Ok(user) } else { diff --git a/src/backend/src/platform/mod.rs b/src/backend/src/platform/mod.rs index 67c303c..c028a7a 100644 --- a/src/backend/src/platform/mod.rs +++ b/src/backend/src/platform/mod.rs @@ -14,7 +14,9 @@ //! 业务侧靠 [`entity::EntitySpec`] 把这些**声明**给引擎,引擎只读声明。 pub mod auth; +pub mod authorization; pub mod cipher; +pub mod compat; pub mod config; pub mod crud; pub mod db; @@ -22,16 +24,14 @@ pub mod entity; pub mod envelope; pub mod guard; pub mod ids; -pub mod face_b; pub mod menu; pub mod monitor; -pub mod permission; +pub mod registry; pub mod route; pub mod seed; pub mod session; pub mod state; pub mod sys; -pub mod system; pub mod variate_catalog; /// 测试共享的 pglite 实例(进程级全局单例 ⇒ 所有单测共用,**禁止**各自 `open_temp`)。 diff --git a/src/backend/src/platform/system.rs b/src/backend/src/platform/registry.rs similarity index 92% rename from src/backend/src/platform/system.rs rename to src/backend/src/platform/registry.rs index fca33a1..a0d1bf7 100644 --- a/src/backend/src/platform/system.rs +++ b/src/backend/src/platform/registry.rs @@ -1,13 +1,17 @@ -//! system —— **多应用 / 多子系统**的注册表与路由(平台层)。 +//! registry —— **多应用 / 多子系统**的注册表与路由(平台层)。 //! //! 契约:`docs/contract.md` §8.7(多应用)+ 官方 JNPF `base_system` / `App-Code`。 //! +//! 🔴 **为什么叫 `registry` 而不是 `system`**:本仓的**契约面**按官方模块名组织 +//! (`compat/system.rs` = 官方面 B 的 system 端点集)。平台机制这一层要用 +//! **语义名**区分开 —— 它管的是「应用注册表」,不是「系统端点」。 +//! //! 🔴 **机制(按官方 JNPF 平台做成多应用)**: //! 1. **注册表** = `base_system` 表:每行一个应用,`f_en_code` 是该应用的 `App-Code`, //! `f_id` 即下游所有 `base_module.f_system_id` 引用的系统 id; //! 2. **路由** = 请求头 `App-Code` ⇒ [`app_code_of`] ⇒ [`resolve_system`] 解析出当前系统; //! 3. **隔离** = `base_module` / 权限判据全部按 `f_system_id` 过滤 -//! (见 [`crate::platform::permission`] / [`crate::platform::face_b::load_menus`])。 +//! (见 [`crate::platform::authorization`] / [`crate::platform::compat::helper::load_menus`])。 //! //! 🔴 **`App-Code` 不是契约判别头**:判别「面 A / 面 B」只看 `Vue-Version: 3` //! (`JNPF_COMPAT_SURFACE.md` §2.2)。`App-Code` 只选「当前应用」,且本仓前端 @@ -102,7 +106,7 @@ pub async fn resolve_system_id(db: &Db, app_code: Option<&str>) -> String { mod tests { use super::*; use crate::bootstrap; - use crate::platform::permission::{self, MenuNode}; + use crate::platform::authorization::{self, MenuNode}; use crate::platform::test_support; /// 多应用:注册表解析 + 菜单按系统隔离。 @@ -160,7 +164,7 @@ mod tests { // `m_sys` 下 ⇒ 主系统的根节点比节点总数少。隔离断言必须用**展平集合**判断。 // 🔴 这里**不写死业务菜单条数**(否则每加一个业务模块就得改平台层 ⇒ 违反 // 「加模块只碰业务层」)⇒ 只钉「5 条内置必须在、且不含异系统菜单」。 - let main_menus = permission::build_menu_list(&db, "admin", 1, MAIN_SYSTEM_ID).await; + let main_menus = authorization::build_menu_list(&db, "admin", 1, MAIN_SYSTEM_ID).await; let main_ids = flat_ids(&main_menus); for builtin in ["m_sys", "m_user", "m_role", "m_org", "m_menu"] { assert!( @@ -178,7 +182,7 @@ mod tests { "主系统不应含 app-b 的菜单(隔离被破坏)" ); // app-b 系统:只含它自己的 1 条菜单(展平后仍是 1 个节点)。 - let appb_menus = permission::build_menu_list(&db, "admin", 1, "app-b").await; + let appb_menus = authorization::build_menu_list(&db, "admin", 1, "app-b").await; let appb_ids = flat_ids(&appb_menus); assert_eq!(appb_ids.len(), 1, "app-b 系统应只有 1 个菜单节点"); assert_eq!(appb_ids[0], "m_appb_x"); diff --git a/src/backend/src/platform/seed.rs b/src/backend/src/platform/seed.rs index e5cb9a9..ee3a4c0 100644 --- a/src/backend/src/platform/seed.rs +++ b/src/backend/src/platform/seed.rs @@ -28,7 +28,7 @@ use crate::platform::cipher::md5_hex; use crate::platform::db::{pglite, pglite::ToSql, Db}; use crate::platform::ids::new_uuid; use crate::platform::menu::MenuSpec; -use crate::platform::system; +use crate::platform::registry; /// 内置 admin 账号名(同时用作种子的 `f_creator_user_id`)。 const ADMIN_ACCOUNT: &str = "admin"; @@ -77,7 +77,7 @@ const BUILTIN_MENUS: [MenuSpec; 5] = [ menu_type: 1, icon: Some("setting"), sort_code: 1, - system_en_code: system::MAIN_SYSTEM_CODE, + system_en_code: registry::MAIN_SYSTEM_CODE, }, MenuSpec { id: "m_user", @@ -88,7 +88,7 @@ const BUILTIN_MENUS: [MenuSpec; 5] = [ menu_type: 2, icon: None, sort_code: 2, - system_en_code: system::MAIN_SYSTEM_CODE, + system_en_code: registry::MAIN_SYSTEM_CODE, }, MenuSpec { id: "m_role", @@ -99,7 +99,7 @@ const BUILTIN_MENUS: [MenuSpec; 5] = [ menu_type: 2, icon: None, sort_code: 3, - system_en_code: system::MAIN_SYSTEM_CODE, + system_en_code: registry::MAIN_SYSTEM_CODE, }, MenuSpec { id: "m_org", @@ -110,7 +110,7 @@ const BUILTIN_MENUS: [MenuSpec; 5] = [ menu_type: 2, icon: None, sort_code: 4, - system_en_code: system::MAIN_SYSTEM_CODE, + system_en_code: registry::MAIN_SYSTEM_CODE, }, MenuSpec { id: "m_menu", @@ -121,7 +121,7 @@ const BUILTIN_MENUS: [MenuSpec; 5] = [ menu_type: 2, icon: None, sort_code: 5, - system_en_code: system::MAIN_SYSTEM_CODE, + system_en_code: registry::MAIN_SYSTEM_CODE, }, ]; @@ -188,7 +188,7 @@ pub async fn ensure_base(db: &Db, extra_menus: &[MenuSpec]) -> Result<(), pglite pub async fn ensure_systems(db: &Db, now: &str) -> Result<(), pglite::Error> { // (id, en_code = App-Code, full_name, f_is_main, description) const BUILTIN_SYSTEMS: [(&str, &str, &str, i32, &str); 2] = [ - (system::MAIN_SYSTEM_ID, system::MAIN_SYSTEM_CODE, "系统平台", 1, "主系统"), + (registry::MAIN_SYSTEM_ID, registry::MAIN_SYSTEM_CODE, "系统平台", 1, "主系统"), ("app-b", "app-b", "演示应用B", 0, "第二个应用(无菜单,用于验证隔离)"), ]; for (id, en_code, full_name, is_main, description) in BUILTIN_SYSTEMS { @@ -720,14 +720,14 @@ async fn system_id_of(db: &Db, system_en_code: &str) -> String { Ok(r) => r, Err(e) => { eprintln!("[seed] 系统解析失败(按主系统处理): {e}"); - return system::MAIN_SYSTEM_ID.to_string(); + return registry::MAIN_SYSTEM_ID.to_string(); } }; rows.first() .and_then(|r| r["id"].as_str()) .filter(|s| !s.is_empty()) .map(str::to_string) - .unwrap_or_else(|| system::MAIN_SYSTEM_ID.to_string()) + .unwrap_or_else(|| registry::MAIN_SYSTEM_ID.to_string()) } /// 平台层自带菜单 + 业务层传入的菜单 = **本次要种的全部内置菜单**。 diff --git a/src/backend/src/routes.rs b/src/backend/src/routes.rs index 6d36222..b7ad5c0 100644 --- a/src/backend/src/routes.rs +++ b/src/backend/src/routes.rs @@ -41,7 +41,7 @@ use serde_json::{json, Value}; use crate::modules; use crate::platform::auth; use crate::platform::envelope::{self, ActionResult}; -use crate::platform::face_b; +use crate::platform::compat; use crate::platform::state::AppState; use crate::platform::sys; @@ -118,179 +118,179 @@ pub fn build_router(state: AppState) -> axum::Router { // 每个 `.route(path, (handler))` 的第一个方法调用;写成 // `get(a).post(b)` 会让 CC3 认为「契约写 POST、代码是 GET」。 // 同一路径多次 `.route()` 在 axum 里是**合并**(方法不冲突即可)。 - .route("/api/permission/Users", get(face_b::users_list)) - .route("/api/permission/Users", post(face_b::user_create)) - .route("/api/permission/Users/{id}", get(face_b::user_info)) - .route("/api/permission/Users/{id}", put(face_b::user_update)) - .route("/api/permission/Users/{id}", delete(face_b::user_delete)) + .route("/api/permission/Users", get(compat::permission::users_list)) + .route("/api/permission/Users", post(compat::permission::user_create)) + .route("/api/permission/Users/{id}", get(compat::helper::user_info)) + .route("/api/permission/Users/{id}", put(compat::permission::user_update)) + .route("/api/permission/Users/{id}", delete(compat::permission::user_delete)) .route( "/api/permission/Users/BatchDelete", - post(face_b::users_batch_delete), + post(compat::permission::users_batch_delete), ) .route( "/api/permission/Users/BatchUpdateState", - post(face_b::users_batch_update_state), + post(compat::permission::users_batch_update_state), ) .route( "/api/permission/Users/{id}/GetPosition", - get(face_b::user_get_position), + get(compat::permission::user_get_position), ) .route( "/api/permission/Users/{id}/Actions/ResetPassword", - post(face_b::user_reset_password), + post(compat::permission::user_reset_password), ) .route( "/api/permission/Users/{id}/Actions/unlock", - put(face_b::user_unlock), + put(compat::permission::user_unlock), ) // ---- 会话与前端启动(面 B):这两条是**打开第一个页面之前**就会被打的 ---- // 🔴 `Logout` 恒成功(前端把返回值包在 try/catch 里丢弃,但 404 会弹红条)。 - .route("/api/oauth/Logout", post(face_b::logout_handler)) + .route("/api/oauth/Logout", post(compat::core::logout_handler)) // 🔴 i18n 远端词条包:登录成功后立刻被 `locales/index.ts` 拉,缺了会炸整个 app。 - .route("/api/system/BaseLang/LangJson", get(face_b::base_lang_json)) + .route("/api/system/BaseLang/LangJson", get(compat::system::base_lang_json)) // ---- 用户分组(用户管理页左侧树)---- - .route("/api/permission/Group", get(face_b::group_list)) - .route("/api/permission/Group", post(face_b::group_create)) - .route("/api/permission/Group/{id}", get(face_b::group_info)) - .route("/api/permission/Group/{id}", put(face_b::group_update)) - .route("/api/permission/Group/{id}", delete(face_b::group_delete)) + .route("/api/permission/Group", get(compat::permission::group_list)) + .route("/api/permission/Group", post(compat::permission::group_create)) + .route("/api/permission/Group/{id}", get(compat::permission::group_info)) + .route("/api/permission/Group/{id}", put(compat::permission::group_update)) + .route("/api/permission/Group/{id}", delete(compat::permission::group_delete)) .route( "/api/permission/Group/{id}/Actions/AddUser", - post(face_b::group_add_user), + post(compat::permission::group_add_user), ) .route( "/api/permission/Group/{id}/Actions/DeleteUser", - post(face_b::group_remove_user), + post(compat::permission::group_remove_user), ) // ---- 岗位 / 交接 / 第三方 ---- // 🔴 `SetPositionBatch` 必须**单独注册**:挂在 `/Users/{id}` 上会被当 id 吃掉。 .route( "/api/permission/Users/SetPositionBatch", - post(face_b::users_set_position_batch), + post(compat::permission::users_set_position_batch), ) .route( "/api/permission/Users/workHandover", - post(face_b::users_work_handover), + post(compat::permission::users_work_handover), ) .route( "/api/permission/Users/{id}/SetPosition", - post(face_b::user_set_position), + post(compat::permission::user_set_position), ) .route( "/api/permission/Users/{id}/SelectorByUserPosId", - get(face_b::user_selector_by_pos_id), + get(compat::permission::user_selector_by_pos_id), ) - .route("/api/permission/Users/Selector", get(face_b::users_selector)) - .route("/api/permission/Users/getUserList", post(face_b::users_get_user_list)) - .route("/api/permission/Users/getSelectedList", post(face_b::users_get_selected_list)) - .route("/api/permission/Users/getSelectedUserList", post(face_b::users_get_selected_user_list)) - .route("/api/permission/Users/ReceiveUserList", get(face_b::users_receive_user_list)) - .route("/api/permission/Users/getAllPermission", get(face_b::users_get_all_permission)) - .route("/api/permission/Users/Authorize", get(face_b::users_authorize)) - .route("/api/permission/Authority/{kind}/{objectId}", get(face_b::authority_common_values)) - .route("/api/permission/Authority/{kind}/{objectId}", post(face_b::authority_common_update)) - .route("/api/permission/RoleRelation/roleList", get(face_b::role_relation_role_list)) - .route("/api/permission/RoleRelation/addRoles", post(face_b::role_relation_add_roles)) - .route("/api/permission/RoleRelation/deleteRoles", post(face_b::role_relation_delete_roles)) - .route("/api/permission/RoleRelation/delete", post(face_b::role_relation_delete)) - .route("/api/permission/UserRelation", post(face_b::user_relation_create)) - .route("/api/permission/UserRelation/delete", post(face_b::user_relation_delete)) - .route("/api/permission/UserRelation/userList", get(face_b::user_relation_user_list)) + .route("/api/permission/Users/Selector", get(compat::permission::users_selector)) + .route("/api/permission/Users/getUserList", post(compat::permission::users_get_user_list)) + .route("/api/permission/Users/getSelectedList", post(compat::permission::users_get_selected_list)) + .route("/api/permission/Users/getSelectedUserList", post(compat::permission::users_get_selected_user_list)) + .route("/api/permission/Users/ReceiveUserList", get(compat::permission::users_receive_user_list)) + .route("/api/permission/Users/getAllPermission", get(compat::permission::users_get_all_permission)) + .route("/api/permission/Users/Authorize", get(compat::permission::users_authorize)) + .route("/api/permission/Authority/{kind}/{objectId}", get(compat::permission::authority_common_values)) + .route("/api/permission/Authority/{kind}/{objectId}", post(compat::permission::authority_common_update)) + .route("/api/permission/RoleRelation/roleList", get(compat::permission::role_relation_role_list)) + .route("/api/permission/RoleRelation/addRoles", post(compat::permission::role_relation_add_roles)) + .route("/api/permission/RoleRelation/deleteRoles", post(compat::permission::role_relation_delete_roles)) + .route("/api/permission/RoleRelation/delete", post(compat::permission::role_relation_delete)) + .route("/api/permission/UserRelation", post(compat::permission::user_relation_create)) + .route("/api/permission/UserRelation/delete", post(compat::permission::user_relation_delete)) + .route("/api/permission/UserRelation/userList", get(compat::permission::user_relation_user_list)) .route( "/api/system/System/getDevUser", - get(face_b::system_get_dev_user), + get(compat::system::system_get_dev_user), ) // ---- 应用中心(官方 `SystemController.java`)---- // 🔴 一条 `.route()` 只挂一个方法(契约扫描器只看第一个方法)。 - .route("/api/system/System", get(face_b::system_list)) - .route("/api/system/System", post(face_b::system_create)) - .route("/api/system/System/Selector", get(face_b::system_selector)) + .route("/api/system/System", get(compat::system::system_list)) + .route("/api/system/System", post(compat::system::system_create)) + .route("/api/system/System/Selector", get(compat::system::system_selector)) .route( "/api/system/System/userAuthList", - get(face_b::system_user_auth_list), + get(compat::system::system_user_auth_list), ) .route( "/api/system/System/actionTop", - post(face_b::system_action_top), + post(compat::system::system_action_top), ) .route( "/api/system/System/getAppAuthorization/{id}", - get(face_b::system_app_auth_get), + get(compat::system::system_app_auth_get), ) .route( "/api/system/System/saveAppAuthorization", - post(face_b::system_app_auth_save), + post(compat::system::system_app_auth_save), ) .route( "/api/system/System/changeAppAuthorization", - post(face_b::system_app_auth_change), + post(compat::system::system_app_auth_change), ) - .route("/api/system/System/{id}", get(face_b::system_info)) - .route("/api/system/System/{id}", put(face_b::system_update)) - .route("/api/system/System/{id}", delete(face_b::system_delete)) + .route("/api/system/System/{id}", get(compat::system::system_info)) + .route("/api/system/System/{id}", put(compat::system::system_update)) + .route("/api/system/System/{id}", delete(compat::system::system_delete)) .route( "/api/system/System/{id}/Actions/Copy", - post(face_b::system_copy), + post(compat::system::system_copy), ) .route( "/api/system/System/preferenceSave/{id}", - post(face_b::system_preference_save), + post(compat::system::system_preference_save), ) // ---- 标签(应用中心页一进来就拉 selector)---- - .route("/api/system/Tag", get(face_b::tag_list)) - .route("/api/system/Tag", post(face_b::tag_create)) - .route("/api/system/Tag/selector", get(face_b::tag_selector)) - .route("/api/system/Tag/{id}", get(face_b::tag_info)) - .route("/api/system/Tag/{id}", put(face_b::tag_update)) - .route("/api/system/Tag/{id}", delete(face_b::tag_delete)) + .route("/api/system/Tag", get(compat::system::tag_list)) + .route("/api/system/Tag", post(compat::system::tag_create)) + .route("/api/system/Tag/selector", get(compat::system::tag_selector)) + .route("/api/system/Tag/{id}", get(compat::system::tag_info)) + .route("/api/system/Tag/{id}", put(compat::system::tag_update)) + .route("/api/system/Tag/{id}", delete(compat::system::tag_delete)) // ---- 消息业务分类(消息记录页左侧两级页签 + 公告类型下拉)---- .route( "/api/system/BusinessCategory", - get(face_b::business_category_list), + get(compat::system::business_category_list), ) .route( "/api/system/BusinessCategory", - post(face_b::business_category_create), + post(compat::system::business_category_create), ) .route( "/api/system/BusinessCategory/treeList", - get(face_b::business_category_tree_list), + get(compat::system::business_category_tree_list), ) .route( "/api/system/BusinessCategory/selector", - get(face_b::business_category_selector), + get(compat::system::business_category_selector), ) .route( "/api/system/BusinessCategory/{id}", - get(face_b::business_category_info), + get(compat::system::business_category_info), ) .route( "/api/system/BusinessCategory/{id}", - put(face_b::business_category_update), + put(compat::system::business_category_update), ) .route( "/api/system/BusinessCategory/{id}", - delete(face_b::business_category_delete), + delete(compat::system::business_category_delete), ) // ---- 站内消息(消息记录页 / 首页铃铛)---- - .route("/api/message", get(face_b::message_list)) - .route("/api/message/Actions/ReadAll", post(face_b::message_read_all)) - .route("/api/message/ReadInfo/{id}", get(face_b::message_read_info)) - .route("/api/message/Record", delete(face_b::message_record_delete)) - .route("/api/message/Reply/{id}", post(face_b::message_reply)) + .route("/api/message", get(compat::message::message_list)) + .route("/api/message/Actions/ReadAll", post(compat::message::message_read_all)) + .route("/api/message/ReadInfo/{id}", get(compat::message::message_read_info)) + .route("/api/message/Record", delete(compat::message::message_record_delete)) + .route("/api/message/Reply/{id}", post(compat::message::message_reply)) // ---- 系统公告(公告管理页)---- - .route("/api/message/Notice/List", post(face_b::notice_list)) - .route("/api/message/Notice", post(face_b::notice_create)) - .route("/api/message/Notice/{id}", get(face_b::notice_info)) - .route("/api/message/Notice/{id}", put(face_b::notice_update)) - .route("/api/message/Notice/{id}", delete(face_b::notice_delete)) + .route("/api/message/Notice/List", post(compat::message::notice_list)) + .route("/api/message/Notice", post(compat::message::notice_create)) + .route("/api/message/Notice/{id}", get(compat::message::notice_info)) + .route("/api/message/Notice/{id}", put(compat::message::notice_update)) + .route("/api/message/Notice/{id}", delete(compat::message::notice_delete)) .route( "/api/message/Notice/{id}/Actions/Release", - put(face_b::notice_release), + put(compat::message::notice_release), ) .route( "/api/message/Notice/{id}/ReplyUserList", - get(face_b::notice_reply_user_list), + get(compat::message::notice_reply_user_list), ) // ---- 系统日志(sysLog 四个页面 + 个人中心登录日志)---- // 🔴 `Log/deleteLoginLog` / `Log/ModuleName` 是静态段,matchit 里**优先于** @@ -298,89 +298,89 @@ pub fn build_router(state: AppState) -> axum::Router { // 🔴 `/Log/{id}` 上同时挂 GET(详情)与 DELETE(按分类一键清空)—— // 官方也是这么复用的(`@DeleteMapping("/{type}")` + `@GetMapping("/{id}")`), // 段名必须统一写 `{id}`(matchit 不允许同一位置两个不同的参数名)。 - .route("/api/system/Log", get(face_b::log_list)) - .route("/api/system/Log", delete(face_b::log_delete)) - .route("/api/system/Log/deleteLoginLog", delete(face_b::log_clear_login)) - .route("/api/system/Log/ModuleName", get(face_b::log_module_name)) - .route("/api/system/Log/{id}", delete(face_b::log_clear)) - .route("/api/system/Log/{id}", get(face_b::log_info)) + .route("/api/system/Log", get(compat::system::log_list)) + .route("/api/system/Log", delete(compat::system::log_delete)) + .route("/api/system/Log/deleteLoginLog", delete(compat::system::log_clear_login)) + .route("/api/system/Log/ModuleName", get(compat::system::log_module_name)) + .route("/api/system/Log/{id}", delete(compat::system::log_clear)) + .route("/api/system/Log/{id}", get(compat::system::log_info)) // ---- 审批常用语(模板中心 / 常用语)---- - .route("/api/system/CommonWords", get(face_b::common_words_list)) - .route("/api/system/CommonWords", post(face_b::common_words_create)) + .route("/api/system/CommonWords", get(compat::system::common_words_list)) + .route("/api/system/CommonWords", post(compat::system::common_words_create)) .route( "/api/system/CommonWords/Selector", - get(face_b::common_words_selector), + get(compat::system::common_words_selector), ) .route( "/api/system/CommonWords/UsesNum", - post(face_b::common_words_uses_num), + post(compat::system::common_words_uses_num), ) .route( "/api/system/CommonWords/{id}", - get(face_b::common_words_info), + get(compat::system::common_words_info), ) .route( "/api/system/CommonWords/{id}", - put(face_b::common_words_update), + put(compat::system::common_words_update), ) .route( "/api/system/CommonWords/{id}", - delete(face_b::common_words_delete), + delete(compat::system::common_words_delete), ) // ---- 单据规则(模板中心 / 单据规则 + 各种「自动单号」)---- - .route("/api/system/BillRule", get(face_b::bill_rule_list)) - .route("/api/system/BillRule", post(face_b::bill_rule_create)) + .route("/api/system/BillRule", get(compat::system::bill_rule_list)) + .route("/api/system/BillRule", post(compat::system::bill_rule_create)) .route( "/api/system/BillRule/Selector", - get(face_b::bill_rule_selector), + get(compat::system::bill_rule_selector), ) .route( "/api/system/BillRule/BillNumber/{enCode}", - get(face_b::bill_rule_number), + get(compat::system::bill_rule_number), ) .route( "/api/system/BillRule/Actions/Import", - post(face_b::bill_rule_import), + post(compat::system::bill_rule_import), ) - .route("/api/system/BillRule/{id}", get(face_b::bill_rule_info)) - .route("/api/system/BillRule/{id}", put(face_b::bill_rule_update)) + .route("/api/system/BillRule/{id}", get(compat::system::bill_rule_info)) + .route("/api/system/BillRule/{id}", put(compat::system::bill_rule_update)) .route( "/api/system/BillRule/{id}", - delete(face_b::bill_rule_delete), + delete(compat::system::bill_rule_delete), ) .route( "/api/system/BillRule/{id}/Actions/State", - put(face_b::bill_rule_state), + put(compat::system::bill_rule_state), ) .route( "/api/system/BillRule/{id}/Actions/Export", - get(face_b::bill_rule_export), + get(compat::system::bill_rule_export), ) // ---- 数据连接(官方 `DbLinkController`,路由前缀 `DataSource`)---- // 🔴 `Selector` / `getGroup` 是**静态段**,`{id}` 是参数段 —— matchit 静态优先, // 两者不冲突(`/DataSource/getGroup` 不会被 `/DataSource/{id}` 抢走)。 - .route("/api/system/DataSource", get(face_b::data_source_list)) - .route("/api/system/DataSource", post(face_b::data_source_create)) + .route("/api/system/DataSource", get(compat::system::data_source_list)) + .route("/api/system/DataSource", post(compat::system::data_source_create)) .route( "/api/system/DataSource/Selector", - get(face_b::data_source_selector), + get(compat::system::data_source_selector), ) .route( "/api/system/DataSource/getGroup", - get(face_b::data_source_group), + get(compat::system::data_source_group), ) .route( "/api/system/DataSource/Actions/Test", - post(face_b::data_source_test), + post(compat::system::data_source_test), ) - .route("/api/system/DataSource/{id}", get(face_b::data_source_info)) + .route("/api/system/DataSource/{id}", get(compat::system::data_source_info)) .route( "/api/system/DataSource/{id}", - put(face_b::data_source_update), + put(compat::system::data_source_update), ) .route( "/api/system/DataSource/{id}", - delete(face_b::data_source_delete), + delete(compat::system::data_source_delete), ) // ---- 数据建模的查询面(官方 `DbTableController`,路由前缀 `DataModel`)---- // 🔴 `{linkId}` 一律**忽略**(本仓只有一个内置库);保留段位是为了让 @@ -392,601 +392,601 @@ pub fn build_router(state: AppState) -> axum::Router { // (`Overlapping method route`)⇒ create 不能另起一行。 .route( "/api/system/BasicDataType", - get(face_b::basic_data_type_list).post(face_b::basic_data_type_create), + get(compat::system::basic_data_type_list).post(compat::system::basic_data_type_create), ) .route( "/api/system/BasicDataType/{id}", - get(face_b::basic_data_type_info) - .put(face_b::basic_data_type_update) - .delete(face_b::basic_data_type_delete), + get(compat::system::basic_data_type_info) + .put(compat::system::basic_data_type_update) + .delete(compat::system::basic_data_type_delete), ) .route( "/api/system/DataTypeMapping", - get(face_b::data_type_mapping_list).post(face_b::data_type_mapping_create), + get(compat::system::data_type_mapping_list).post(compat::system::data_type_mapping_create), ) // 🔴 静态段 `getKeyList` 必须**先于**参数段 `/{id}` 注册的直觉仍然成立 // (axum/matchit 本身是静态优先,这里按可读性排)。 .route( "/api/system/DataTypeMapping/getKeyList", - get(face_b::data_type_mapping_key_list), + get(compat::system::data_type_mapping_key_list), ) .route( "/api/system/DataTypeMapping/{id}", - get(face_b::data_type_mapping_info) - .put(face_b::data_type_mapping_update) - .delete(face_b::data_type_mapping_delete), + get(compat::system::data_type_mapping_info) + .put(compat::system::data_type_mapping_update) + .delete(compat::system::data_type_mapping_delete), ) .route( "/api/system/DataBase", - get(face_b::data_base_list).post(face_b::data_base_create), + get(compat::system::data_base_list).post(compat::system::data_base_create), ) .route( "/api/system/DataBase/{id}", - get(face_b::data_base_info) - .put(face_b::data_base_update) - .delete(face_b::data_base_delete), + get(compat::system::data_base_info) + .put(compat::system::data_base_update) + .delete(compat::system::data_base_delete), ) .route( "/api/system/DataTypeRelation", - get(face_b::data_type_relation_list).post(face_b::data_type_relation_create), + get(compat::system::data_type_relation_list).post(compat::system::data_type_relation_create), ) .route( "/api/system/DataTypeRelation/{id}", - get(face_b::data_type_relation_info) - .put(face_b::data_type_relation_update) - .delete(face_b::data_type_relation_delete), + get(compat::system::data_type_relation_info) + .put(compat::system::data_type_relation_update) + .delete(compat::system::data_type_relation_delete), ) .route( "/api/system/CommonFields", - get(face_b::common_fields_list).post(face_b::common_fields_create), + get(compat::system::common_fields_list).post(compat::system::common_fields_create), ) .route( "/api/system/CommonFields/{id}", - get(face_b::common_fields_info) - .put(face_b::common_fields_update) - .delete(face_b::common_fields_delete), + get(compat::system::common_fields_info) + .put(compat::system::common_fields_update) + .delete(compat::system::common_fields_delete), ) // ---- 数据同步(四条一律明确拒绝:本仓无跨库能力,见 `face_b` 的注释)---- - .route("/api/system/DataSync", post(face_b::data_sync_check)) + .route("/api/system/DataSync", post(compat::system::data_sync_check)) .route( "/api/system/DataSync/Actions/checkDbLink", - post(face_b::data_sync_check_db_link), + post(compat::system::data_sync_check_db_link), ) .route( "/api/system/DataSync/Actions/Execute", - post(face_b::data_sync_execute), + post(compat::system::data_sync_execute), ) .route( "/api/system/DataSync/Actions/batchExecute", - post(face_b::data_sync_batch_execute), + post(compat::system::data_sync_batch_execute), ) .route( "/api/system/DataInterfaceVariate/Selector", - get(face_b::data_interface_variate_selector), + get(compat::system::data_interface_variate_selector), ) .route( "/api/system/DataModel/{linkId}/Tables", - get(face_b::data_model_tables), + get(compat::system::data_model_tables), ) .route( "/api/system/DataModel/{linkId}/TableAll", - get(face_b::data_model_table_all), + get(compat::system::data_model_table_all), ) .route( "/api/system/DataModel/{linkId}/Table/{tableName}", - get(face_b::data_model_info), + get(compat::system::data_model_info), ) .route( "/api/system/DataModel/{linkId}/Tables/{tableName}/Fields", - get(face_b::data_model_fields), + get(compat::system::data_model_fields), ) .route( "/api/system/DataModel/{linkId}/Tables/{tableName}/Fields/Selector", - get(face_b::data_model_fields_selector), + get(compat::system::data_model_fields_selector), ) .route( "/api/system/DataModel/{linkId}/Table/{tableName}/Preview", - get(face_b::data_model_preview), + get(compat::system::data_model_preview), ) // ---- 数据建模的写面(真 DDL:建表 / 改表 / 加字段 / 删表 / 复制)---- // 🔴 两条护栏在 handler 里:`db_ident` 标识符白名单 + `is_builtin_table` // (`schema.sql` 定义过的 35 张只给看,禁改禁删)。 .route( "/api/system/DataModel/{linkId}/Table", - post(face_b::data_model_create), + post(compat::system::data_model_create), ) .route( "/api/system/DataModel/{linkId}/Table", - put(face_b::data_model_update), + put(compat::system::data_model_update), ) .route( "/api/system/DataModel/{linkId}/addFields", - put(face_b::data_model_add_fields), + put(compat::system::data_model_add_fields), ) .route( "/api/system/DataModel/{linkId}/Table/{tableName}", - delete(face_b::data_model_delete), + delete(compat::system::data_model_delete), ) .route( "/api/system/DataModel/{linkId}/deleteAllTable", - delete(face_b::data_model_delete_all), + delete(compat::system::data_model_delete_all), ) .route( "/api/system/DataModel/{linkId}/Table/{tableName}/Actions/Copy", - post(face_b::data_model_copy), + post(compat::system::data_model_copy), ) .route( "/api/system/DataModel/{linkId}/Table/{tableName}/Actions/Export", - get(face_b::data_model_export), + get(compat::system::data_model_export), ) .route( "/api/system/DataModel/{linkId}/Actions/Import", - post(face_b::data_model_import), + post(compat::system::data_model_import), ) // ---- 数据集(官方 `DataSetController`)---- // 🔴 这是全仓**唯一**执行用户手写 SQL 的地方。三道护栏在 `dataset_sql_guard`: // 只放行 select/with、不许有分号、按词边界扫危险动词。 // 变量 `${xxx}` / `@xxx` 一律转 `$N` **绑定**,不拼文本。 - .route("/api/system/Dataset", get(face_b::dataset_list)) - .route("/api/system/Dataset", post(face_b::dataset_create)) - .route("/api/system/Dataset/getList", get(face_b::dataset_get_list)) - .route("/api/system/Dataset/previewSql", post(face_b::dataset_preview_sql)) - .route("/api/system/Dataset/fields", post(face_b::dataset_fields)) + .route("/api/system/Dataset", get(compat::system::dataset_list)) + .route("/api/system/Dataset", post(compat::system::dataset_create)) + .route("/api/system/Dataset/getList", get(compat::system::dataset_get_list)) + .route("/api/system/Dataset/previewSql", post(compat::system::dataset_preview_sql)) + .route("/api/system/Dataset/fields", post(compat::system::dataset_fields)) .route( "/api/system/Dataset/Actions/Import", - post(face_b::dataset_import), + post(compat::system::dataset_import), ) .route( "/api/system/Dataset/GetParam/{id}", - get(face_b::dataset_get_param), + get(compat::system::dataset_get_param), ) - .route("/api/system/Dataset/{id}", get(face_b::dataset_info)) - .route("/api/system/Dataset/{id}", put(face_b::dataset_update)) - .route("/api/system/Dataset/{id}", delete(face_b::dataset_delete)) - .route("/api/system/Dataset/{id}/get", get(face_b::dataset_des_get)) - .route("/api/system/Dataset/{id}/save", post(face_b::dataset_des_save)) + .route("/api/system/Dataset/{id}", get(compat::system::dataset_info)) + .route("/api/system/Dataset/{id}", put(compat::system::dataset_update)) + .route("/api/system/Dataset/{id}", delete(compat::system::dataset_delete)) + .route("/api/system/Dataset/{id}/get", get(compat::system::dataset_des_get)) + .route("/api/system/Dataset/{id}/save", post(compat::system::dataset_des_save)) .route( "/api/system/Dataset/{id}/Actions/Export", - get(face_b::dataset_export), + get(compat::system::dataset_export), ) .route( "/api/system/Dataset/{id}/Actions/Copy", - post(face_b::dataset_copy), + post(compat::system::dataset_copy), ) .route( "/api/system/Dataset/{id}/Actions/Preview", - post(face_b::dataset_preview), + post(compat::system::dataset_preview), ) .route( "/api/system/Dataset/{id}/Actions/List", - post(face_b::dataset_actions_list), + post(compat::system::dataset_actions_list), ) .route( "/api/system/Dataset/{id}/Actions/InfoByIds", - post(face_b::dataset_info_by_ids), + post(compat::system::dataset_info_by_ids), ) .route( "/api/system/Dataset/{id}/Actions/getRes", - post(face_b::dataset_get_res), + post(compat::system::dataset_get_res), ) // ---- 数据接口(官方 `DataInterfaceController.java`,权限 `dataCenter.dataService`)---- // 🔴 `Actions/Preview` 复用 Dataset 的 SQL 护栏 + 绑定引擎(`dataset_run`)。 - .route("/api/system/DataInterface", get(face_b::data_interface_list)) - .route("/api/system/DataInterface", post(face_b::data_interface_create)) + .route("/api/system/DataInterface", get(compat::system::data_interface_list)) + .route("/api/system/DataInterface", post(compat::system::data_interface_create)) .route( "/api/system/DataInterface/getList", - get(face_b::data_interface_get_list), + get(compat::system::data_interface_get_list), ) .route( "/api/system/DataInterface/GetParam/{id}", - get(face_b::data_interface_get_param), + get(compat::system::data_interface_get_param), ) - .route("/api/system/DataInterface/{id}", get(face_b::data_interface_info)) + .route("/api/system/DataInterface/{id}", get(compat::system::data_interface_info)) .route( "/api/system/DataInterface/{id}", - put(face_b::data_interface_update), + put(compat::system::data_interface_update), ) .route( "/api/system/DataInterface/{id}", - delete(face_b::data_interface_delete), + delete(compat::system::data_interface_delete), ) .route( "/api/system/DataInterface/{id}/get", - get(face_b::data_interface_get), + get(compat::system::data_interface_get), ) .route( "/api/system/DataInterface/{id}/save", - post(face_b::data_interface_save), + post(compat::system::data_interface_save), ) .route( "/api/system/DataInterface/{id}/Actions/Copy", - post(face_b::data_interface_copy), + post(compat::system::data_interface_copy), ) .route( "/api/system/DataInterface/{id}/Actions/Export", - get(face_b::data_interface_export), + get(compat::system::data_interface_export), ) .route( "/api/system/DataInterface/{id}/Actions/Preview", - post(face_b::data_interface_preview), + post(compat::system::data_interface_preview), ) // ---- 接口认证(官方 `InterfaceOauthController.java`,权限 `integrationCenter.openApi`)---- .route( "/api/system/InterfaceOauth", - get(face_b::interface_oauth_list), + get(compat::system::interface_oauth_list), ) .route( "/api/system/InterfaceOauth", - post(face_b::interface_oauth_create), + post(compat::system::interface_oauth_create), ) .route( "/api/system/InterfaceOauth/getAppId", - get(face_b::interface_oauth_get_app_id), + get(compat::system::interface_oauth_get_app_id), ) .route( "/api/system/InterfaceOauth/getInterfaceList", - post(face_b::interface_oauth_get_interface_list), + post(compat::system::interface_oauth_get_interface_list), ) .route( "/api/system/InterfaceOauth/dataInterfaceLog/{id}", - get(face_b::interface_oauth_data_interface_log), + get(compat::system::interface_oauth_data_interface_log), ) .route( "/api/system/InterfaceOauth/interfaceSelector", - get(face_b::interface_oauth_interface_selector), + get(compat::system::interface_oauth_interface_selector), ) .route( "/api/system/InterfaceOauth/SaveUserList", - post(face_b::interface_oauth_save_user_list), + post(compat::system::interface_oauth_save_user_list), ) .route( "/api/system/InterfaceOauth/{id}", - get(face_b::interface_oauth_info), + get(compat::system::interface_oauth_info), ) .route( "/api/system/InterfaceOauth/{id}", - put(face_b::interface_oauth_update), + put(compat::system::interface_oauth_update), ) .route( "/api/system/InterfaceOauth/{id}", - delete(face_b::interface_oauth_delete), + delete(compat::system::interface_oauth_delete), ) // ---- 打印模板(官方 `PrintDevController.java`,权限 `onlineDev.printDev`)---- // 🔴 打印渲染引擎不在本仓 ⇒ `Actions/Export` / `BatchData` 返回业务失败 400。 - .route("/api/system/printDev", get(face_b::print_dev_list)) - .route("/api/system/printDev", post(face_b::print_dev_create)) + .route("/api/system/printDev", get(compat::system::print_dev_list)) + .route("/api/system/printDev", post(compat::system::print_dev_create)) .route( "/api/system/printDev/Selector", - get(face_b::print_dev_selector), + get(compat::system::print_dev_selector), ) .route( "/api/system/printDev/WorkSelector", - get(face_b::print_dev_work_selector), + get(compat::system::print_dev_work_selector), ) .route( "/api/system/printDev/getListOptions", - post(face_b::print_dev_get_list_options), + post(compat::system::print_dev_get_list_options), ) - .route("/api/system/printDev/{id}", get(face_b::print_dev_info)) - .route("/api/system/printDev/{id}", put(face_b::print_dev_update)) + .route("/api/system/printDev/{id}", get(compat::system::print_dev_info)) + .route("/api/system/printDev/{id}", put(compat::system::print_dev_update)) .route( "/api/system/printDev/{id}", - delete(face_b::print_dev_delete), + delete(compat::system::print_dev_delete), ) .route( "/api/system/printDev/{id}/Actions/Copy", - post(face_b::print_dev_copy), + post(compat::system::print_dev_copy), ) .route( "/api/system/printDev/{id}/Actions/Export", - get(face_b::print_dev_export), + get(compat::system::print_dev_export), ) .route( "/api/system/printDev/{id}/Actions/Preview", - get(face_b::print_dev_preview), + get(compat::system::print_dev_preview), ) .route( "/api/system/printDev/BatchData", - post(face_b::print_dev_batch_data), + post(compat::system::print_dev_batch_data), ) - .route("/api/system/printDev/Save", post(face_b::print_dev_save)) + .route("/api/system/printDev/Save", post(compat::system::print_dev_save)) .route( "/api/system/printDev/Info/{id}", - get(face_b::print_dev_version_info), + get(compat::system::print_dev_version_info), ) .route( "/api/system/printDev/Version/{id}", - get(face_b::print_dev_version_list), + get(compat::system::print_dev_version_list), ) .route( "/api/system/printDev/Info/{id}", - post(face_b::print_dev_version_copy), + post(compat::system::print_dev_version_copy), ) .route( "/api/system/printDev/Info/{id}", - delete(face_b::print_dev_version_delete), + delete(compat::system::print_dev_version_delete), ) // ---- 电子签章(官方 `SignatureController.java`;官方**无** `@SaCheckPermission`)---- - .route("/api/system/Signature", get(face_b::signature_list)) - .route("/api/system/Signature", post(face_b::signature_create)) + .route("/api/system/Signature", get(compat::system::signature_list)) + .route("/api/system/Signature", post(compat::system::signature_create)) .route( "/api/system/Signature/Selector", - get(face_b::signature_selector), + get(compat::system::signature_selector), ) .route( "/api/system/Signature/ListByIds", - post(face_b::signature_list_by_ids), + post(compat::system::signature_list_by_ids), ) - .route("/api/system/Signature/{id}", get(face_b::signature_info)) - .route("/api/system/Signature/{id}", put(face_b::signature_update)) + .route("/api/system/Signature/{id}", get(compat::system::signature_info)) + .route("/api/system/Signature/{id}", put(compat::system::signature_update)) .route( "/api/system/Signature/{id}", - delete(face_b::signature_delete), + delete(compat::system::signature_delete), ) // ---- 按钮权限(官方 `ModuleButtonController.java`,权限 OR 两码)---- .route( "/api/system/ModuleButton", - post(face_b::module_button_create), + post(compat::system::module_button_create), ) .route( "/api/system/ModuleButton/selectActions/{menuId}", - post(face_b::module_button_select_actions), + post(compat::system::module_button_select_actions), ) .route( "/api/system/ModuleButton/{menuId}/List", - get(face_b::module_button_list), + get(compat::system::module_button_list), ) .route( "/api/system/ModuleButton/{menuId}/Selector", - get(face_b::module_button_selector), + get(compat::system::module_button_selector), ) - .route("/api/system/ModuleButton/{id}", get(face_b::module_button_info)) + .route("/api/system/ModuleButton/{id}", get(compat::system::module_button_info)) .route( "/api/system/ModuleButton/{id}", - put(face_b::module_button_update), + put(compat::system::module_button_update), ) .route( "/api/system/ModuleButton/{id}", - delete(face_b::module_button_delete), + delete(compat::system::module_button_delete), ) // ---- 列表权限(官方 `ModuleColumnController.java`)---- .route( "/api/system/ModuleColumn", - post(face_b::module_column_create), + post(compat::system::module_column_create), ) .route( "/api/system/ModuleColumn/Actions/Batch", - post(face_b::module_column_batch_create), + post(compat::system::module_column_batch_create), ) .route( "/api/system/ModuleColumn/{moduleId}/Fields", - get(face_b::module_column_list), + get(compat::system::module_column_list), ) - .route("/api/system/ModuleColumn/{id}", get(face_b::module_column_info)) + .route("/api/system/ModuleColumn/{id}", get(compat::system::module_column_info)) .route( "/api/system/ModuleColumn/{id}", - put(face_b::module_column_update), + put(compat::system::module_column_update), ) .route( "/api/system/ModuleColumn/{id}", - delete(face_b::module_column_delete), + delete(compat::system::module_column_delete), ) // ---- 表单权限(官方 `ModuleFormController.java`)---- - .route("/api/system/ModuleForm", post(face_b::module_form_create)) + .route("/api/system/ModuleForm", post(compat::system::module_form_create)) .route( "/api/system/ModuleForm/Actions/Batch", - post(face_b::module_form_batch_create), + post(compat::system::module_form_batch_create), ) .route( "/api/system/ModuleForm/{moduleId}/Fields", - get(face_b::module_form_list), + get(compat::system::module_form_list), ) - .route("/api/system/ModuleForm/{id}", get(face_b::module_form_info)) + .route("/api/system/ModuleForm/{id}", get(compat::system::module_form_info)) .route( "/api/system/ModuleForm/{id}", - put(face_b::module_form_update), + put(compat::system::module_form_update), ) .route( "/api/system/ModuleForm/{id}", - delete(face_b::module_form_delete), + delete(compat::system::module_form_delete), ) // ---- 高级查询方案(官方 `AdvancedQueryController.java`;官方**无** `@SaCheckPermission`)---- .route( "/api/system/AdvancedQuery", - post(face_b::advanced_query_create), + post(compat::system::advanced_query_create), ) .route( "/api/system/AdvancedQuery/{moduleId}/List", - get(face_b::advanced_query_list), + get(compat::system::advanced_query_list), ) .route( "/api/system/AdvancedQuery/{id}", - get(face_b::advanced_query_info), + get(compat::system::advanced_query_info), ) .route( "/api/system/AdvancedQuery/{id}", - put(face_b::advanced_query_update), + put(compat::system::advanced_query_update), ) .route( "/api/system/AdvancedQuery/{id}", - delete(face_b::advanced_query_delete), + delete(compat::system::advanced_query_delete), ) // ---- 数据权限三件套(官方 `ModuleDataAuthorize(Controller/Scheme/Link)Controller`)---- .route( "/api/system/ModuleDataAuthorize", - post(face_b::module_data_authorize_create), + post(compat::system::module_data_authorize_create), ) .route( "/api/system/ModuleDataAuthorize/{moduleId}/List", - get(face_b::module_data_authorize_list), + get(compat::system::module_data_authorize_list), ) .route( "/api/system/ModuleDataAuthorize/{moduleId}/FieldList", - get(face_b::module_data_authorize_field_list), + get(compat::system::module_data_authorize_field_list), ) - .route("/api/system/ModuleDataAuthorize/{id}", get(face_b::module_data_authorize_info)) + .route("/api/system/ModuleDataAuthorize/{id}", get(compat::system::module_data_authorize_info)) .route( "/api/system/ModuleDataAuthorize/{id}", - put(face_b::module_data_authorize_update), + put(compat::system::module_data_authorize_update), ) .route( "/api/system/ModuleDataAuthorize/{id}", - delete(face_b::module_data_authorize_delete), + delete(compat::system::module_data_authorize_delete), ) .route( "/api/system/ModuleDataAuthorizeScheme", - post(face_b::module_data_authorize_scheme_create), + post(compat::system::module_data_authorize_scheme_create), ) .route( "/api/system/ModuleDataAuthorizeScheme/{moduleId}/List", - get(face_b::module_data_authorize_scheme_list), + get(compat::system::module_data_authorize_scheme_list), ) .route( "/api/system/ModuleDataAuthorizeScheme/{id}", - get(face_b::module_data_authorize_scheme_info), + get(compat::system::module_data_authorize_scheme_info), ) .route( "/api/system/ModuleDataAuthorizeScheme/{id}", - put(face_b::module_data_authorize_scheme_update), + put(compat::system::module_data_authorize_scheme_update), ) .route( "/api/system/ModuleDataAuthorizeScheme/{id}", - delete(face_b::module_data_authorize_scheme_delete), + delete(compat::system::module_data_authorize_scheme_delete), ) .route( "/api/system/ModuleDataAuthorizeLink/saveLinkData", - post(face_b::module_data_authorize_link_save), + post(compat::system::module_data_authorize_link_save), ) .route( "/api/system/ModuleDataAuthorizeLink/getVisualTables/{menuId}/{type}", - get(face_b::module_data_authorize_link_visual_tables), + get(compat::system::module_data_authorize_link_visual_tables), ) .route( "/api/system/ModuleDataAuthorizeLink/getInfo/{menudId}/{type}", - get(face_b::module_data_authorize_link_info), + get(compat::system::module_data_authorize_link_info), ) .route( "/api/system/ModuleDataAuthorizeLink/{linkId}/Tables/{tableName}/Fields/{menuType}/{dataType}", - get(face_b::module_data_authorize_link_table_fields), + get(compat::system::module_data_authorize_link_table_fields), ) // ---- 系统配置 + 第三方同步(官方 `SysConfigController` / `SynThirdInfoController`)---- - .route("/api/system/SysConfig", get(face_b::sys_config_get)) - .route("/api/system/SysConfig", put(face_b::sys_config_update)) + .route("/api/system/SysConfig", get(compat::system::sys_config_get)) + .route("/api/system/SysConfig", put(compat::system::sys_config_update)) .route( "/api/system/SysConfig/socials", - get(face_b::sys_config_socials_get), + get(compat::system::sys_config_socials_get), ) .route( "/api/system/SysConfig/socials", - put(face_b::sys_config_socials_update), + put(compat::system::sys_config_socials_update), ) .route( "/api/system/SysConfig/getAdminList", - get(face_b::sys_config_admin_list), + get(compat::system::sys_config_admin_list), ) .route( "/api/system/SysConfig/setAdminList", - put(face_b::sys_config_admin_set), + put(compat::system::sys_config_admin_set), ) .route( "/api/system/SysConfig/{type}/testQyWebChatConnect", - post(face_b::sys_config_test_qy), + post(compat::system::sys_config_test_qy), ) .route( "/api/system/SysConfig/testDingTalkConnect", - post(face_b::sys_config_test_ding), + post(compat::system::sys_config_test_ding), ) - .route("/api/system/SynThirdInfo", post(face_b::syn_third_info_sync)) + .route("/api/system/SynThirdInfo", post(compat::system::syn_third_info_sync)) .route( "/api/system/SynThirdInfo/getSynThirdTotal/{type}", - get(face_b::syn_third_info_total), + get(compat::system::syn_third_info_total), ) .route( "/api/system/SynThirdInfo/clearAllSyn", - get(face_b::syn_third_info_clear), + get(compat::system::syn_third_info_clear), ) .route( "/api/system/SynThirdInfo/getHandleNum", - get(face_b::syn_third_info_handle_num), + get(compat::system::syn_third_info_handle_num), ) - .route("/api/permission/socials/{id}", delete(face_b::socials_delete)) + .route("/api/permission/socials/{id}", delete(compat::permission::socials_delete)) // ---- 前端每页都拉的公共接口(本仓无对应表 ⇒ 保守空形状,但必须是 200)---- .route( "/api/system/DictionaryData/All", - get(face_b::dictionary_data_all), + get(compat::system::dictionary_data_all), ) - .route("/api/system/DictionaryType", get(face_b::dict_type_list)) - .route("/api/system/DictionaryType", post(face_b::dict_type_create)) - .route("/api/system/DictionaryType/Selector/{id}", get(face_b::dict_type_selector)) - .route("/api/system/DictionaryType/{id}", get(face_b::dict_type_info)) - .route("/api/system/DictionaryType/{id}", put(face_b::dict_type_update)) - .route("/api/system/DictionaryType/{id}", delete(face_b::dict_type_delete)) - .route("/api/system/DictionaryData", post(face_b::dict_data_create)) - .route("/api/system/DictionaryData/{id}", get(face_b::dict_data_list)) - .route("/api/system/DictionaryData/{id}/Data/Selector", get(face_b::dict_data_selector)) - .route("/api/system/DictionaryData/{id}/Selector/{pid}", get(face_b::dict_data_selector_tree)) - .route("/api/system/DictionaryData/{id}/Info", get(face_b::dict_data_info)) - .route("/api/system/DictionaryData/{id}", put(face_b::dict_data_update)) - .route("/api/system/DictionaryData/{id}", delete(face_b::dict_data_delete)) - .route("/api/system/DictionaryData/{id}/Actions/Export", get(face_b::dict_data_export)) - .route("/api/system/HomeData", get(face_b::home_data)) + .route("/api/system/DictionaryType", get(compat::system::dict_type_list)) + .route("/api/system/DictionaryType", post(compat::system::dict_type_create)) + .route("/api/system/DictionaryType/Selector/{id}", get(compat::system::dict_type_selector)) + .route("/api/system/DictionaryType/{id}", get(compat::system::dict_type_info)) + .route("/api/system/DictionaryType/{id}", put(compat::system::dict_type_update)) + .route("/api/system/DictionaryType/{id}", delete(compat::system::dict_type_delete)) + .route("/api/system/DictionaryData", post(compat::system::dict_data_create)) + .route("/api/system/DictionaryData/{id}", get(compat::system::dict_data_list)) + .route("/api/system/DictionaryData/{id}/Data/Selector", get(compat::system::dict_data_selector)) + .route("/api/system/DictionaryData/{id}/Selector/{pid}", get(compat::system::dict_data_selector_tree)) + .route("/api/system/DictionaryData/{id}/Info", get(compat::system::dict_data_info)) + .route("/api/system/DictionaryData/{id}", put(compat::system::dict_data_update)) + .route("/api/system/DictionaryData/{id}", delete(compat::system::dict_data_delete)) + .route("/api/system/DictionaryData/{id}/Actions/Export", get(compat::system::dict_data_export)) + .route("/api/system/HomeData", get(compat::system::home_data)) .route( "/api/system/MenuData/useModuleNum/{id}", - post(face_b::menu_data_use_module_num), + post(compat::system::menu_data_use_module_num), ) // 🔴 登录**前**就会拉 ⇒ 不能挂守卫。 - .route("/api/oauth/getLoginConfig", get(face_b::get_login_config)) - .route("/api/oauth/getConfig/{account}", get(face_b::get_user_config)) - .route("/api/permission/Role", get(face_b::roles_list)) - .route("/api/permission/Role", post(face_b::role_create)) - .route("/api/permission/Role/Selector", get(face_b::role_selector)) - .route("/api/permission/Role/RoleCondition", post(face_b::role_condition)) - .route("/api/permission/Role/{id}", get(face_b::role_info)) - .route("/api/permission/Role/{id}", put(face_b::role_update)) - .route("/api/permission/Role/{id}", delete(face_b::role_delete)) - .route("/api/permission/Position", get(face_b::position_list)) - .route("/api/permission/Position", post(face_b::position_create)) - .route("/api/permission/Position/Selector", get(face_b::position_selector)) - .route("/api/permission/Position/SelectorTree", get(face_b::position_selector_tree)) - .route("/api/permission/Position/PositionCondition", post(face_b::position_condition)) - .route("/api/permission/Position/SelectedList", post(face_b::position_selected_list)) - .route("/api/permission/Position/{id}", get(face_b::position_info)) - .route("/api/permission/Position/{id}", put(face_b::position_update)) - .route("/api/permission/Position/{id}", delete(face_b::position_delete)) - .route("/api/permission/Position/{id}/Actions/DutyPosition", post(face_b::position_duty_position)) - .route("/api/permission/Position/{id}/Actions/DutyUser", post(face_b::position_duty_user)) - .route("/api/permission/Group/Selector", get(face_b::group_selector)) - .route("/api/permission/Organize/AsyncPosList", get(face_b::organize_async_pos_list)) + .route("/api/oauth/getLoginConfig", get(compat::core::get_login_config)) + .route("/api/oauth/getConfig/{account}", get(compat::core::get_user_config)) + .route("/api/permission/Role", get(compat::permission::roles_list)) + .route("/api/permission/Role", post(compat::permission::role_create)) + .route("/api/permission/Role/Selector", get(compat::permission::role_selector)) + .route("/api/permission/Role/RoleCondition", post(compat::permission::role_condition)) + .route("/api/permission/Role/{id}", get(compat::permission::role_info)) + .route("/api/permission/Role/{id}", put(compat::permission::role_update)) + .route("/api/permission/Role/{id}", delete(compat::permission::role_delete)) + .route("/api/permission/Position", get(compat::permission::position_list)) + .route("/api/permission/Position", post(compat::permission::position_create)) + .route("/api/permission/Position/Selector", get(compat::permission::position_selector)) + .route("/api/permission/Position/SelectorTree", get(compat::permission::position_selector_tree)) + .route("/api/permission/Position/PositionCondition", post(compat::permission::position_condition)) + .route("/api/permission/Position/SelectedList", post(compat::permission::position_selected_list)) + .route("/api/permission/Position/{id}", get(compat::permission::position_info)) + .route("/api/permission/Position/{id}", put(compat::permission::position_update)) + .route("/api/permission/Position/{id}", delete(compat::permission::position_delete)) + .route("/api/permission/Position/{id}/Actions/DutyPosition", post(compat::permission::position_duty_position)) + .route("/api/permission/Position/{id}/Actions/DutyUser", post(compat::permission::position_duty_user)) + .route("/api/permission/Group/Selector", get(compat::permission::group_selector)) + .route("/api/permission/Organize/AsyncPosList", get(compat::permission::organize_async_pos_list)) .route( "/api/permission/Organize/AsyncList/{id}", - get(face_b::organize_async_list), + get(compat::permission::organize_async_list), ) - .route("/api/permission/Organize", get(face_b::organize_list)) - .route("/api/permission/Organize", post(face_b::organize_create)) - .route("/api/permission/Organize/Selector", get(face_b::organize_selector)) - .route("/api/permission/Organize/{id}", get(face_b::organize_info)) - .route("/api/permission/Organize/{id}", put(face_b::organize_update)) - .route("/api/permission/Organize/{id}", delete(face_b::organize_delete)) - .route("/api/system/Menu/ModuleBySystem", get(face_b::module_by_system)) - .route("/api/system/Menu", post(face_b::menu_create)) - .route("/api/system/Menu/Selector/All", get(face_b::menu_selector_all)) - .route("/api/system/Menu/Selector/Form", get(face_b::menu_selector_form)) - .route("/api/system/Menu/Selector/Page", get(face_b::menu_selector_page)) - .route("/api/system/Menu/getSystemMenu", get(face_b::menu_get_system_menu)) - .route("/api/system/Menu/{id}", get(face_b::menu_info)) - .route("/api/system/Menu/{id}", put(face_b::menu_update)) - .route("/api/system/Menu/{id}", delete(face_b::menu_delete)) - .route("/api/system/Menu/{id}/Actions/Export", get(face_b::menu_export)) - .route("/api/system/Menu/getPermissionGroup/{id}", get(face_b::menu_permission_group)) - .route("/api/system/Menu/getPermission/{id}/{permissionId}", get(face_b::menu_permission_info)) - .route("/api/system/Menu/Selector/{id}", get(face_b::menu_selector)) - .route("/api/system/Menu/SelectorFilter/{id}", get(face_b::menu_selector_filter)) + .route("/api/permission/Organize", get(compat::permission::organize_list)) + .route("/api/permission/Organize", post(compat::permission::organize_create)) + .route("/api/permission/Organize/Selector", get(compat::permission::organize_selector)) + .route("/api/permission/Organize/{id}", get(compat::permission::organize_info)) + .route("/api/permission/Organize/{id}", put(compat::permission::organize_update)) + .route("/api/permission/Organize/{id}", delete(compat::permission::organize_delete)) + .route("/api/system/Menu/ModuleBySystem", get(compat::system::module_by_system)) + .route("/api/system/Menu", post(compat::system::menu_create)) + .route("/api/system/Menu/Selector/All", get(compat::system::menu_selector_all)) + .route("/api/system/Menu/Selector/Form", get(compat::system::menu_selector_form)) + .route("/api/system/Menu/Selector/Page", get(compat::system::menu_selector_page)) + .route("/api/system/Menu/getSystemMenu", get(compat::system::menu_get_system_menu)) + .route("/api/system/Menu/{id}", get(compat::system::menu_info)) + .route("/api/system/Menu/{id}", put(compat::system::menu_update)) + .route("/api/system/Menu/{id}", delete(compat::system::menu_delete)) + .route("/api/system/Menu/{id}/Actions/Export", get(compat::system::menu_export)) + .route("/api/system/Menu/getPermissionGroup/{id}", get(compat::system::menu_permission_group)) + .route("/api/system/Menu/getPermission/{id}/{permissionId}", get(compat::system::menu_permission_info)) + .route("/api/system/Menu/Selector/{id}", get(compat::system::menu_selector)) + .route("/api/system/Menu/SelectorFilter/{id}", get(compat::system::menu_selector_filter)) // 🔴 官方是 `POST /api/permission/Authority/Data/{objectId}/Values` // —— 与面 A 的 `PUT .../Data/{objectId}` **同前缀不同方法不同路径** // ⇒ matchit 0.8.4 允许「静态段跟在参数节点后」⇒ 两条可共存。 .route( "/api/permission/Authority/Data/{objectId}/Values", - post(face_b::authority_values), + post(compat::permission::authority_values), ) // ---- 个人设置(`permission/Users/Current/*`)---- // 🔴 **必须内联 `require_login_face_b(&state, &headers)`**(不抽辅助函数): @@ -997,147 +997,147 @@ pub fn build_router(state: AppState) -> axum::Router { // (后者是静态段更具体 ⇒ 优先匹配)。 .route( "/api/permission/Users/Current/BaseInfo", - get(face_b::self_base_info), + get(compat::permission::self_base_info), ) .route( "/api/permission/Users/Current/BaseInfo", - put(face_b::self_update_base_info), + put(compat::permission::self_update_base_info), ) .route( "/api/permission/Users/Current/Avatar", - put(face_b::self_update_avatar), + put(compat::permission::self_update_avatar), ) .route( "/api/permission/Users/Current/SystemTheme", - put(face_b::self_update_theme), + put(compat::permission::self_update_theme), ) .route( "/api/permission/Users/Current/SystemLanguage", - put(face_b::self_update_language), + put(compat::permission::self_update_language), ) .route( "/api/permission/Users/Current/Actions/ModifyPassword", - post(face_b::self_modify_password), + post(compat::permission::self_modify_password), ) .route( "/api/permission/Users/Current/Subordinate/{id}", - get(face_b::self_subordinate), + get(compat::permission::self_subordinate), ) .route( "/api/permission/Users/Current/SystemLog", - get(face_b::self_system_log), + get(compat::permission::self_system_log), ) .route( "/api/permission/Users/Current/getUserOrganizes", - get(face_b::self_organizes), + get(compat::permission::self_organizes), ) .route( "/api/permission/Users/Current/getUserPositions", - get(face_b::self_positions), + get(compat::permission::self_positions), ) .route( "/api/permission/Users/Current/getUserRoles", - get(face_b::self_roles), + get(compat::permission::self_roles), ) - .route("/api/permission/Users/Current/major", put(face_b::self_major)) + .route("/api/permission/Users/Current/major", put(compat::permission::self_major)) .route( "/api/permission/Users/Current/SignImg", - get(face_b::self_sign_list), + get(compat::permission::self_sign_list), ) .route( "/api/permission/Users/Current/SignImg", - post(face_b::self_sign_create), + post(compat::permission::self_sign_create), ) .route( "/api/permission/Users/Current/{id}/SignImg", - delete(face_b::self_sign_delete), + delete(compat::permission::self_sign_delete), ) .route( "/api/permission/Users/Current/{id}/SignImg", - put(face_b::self_sign_default), + put(compat::permission::self_sign_default), ) .route( "/api/permission/Users/Current/getAppSecret", - get(face_b::self_get_app_secret), + get(compat::permission::self_get_app_secret), ) .route( "/api/permission/Users/Current/saveAppSecret", - put(face_b::self_save_app_secret), + put(compat::permission::self_save_app_secret), ) .route( "/api/permission/Users/Current/saasList", - get(face_b::self_saas_list), + get(compat::permission::self_saas_list), ) .route( "/api/permission/Users/Current/saasinfo", - get(face_b::self_saas_info), + get(compat::permission::self_saas_info), ) .route( "/api/permission/Users/Current/saasTenantName/{id}", - get(face_b::self_saas_tenant_name), + get(compat::permission::self_saas_tenant_name), ) .route( "/api/permission/Users/Current/saasjoin", - post(face_b::self_saas_join), + post(compat::permission::self_saas_join), ) .route( "/api/permission/Users/Current/{id}/saas", - delete(face_b::self_saas_exit), + delete(compat::permission::self_saas_exit), ) // ---- 身份管理(`permission/Standing`)---- // // 🔴 **一条 `.route()` 只挂一个方法**(`check-contract-scan.py` 只解析第一个 // 方法调用)⇒ 同路径的多方法必须写成**多条** `.route()`(axum 会合并)。 - .route("/api/permission/Standing", get(face_b::standing_list)) - .route("/api/permission/Standing", post(face_b::standing_create)) - .route("/api/permission/Standing/list", get(face_b::standing_relation_list)) - .route("/api/permission/Standing/{id}", get(face_b::standing_info)) - .route("/api/permission/Standing/{id}", put(face_b::standing_update)) - .route("/api/permission/Standing/{id}", delete(face_b::standing_delete)) + .route("/api/permission/Standing", get(compat::permission::standing_list)) + .route("/api/permission/Standing", post(compat::permission::standing_create)) + .route("/api/permission/Standing/list", get(compat::permission::standing_relation_list)) + .route("/api/permission/Standing/{id}", get(compat::permission::standing_info)) + .route("/api/permission/Standing/{id}", put(compat::permission::standing_update)) + .route("/api/permission/Standing/{id}", delete(compat::permission::standing_delete)) .route( "/api/permission/Standing/{id}/Actions/AddObject", - post(face_b::standing_add_object), + post(compat::permission::standing_add_object), ) .route( "/api/permission/Standing/{id}/Actions/DeleteObject", - post(face_b::standing_delete_object), + post(compat::permission::standing_delete_object), ) // ---- 权限组(`permission/PermissionGroup`)---- - .route("/api/permission/PermissionGroup", get(face_b::permission_group_list)) + .route("/api/permission/PermissionGroup", get(compat::permission::permission_group_list)) .route( "/api/permission/PermissionGroup", - post(face_b::permission_group_create), + post(compat::permission::permission_group_create), ) .route( "/api/permission/PermissionGroup/PermissionMember/{id}", - get(face_b::permission_group_member_list), + get(compat::permission::permission_group_member_list), ) .route( "/api/permission/PermissionGroup/PermissionMember/{id}", - post(face_b::permission_group_member_save), + post(compat::permission::permission_group_member_save), ) .route( "/api/permission/PermissionGroup/{id}", - get(face_b::permission_group_info), + get(compat::permission::permission_group_info), ) .route( "/api/permission/PermissionGroup/{id}", - put(face_b::permission_group_update), + put(compat::permission::permission_group_update), ) .route( "/api/permission/PermissionGroup/{id}", - delete(face_b::permission_group_delete), + delete(compat::permission::permission_group_delete), ) .route( "/api/permission/PermissionGroup/{id}/Actions/Copy", - post(face_b::permission_group_copy), + post(compat::permission::permission_group_copy), ) // ---- 动作管理(`permission/Action`)---- - .route("/api/permission/Action", get(face_b::action_list)) - .route("/api/permission/Action", post(face_b::action_create)) - .route("/api/permission/Action/{id}", get(face_b::action_info)) - .route("/api/permission/Action/{id}", put(face_b::action_update)) - .route("/api/permission/Action/{id}", delete(face_b::action_delete)) + .route("/api/permission/Action", get(compat::permission::action_list)) + .route("/api/permission/Action", post(compat::permission::action_create)) + .route("/api/permission/Action/{id}", get(compat::permission::action_info)) + .route("/api/permission/Action/{id}", put(compat::permission::action_update)) + .route("/api/permission/Action/{id}", delete(compat::permission::action_delete)) // ---- 行政区划(`system/Area`,`base_province`)---- // 🔴 官方 `AreaController` 是**树 + 懒加载**:`GET /{nodeId}` 返回该节点的 // 直接子节点(扁平 + `isLeaf`/`hasChildren`),不是嵌套树。 @@ -1148,32 +1148,32 @@ pub fn build_router(state: AppState) -> axum::Router { // URL 本身不受影响(参数名只是占位符),契约 `[ENDPOINT]` 同步写 `{id}`; // 官方台账 `[OFFICIAL]` 保留 `{nodeId}`,CC10 会把参数归一后对账。 // 🔴 `GetAreaByIds` 与 `/{id}` 同层:静态段优先于参数段,方法也不同(POST vs GET)。 - .route("/api/system/Area/{id}", get(face_b::area_list)) + .route("/api/system/Area/{id}", get(compat::system::area_list)) .route( "/api/system/Area/{id}/Selector/{ids}", - get(face_b::area_selector), + get(compat::system::area_selector), ) - .route("/api/system/Area/{id}/Info", get(face_b::area_info)) - .route("/api/system/Area", post(face_b::area_create)) - .route("/api/system/Area/{id}", put(face_b::area_update)) - .route("/api/system/Area/{id}", delete(face_b::area_delete)) + .route("/api/system/Area/{id}/Info", get(compat::system::area_info)) + .route("/api/system/Area", post(compat::system::area_create)) + .route("/api/system/Area/{id}", put(compat::system::area_update)) + .route("/api/system/Area/{id}", delete(compat::system::area_delete)) .route( "/api/system/Area/GetAreaByIds", - post(face_b::area_get_by_ids), + post(compat::system::area_get_by_ids), ) // ---- 公有变量(`system/Variate`,`base_common_variate`)---- // 🔴 这一族**没有点权限**(官方 `CommonVariateController` 零 `@SaCheckPermission`) // ⇒ 守卫只查登录。照抄官方,别「顺手加上」——加了官方前端反而会 403。 - .route("/api/system/Variate", get(face_b::variate_list)) - .route("/api/system/Variate", post(face_b::variate_create)) - .route("/api/system/Variate/selector", get(face_b::variate_selector)) + .route("/api/system/Variate", get(compat::system::variate_list)) + .route("/api/system/Variate", post(compat::system::variate_create)) + .route("/api/system/Variate/selector", get(compat::system::variate_selector)) .route( "/api/system/Variate/sysfunccategory", - get(face_b::variate_sys_func_category), + get(compat::system::variate_sys_func_category), ) - .route("/api/system/Variate/{id}", get(face_b::variate_info)) - .route("/api/system/Variate/{id}", put(face_b::variate_update)) - .route("/api/system/Variate/{id}", delete(face_b::variate_delete)) + .route("/api/system/Variate/{id}", get(compat::system::variate_info)) + .route("/api/system/Variate/{id}", put(compat::system::variate_update)) + .route("/api/system/Variate/{id}", delete(compat::system::variate_delete)) // ---- 业务模块的路由(demo / shop / books)由业务层自带 ⇒ 这里只 merge ---- .merge(modules::router()) // ---- 业务包的路由(面 B 官方形状)由**业务包自带** ⇒ 按声明生成 ---- @@ -1185,205 +1185,205 @@ pub fn build_router(state: AppState) -> axum::Router { // ⇒ 两条同时存在不会互相抢(与 `/Log/deleteLoginLog` 同理)。 .route( "/api/system/BaseLang", - get(face_b::base_lang_list).post(face_b::base_lang_create), + get(compat::system::base_lang_list).post(compat::system::base_lang_create), ) .route( "/api/system/BaseLang/TemplateDownload", - get(face_b::base_lang_template_download), + get(compat::system::base_lang_template_download), ) .route( "/api/system/BaseLang/ImportData", - post(face_b::base_lang_import_data), + post(compat::system::base_lang_import_data), ) .route( "/api/system/BaseLang/{id}", - get(face_b::base_lang_info) - .put(face_b::base_lang_update) - .delete(face_b::base_lang_delete), + get(compat::system::base_lang_info) + .put(compat::system::base_lang_update) + .delete(compat::system::base_lang_delete), ) // ---- 表单套件(官方 `VisualKitController`,前缀 `Kit`)---- .route( "/api/system/Kit", - get(face_b::kit_list).post(face_b::kit_create), + get(compat::system::kit_list).post(compat::system::kit_create), ) - .route("/api/system/Kit/Selector", get(face_b::kit_selector)) + .route("/api/system/Kit/Selector", get(compat::system::kit_selector)) .route( "/api/system/Kit/{id}", - get(face_b::kit_info) - .put(face_b::kit_update) - .delete(face_b::kit_delete), + get(compat::system::kit_info) + .put(compat::system::kit_update) + .delete(compat::system::kit_delete), ) - .route("/api/system/Kit/{id}/Actions/Copy", post(face_b::kit_copy)) + .route("/api/system/Kit/{id}/Actions/Copy", post(compat::system::kit_copy)) .route( "/api/system/Kit/{id}/Actions/Export", - get(face_b::kit_export), + get(compat::system::kit_export), ) // ---- 缓存管理(本仓 = 内存会话表,见 face_b 的 CacheManage 段说明)---- - .route("/api/system/CacheManage", get(face_b::cache_manage_list)) + .route("/api/system/CacheManage", get(compat::system::cache_manage_list)) .route( "/api/system/CacheManage/Actions/ClearAll", - post(face_b::cache_manage_clear_all), + post(compat::system::cache_manage_clear_all), ) .route( "/api/system/CacheManage/{name}", - get(face_b::cache_manage_info).delete(face_b::cache_manage_delete), + get(compat::system::cache_manage_info).delete(compat::system::cache_manage_delete), ) // ---- 任务调度(官方 `TimeTaskController`,无 `/api/system` 前缀)---- .route( "/api/scheduletask", - get(face_b::task_list).post(face_b::task_create), + get(compat::scheduletask::task_list).post(compat::scheduletask::task_create), ) - .route("/api/scheduletask/TaskMethods", get(face_b::task_methods)) - .route("/api/scheduletask/Info/{id}", get(face_b::task_info)) + .route("/api/scheduletask/TaskMethods", get(compat::scheduletask::task_methods)) + .route("/api/scheduletask/Info/{id}", get(compat::scheduletask::task_info)) .route( "/api/scheduletask/{id}", - put(face_b::task_update).delete(face_b::task_delete), + put(compat::scheduletask::task_update).delete(compat::scheduletask::task_delete), ) .route( "/api/scheduletask/{id}/TaskLog", - get(face_b::task_log_list), + get(compat::scheduletask::task_log_list), ) // ---- IM 会话(官方 `ImReplyController`)---- - .route("/api/message/imreply", get(face_b::im_reply_list)) + .route("/api/message/imreply", get(compat::message::im_reply_list)) .route( "/api/message/imreply/deleteChatRecord/{id}", - delete(face_b::im_reply_delete_chat), + delete(compat::message::im_reply_delete_chat), ) .route( "/api/message/imreply/relocation/{id}", - delete(face_b::im_reply_relocation), + delete(compat::message::im_reply_relocation), ) // ---- 常用(收藏)菜单(官方 `ModuleDataController`)---- - .route("/api/system/MenuData", get(face_b::menu_data_list)) + .route("/api/system/MenuData", get(compat::system::menu_data_list)) .route( "/api/system/MenuData/{id}", - post(face_b::menu_data_create).delete(face_b::menu_data_delete), + post(compat::system::menu_data_create).delete(compat::system::menu_data_delete), ) // ---- 公式目录(补 Variate 的三条;数据源是生成物 `variate_catalog.rs`)---- .route( "/api/system/Variate/sysvariate", - get(face_b::variate_sys_variate), + get(compat::system::variate_sys_variate), ) .route( "/api/system/Variate/sysfunctree", - get(face_b::variate_sys_func_tree), + get(compat::system::variate_sys_func_tree), ) .route( "/api/system/Variate/{type}/sysfunc", - get(face_b::variate_sys_func), + get(compat::system::variate_sys_func), ) // ---- 系统监控 / 我的应用 ---- - .route("/api/system/Monitor", get(face_b::monitor)) - .route("/api/system/HomeData/mySystem", get(face_b::home_my_system)) + .route("/api/system/Monitor", get(compat::system::monitor)) + .route("/api/system/HomeData/mySystem", get(compat::system::home_my_system)) // ---- 三处 `Actions/Export`:本仓无文件服务 ⇒ 明确拒绝(不返假 url)---- .route( "/api/system/System/{id}/Actions/Export", - get(face_b::system_export), + get(compat::system::system_export), ) .route( "/api/system/Tag/{id}/Actions/Export", - get(face_b::tag_export), + get(compat::system::tag_export), ) // ---- 权限关系族(批次 16):角色绑定 / 在线用户 / 自定义范围 / 工作详情 / 导入导出 ---- // 🔴 `Users|Organize|Position` 下的这些**静态段**与已有的 `{id}` 同深度 // ⇒ matchit 里静态段优先,两条可以共存(同 `Kit/Selector`)。 .route( "/api/permission/RoleRelation", - get(face_b::role_relation_list).post(face_b::role_relation_add), + get(compat::permission::role_relation_list).post(compat::permission::role_relation_add), ) .route( "/api/permission/Group/GroupCondition", - post(face_b::group_condition), + post(compat::permission::group_condition), ) .route( "/api/permission/Organize/SelectedList", - post(face_b::organize_selected_list), + post(compat::permission::organize_selected_list), ) .route( "/api/permission/Organize/OrganizeCondition", - post(face_b::organize_condition), + post(compat::permission::organize_condition), ) .route( "/api/permission/Users/getWorkByUser", - get(face_b::user_get_work_by_user), + get(compat::permission::user_get_work_by_user), ) .route( "/api/permission/socials", - get(face_b::socials_list), + get(compat::permission::socials_list), ) .route( "/api/permission/socials/render/{source}", - get(face_b::socials_render), + get(compat::permission::socials_render), ) // 在线用户:本仓 = 内存会话表(同批次 15 的 CacheManage 底座) .route( "/api/system/OnlineUser", - get(face_b::online_user_list).delete(face_b::online_user_batch_delete), + get(compat::system::online_user_list).delete(compat::system::online_user_batch_delete), ) .route( "/api/system/OnlineUser/{token}", - delete(face_b::online_user_delete), + delete(compat::system::online_user_delete), ) // 三实体 × 导入导出:模板下载 / 导入预览 / 导入 / 导出 / 导出异常报告 .route( "/api/permission/Users/TemplateDownload", - get(face_b::user_template_download), + get(compat::permission::user_template_download), ) .route( "/api/permission/Users/ImportPreview", - get(face_b::user_import_preview), + get(compat::permission::user_import_preview), ) .route( "/api/permission/Users/ImportData", - post(face_b::user_import_data), + post(compat::permission::user_import_data), ) .route( "/api/permission/Users/ExportData", - get(face_b::user_export_data), + get(compat::permission::user_export_data), ) .route( "/api/permission/Users/ExportExceptionData", - post(face_b::user_export_exception_data), + post(compat::permission::user_export_exception_data), ) .route( "/api/permission/Organize/TemplateDownload", - get(face_b::organize_template_download), + get(compat::permission::organize_template_download), ) .route( "/api/permission/Organize/ImportPreview", - get(face_b::organize_import_preview), + get(compat::permission::organize_import_preview), ) .route( "/api/permission/Organize/ImportData", - post(face_b::organize_import_data), + post(compat::permission::organize_import_data), ) .route( "/api/permission/Organize/ExportData", - get(face_b::organize_export_data), + get(compat::permission::organize_export_data), ) .route( "/api/permission/Organize/ExportExceptionData", - post(face_b::organize_export_exception_data), + post(compat::permission::organize_export_exception_data), ) .route( "/api/permission/Position/TemplateDownload", - get(face_b::position_template_download), + get(compat::permission::position_template_download), ) .route( "/api/permission/Position/ImportPreview", - get(face_b::position_import_preview), + get(compat::permission::position_import_preview), ) .route( "/api/permission/Position/ImportData", - post(face_b::position_import_data), + post(compat::permission::position_import_data), ) .route( "/api/permission/Position/ExportData", - get(face_b::position_export_data), + get(compat::permission::position_export_data), ) .route( "/api/permission/Position/ExportExceptionData", - post(face_b::position_export_exception_data), + post(compat::permission::position_export_exception_data), ) // 🔴 **批次 12 交付物 ①**:业务包声明 `PackRoute`(纯数据)⇒ // 装配根按声明 + spec 生成真正的 axum 路由 ⇒ **平台层零改动**。 diff --git a/src/backend/tests/auth_it.rs b/src/backend/tests/auth_it.rs index 641f2af..e410900 100644 --- a/src/backend/tests/auth_it.rs +++ b/src/backend/tests/auth_it.rs @@ -451,7 +451,7 @@ async fn current_user_with_token_returns_user_info_and_menu() { ); assert_eq!( data["currentSystemId"], - serde_json::json!(ssw_platform::platform::system::MAIN_SYSTEM_ID), + serde_json::json!(ssw_platform::platform::registry::MAIN_SYSTEM_ID), "无 App-Code 头 ⇒ 回落主系统" ); } diff --git a/src/backend/tests/batch6_it.rs b/src/backend/tests/batch6_it.rs index 60fed8b..968342f 100644 --- a/src/backend/tests/batch6_it.rs +++ b/src/backend/tests/batch6_it.rs @@ -370,10 +370,14 @@ async fn data_model_tables_info_and_fields() { let token = login(port).await; // ① 表清单:`DbTableListVO`(list + pagination),分页真的生效。 + // 🔴 **pageSize 给 1000 而不是 100**(批次 17 改):官方平台表已全量导入 + // (123 张 `base_*`)+ 业务包表 ⇒ 库里有 127+ 张表;`pageSize=100` 会把 + // `base_user` 截到第 2 页去,**让「清单里必须能看见 base_user」这条断言 + // 变成对表数的隐式假设**。给足页大小,断言才是真的在验「清单内容」。 let (_, tables) = call( port, "GET", - "/api/system/DataModel/0/Tables?currentPage=1&pageSize=100", + "/api/system/DataModel/0/Tables?currentPage=1&pageSize=1000", &token, None, ) diff --git a/src/backend/tests/batch7_it.rs b/src/backend/tests/batch7_it.rs index ed1f42f..3821367 100644 --- a/src/backend/tests/batch7_it.rs +++ b/src/backend/tests/batch7_it.rs @@ -744,10 +744,13 @@ async fn copy_guards_and_delete_all_spares_builtin() { assert_eq!(cleared["code"], 200, "{cleared}"); // 🔴 清空的只是**非内置**表:`base_user` / `demo_item` 必须都还在。 + // 🔴 **pageSize 给 1000 而不是 100**(批次 17 改):官方平台表已全量导入 + // (123 张 `base_*`)⇒ 库里有 127+ 张表;`pageSize=100` 会把 `base_user` + // 截到第 2 页 ⇒ 断言「内置表还在」会**假失败**(表其实没被删)。 let (_, list) = call( port, "GET", - "/api/system/DataModel/0/Tables?pageSize=100", + "/api/system/DataModel/0/Tables?pageSize=1000", &token, None, ) diff --git a/src/backend/tests/permission_it.rs b/src/backend/tests/permission_it.rs index c4681be..80503f7 100644 --- a/src/backend/tests/permission_it.rs +++ b/src/backend/tests/permission_it.rs @@ -12,7 +12,7 @@ use ssw_platform::platform::db::Db; use ssw_platform::platform::ids::new_uuid; -use ssw_platform::platform::permission::{ +use ssw_platform::platform::authorization::{ build_menu_list, has_module, render_tree, resolve_user_module_ids, }; use ssw_platform::bootstrap::ensure_base; @@ -49,7 +49,7 @@ const M_RESOURCE: &str = "m_resource"; /// 多应用:本仓的主系统 id(`base_system.f_en_code = 'ssw-platform'`)。 /// 菜单查询按 `f_system_id` 隔离 ⇒ 这些测试里的菜单都属于主系统。 /// 主系统 id —— 🔴 取**平台常量**而不是字面量(主系统 id 改一处就够)。 -const SYS: &str = ssw_platform::platform::system::MAIN_SYSTEM_ID; +const SYS: &str = ssw_platform::platform::registry::MAIN_SYSTEM_ID; /// 9 个内置菜单的期望菜单树(契约 §8.4,逐字断言)。 const EXPECTED_ADMIN_TREE: &str =