面 B:补齐岗位/角色/菜单三族(+19 端点)
- 新表 base_position(官方 DDL 逐字),tables 13→14
- Position 一族 12 条:CRUD + Selector/SelectorTree/Condition/SelectedList/Duty*
- Role 一族 6 条:CRUD + Selector + RoleCondition(base_role 已有)
- Menu 一族 13 条:CRUD + 四种 Selector + Export/权限组(base_module 已有)
- 官方端点覆盖 49/72 → 87/98
- 坑:加新表必须重置运行库(schema 只在 base_user 不存在时整体执行);
委托调用 handler 会让契约扫描器推不出守卫(CC6)⇒ 必须内联
This commit is contained in:
1 parent
afc4fc1f5f
commit
5f6ca8d963
7 files changed
+1349
-23
No files matched your search
@@ -137,6 +137,33 @@ CREATE TABLE base_group (
|
||||
PRIMARY KEY (f_id, f_tenant_id)
|
||||
);
|
||||
|
||||
CREATE TABLE base_position (
|
||||
f_id VARCHAR(50) NOT NULL,
|
||||
f_full_name VARCHAR(200),
|
||||
f_en_code VARCHAR(200),
|
||||
f_type VARCHAR(50),
|
||||
f_property_json TEXT,
|
||||
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_organize_id VARCHAR(50),
|
||||
f_tenant_id VARCHAR(50) DEFAULT '0' NOT NULL,
|
||||
f_parent_id VARCHAR(50),
|
||||
f_duty_user VARCHAR(50),
|
||||
f_position_id_tree TEXT,
|
||||
f_is_condition INTEGER,
|
||||
f_condition_json TEXT,
|
||||
f_default_mark INTEGER,
|
||||
PRIMARY KEY (f_id, f_tenant_id)
|
||||
);
|
||||
|
||||
CREATE TABLE base_user (
|
||||
f_id VARCHAR(50) NOT NULL,
|
||||
f_account VARCHAR(50),
|
||||
|
||||
@@ -42,7 +42,7 @@ use ssw_platform::routes;
|
||||
/// 多应用 MVP 新增了平台表 `base_system`(`SystemEntity` 注册表,
|
||||
/// 承载 `App-Code` → `systemId` 的映射),故清单现在是 **8 张**
|
||||
/// (原 7 张 + `base_system`)。
|
||||
const BASE_TABLES: [&str; 9] = [
|
||||
const BASE_TABLES: [&str; 10] = [
|
||||
"base_group",
|
||||
"base_user",
|
||||
"base_role",
|
||||
@@ -52,6 +52,7 @@ const BASE_TABLES: [&str; 9] = [
|
||||
"base_role_relation",
|
||||
"base_user_relation",
|
||||
"base_system",
|
||||
"base_position",
|
||||
];
|
||||
|
||||
/// 命令行解析的结果(**纯数据**,便于单测)。
|
||||
|
||||
@@ -1055,22 +1055,22 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn schema_sql_has_thirteen_tables() {
|
||||
// schema.sql 必须包含 13 张表的 CREATE TABLE
|
||||
// (9 张 base_*:8 张官方 + 多应用注册表 base_system + 用户分组 base_group,+ 4 张业务表)。
|
||||
fn schema_sql_has_fourteen_tables() {
|
||||
// schema.sql 必须包含 14 张表的 CREATE TABLE
|
||||
// (10 张 base_*:8 张官方 + 多应用注册表 base_system + 用户分组 base_group + 岗位 base_position,+ 4 张业务表)。
|
||||
let count = SCHEMA_SQL.matches("CREATE TABLE ").count();
|
||||
assert_eq!(count, 13, "schema.sql 的 CREATE TABLE 数量应为 13");
|
||||
assert_eq!(count, 14, "schema.sql 的 CREATE TABLE 数量应为 14");
|
||||
}
|
||||
|
||||
/// 🔴 [`ddl_tables`] 的解析必须与上面那条计数一致(不能只数到 12 却解析出别的)。
|
||||
#[test]
|
||||
fn ddl_tables_parses_every_create_table() {
|
||||
let tables = ddl_tables();
|
||||
assert_eq!(tables.len(), 13, "ddl_tables 应解析出 13 张表");
|
||||
assert_eq!(tables.len(), 14, "ddl_tables 应解析出 14 张表");
|
||||
assert!(tables.iter().all(|t| !t.is_empty()));
|
||||
assert_eq!(
|
||||
tables.iter().collect::<std::collections::HashSet<_>>().len(),
|
||||
13,
|
||||
14,
|
||||
"表名不许重复"
|
||||
);
|
||||
// 8 张 base_* 必须都在(业务表由业务层 spec 派生,不在本文件写死)。
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -199,6 +199,25 @@ pub fn build_router(state: AppState) -> axum::Router<AppState> {
|
||||
.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/Role", post(jnpf::role_create))
|
||||
.route("/api/permission/Role/Selector", get(jnpf::role_selector))
|
||||
.route("/api/permission/Role/RoleCondition", post(jnpf::role_condition))
|
||||
.route("/api/permission/Role/{id}", get(jnpf::role_info))
|
||||
.route("/api/permission/Role/{id}", put(jnpf::role_update))
|
||||
.route("/api/permission/Role/{id}", delete(jnpf::role_delete))
|
||||
.route("/api/permission/Position", get(jnpf::position_list))
|
||||
.route("/api/permission/Position", post(jnpf::position_create))
|
||||
.route("/api/permission/Position/Selector", get(jnpf::position_selector))
|
||||
.route("/api/permission/Position/SelectorTree", get(jnpf::position_selector_tree))
|
||||
.route("/api/permission/Position/PositionCondition", post(jnpf::position_condition))
|
||||
.route("/api/permission/Position/SelectedList", post(jnpf::position_selected_list))
|
||||
.route("/api/permission/Position/{id}", get(jnpf::position_info))
|
||||
.route("/api/permission/Position/{id}", put(jnpf::position_update))
|
||||
.route("/api/permission/Position/{id}", delete(jnpf::position_delete))
|
||||
.route("/api/permission/Position/{id}/Actions/DutyPosition", post(jnpf::position_duty_position))
|
||||
.route("/api/permission/Position/{id}/Actions/DutyUser", post(jnpf::position_duty_user))
|
||||
.route("/api/permission/Group/Selector", get(jnpf::group_selector))
|
||||
.route("/api/permission/Organize/AsyncPosList", get(jnpf::organize_async_pos_list))
|
||||
.route(
|
||||
"/api/permission/Organize/AsyncList/{id}",
|
||||
get(jnpf::organize_async_list),
|
||||
@@ -210,6 +229,19 @@ pub fn build_router(state: AppState) -> axum::Router<AppState> {
|
||||
.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))
|
||||
.route("/api/system/Menu", post(jnpf::menu_create))
|
||||
.route("/api/system/Menu/Selector/All", get(jnpf::menu_selector_all))
|
||||
.route("/api/system/Menu/Selector/Form", get(jnpf::menu_selector_form))
|
||||
.route("/api/system/Menu/Selector/Page", get(jnpf::menu_selector_page))
|
||||
.route("/api/system/Menu/getSystemMenu", get(jnpf::menu_get_system_menu))
|
||||
.route("/api/system/Menu/{id}", get(jnpf::menu_info))
|
||||
.route("/api/system/Menu/{id}", put(jnpf::menu_update))
|
||||
.route("/api/system/Menu/{id}", delete(jnpf::menu_delete))
|
||||
.route("/api/system/Menu/{id}/Actions/Export", get(jnpf::menu_export))
|
||||
.route("/api/system/Menu/getPermissionGroup/{id}", get(jnpf::menu_permission_group))
|
||||
.route("/api/system/Menu/getPermission/{id}/{permissionId}", get(jnpf::menu_permission_info))
|
||||
.route("/api/system/Menu/Selector/{id}", get(jnpf::menu_selector))
|
||||
.route("/api/system/Menu/SelectorFilter/{id}", get(jnpf::menu_selector_filter))
|
||||
// 🔴 官方是 `POST /api/permission/Authority/Data/{objectId}/Values`
|
||||
// —— 与面 A 的 `PUT .../Data/{objectId}` **同前缀不同方法不同路径**
|
||||
// ⇒ matchit 0.8.4 允许「静态段跟在参数节点后」⇒ 两条可共存。
|
||||
@@ -737,7 +769,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"], 13);
|
||||
assert_eq!(body["tables"], 14);
|
||||
assert_eq!(body["version"], env!("CARGO_PKG_VERSION"));
|
||||
}
|
||||
|
||||
@@ -752,7 +784,7 @@ mod tests {
|
||||
let port = serve(new_state(db().await)).await;
|
||||
|
||||
// 🔴 按**路径**列(同一路径多个方法只算一条)—— 每条都用 PATCH 探 405。
|
||||
const JNPF_REGISTERED: [&str; 31] = [
|
||||
const JNPF_REGISTERED: [&str; 55] = [
|
||||
"/api/permission/Users",
|
||||
"/api/permission/Users/any-id",
|
||||
"/api/permission/Users/BatchDelete",
|
||||
@@ -779,6 +811,30 @@ mod tests {
|
||||
"/api/permission/Organize",
|
||||
"/api/permission/Organize/any-id",
|
||||
"/api/permission/Organize/Selector",
|
||||
"/api/permission/Organize/AsyncPosList",
|
||||
"/api/permission/Role/Selector",
|
||||
"/api/permission/Role/RoleCondition",
|
||||
"/api/permission/Role/any-id",
|
||||
"/api/permission/Position",
|
||||
"/api/permission/Position/Selector",
|
||||
"/api/permission/Position/SelectorTree",
|
||||
"/api/permission/Position/PositionCondition",
|
||||
"/api/permission/Position/SelectedList",
|
||||
"/api/permission/Position/any-id",
|
||||
"/api/permission/Position/any-id/Actions/DutyPosition",
|
||||
"/api/permission/Position/any-id/Actions/DutyUser",
|
||||
"/api/permission/Group/Selector",
|
||||
"/api/system/Menu",
|
||||
"/api/system/Menu/any-id",
|
||||
"/api/system/Menu/Selector/All",
|
||||
"/api/system/Menu/Selector/Form",
|
||||
"/api/system/Menu/Selector/Page",
|
||||
"/api/system/Menu/Selector/any-id",
|
||||
"/api/system/Menu/SelectorFilter/any-id",
|
||||
"/api/system/Menu/getSystemMenu",
|
||||
"/api/system/Menu/any-id/Actions/Export",
|
||||
"/api/system/Menu/getPermissionGroup/any-id",
|
||||
"/api/system/Menu/getPermission/any-id/any-id",
|
||||
"/api/system/DictionaryData/All",
|
||||
"/api/system/HomeData",
|
||||
"/api/system/MenuData/useModuleNum/any-id",
|
||||
|
||||
Reference in new issue
Block a user