面 B:跑通 JNPF 前端用户管理页 + 补齐机构 CRUD
- 前端真跑起来:登录→/home→/permission/user 正常渲染,零非 200
- 新增端点 31 条(Group 一族/SetPosition/getDevUser/workHandover/Organize CRUD+Selector/
页面级 404 五条)
- 新表 base_group(官方 DDL 逐字),tables 12→13
- 修:preferenceJson 必须为字符串;菜单 urlAddress 走 permission/user;
Users 列表 keyword 未进 SQL;空关键词多传参数导致 PG bind 报错
- 契约三处 + JNPF_REGISTERED 同步;六闸全绿,cargo test 221 全过
This commit is contained in:
1 parent
83d3ef7d66
commit
afc4fc1f5f
9 files changed
+1378
-87
No files matched your search
@@ -115,9 +115,31 @@ CREATE TABLE base_role_relation (
|
||||
PRIMARY KEY (f_id, f_tenant_id)
|
||||
);
|
||||
|
||||
-- 用户分组(用户管理页左侧的分组树)—— 官方 `JNPF-PostgreSQL.sql:1758`,14 列逐字。
|
||||
-- 🔴 成员关系**不在这张表里**:分组—用户关系复用 `base_user_relation`
|
||||
-- (`f_object_type = 'Group'` / `f_object_id` = 分组 id / `f_user_id` = 用户 id),
|
||||
-- 与官方「组织/岗位关系都在 base_user_relation」的做法一致。
|
||||
CREATE TABLE base_group (
|
||||
f_id VARCHAR(50) NOT NULL,
|
||||
f_full_name VARCHAR(200),
|
||||
f_en_code VARCHAR(200),
|
||||
f_description VARCHAR(500),
|
||||
f_enabled_mark INTEGER,
|
||||
f_sort_code BIGINT,
|
||||
f_creator_time TIMESTAMP(0) WITHOUT TIME ZONE,
|
||||
f_creator_user_id VARCHAR(50),
|
||||
f_last_modify_time TIMESTAMP(0) WITHOUT TIME ZONE,
|
||||
f_last_modify_user_id VARCHAR(50),
|
||||
f_delete_time TIMESTAMP(0) WITHOUT TIME ZONE,
|
||||
f_delete_user_id VARCHAR(50),
|
||||
f_delete_mark INTEGER,
|
||||
f_tenant_id VARCHAR(50) DEFAULT '0' NOT NULL,
|
||||
PRIMARY KEY (f_id, f_tenant_id)
|
||||
);
|
||||
|
||||
CREATE TABLE base_user (
|
||||
f_id VARCHAR(50) NOT NULL,
|
||||
f_account VARCHAR(50),
|
||||
f_id VARCHAR(50) NOT NULL,
|
||||
f_account VARCHAR(50),
|
||||
f_real_name VARCHAR(50),
|
||||
f_quick_query VARCHAR(100),
|
||||
f_nick_name VARCHAR(50),
|
||||
|
||||
@@ -42,7 +42,8 @@ use ssw_platform::routes;
|
||||
/// 多应用 MVP 新增了平台表 `base_system`(`SystemEntity` 注册表,
|
||||
/// 承载 `App-Code` → `systemId` 的映射),故清单现在是 **8 张**
|
||||
/// (原 7 张 + `base_system`)。
|
||||
const BASE_TABLES: [&str; 8] = [
|
||||
const BASE_TABLES: [&str; 9] = [
|
||||
"base_group",
|
||||
"base_user",
|
||||
"base_role",
|
||||
"base_organize",
|
||||
|
||||
@@ -1055,22 +1055,22 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn schema_sql_has_twelve_tables() {
|
||||
// schema.sql 必须包含 12 张表的 CREATE TABLE
|
||||
// (8 张 base_*:7 张官方 + 多应用注册表 base_system,+ 4 张业务表)。
|
||||
fn schema_sql_has_thirteen_tables() {
|
||||
// schema.sql 必须包含 13 张表的 CREATE TABLE
|
||||
// (9 张 base_*:8 张官方 + 多应用注册表 base_system + 用户分组 base_group,+ 4 张业务表)。
|
||||
let count = SCHEMA_SQL.matches("CREATE TABLE ").count();
|
||||
assert_eq!(count, 12, "schema.sql 的 CREATE TABLE 数量应为 12");
|
||||
assert_eq!(count, 13, "schema.sql 的 CREATE TABLE 数量应为 13");
|
||||
}
|
||||
|
||||
/// 🔴 [`ddl_tables`] 的解析必须与上面那条计数一致(不能只数到 12 却解析出别的)。
|
||||
#[test]
|
||||
fn ddl_tables_parses_every_create_table() {
|
||||
let tables = ddl_tables();
|
||||
assert_eq!(tables.len(), 12, "ddl_tables 应解析出 12 张表");
|
||||
assert_eq!(tables.len(), 13, "ddl_tables 应解析出 13 张表");
|
||||
assert!(tables.iter().all(|t| !t.is_empty()));
|
||||
assert_eq!(
|
||||
tables.iter().collect::<std::collections::HashSet<_>>().len(),
|
||||
12,
|
||||
13,
|
||||
"表名不许重复"
|
||||
);
|
||||
// 8 张 base_* 必须都在(业务表由业务层 spec 派生,不在本文件写死)。
|
||||
|
||||
+1072
-34
File diff suppressed because it is too large.
Load diff
@@ -143,11 +143,72 @@ pub fn build_router(state: AppState) -> axum::Router<AppState> {
|
||||
"/api/permission/Users/{id}/Actions/unlock",
|
||||
put(jnpf::user_unlock),
|
||||
)
|
||||
// ---- 会话与前端启动(面 B):这两条是**打开第一个页面之前**就会被打的 ----
|
||||
// 🔴 `Logout` 恒成功(前端把返回值包在 try/catch 里丢弃,但 404 会弹红条)。
|
||||
.route("/api/oauth/Logout", post(jnpf::logout_handler))
|
||||
// 🔴 i18n 远端词条包:登录成功后立刻被 `locales/index.ts` 拉,缺了会炸整个 app。
|
||||
.route("/api/system/BaseLang/LangJson", get(jnpf::base_lang_json))
|
||||
// ---- 用户分组(用户管理页左侧树)----
|
||||
.route("/api/permission/Group", get(jnpf::group_list))
|
||||
.route("/api/permission/Group", post(jnpf::group_create))
|
||||
.route("/api/permission/Group/{id}", get(jnpf::group_info))
|
||||
.route("/api/permission/Group/{id}", put(jnpf::group_update))
|
||||
.route("/api/permission/Group/{id}", delete(jnpf::group_delete))
|
||||
.route(
|
||||
"/api/permission/Group/{id}/Actions/AddUser",
|
||||
post(jnpf::group_add_user),
|
||||
)
|
||||
.route(
|
||||
"/api/permission/Group/{id}/Actions/DeleteUser",
|
||||
post(jnpf::group_remove_user),
|
||||
)
|
||||
// ---- 岗位 / 交接 / 第三方 ----
|
||||
// 🔴 `SetPositionBatch` 必须**单独注册**:挂在 `/Users/{id}` 上会被当 id 吃掉。
|
||||
.route(
|
||||
"/api/permission/Users/SetPositionBatch",
|
||||
post(jnpf::users_set_position_batch),
|
||||
)
|
||||
.route(
|
||||
"/api/permission/Users/workHandover",
|
||||
post(jnpf::users_work_handover),
|
||||
)
|
||||
.route(
|
||||
"/api/permission/Users/{id}/SetPosition",
|
||||
post(jnpf::user_set_position),
|
||||
)
|
||||
.route(
|
||||
"/api/permission/Users/{id}/SelectorByUserPosId",
|
||||
get(jnpf::user_selector_by_pos_id),
|
||||
)
|
||||
.route(
|
||||
"/api/system/System/getDevUser",
|
||||
get(jnpf::system_get_dev_user),
|
||||
)
|
||||
.route("/api/permission/socials/{id}", delete(jnpf::socials_delete))
|
||||
// ---- 前端每页都拉的公共接口(本仓无对应表 ⇒ 保守空形状,但必须是 200)----
|
||||
.route(
|
||||
"/api/system/DictionaryData/All",
|
||||
get(jnpf::dictionary_data_all),
|
||||
)
|
||||
.route("/api/system/HomeData", get(jnpf::home_data))
|
||||
.route(
|
||||
"/api/system/MenuData/useModuleNum/{id}",
|
||||
post(jnpf::menu_data_use_module_num),
|
||||
)
|
||||
// 🔴 登录**前**就会拉 ⇒ 不能挂守卫。
|
||||
.route("/api/oauth/getLoginConfig", get(jnpf::get_login_config))
|
||||
.route("/api/oauth/getConfig/{account}", get(jnpf::get_user_config))
|
||||
.route("/api/permission/Role", get(jnpf::roles_list))
|
||||
.route(
|
||||
"/api/permission/Organize/AsyncList/{id}",
|
||||
get(jnpf::organize_async_list),
|
||||
)
|
||||
.route("/api/permission/Organize", get(jnpf::organize_list))
|
||||
.route("/api/permission/Organize", post(jnpf::organize_create))
|
||||
.route("/api/permission/Organize/Selector", get(jnpf::organize_selector))
|
||||
.route("/api/permission/Organize/{id}", get(jnpf::organize_info))
|
||||
.route("/api/permission/Organize/{id}", put(jnpf::organize_update))
|
||||
.route("/api/permission/Organize/{id}", delete(jnpf::organize_delete))
|
||||
.route("/api/system/Menu/ModuleBySystem", get(jnpf::module_by_system))
|
||||
// 🔴 官方是 `POST /api/permission/Authority/Data/{objectId}/Values`
|
||||
// —— 与面 A 的 `PUT .../Data/{objectId}` **同前缀不同方法不同路径**
|
||||
@@ -676,7 +737,7 @@ mod tests {
|
||||
let (_, body) = raw.split_once("\r\n\r\n").expect("响应必须有头体分隔");
|
||||
let body: Value = serde_json::from_str(body).expect("响应体必须是合法 JSON");
|
||||
assert_eq!(body["ok"], true);
|
||||
assert_eq!(body["tables"], 12);
|
||||
assert_eq!(body["tables"], 13);
|
||||
assert_eq!(body["version"], env!("CARGO_PKG_VERSION"));
|
||||
}
|
||||
|
||||
@@ -691,7 +752,7 @@ mod tests {
|
||||
let port = serve(new_state(db().await)).await;
|
||||
|
||||
// 🔴 按**路径**列(同一路径多个方法只算一条)—— 每条都用 PATCH 探 405。
|
||||
const JNPF_REGISTERED: [&str; 11] = [
|
||||
const JNPF_REGISTERED: [&str; 31] = [
|
||||
"/api/permission/Users",
|
||||
"/api/permission/Users/any-id",
|
||||
"/api/permission/Users/BatchDelete",
|
||||
@@ -703,6 +764,26 @@ mod tests {
|
||||
"/api/permission/Organize/AsyncList/0",
|
||||
"/api/system/Menu/ModuleBySystem",
|
||||
"/api/permission/Authority/Data/any-id/Values",
|
||||
"/api/oauth/Logout",
|
||||
"/api/system/BaseLang/LangJson",
|
||||
"/api/permission/Group",
|
||||
"/api/permission/Group/any-id",
|
||||
"/api/permission/Group/any-id/Actions/AddUser",
|
||||
"/api/permission/Group/any-id/Actions/DeleteUser",
|
||||
"/api/permission/Users/SetPositionBatch",
|
||||
"/api/permission/Users/workHandover",
|
||||
"/api/permission/Users/any-id/SetPosition",
|
||||
"/api/permission/Users/any-id/SelectorByUserPosId",
|
||||
"/api/system/System/getDevUser",
|
||||
"/api/permission/socials/any-id",
|
||||
"/api/permission/Organize",
|
||||
"/api/permission/Organize/any-id",
|
||||
"/api/permission/Organize/Selector",
|
||||
"/api/system/DictionaryData/All",
|
||||
"/api/system/HomeData",
|
||||
"/api/system/MenuData/useModuleNum/any-id",
|
||||
"/api/oauth/getLoginConfig",
|
||||
"/api/oauth/getConfig/admin",
|
||||
];
|
||||
|
||||
for path in JNPF_REGISTERED {
|
||||
|
||||
Reference in new issue
Block a user