feat(face-b): 系统日志 + 审批常用语 + 单据规则落地(面 B 批次 5,+21 端点)
- 新表三张(官方 DDL 逐字):base_sys_log(30 列) / base_common_words / base_bill_rule,tables 29→32 - 登录即落日志:auth.rs::login_handler 写 f_type=1,Log 页与个人中心「登录日志」共用同一 log_page - 单据规则带单号生成器:时间/随机/UUID 三分支 + 跨天归零 + 回写 f_this_number/f_output_number - DictionaryData/All 从恒空改为真读字典,seed 灌 businessType 13 行 - 回归 tests/batch5_it.rs(6 条);cargo test --workspace 508 passed
This commit is contained in:
1 parent
c932075082
commit
0d5c43570d
12 files changed
+2881
-39
No files matched your search
@@ -608,6 +608,105 @@ CREATE TABLE base_notice (
|
||||
PRIMARY KEY (f_id, f_tenant_id)
|
||||
);
|
||||
|
||||
-- 系统日志(`/api/system/Log` + 个人中心「登录日志」)—— 列与官方 JNPF 7.0 逐字一致
|
||||
-- (官方 database/PostgreSQL/JNPF-PostgreSQL.sql `base_sys_log`)。
|
||||
-- 🔴 **一张表装五种日志**,靠 `f_type` 区分:1 登录 / 2 访问 / 3 操作 / 4 异常 / 5 请求
|
||||
-- (官方 `LogController.getInfoList` 的 `switch(pagination.getCategory())`)。
|
||||
-- 🔴 `f_creator_time` 在这里**就是日志时间**(官方没有单独的 `f_login_time`)。
|
||||
-- 🔴 `f_login_mark`:1 成功 / 0 失败;`f_login_type`:0 登录 / 1 退出
|
||||
-- (`views/sysLog/loginLog/index.vue:26-28` 的取值)。
|
||||
CREATE TABLE base_sys_log (
|
||||
f_id VARCHAR(50) NOT NULL,
|
||||
f_user_id VARCHAR(50),
|
||||
f_user_name VARCHAR(100),
|
||||
f_type INTEGER,
|
||||
f_level INTEGER,
|
||||
f_ip_address VARCHAR(50),
|
||||
f_ip_address_name VARCHAR(50),
|
||||
f_request_url VARCHAR(500),
|
||||
f_request_method VARCHAR(50),
|
||||
f_request_duration INTEGER,
|
||||
f_json TEXT,
|
||||
f_plat_form VARCHAR(500),
|
||||
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_module_id VARCHAR(50),
|
||||
f_module_name VARCHAR(50),
|
||||
f_object_id VARCHAR(50),
|
||||
f_description VARCHAR(500),
|
||||
f_sort_code BIGINT,
|
||||
f_creator_time TIMESTAMP(0) WITHOUT TIME ZONE,
|
||||
f_tenant_id VARCHAR(50) DEFAULT '0' NOT NULL,
|
||||
f_browser VARCHAR(50),
|
||||
f_request_param TEXT,
|
||||
f_request_target TEXT,
|
||||
f_login_mark INTEGER,
|
||||
f_login_type INTEGER,
|
||||
PRIMARY KEY (f_id, f_tenant_id)
|
||||
);
|
||||
|
||||
-- 审批常用语(`/api/system/CommonWords`)—— 列与官方 JNPF 7.0 逐字一致。
|
||||
-- 🔴 `f_common_words_type`:0 公共(列表页 `searchInfo.commonWordsType`)/ 1 个人
|
||||
-- (官方在 `type=1` 时**额外**加 `f_creator_user_id = 当前用户`,并按 `f_uses_num` 倒序)。
|
||||
-- 🔴 `f_system_ids` 是**逗号串**(不是关联表):一个常用语可挂多个应用。
|
||||
CREATE TABLE base_common_words (
|
||||
f_id VARCHAR(50) NOT NULL,
|
||||
f_system_ids VARCHAR(4000),
|
||||
f_common_words_text VARCHAR(4000),
|
||||
f_common_words_type INTEGER,
|
||||
f_sort_code BIGINT,
|
||||
f_enabled_mark INTEGER,
|
||||
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,
|
||||
f_uses_num BIGINT,
|
||||
PRIMARY KEY (f_id, f_tenant_id)
|
||||
);
|
||||
|
||||
-- 单据规则(`/api/system/BillRule` + `/BillNumber/{enCode}`)—— 列与官方 JNPF 7.0 逐字一致。
|
||||
-- 🔴 `f_type`:1 时间格式 / 2 随机数编号 / 3 UUID(官方 `getNumber` 三分支);
|
||||
-- 时间格式分支还要 `f_date_format` + `f_digit` + `f_start_number` + `f_suffix`。
|
||||
-- 🔴 `f_this_number` / `f_output_number` 是**生成器状态**:每发一个号就 +1 并回写,
|
||||
-- 所以删规则时官方要求 `f_output_number` 为空(`SYS003 已生成过流水号,不能删除`)。
|
||||
CREATE TABLE base_bill_rule (
|
||||
f_id VARCHAR(50) NOT NULL,
|
||||
f_full_name VARCHAR(200),
|
||||
f_en_code VARCHAR(200),
|
||||
f_prefix VARCHAR(50),
|
||||
f_date_format VARCHAR(50),
|
||||
f_digit INTEGER,
|
||||
f_start_number VARCHAR(50),
|
||||
f_example VARCHAR(100),
|
||||
f_this_number INTEGER,
|
||||
f_output_number VARCHAR(100),
|
||||
f_description VARCHAR(500),
|
||||
f_enabled_mark INTEGER,
|
||||
f_category VARCHAR(50),
|
||||
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,
|
||||
f_type INTEGER,
|
||||
f_random_digit INTEGER,
|
||||
f_random_type INTEGER,
|
||||
f_suffix VARCHAR(50),
|
||||
PRIMARY KEY (f_id, f_tenant_id)
|
||||
);
|
||||
|
||||
-- ============================================================================
|
||||
-- 业务表 3 张(demo_item / shop_product / book_shop_book)
|
||||
--
|
||||
|
||||
@@ -44,8 +44,9 @@ use ssw_platform::routes;
|
||||
/// 承载 `App-Code` → `systemId` 的映射);P2 低代码新增 `base_visual_dev` /
|
||||
/// `base_visual_release`(功能定义与发布快照);应用中心/系统配置批次新增
|
||||
/// `base_system_top` / `base_sys_config` / `base_tag`;消息批次新增
|
||||
/// `base_business_category` / `base_message` / `base_notice`,故清单现在是 **25 张**。
|
||||
const BASE_TABLES: [&str; 25] = [
|
||||
/// `base_business_category` / `base_message` / `base_notice`;日志与模板中心批次新增
|
||||
/// `base_sys_log` / `base_common_words` / `base_bill_rule`,故清单现在是 **28 张**。
|
||||
const BASE_TABLES: [&str; 28] = [
|
||||
"base_group",
|
||||
"base_user",
|
||||
"base_role",
|
||||
@@ -72,6 +73,10 @@ const BASE_TABLES: [&str; 25] = [
|
||||
"base_business_category",
|
||||
"base_message",
|
||||
"base_notice",
|
||||
// 🔴 日志与模板中心批次(2026-11-01):系统日志 + 审批常用语 + 单据规则。
|
||||
"base_sys_log",
|
||||
"base_common_words",
|
||||
"base_bill_rule",
|
||||
// 🔴 低代码两张表是**平台表**不是业务表:它们存的是「功能定义」,
|
||||
// 任何业务模块都会用,属于引擎基础设施。
|
||||
"base_visual_dev",
|
||||
|
||||
@@ -19,6 +19,7 @@ use axum::Json;
|
||||
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::session::TokenUser;
|
||||
@@ -152,8 +153,162 @@ pub async fn login_from_bytes(state: &AppState, body: Bytes) -> Json<ActionResul
|
||||
}
|
||||
|
||||
/// axum handler(`POST /api/oauth/Login`)—— Task 10 装配路由时直接用它。
|
||||
pub async fn login_handler(State(state): State<AppState>, body: Bytes) -> Json<ActionResult> {
|
||||
login_from_bytes(&state, body).await
|
||||
///
|
||||
/// 🔴 比 [`login_from_bytes`] 多收一个 `HeaderMap`:登录成功/失败都要落一条
|
||||
/// `base_sys_log`(`f_type = 1`),而 IP / 浏览器 / 操作系统**只能从请求头拿**。
|
||||
/// 官方 `LogController` 的「登录日志」页与个人中心的 `Users/Current/SystemLog`
|
||||
/// 都读它 —— 不写这张表,两个页面永远是空的(而且**不报错**)。
|
||||
pub async fn login_handler(
|
||||
State(state): State<AppState>,
|
||||
headers: HeaderMap,
|
||||
body: Bytes,
|
||||
) -> Json<ActionResult> {
|
||||
// 先留一份账号:`login_from_bytes` 会把 body 消费掉,事后就拿不到了。
|
||||
let account = serde_urlencoded::from_bytes::<LoginForm>(&body)
|
||||
.ok()
|
||||
.and_then(|form| form.account)
|
||||
.unwrap_or_default();
|
||||
let resp = login_from_bytes(&state, body).await;
|
||||
// 🔴 只在**有账号**时记账(连账号都没带 ⇒ 不是一次「登录尝试」,记账只会灌垃圾)。
|
||||
if !account.trim().is_empty() {
|
||||
let (mark, msg) = if resp.0.code == 200 {
|
||||
(1, "登录成功".to_string())
|
||||
} else {
|
||||
(0, resp.0.msg.clone())
|
||||
};
|
||||
write_login_log(&state, &headers, account.trim(), mark, &msg).await;
|
||||
}
|
||||
resp
|
||||
}
|
||||
|
||||
/// 写一条登录日志(`base_sys_log`,`f_type = 1`)。
|
||||
///
|
||||
/// 🔴 **失败不冒泡**:日志写不进去绝不能让登录失败(官方同理,
|
||||
/// 日志是旁路不是主链路)—— 只往服务端 stderr 打一行。
|
||||
/// 🔴 `f_login_mark`:1 成功 / 0 失败;`f_login_type`:0 登录 / 1 退出
|
||||
/// (退出日志本仓没有「登出」端点,恒写 0)。
|
||||
async fn write_login_log(
|
||||
state: &AppState,
|
||||
headers: &HeaderMap,
|
||||
account: &str,
|
||||
mark: i32,
|
||||
msg: &str,
|
||||
) {
|
||||
// 账号 ⇒ 用户 id / 姓名(失败时用户可能不存在 ⇒ 只有账号)。
|
||||
let rows = state
|
||||
.db
|
||||
.query_json_params(
|
||||
"SELECT f_id AS \"id\", COALESCE(f_real_name, '') AS \"realName\" \
|
||||
FROM base_user WHERE f_account = $1::text LIMIT 1",
|
||||
&[&account.to_string()],
|
||||
)
|
||||
.await
|
||||
.unwrap_or_default();
|
||||
let user_id = rows
|
||||
.first()
|
||||
.and_then(|r| r.get("id"))
|
||||
.and_then(Value::as_str)
|
||||
.unwrap_or("")
|
||||
.to_string();
|
||||
let real_name = rows
|
||||
.first()
|
||||
.and_then(|r| r.get("realName"))
|
||||
.and_then(Value::as_str)
|
||||
.unwrap_or("");
|
||||
let user_name = if real_name.is_empty() {
|
||||
account.to_string()
|
||||
} else {
|
||||
real_name.to_string()
|
||||
};
|
||||
|
||||
let ip = client_ip(headers);
|
||||
let ua = headers
|
||||
.get(axum::http::header::USER_AGENT)
|
||||
.and_then(|v| v.to_str().ok())
|
||||
.unwrap_or("");
|
||||
let (browser, platform) = parse_user_agent(ua);
|
||||
|
||||
let id = crate::platform::ids::new_uuid();
|
||||
let mark_text = mark.to_string();
|
||||
let values: [Option<String>; 11] = [
|
||||
Some(id),
|
||||
Some(user_id.clone()),
|
||||
Some(user_name),
|
||||
Some("1".to_string()),
|
||||
Some(ip),
|
||||
Some(browser),
|
||||
Some(platform),
|
||||
Some(mark_text),
|
||||
Some("0".to_string()),
|
||||
Some(msg.to_string()),
|
||||
Some(user_id),
|
||||
];
|
||||
// 参数一律按 text 绑定,类型转换交给 SQL 里的 `::integer`(与面 B 全仓同一口径)。
|
||||
let params: Vec<&(dyn ToSql + Sync)> =
|
||||
values.iter().map(|v| v as &(dyn ToSql + Sync)).collect();
|
||||
if let Err(e) = state
|
||||
.db
|
||||
.exec_params(
|
||||
"INSERT INTO base_sys_log (f_id, f_user_id, f_user_name, f_type, f_ip_address, \
|
||||
f_browser, f_plat_form, f_login_mark, f_login_type, f_description, \
|
||||
f_creator_user_id, f_creator_time, f_delete_mark, f_tenant_id) \
|
||||
VALUES ($1::text, $2::text, $3::text, $4::text::integer, $5::text, \
|
||||
$6::text, $7::text, $8::text::integer, $9::text::integer, $10::text, \
|
||||
$11::text, now(), 0, '0')",
|
||||
¶ms,
|
||||
)
|
||||
.await
|
||||
{
|
||||
eprintln!("[auth] 写登录日志失败(不影响登录): {e}");
|
||||
}
|
||||
}
|
||||
|
||||
/// 客户端 IP —— 先看反代头(`X-Forwarded-For` 取第一个),再 `X-Real-IP`,最后回环地址。
|
||||
fn client_ip(headers: &HeaderMap) -> String {
|
||||
for name in ["x-forwarded-for", "x-real-ip"] {
|
||||
if let Some(value) = headers.get(name).and_then(|v| v.to_str().ok()) {
|
||||
let first = value.split(',').next().unwrap_or("").trim();
|
||||
if !first.is_empty() {
|
||||
return first.to_string();
|
||||
}
|
||||
}
|
||||
}
|
||||
"127.0.0.1".to_string()
|
||||
}
|
||||
|
||||
/// 从 User-Agent 粗分「浏览器 / 操作系统」。
|
||||
///
|
||||
/// 🔴 只做**关键字分档**(官方用 `UserAgentUtil` 解析成同一组枚举)——
|
||||
/// 页面这两列只是给人看的,分不出就写「其他」,绝不返空串(空串看起来像数据丢了)。
|
||||
fn parse_user_agent(ua: &str) -> (String, String) {
|
||||
let lower = ua.to_lowercase();
|
||||
let browser = if lower.contains("edg/") {
|
||||
"Edge"
|
||||
} else if lower.contains("chrome/") || lower.contains("crios/") {
|
||||
"Chrome"
|
||||
} else if lower.contains("firefox/") || lower.contains("fxios/") {
|
||||
"Firefox"
|
||||
} else if lower.contains("safari/") {
|
||||
"Safari"
|
||||
} else if lower.contains("msie") || lower.contains("trident") {
|
||||
"IE"
|
||||
} else {
|
||||
"其他"
|
||||
};
|
||||
let platform = if lower.contains("windows") {
|
||||
"Windows"
|
||||
} else if lower.contains("android") {
|
||||
"Android"
|
||||
} else if lower.contains("iphone") || lower.contains("ipad") || lower.contains("ios") {
|
||||
"iOS"
|
||||
} else if lower.contains("mac os") || lower.contains("macintosh") {
|
||||
"macOS"
|
||||
} else if lower.contains("linux") {
|
||||
"Linux"
|
||||
} else {
|
||||
"其他"
|
||||
};
|
||||
(browser.to_string(), platform.to_string())
|
||||
}
|
||||
|
||||
/// 当前用户(契约 §6.1)。
|
||||
|
||||
+1601
-15
File diff suppressed because it is too large.
Load diff
@@ -160,6 +160,9 @@ pub async fn ensure_base(db: &Db, extra_menus: &[MenuSpec]) -> Result<(), pglite
|
||||
// 🔴 消息业务分类字典(`base_business_category`):消息记录页左侧两级页签的数据源。
|
||||
// 缺了它页面只是「页签为空」,不报错 ⇒ 很容易一直没人发现,所以放在同一处种。
|
||||
ensure_business_category(db, &now).await?;
|
||||
// 🔴 `businessType` 字典:单据规则(模板中心)的「业务分类」列/下拉的唯一数据源。
|
||||
// 同样是「缺了不报错、只是全空」的那类,一并种在这里。
|
||||
ensure_business_type_dict(db, &now).await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -334,6 +337,121 @@ pub async fn ensure_business_category(db: &Db, now: &str) -> Result<(), pglite::
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// `businessType`(**业务分类**)字典的数据行 —— 官方初始库的 13 行原样。
|
||||
///
|
||||
/// 真源:`jnpf-database/PostgreSQL/jnpf_db_init.sql` 里
|
||||
/// `f_dictionary_type_id = '306427078100678661'` 的那 13 条 `base_dictionary_data`。
|
||||
///
|
||||
/// 🔴 **为什么要灌它**:单据规则的 `f_category` 存的就是这些 id
|
||||
/// (`BillRuleController.list` 只是把 id 换成 `f_full_name` 显示),
|
||||
/// 字典为空 ⇒ 列表「业务分类」列全空、新建表单的分类下拉一个选项都没有。
|
||||
/// 🔴 id 沿用官方字面量:`f_category` 存 id,换 id 官方数据就对不上分类。
|
||||
const BUSINESS_TYPES: [(&str, &str, &str); 13] = [
|
||||
("802fb04ab5b84aa5bcc5dc53372a271d", "费用相关", "costRelated"),
|
||||
("8f65bbe3bce341c8b3625d93544a044a", "仓库管理", "warehouseManagement"),
|
||||
("972acb74d15e493aae4f471e16518bef", "人事管理", "personnelManage"),
|
||||
("9b077e268d4f44e6baa29bb40345f422", "项目管理", "projectManage"),
|
||||
("9e9205fb43da4b88a24bb1eebd626ff0", "销售管理", "saleManage"),
|
||||
("be6b516477ed41dab4d0777336e58ddf", "日常工作", "routine"),
|
||||
("c92985dbcdd648c6a98b272a8f09698e", "服务支持", "serviceSupport"),
|
||||
("ce51233654ee4d1890c7c081a04da2be", "资产管理", "assetsManage"),
|
||||
("e17e977fe98e43d0baabb327f70e6549", "车辆管理", "cheliang"),
|
||||
("e43a773b8a024d109dfb176e99f08a35", "行政管理", "administrationManage"),
|
||||
("e8bfa8ac60d34361b815b48c494f3e06", "合同管理", "contractManage"),
|
||||
("f8b87124ef2a45758426c7d76afa2c90", "公文管理", "documentManage"),
|
||||
("fe72535365154b5f82fd7c2f984087f3", "CRM应用", "crm"),
|
||||
];
|
||||
|
||||
/// `businessType` 字典**分类**行的固定 id(官方初始库同值)。
|
||||
const BUSINESS_TYPE_DICT_ID: &str = "306427078100678661";
|
||||
|
||||
/// 灌 `businessType` 字典(分类 1 行 + 数据 13 行)—— 幂等,按 `f_id` 判存在。
|
||||
///
|
||||
/// 🔴 与 [`ensure_business_category`] 同一口径:**不看 `f_delete_mark`**
|
||||
/// ⇒ 管理员在 UI 里删掉的分类不会被下次启动又插回来。
|
||||
pub async fn ensure_business_type_dict(db: &Db, now: &str) -> Result<(), pglite::Error> {
|
||||
let now = now.to_string();
|
||||
let tenant_id = "0".to_string();
|
||||
let enabled_mark = "1".to_string();
|
||||
let delete_mark = "0".to_string();
|
||||
let sort_zero = "0".to_string();
|
||||
let parent_zero = "0".to_string();
|
||||
let dict_id = BUSINESS_TYPE_DICT_ID.to_string();
|
||||
let dict_name = "业务分类".to_string();
|
||||
let dict_code = "businessType".to_string();
|
||||
let is_tree = "0".to_string();
|
||||
let dict_type = "1".to_string();
|
||||
|
||||
let existed = db
|
||||
.query_json_params(
|
||||
"SELECT f_id AS \"id\" FROM base_dictionary_type WHERE f_id = $1::text LIMIT 1",
|
||||
&[&dict_id],
|
||||
)
|
||||
.await?;
|
||||
if existed.is_empty() {
|
||||
let params: [&(dyn ToSql + Sync); 11] = [
|
||||
&dict_id,
|
||||
&parent_zero,
|
||||
&dict_name,
|
||||
&dict_code,
|
||||
&is_tree,
|
||||
&dict_type,
|
||||
&enabled_mark,
|
||||
&sort_zero,
|
||||
&delete_mark,
|
||||
&tenant_id,
|
||||
&now,
|
||||
];
|
||||
db.exec_params(
|
||||
"INSERT INTO base_dictionary_type \
|
||||
(f_id, f_parent_id, f_full_name, f_en_code, f_is_tree, f_type, f_enabled_mark, \
|
||||
f_sort_code, f_delete_mark, f_tenant_id, f_creator_time) \
|
||||
VALUES ($1::text, $2::text, $3::text, $4::text, $5::text::integer, \
|
||||
$6::text::integer, $7::text::integer, $8::text::bigint, \
|
||||
$9::text::integer, $10::text, $11::text::timestamp)",
|
||||
¶ms,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
|
||||
for (index, (id, full_name, en_code)) in BUSINESS_TYPES.iter().enumerate() {
|
||||
let (id, full_name, en_code) =
|
||||
(id.to_string(), full_name.to_string(), en_code.to_string());
|
||||
let sort_code = index.to_string();
|
||||
let existed = db
|
||||
.query_json_params(
|
||||
"SELECT f_id AS \"id\" FROM base_dictionary_data WHERE f_id = $1::text LIMIT 1",
|
||||
&[&id],
|
||||
)
|
||||
.await?;
|
||||
if !existed.is_empty() {
|
||||
continue;
|
||||
}
|
||||
let params: [&(dyn ToSql + Sync); 10] = [
|
||||
&id,
|
||||
&parent_zero,
|
||||
&full_name,
|
||||
&en_code,
|
||||
&enabled_mark,
|
||||
&dict_id,
|
||||
&sort_code,
|
||||
&delete_mark,
|
||||
&tenant_id,
|
||||
&now,
|
||||
];
|
||||
db.exec_params(
|
||||
"INSERT INTO base_dictionary_data \
|
||||
(f_id, f_parent_id, f_full_name, f_en_code, f_enabled_mark, f_dictionary_type_id, \
|
||||
f_sort_code, f_delete_mark, f_tenant_id, f_creator_time) \
|
||||
VALUES ($1::text, $2::text, $3::text, $4::text, $5::text::integer, $6::text, \
|
||||
$7::text::bigint, $8::text::integer, $9::text, $10::text::timestamp)",
|
||||
¶ms,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 把一个 `App-Code`(`base_system.f_en_code`)解析成系统 id(`base_system.f_id`)。
|
||||
///
|
||||
/// 🔴 用于把菜单种进正确的系统(`f_system_id`)—— 平台层**不认**具体 app 名,
|
||||
|
||||
@@ -292,6 +292,70 @@ pub fn build_router(state: AppState) -> axum::Router<AppState> {
|
||||
"/api/message/Notice/{id}/ReplyUserList",
|
||||
get(face_b::notice_reply_user_list),
|
||||
)
|
||||
// ---- 系统日志(sysLog 四个页面 + 个人中心登录日志)----
|
||||
// 🔴 `Log/deleteLoginLog` / `Log/ModuleName` 是静态段,matchit 里**优先于**
|
||||
// `Log/{id}` 参数段 ⇒ 两条同时存在也不会互相抢(以测试钉住)。
|
||||
// 🔴 `/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/CommonWords", get(face_b::common_words_list))
|
||||
.route("/api/system/CommonWords", post(face_b::common_words_create))
|
||||
.route(
|
||||
"/api/system/CommonWords/Selector",
|
||||
get(face_b::common_words_selector),
|
||||
)
|
||||
.route(
|
||||
"/api/system/CommonWords/UsesNum",
|
||||
post(face_b::common_words_uses_num),
|
||||
)
|
||||
.route(
|
||||
"/api/system/CommonWords/{id}",
|
||||
get(face_b::common_words_info),
|
||||
)
|
||||
.route(
|
||||
"/api/system/CommonWords/{id}",
|
||||
put(face_b::common_words_update),
|
||||
)
|
||||
.route(
|
||||
"/api/system/CommonWords/{id}",
|
||||
delete(face_b::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/Selector",
|
||||
get(face_b::bill_rule_selector),
|
||||
)
|
||||
.route(
|
||||
"/api/system/BillRule/BillNumber/{enCode}",
|
||||
get(face_b::bill_rule_number),
|
||||
)
|
||||
.route(
|
||||
"/api/system/BillRule/Actions/Import",
|
||||
post(face_b::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}",
|
||||
delete(face_b::bill_rule_delete),
|
||||
)
|
||||
.route(
|
||||
"/api/system/BillRule/{id}/Actions/State",
|
||||
put(face_b::bill_rule_state),
|
||||
)
|
||||
.route(
|
||||
"/api/system/BillRule/{id}/Actions/Export",
|
||||
get(face_b::bill_rule_export),
|
||||
)
|
||||
// ---- 系统配置 + 第三方同步(官方 `SysConfigController` / `SynThirdInfoController`)----
|
||||
.route("/api/system/SysConfig", get(face_b::sys_config_get))
|
||||
.route("/api/system/SysConfig", put(face_b::sys_config_update))
|
||||
@@ -1084,7 +1148,7 @@ mod tests {
|
||||
// 🔴 表数**故意写死**:它同时校验「schema.sql 建了预期的表」与
|
||||
// 「health 报的是真数」。加表要同步改这里 + main.rs 的 BASE_TABLES
|
||||
// + crates/sspf-store 的两条 DDL 断言(共四处,漏一处就红)。
|
||||
assert_eq!(body["tables"], 29);
|
||||
assert_eq!(body["tables"], 32);
|
||||
assert_eq!(body["version"], env!("CARGO_PKG_VERSION"));
|
||||
}
|
||||
|
||||
@@ -1099,7 +1163,7 @@ mod tests {
|
||||
let port = serve(new_state(db().await)).await;
|
||||
|
||||
// 🔴 按**路径**列(同一路径多个方法只算一条)—— 每条都用 PATCH 探 405。
|
||||
const FACE_B_REGISTERED: [&str; 147] = [
|
||||
const FACE_B_REGISTERED: [&str; 162] = [
|
||||
"/api/permission/Users",
|
||||
"/api/permission/Users/any-id",
|
||||
"/api/permission/Users/BatchDelete",
|
||||
@@ -1249,6 +1313,23 @@ mod tests {
|
||||
"/api/message/Notice/any-id",
|
||||
"/api/message/Notice/any-id/Actions/Release",
|
||||
"/api/message/Notice/any-id/ReplyUserList",
|
||||
// —— 系统日志 + 审批常用语 + 单据规则(批次 5)——
|
||||
// 🔴 `/Log/any-id` 一条覆盖两个方法(GET 详情 / DELETE 按分类清空)。
|
||||
"/api/system/Log",
|
||||
"/api/system/Log/deleteLoginLog",
|
||||
"/api/system/Log/ModuleName",
|
||||
"/api/system/Log/any-id",
|
||||
"/api/system/CommonWords",
|
||||
"/api/system/CommonWords/Selector",
|
||||
"/api/system/CommonWords/UsesNum",
|
||||
"/api/system/CommonWords/any-id",
|
||||
"/api/system/BillRule",
|
||||
"/api/system/BillRule/Selector",
|
||||
"/api/system/BillRule/BillNumber/any-param",
|
||||
"/api/system/BillRule/Actions/Import",
|
||||
"/api/system/BillRule/any-id",
|
||||
"/api/system/BillRule/any-id/Actions/State",
|
||||
"/api/system/BillRule/any-id/Actions/Export",
|
||||
];
|
||||
|
||||
for path in FACE_B_REGISTERED {
|
||||
|
||||
@@ -0,0 +1,651 @@
|
||||
//! 批次 5(系统日志 `/api/system/Log` + 审批常用语 `/api/system/CommonWords` +
|
||||
//! 单据规则 `/api/system/BillRule`)集成测试。
|
||||
//!
|
||||
//! 🔴 **钉住的契约点**(每条都对应官方控制器 / mapper 的一处硬要求):
|
||||
//! ① `GET /Log?category=1` 是 `PageListVO`,`creatorTime` 是**毫秒数**(官方 VO 是 `Long`);
|
||||
//! `category=2`(访问日志)官方走 `default` ⇒ **必须 400**,不是空列表。
|
||||
//! ② 登录**会落 `base_sys_log`**(`f_type=1`):`loginMark=1`、`browser`/`platForm` 从 UA 粗分
|
||||
//! ⇒ 个人中心 `Users/Current/SystemLog` 才有内容(早先恒空、也不报错)。
|
||||
//! ③ `DELETE /Log/{type}` 按**分类**清空(`type` 是分类号不是 id),
|
||||
//! `DELETE /Log/deleteLoginLog` 只清**自己的** —— 两条语义不同,不能合并。
|
||||
//! ④ 常用语:`text + type` 同档判重(`SYS105`)、`UsesNum` 按**文本**累加。
|
||||
//! ⑤ 单据规则的单号生成三分支 + **跨天归零**:上一号的日期段 ≠ 今天 ⇒ 从 0 重来。
|
||||
//! ⑥ 已发过号的规则**不许删**(`SYS003`);导出/导入本仓无文件服务 ⇒ 明确 400。
|
||||
//!
|
||||
//! 🔴 pglite-rs 0.2.7 是**进程级全局标志** ⇒ 全文件共用一个临时库 + 一把互斥锁。
|
||||
|
||||
use std::path::PathBuf;
|
||||
use std::sync::Arc;
|
||||
|
||||
use serde_json::{json, Value};
|
||||
use ssw_platform::bootstrap::ensure_base;
|
||||
use ssw_platform::platform::config::Config;
|
||||
use ssw_platform::platform::db::{pglite::ToSql, Db};
|
||||
use ssw_platform::platform::seed::first_seed;
|
||||
use ssw_platform::platform::session::SessionStore;
|
||||
use ssw_platform::platform::state::AppState;
|
||||
use ssw_platform::routes::build_app;
|
||||
use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
||||
use tokio::net::TcpStream;
|
||||
use tokio::sync::{Mutex, OnceCell};
|
||||
|
||||
static DB: OnceCell<Db> = OnceCell::const_new();
|
||||
static LOCK: Mutex<()> = Mutex::const_new(());
|
||||
|
||||
async fn db() -> &'static Db {
|
||||
DB.get_or_init(|| async {
|
||||
let db = Db::open_temp().await.expect("打开 pglite 临时库失败");
|
||||
db.ensure_schema().await.expect("ensure_schema 失败");
|
||||
ensure_base(&db).await.expect("ensure_base 失败");
|
||||
first_seed(&db, "123456").await.expect("first_seed 失败");
|
||||
db
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
||||
async fn serve(state: AppState) -> u16 {
|
||||
let listener = tokio::net::TcpListener::bind("127.0.0.1:0")
|
||||
.await
|
||||
.expect("绑定失败");
|
||||
let port = listener.local_addr().expect("取本地地址失败").port();
|
||||
let server = tokio::spawn(async move {
|
||||
let _ = axum::serve(listener, build_app(state)).await;
|
||||
});
|
||||
tokio::task::yield_now().await;
|
||||
std::mem::forget(server);
|
||||
port
|
||||
}
|
||||
|
||||
/// 面 B 请求(带 `Vue-Version: 3`)。
|
||||
async fn call(
|
||||
port: u16,
|
||||
method: &str,
|
||||
path: &str,
|
||||
token: &str,
|
||||
body: Option<&str>,
|
||||
) -> (String, Value) {
|
||||
let mut stream = TcpStream::connect(("127.0.0.1", port))
|
||||
.await
|
||||
.expect("连接失败");
|
||||
let payload = body.unwrap_or("");
|
||||
let req = format!(
|
||||
"{method} {path} HTTP/1.1\r\n\
|
||||
Host: 127.0.0.1\r\n\
|
||||
Vue-Version: 3\r\n\
|
||||
App-Code: mainSystem\r\n\
|
||||
Authorization: {token}\r\n\
|
||||
Content-Type: application/json\r\n\
|
||||
Content-Length: {}\r\n\
|
||||
Connection: close\r\n\r\n{payload}",
|
||||
payload.len()
|
||||
);
|
||||
stream.write_all(req.as_bytes()).await.expect("写请求失败");
|
||||
let mut buf = Vec::new();
|
||||
tokio::time::timeout(
|
||||
std::time::Duration::from_secs(10),
|
||||
stream.read_to_end(&mut buf),
|
||||
)
|
||||
.await
|
||||
.expect("读响应超时")
|
||||
.expect("读响应失败");
|
||||
let text = String::from_utf8_lossy(&buf).to_string();
|
||||
let (head, body) = text.split_once("\r\n\r\n").expect("响应必须有头体分隔");
|
||||
let status = head.lines().next().unwrap_or_default().to_string();
|
||||
let json: Value = serde_json::from_str(body.trim()).unwrap_or(Value::Null);
|
||||
(status, json)
|
||||
}
|
||||
|
||||
/// 登录(**带 User-Agent**:登录日志的「浏览器 / 操作系统」两列靠它)。
|
||||
async fn login(port: u16) -> String {
|
||||
let enc = ssw_platform::platform::cipher::encrypt_password("123456");
|
||||
let payload = format!("account=admin&password={enc}");
|
||||
let mut stream = TcpStream::connect(("127.0.0.1", port))
|
||||
.await
|
||||
.expect("连接失败");
|
||||
let req = format!(
|
||||
"POST /api/oauth/Login HTTP/1.1\r\n\
|
||||
Host: 127.0.0.1\r\n\
|
||||
Vue-Version: 3\r\n\
|
||||
App-Code: mainSystem\r\n\
|
||||
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 \
|
||||
(KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36\r\n\
|
||||
Content-Type: application/x-www-form-urlencoded\r\n\
|
||||
Content-Length: {}\r\n\
|
||||
Connection: close\r\n\r\n{payload}",
|
||||
payload.len()
|
||||
);
|
||||
stream.write_all(req.as_bytes()).await.expect("写请求失败");
|
||||
let mut buf = Vec::new();
|
||||
tokio::time::timeout(
|
||||
std::time::Duration::from_secs(10),
|
||||
stream.read_to_end(&mut buf),
|
||||
)
|
||||
.await
|
||||
.expect("读响应超时")
|
||||
.expect("读响应失败");
|
||||
let text = String::from_utf8_lossy(&buf).to_string();
|
||||
let (_, body) = text.split_once("\r\n\r\n").expect("响应必须有头体分隔");
|
||||
let json: Value = serde_json::from_str(body.trim()).expect("登录响应必须是 JSON");
|
||||
json["data"]["token"]
|
||||
.as_str()
|
||||
.expect("登录必须返回 token")
|
||||
.to_string()
|
||||
}
|
||||
|
||||
fn new_state(db: &Db) -> AppState {
|
||||
AppState {
|
||||
config: Arc::new(Config::from_env(PathBuf::from("/tmp/ssw-platform-batch5-it"))),
|
||||
db: Arc::new(db.clone()),
|
||||
sessions: Arc::new(SessionStore::default()),
|
||||
}
|
||||
}
|
||||
|
||||
/// 取「今天」的 `YYYYMMDD`(与后端 `to_char(now(), 'YYYYMMDD')` 同一来源:库里算)。
|
||||
async fn today_ymd(db: &Db) -> String {
|
||||
let rows = db
|
||||
.query_json_params("SELECT to_char(now(), 'YYYYMMDD') AS \"d\"", &[])
|
||||
.await
|
||||
.expect("取日期失败");
|
||||
rows[0]["d"].as_str().unwrap_or_default().to_string()
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 系统日志
|
||||
|
||||
/// 登录落库 ⇒ `/api/system/Log` 与个人中心「登录日志」都看得到同一条。
|
||||
#[tokio::test]
|
||||
async fn login_writes_log_and_both_readers_agree() {
|
||||
let _guard = LOCK.lock().await;
|
||||
let port = serve(new_state(db().await)).await;
|
||||
let token = login(port).await;
|
||||
|
||||
// ① 登录日志列表:形状是 PageListVO,`creatorTime` 是毫秒数。
|
||||
let (_, listed) = call(port, "GET", "/api/system/Log?category=1", &token, None).await;
|
||||
assert_eq!(listed["code"], 200, "登录日志列表失败: {listed}");
|
||||
let pagination = listed["data"]["pagination"]
|
||||
.as_object()
|
||||
.unwrap_or_else(|| panic!("data 必须是 PageListVO: {listed}"));
|
||||
assert!(pagination.contains_key("total"), "必须有 total: {listed}");
|
||||
let rows = listed["data"]["list"].as_array().expect("必须有 list");
|
||||
assert!(!rows.is_empty(), "登录过就必须有登录日志: {listed}");
|
||||
let row = rows.first().expect("至少一行");
|
||||
assert_eq!(row["loginMark"], json!(1), "成功登录 ⇒ loginMark=1: {row}");
|
||||
assert_eq!(row["loginType"], json!(0), "登录 ⇒ loginType=0: {row}");
|
||||
assert_eq!(row["userName"], json!("管理员"), "用户名取 realName: {row}");
|
||||
assert_eq!(row["browser"], json!("Chrome"), "UA 应分出 Chrome: {row}");
|
||||
assert_eq!(row["platForm"], json!("macOS"), "UA 应分出 macOS: {row}");
|
||||
assert_eq!(row["ipAddress"], json!("127.0.0.1"), "默认回环: {row}");
|
||||
// 🔴 毫秒时间戳(官方 LoginLogVO.creatorTime 是 Long)—— 13 位量级。
|
||||
let ts = row["creatorTime"].as_i64().expect("必须是数字");
|
||||
assert!(ts > 1_600_000_000_000, "必须是毫秒时间戳,实际 {ts}");
|
||||
|
||||
// ② 个人中心那条读的是同一张表(同一个用户 ⇒ 同样有行)。
|
||||
let (_, mine) = call(
|
||||
port,
|
||||
"GET",
|
||||
"/api/permission/Users/Current/SystemLog",
|
||||
&token,
|
||||
None,
|
||||
)
|
||||
.await;
|
||||
assert_eq!(mine["code"], 200, "个人中心登录日志失败: {mine}");
|
||||
let mine_total = mine["data"]["pagination"]["total"].as_i64().unwrap_or(0);
|
||||
assert!(mine_total >= 1, "个人中心也该看到自己的登录日志: {mine}");
|
||||
|
||||
// ③ 访问日志(category=2)官方走 default ⇒ 400,不是空列表。
|
||||
let (_, denied) = call(port, "GET", "/api/system/Log?category=2", &token, None).await;
|
||||
assert_eq!(denied["code"], json!(400), "category=2 必须 400: {denied}");
|
||||
}
|
||||
|
||||
/// 三条删除路径的**语义差别**:按 id 删 / 按分类清空 / 只清自己的。
|
||||
#[tokio::test]
|
||||
async fn log_delete_paths_have_distinct_semantics() {
|
||||
let _guard = LOCK.lock().await;
|
||||
let port = serve(new_state(db().await)).await;
|
||||
let token = login(port).await;
|
||||
|
||||
// 先清干净,计数才有确定性。
|
||||
let (_, cleared) = call(port, "DELETE", "/api/system/Log/1", &token, None).await;
|
||||
assert_eq!(cleared["code"], 200, "一键清空失败: {cleared}");
|
||||
let (_, after) = call(port, "GET", "/api/system/Log?category=1", &token, None).await;
|
||||
assert_eq!(after["data"]["pagination"]["total"], json!(0), "{after}");
|
||||
|
||||
// ① 按 id 批量删。
|
||||
let _ = login(port).await;
|
||||
let (_, listed) = call(port, "GET", "/api/system/Log?category=1", &token, None).await;
|
||||
let id = listed["data"]["list"][0]["id"]
|
||||
.as_str()
|
||||
.expect("日志必须有 id")
|
||||
.to_string();
|
||||
let body = json!({ "ids": [id] }).to_string();
|
||||
let (_, deleted) = call(port, "DELETE", "/api/system/Log", &token, Some(&body)).await;
|
||||
assert_eq!(deleted["code"], 200, "按 id 删除失败: {deleted}");
|
||||
let (_, after) = call(port, "GET", "/api/system/Log?category=1", &token, None).await;
|
||||
assert_eq!(after["data"]["pagination"]["total"], json!(0), "{after}");
|
||||
|
||||
// ② 只清自己的(`deleteLoginLog`)—— 自己的删掉就归零。
|
||||
let _ = login(port).await;
|
||||
let (_, mine_del) = call(port, "DELETE", "/api/system/Log/deleteLoginLog", &token, None).await;
|
||||
assert_eq!(mine_del["code"], 200, "清空个人登录日志失败: {mine_del}");
|
||||
let (_, after) = call(port, "GET", "/api/system/Log?category=1", &token, None).await;
|
||||
assert_eq!(after["data"]["pagination"]["total"], json!(0), "{after}");
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 审批常用语
|
||||
|
||||
/// 常用语:判重 / 列表 / 下拉 / 使用计数 / 改 / 删。
|
||||
#[tokio::test]
|
||||
async fn common_words_crud_and_uses_num() {
|
||||
let _guard = LOCK.lock().await;
|
||||
let port = serve(new_state(db().await)).await;
|
||||
let token = login(port).await;
|
||||
let text = "同意,请按计划推进";
|
||||
|
||||
let body = json!({ "commonWordsText": text, "commonWordsType": 0, "enabledMark": 1 });
|
||||
let (_, created) = call(
|
||||
port,
|
||||
"POST",
|
||||
"/api/system/CommonWords",
|
||||
&token,
|
||||
Some(&body.to_string()),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(created["code"], 200, "新建常用语失败: {created}");
|
||||
|
||||
// ① 同文本同类型 ⇒ `SYS105 常用语已存在`。
|
||||
let (_, dup) = call(
|
||||
port,
|
||||
"POST",
|
||||
"/api/system/CommonWords",
|
||||
&token,
|
||||
Some(&body.to_string()),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(dup["code"], json!(400), "重复必须 400: {dup}");
|
||||
assert_eq!(dup["msg"], json!("常用语已存在"), "{dup}");
|
||||
|
||||
// ② 列表(公共 type=0)能查到,且形状是 PageListVO。
|
||||
let (_, listed) = call(
|
||||
port,
|
||||
"GET",
|
||||
"/api/system/CommonWords?commonWordsType=0¤tPage=1&pageSize=20",
|
||||
&token,
|
||||
None,
|
||||
)
|
||||
.await;
|
||||
assert_eq!(listed["code"], 200, "常用语列表失败: {listed}");
|
||||
let row = listed["data"]["list"]
|
||||
.as_array()
|
||||
.expect("PageListVO")
|
||||
.iter()
|
||||
.find(|x| x["commonWordsText"] == json!(text))
|
||||
.unwrap_or_else(|| panic!("新建的常用语必须在列表里: {listed}"))
|
||||
.clone();
|
||||
let id = row["id"].as_str().expect("必须有 id").to_string();
|
||||
assert_eq!(row["commonWordsType"], json!(0), "{row}");
|
||||
|
||||
// ③ 下拉:`ListVO`(只有 list)。
|
||||
let (_, selector) = call(
|
||||
port,
|
||||
"GET",
|
||||
"/api/system/CommonWords/Selector?type=0",
|
||||
&token,
|
||||
None,
|
||||
)
|
||||
.await;
|
||||
assert_eq!(selector["code"], 200, "常用语下拉失败: {selector}");
|
||||
assert!(
|
||||
selector["data"].get("pagination").is_none(),
|
||||
"Selector 是 ListVO,不该有 pagination: {selector}"
|
||||
);
|
||||
|
||||
// ④ 使用计数:按**文本**加。
|
||||
let uses = json!({ "commonWordsText": text }).to_string();
|
||||
let (_, counted) = call(
|
||||
port,
|
||||
"POST",
|
||||
"/api/system/CommonWords/UsesNum",
|
||||
&token,
|
||||
Some(&uses),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(counted["code"], 200, "计数失败: {counted}");
|
||||
let (_, info) = call(port, "GET", &format!("/api/system/CommonWords/{id}"), &token, None).await;
|
||||
assert_eq!(info["data"]["usesNum"], json!(1), "计数应 +1: {info}");
|
||||
assert!(info["data"]["systemNames"].is_string(), "详情要补 systemNames: {info}");
|
||||
|
||||
// ⑤ 改:只 SET body 出现的键(这里只改文本)。
|
||||
let patch = json!({ "commonWordsText": "同意,按计划推进(修订)" }).to_string();
|
||||
let (_, updated) = call(
|
||||
port,
|
||||
"PUT",
|
||||
&format!("/api/system/CommonWords/{id}"),
|
||||
&token,
|
||||
Some(&patch),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(updated["code"], 200, "修改失败: {updated}");
|
||||
let (_, info) = call(port, "GET", &format!("/api/system/CommonWords/{id}"), &token, None).await;
|
||||
assert_eq!(info["data"]["commonWordsText"], json!("同意,按计划推进(修订)"), "{info}");
|
||||
assert_eq!(info["data"]["enabledMark"], json!(1), "没给的键不能被清空: {info}");
|
||||
|
||||
// ⑥ 删(软删)⇒ 列表里没了。
|
||||
let (_, deleted) = call(
|
||||
port,
|
||||
"DELETE",
|
||||
&format!("/api/system/CommonWords/{id}"),
|
||||
&token,
|
||||
None,
|
||||
)
|
||||
.await;
|
||||
assert_eq!(deleted["code"], 200, "删除失败: {deleted}");
|
||||
let (_, listed) = call(
|
||||
port,
|
||||
"GET",
|
||||
"/api/system/CommonWords?commonWordsType=0",
|
||||
&token,
|
||||
None,
|
||||
)
|
||||
.await;
|
||||
assert!(
|
||||
listed["data"]["list"]
|
||||
.as_array()
|
||||
.expect("PageListVO")
|
||||
.iter()
|
||||
.all(|x| x["id"] != json!(id)),
|
||||
"软删后不该再出现: {listed}"
|
||||
);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 单据规则
|
||||
|
||||
/// 单号生成:时间格式 + 位数补零 + **跨天归零**;`f_this_number` 会回写。
|
||||
#[tokio::test]
|
||||
async fn bill_number_time_format_and_day_reset() {
|
||||
let _guard = LOCK.lock().await;
|
||||
let db = db().await;
|
||||
let port = serve(new_state(db)).await;
|
||||
let token = login(port).await;
|
||||
let ymd = today_ymd(db).await;
|
||||
|
||||
let body = json!({
|
||||
"fullName": "测试单号-时间格式",
|
||||
"enCode": "biz_test_no",
|
||||
"category": "9b077e268d4f44e6baa29bb40345f422",
|
||||
"prefix": "SO",
|
||||
"type": 1,
|
||||
"dateFormat": "YYYYMMDD",
|
||||
"digit": 4,
|
||||
"startNumber": "1",
|
||||
});
|
||||
let (_, created) = call(
|
||||
port,
|
||||
"POST",
|
||||
"/api/system/BillRule",
|
||||
&token,
|
||||
Some(&body.to_string()),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(created["code"], 200, "新建单据规则失败: {created}");
|
||||
|
||||
// ① 第一次发号:起始值 1 ⇒ `SO{今天}0001`。
|
||||
let (_, first) = call(
|
||||
port,
|
||||
"GET",
|
||||
"/api/system/BillRule/BillNumber/biz_test_no",
|
||||
&token,
|
||||
None,
|
||||
)
|
||||
.await;
|
||||
assert_eq!(first["code"], 200, "发号失败: {first}");
|
||||
assert_eq!(
|
||||
first["data"],
|
||||
json!(format!("SO{ymd}0001")),
|
||||
"第一次发号应等于 前缀+日期+起始值补零: {first}"
|
||||
);
|
||||
|
||||
// ② 第二次:连续递增(**同一天**不清零)。
|
||||
let (_, second) = call(
|
||||
port,
|
||||
"GET",
|
||||
"/api/system/BillRule/BillNumber/biz_test_no",
|
||||
&token,
|
||||
None,
|
||||
)
|
||||
.await;
|
||||
assert_eq!(second["data"], json!(format!("SO{ymd}0002")), "{second}");
|
||||
|
||||
// ③ 跨天归零:把上一号伪造成「去年 1 月 1 日的 0009」⇒ 下次必须回到 0001。
|
||||
let sql = "UPDATE base_bill_rule SET f_output_number = $1::text, \
|
||||
f_this_number = $2::text::integer WHERE f_en_code = 'biz_test_no'";
|
||||
let values = [Some("SO202001010009".to_string()), Some("9".to_string())];
|
||||
let params: Vec<&(dyn ToSql + Sync)> =
|
||||
values.iter().map(|v| v as &(dyn ToSql + Sync)).collect();
|
||||
db.exec_params(sql, ¶ms).await.expect("伪造上一号失败");
|
||||
let (_, reset) = call(
|
||||
port,
|
||||
"GET",
|
||||
"/api/system/BillRule/BillNumber/biz_test_no",
|
||||
&token,
|
||||
None,
|
||||
)
|
||||
.await;
|
||||
assert_eq!(
|
||||
reset["data"],
|
||||
json!(format!("SO{ymd}0001")),
|
||||
"日期段变了就必须从起始值重来: {reset}"
|
||||
);
|
||||
|
||||
// ④ 列表:`category` 要换成字典里的**中文名**(`businessType` 项目管理)。
|
||||
let (_, listed) = call(port, "GET", "/api/system/BillRule", &token, None).await;
|
||||
assert_eq!(listed["code"], 200, "单据规则列表失败: {listed}");
|
||||
let row = listed["data"]["list"]
|
||||
.as_array()
|
||||
.expect("PageListVO")
|
||||
.iter()
|
||||
.find(|x| x["enCode"] == json!("biz_test_no"))
|
||||
.unwrap_or_else(|| panic!("新建的规则必须在列表里: {listed}"))
|
||||
.clone();
|
||||
assert_eq!(row["category"], json!("项目管理"), "分类要显示中文名: {row}");
|
||||
assert_eq!(row["creatorUser"], json!("管理员/admin"), "创建人=姓名/账号: {row}");
|
||||
assert_eq!(row["outputNumber"], json!(format!("SO{ymd}0001")), "{row}");
|
||||
}
|
||||
|
||||
/// 单据规则的几道闸:判重 / 已用不许删 / 导出导入明确不支持 / 改规则清流水。
|
||||
#[tokio::test]
|
||||
async fn bill_rule_guards() {
|
||||
let _guard = LOCK.lock().await;
|
||||
let port = serve(new_state(db().await)).await;
|
||||
let token = login(port).await;
|
||||
|
||||
let body = json!({
|
||||
"fullName": "测试单号-闸门",
|
||||
"enCode": "biz_guard_no",
|
||||
"category": "9b077e268d4f44e6baa29bb40345f422",
|
||||
"prefix": "GD",
|
||||
"type": 1,
|
||||
"dateFormat": "YYYYMMDD",
|
||||
"digit": 3,
|
||||
"startNumber": "1",
|
||||
});
|
||||
let (_, created) = call(
|
||||
port,
|
||||
"POST",
|
||||
"/api/system/BillRule",
|
||||
&token,
|
||||
Some(&body.to_string()),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(created["code"], 200, "新建失败: {created}");
|
||||
|
||||
// ① 名称重复 ⇒ `EXIST001 名称不能重复`。
|
||||
let mut dup_name = body.clone();
|
||||
dup_name["enCode"] = json!("biz_guard_no_2");
|
||||
let (_, dup) = call(
|
||||
port,
|
||||
"POST",
|
||||
"/api/system/BillRule",
|
||||
&token,
|
||||
Some(&dup_name.to_string()),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(dup["code"], json!(400), "{dup}");
|
||||
assert_eq!(dup["msg"], json!("名称不能重复"), "{dup}");
|
||||
|
||||
// ② 编码重复 ⇒ `EXIST002 编码不能重复`。
|
||||
let mut dup_code = body.clone();
|
||||
dup_code["fullName"] = json!("测试单号-闸门2");
|
||||
let (_, dup) = call(
|
||||
port,
|
||||
"POST",
|
||||
"/api/system/BillRule",
|
||||
&token,
|
||||
Some(&dup_code.to_string()),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(dup["msg"], json!("编码不能重复"), "{dup}");
|
||||
|
||||
// ③ 发一次号 ⇒ 之后不许删(`SYS003`)。
|
||||
let (_, numbered) = call(
|
||||
port,
|
||||
"GET",
|
||||
"/api/system/BillRule/BillNumber/biz_guard_no",
|
||||
&token,
|
||||
None,
|
||||
)
|
||||
.await;
|
||||
assert_eq!(numbered["code"], 200, "{numbered}");
|
||||
let (_, listed) = call(
|
||||
port,
|
||||
"GET",
|
||||
"/api/system/BillRule?keyword=biz_guard_no",
|
||||
&token,
|
||||
None,
|
||||
)
|
||||
.await;
|
||||
let id = listed["data"]["list"][0]["id"]
|
||||
.as_str()
|
||||
.expect("必须有 id")
|
||||
.to_string();
|
||||
let (_, blocked) = call(
|
||||
port,
|
||||
"DELETE",
|
||||
&format!("/api/system/BillRule/{id}"),
|
||||
&token,
|
||||
None,
|
||||
)
|
||||
.await;
|
||||
assert_eq!(blocked["code"], json!(400), "已发号不许删: {blocked}");
|
||||
assert_eq!(blocked["msg"], json!("单据已经被使用,不允许被删除"), "{blocked}");
|
||||
|
||||
// ④ 导出/导入:本仓无文件服务 ⇒ 明确 400(不假装成功)。
|
||||
let (_, exported) = call(
|
||||
port,
|
||||
"GET",
|
||||
&format!("/api/system/BillRule/{id}/Actions/Export"),
|
||||
&token,
|
||||
None,
|
||||
)
|
||||
.await;
|
||||
assert_eq!(exported["code"], json!(400), "{exported}");
|
||||
let (_, imported) = call(
|
||||
port,
|
||||
"POST",
|
||||
"/api/system/BillRule/Actions/Import",
|
||||
&token,
|
||||
Some("{}"),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(imported["code"], json!(400), "{imported}");
|
||||
|
||||
// ⑤ 改「位数」= 生成规则变了 ⇒ 流水号状态清空(thisNumber 归 0、outputNumber 归 null)。
|
||||
let patch = json!({ "digit": 5 }).to_string();
|
||||
let (_, updated) = call(
|
||||
port,
|
||||
"PUT",
|
||||
&format!("/api/system/BillRule/{id}"),
|
||||
&token,
|
||||
Some(&patch),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(updated["code"], 200, "修改失败: {updated}");
|
||||
let (_, info) = call(
|
||||
port,
|
||||
"GET",
|
||||
&format!("/api/system/BillRule/{id}"),
|
||||
&token,
|
||||
None,
|
||||
)
|
||||
.await;
|
||||
assert_eq!(info["data"]["digit"], json!(5), "{info}");
|
||||
assert_eq!(info["data"]["thisNumber"], json!(0), "改位数应清空流水: {info}");
|
||||
assert!(info["data"]["outputNumber"].is_null(), "改位数应清空上一号: {info}");
|
||||
|
||||
// ⑥ 清空后就能删了。
|
||||
let (_, deleted) = call(
|
||||
port,
|
||||
"DELETE",
|
||||
&format!("/api/system/BillRule/{id}"),
|
||||
&token,
|
||||
None,
|
||||
)
|
||||
.await;
|
||||
assert_eq!(deleted["code"], 200, "清空流水后应可删: {deleted}");
|
||||
}
|
||||
|
||||
/// 随机数 / UUID 两个分支:位数对得上、两次不同。
|
||||
#[tokio::test]
|
||||
async fn bill_number_random_and_uuid() {
|
||||
let _guard = LOCK.lock().await;
|
||||
let port = serve(new_state(db().await)).await;
|
||||
let token = login(port).await;
|
||||
|
||||
for (en_code, kind, extra) in [
|
||||
("biz_random_no", 2, json!({ "randomDigit": 6, "randomType": 1 })),
|
||||
("biz_uuid_no", 3, json!({})),
|
||||
] {
|
||||
let mut body = json!({
|
||||
"fullName": format!("测试单号-{en_code}"),
|
||||
"enCode": en_code,
|
||||
"category": "9b077e268d4f44e6baa29bb40345f422",
|
||||
"prefix": "R",
|
||||
"type": kind,
|
||||
"dateFormat": "no",
|
||||
"digit": 1,
|
||||
"startNumber": "1",
|
||||
});
|
||||
if let Some(obj) = extra.as_object() {
|
||||
for (k, v) in obj {
|
||||
body[k] = v.clone();
|
||||
}
|
||||
}
|
||||
let (_, created) = call(
|
||||
port,
|
||||
"POST",
|
||||
"/api/system/BillRule",
|
||||
&token,
|
||||
Some(&body.to_string()),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(created["code"], 200, "新建 {en_code} 失败: {created}");
|
||||
|
||||
let path = format!("/api/system/BillRule/BillNumber/{en_code}");
|
||||
let (_, first) = call(port, "GET", &path, &token, None).await;
|
||||
let (_, second) = call(port, "GET", &path, &token, None).await;
|
||||
assert_eq!(first["code"], 200, "{en_code} 发号失败: {first}");
|
||||
let a = first["data"].as_str().unwrap_or_default().to_string();
|
||||
let b = second["data"].as_str().unwrap_or_default().to_string();
|
||||
assert!(a.starts_with('R'), "{en_code} 必须带前缀: {a}");
|
||||
assert_ne!(a, b, "{en_code} 两次发号不该相同: {a} / {b}");
|
||||
if kind == 2 {
|
||||
assert_eq!(a.chars().count(), 1 + 6, "随机数位数应 = prefix 1 + randomDigit 6: {a}");
|
||||
assert!(
|
||||
a.chars().skip(1).all(|c| c.is_ascii_digit()),
|
||||
"randomType=1 ⇒ 数字: {a}"
|
||||
);
|
||||
} else {
|
||||
// UUID 大写、带连字符(官方 `IdUtil.randomUUID().toUpperCase()`)。
|
||||
assert_eq!(a.chars().count(), 1 + 36, "UUID 应是 36 位(带连字符): {a}");
|
||||
assert_eq!(a, a.to_uppercase(), "UUID 必须大写: {a}");
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user