feat: 审计修复 Phase 6-7 — SSE 推送/工作流补全/消息群发/前端收尾
Phase 6 功能补全: - P1-3: 消息 SSE 实时推送端点 + 前端 EventSource 连接 - P1-6: ServiceTask HTTP 调用能力 (reqwest GET/POST) - P1-7: user.deleted 事件处理 — 终止相关流程实例 - P1-8: 任务认领 (claim) 端点 + handler - P1-9: 超时检查器发布 task.timeout 事件 - P1-15: 组织/部门名称唯一性校验 (create + update) - P1-18: 消息群发 fan-out (role/department/all 批量投递) Phase 7 P3-P4 收尾: - PluginAdmin purge 按钮状态修复 - ChangePassword 最小 8 字符 + 新旧密码不同验证 - AuditLogViewer 用户名缓存 + 扩展资源类型 - InstanceMonitor 通过 definition 缓存解析 node_name - NotificationPreferences DND 时间范围校验
This commit is contained in:
iven
@@ -1,5 +1,5 @@
|
||||
use axum::Router;
|
||||
use axum::routing::{get, post};
|
||||
use axum::routing::{get, post, put};
|
||||
use std::time::Duration;
|
||||
use uuid::Uuid;
|
||||
|
||||
@@ -83,13 +83,17 @@ impl WorkflowModule {
|
||||
"/workflow/tasks/{id}/delegate",
|
||||
post(task_handler::delegate_task),
|
||||
)
|
||||
.route(
|
||||
"/workflow/tasks/{id}/claim",
|
||||
put(task_handler::claim_task),
|
||||
)
|
||||
}
|
||||
|
||||
/// 启动超时检查后台任务。
|
||||
///
|
||||
/// 每 60 秒扫描一次 tasks 表，查找 due_date 已过期但仍处于 pending 状态的任务。
|
||||
/// 发现超时任务时记录 warning 日志，后续迭代将实现自动完成/升级逻辑。
|
||||
pub fn start_timeout_checker(db: sea_orm::DatabaseConnection) {
|
||||
/// 发现超时任务时发布 `task.timeout` 事件到事件总线，并记录 warning 日志。
|
||||
pub fn start_timeout_checker(db: sea_orm::DatabaseConnection, event_bus: EventBus) {
|
||||
tokio::spawn(async move {
|
||||
let mut interval = tokio::time::interval(Duration::from_secs(60));
|
||||
|
||||
@@ -99,14 +103,26 @@ impl WorkflowModule {
|
||||
loop {
|
||||
interval.tick().await;
|
||||
|
||||
match crate::engine::timeout::TimeoutChecker::find_all_overdue_tasks(&db).await {
|
||||
match crate::engine::timeout::TimeoutChecker::find_all_overdue_tasks_with_details(&db).await {
|
||||
Ok(overdue) => {
|
||||
if !overdue.is_empty() {
|
||||
tracing::warn!(
|
||||
count = overdue.len(),
|
||||
task_ids = ?overdue,
|
||||
"发现超时未完成的任务 — TODO: 实现自动完成/升级逻辑"
|
||||
"发现超时未完成的任务，发布 task.timeout 事件"
|
||||
);
|
||||
for (task_id, tenant_id, instance_id, assignee_id) in &overdue {
|
||||
// 发布超时事件
|
||||
let event = erp_core::events::DomainEvent::new(
|
||||
"task.timeout",
|
||||
*tenant_id,
|
||||
serde_json::json!({
|
||||
"task_id": task_id,
|
||||
"instance_id": instance_id,
|
||||
"assignee_id": assignee_id,
|
||||
}),
|
||||
);
|
||||
event_bus.publish(event, &db).await;
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
@@ -138,7 +154,140 @@ impl ErpModule for WorkflowModule {
|
||||
vec!["auth"]
|
||||
}
|
||||
|
||||
fn register_event_handlers(&self, _bus: &EventBus) {}
|
||||
fn register_event_handlers(&self, _bus: &EventBus) {
|
||||
// 事件处理器已迁移到 on_startup（需要 DB 连接），此处保留空实现以兼容 trait 签名
|
||||
}
|
||||
|
||||
async fn on_startup(
|
||||
&self,
|
||||
ctx: &erp_core::module::ModuleContext,
|
||||
) -> erp_core::error::AppResult<()> {
|
||||
let db = ctx.db.clone();
|
||||
let bus = ctx.event_bus.clone();
|
||||
|
||||
// 订阅 user. 前缀事件，处理 user.deleted
|
||||
let (mut receiver, _handle) = bus.subscribe_filtered("user.".to_string());
|
||||
|
||||
tokio::spawn(async move {
|
||||
loop {
|
||||
match receiver.recv().await {
|
||||
Some(event) if event.event_type == "user.deleted" => {
|
||||
let user_id = match event.payload.get("user_id").and_then(|v| v.as_str()) {
|
||||
Some(id) => match Uuid::parse_str(id) {
|
||||
Ok(u) => u,
|
||||
Err(e) => {
|
||||
tracing::warn!(
|
||||
error = %e,
|
||||
"user.deleted 事件的 user_id 解析失败，跳过"
|
||||
);
|
||||
continue;
|
||||
}
|
||||
},
|
||||
_ => {
|
||||
tracing::warn!("user.deleted 事件缺少 user_id 字段，跳过");
|
||||
continue;
|
||||
}
|
||||
};
|
||||
|
||||
tracing::info!(
|
||||
user_id = %user_id,
|
||||
tenant_id = %event.tenant_id,
|
||||
"收到 user.deleted 事件，查找并终止相关流程实例"
|
||||
);
|
||||
|
||||
// 查找该用户有活跃任务的流程实例
|
||||
use sea_orm::{ActiveModelTrait, ColumnTrait, EntityTrait, QueryFilter, Set};
|
||||
use chrono::Utc;
|
||||
|
||||
// 查找该用户作为 assignee 的 pending 任务
|
||||
let active_tasks = crate::entity::task::Entity::find()
|
||||
.filter(crate::entity::task::Column::TenantId.eq(event.tenant_id))
|
||||
.filter(crate::entity::task::Column::AssigneeId.eq(user_id))
|
||||
.filter(crate::entity::task::Column::Status.eq("pending"))
|
||||
.filter(crate::entity::task::Column::DeletedAt.is_null())
|
||||
.all(&db)
|
||||
.await;
|
||||
|
||||
match active_tasks {
|
||||
Ok(tasks) if tasks.is_empty() => {
|
||||
tracing::info!(
|
||||
user_id = %user_id,
|
||||
"该用户没有活跃的待办任务，无需终止流程"
|
||||
);
|
||||
}
|
||||
Ok(tasks) => {
|
||||
// 收集需要终止的实例 ID
|
||||
let instance_ids: std::collections::HashSet<Uuid> =
|
||||
tasks.iter().map(|t| t.instance_id).collect();
|
||||
|
||||
for instance_id in &instance_ids {
|
||||
// 将实例状态设置为 terminated
|
||||
let instance = crate::entity::process_instance::Entity::find_by_id(*instance_id)
|
||||
.one(&db)
|
||||
.await;
|
||||
|
||||
if let Ok(Some(inst)) = instance {
|
||||
if inst.tenant_id == event.tenant_id
|
||||
&& inst.deleted_at.is_none()
|
||||
&& inst.status == "running"
|
||||
{
|
||||
let ver = inst.version;
|
||||
let mut active: crate::entity::process_instance::ActiveModel = inst.into();
|
||||
active.status = Set("terminated".to_string());
|
||||
active.updated_at = Set(Utc::now());
|
||||
active.version = Set(ver + 1);
|
||||
match active.update(&db).await {
|
||||
Ok(_) => {
|
||||
tracing::info!(
|
||||
instance_id = %instance_id,
|
||||
"流程实例已终止（用户被删除）"
|
||||
);
|
||||
}
|
||||
Err(e) => {
|
||||
tracing::warn!(
|
||||
instance_id = %instance_id,
|
||||
error = %e,
|
||||
"终止流程实例失败"
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
tracing::info!(
|
||||
user_id = %user_id,
|
||||
instance_count = instance_ids.len(),
|
||||
task_count = tasks.len(),
|
||||
"用户删除事件处理完成"
|
||||
);
|
||||
}
|
||||
Err(e) => {
|
||||
tracing::warn!(
|
||||
error = %e,
|
||||
"查询用户活跃任务失败"
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
Some(event) => {
|
||||
// 其他 user. 前缀事件，忽略
|
||||
tracing::debug!(
|
||||
event_type = %event.event_type,
|
||||
"忽略非 user.deleted 事件"
|
||||
);
|
||||
}
|
||||
None => {
|
||||
// 通道关闭，退出循环
|
||||
tracing::info!("Workflow 事件订阅通道已关闭");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
tracing::info!(module = "workflow", "Workflow 事件处理器已注册（监听 user.deleted）");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn on_tenant_created(
|
||||
&self,
|
||||
|
||||
Reference in New Issue
Block a user