feat(config): add missing dictionary item CRUD, setting delete, and numbering delete routes
- Dictionary items: POST/PUT/DELETE endpoints under /config/dictionaries/{dict_id}/items
- Settings: DELETE /config/settings/{key}
- Numbering rules: DELETE /config/numbering-rules/{id}
- Fix workflow Entities: add deleted_at and version_field to process_definition,
add standard fields to token and process_variable entities
- Update seed data for expanded permissions
This commit is contained in:
@@ -113,7 +113,22 @@ const DEFAULT_PERMISSIONS: &[(&str, &str, &str, &str, &str)] = &[
|
|||||||
];
|
];
|
||||||
|
|
||||||
/// Indices of read-only permissions within DEFAULT_PERMISSIONS.
|
/// Indices of read-only permissions within DEFAULT_PERMISSIONS.
|
||||||
const READ_PERM_INDICES: &[usize] = &[1, 5, 9, 11, 15, 19, 23, 24, 28, 29, 34, 38, 37, 38];
|
const READ_PERM_INDICES: &[usize] = &[
|
||||||
|
1, // user:read
|
||||||
|
5, // role:read
|
||||||
|
8, // permission:read
|
||||||
|
10, // organization:read
|
||||||
|
14, // department:read
|
||||||
|
18, // position:read
|
||||||
|
22, // dictionary:list
|
||||||
|
25, // menu:list
|
||||||
|
27, // setting:read
|
||||||
|
30, // numbering:list
|
||||||
|
33, // theme:read
|
||||||
|
35, // language:list
|
||||||
|
38, // workflow:list
|
||||||
|
39, // workflow:read
|
||||||
|
];
|
||||||
|
|
||||||
/// Seed default auth data for a new tenant.
|
/// Seed default auth data for a new tenant.
|
||||||
///
|
///
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ use uuid::Uuid;
|
|||||||
|
|
||||||
use crate::config_state::ConfigState;
|
use crate::config_state::ConfigState;
|
||||||
use crate::dto::{
|
use crate::dto::{
|
||||||
CreateDictionaryReq, DictionaryItemResp, DictionaryResp, UpdateDictionaryReq,
|
CreateDictionaryItemReq, CreateDictionaryReq, DictionaryItemResp, DictionaryResp,
|
||||||
|
UpdateDictionaryItemReq, UpdateDictionaryReq,
|
||||||
};
|
};
|
||||||
use crate::service::dictionary_service::DictionaryService;
|
use crate::service::dictionary_service::DictionaryService;
|
||||||
|
|
||||||
@@ -156,6 +157,98 @@ where
|
|||||||
Ok(Json(ApiResponse::ok(items)))
|
Ok(Json(ApiResponse::ok(items)))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// POST /api/v1/dictionaries/:dict_id/items
|
||||||
|
///
|
||||||
|
/// 向指定字典添加新的字典项。
|
||||||
|
/// 字典项的 value 在同一字典内必须唯一。
|
||||||
|
/// 需要 `dictionary.create` 权限。
|
||||||
|
pub async fn create_item<S>(
|
||||||
|
State(state): State<ConfigState>,
|
||||||
|
Extension(ctx): Extension<TenantContext>,
|
||||||
|
Path(dict_id): Path<Uuid>,
|
||||||
|
Json(req): Json<CreateDictionaryItemReq>,
|
||||||
|
) -> Result<Json<ApiResponse<DictionaryItemResp>>, AppError>
|
||||||
|
where
|
||||||
|
ConfigState: FromRef<S>,
|
||||||
|
S: Clone + Send + Sync + 'static,
|
||||||
|
{
|
||||||
|
require_permission(&ctx, "dictionary.create")?;
|
||||||
|
|
||||||
|
req.validate()
|
||||||
|
.map_err(|e| AppError::Validation(e.to_string()))?;
|
||||||
|
|
||||||
|
let item = DictionaryService::add_item(
|
||||||
|
dict_id,
|
||||||
|
ctx.tenant_id,
|
||||||
|
ctx.user_id,
|
||||||
|
&req,
|
||||||
|
&state.db,
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(Json(ApiResponse::ok(item)))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// PUT /api/v1/dictionaries/:dict_id/items/:item_id
|
||||||
|
///
|
||||||
|
/// 更新字典项的可编辑字段(label、value、sort_order、color)。
|
||||||
|
/// 需要 `dictionary.update` 权限。
|
||||||
|
pub async fn update_item<S>(
|
||||||
|
State(state): State<ConfigState>,
|
||||||
|
Extension(ctx): Extension<TenantContext>,
|
||||||
|
Path((dict_id, item_id)): Path<(Uuid, Uuid)>,
|
||||||
|
Json(req): Json<UpdateDictionaryItemReq>,
|
||||||
|
) -> Result<Json<ApiResponse<DictionaryItemResp>>, AppError>
|
||||||
|
where
|
||||||
|
ConfigState: FromRef<S>,
|
||||||
|
S: Clone + Send + Sync + 'static,
|
||||||
|
{
|
||||||
|
require_permission(&ctx, "dictionary.update")?;
|
||||||
|
|
||||||
|
// 验证 item_id 属于 dict_id
|
||||||
|
let item = DictionaryService::update_item(
|
||||||
|
item_id,
|
||||||
|
ctx.tenant_id,
|
||||||
|
ctx.user_id,
|
||||||
|
&req,
|
||||||
|
&state.db,
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
// 确保 item 属于指定的 dictionary
|
||||||
|
if item.dictionary_id != dict_id {
|
||||||
|
return Err(AppError::Validation(
|
||||||
|
"字典项不属于指定的字典".to_string(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(Json(ApiResponse::ok(item)))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// DELETE /api/v1/dictionaries/:dict_id/items/:item_id
|
||||||
|
///
|
||||||
|
/// 软删除字典项,设置 deleted_at 时间戳。
|
||||||
|
/// 需要 `dictionary.delete` 权限。
|
||||||
|
pub async fn delete_item<S>(
|
||||||
|
State(state): State<ConfigState>,
|
||||||
|
Extension(ctx): Extension<TenantContext>,
|
||||||
|
Path((_dict_id, item_id)): Path<(Uuid, Uuid)>,
|
||||||
|
) -> Result<Json<ApiResponse<()>>, AppError>
|
||||||
|
where
|
||||||
|
ConfigState: FromRef<S>,
|
||||||
|
S: Clone + Send + Sync + 'static,
|
||||||
|
{
|
||||||
|
require_permission(&ctx, "dictionary.delete")?;
|
||||||
|
|
||||||
|
DictionaryService::delete_item(item_id, ctx.tenant_id, ctx.user_id, &state.db).await?;
|
||||||
|
|
||||||
|
Ok(Json(ApiResponse {
|
||||||
|
success: true,
|
||||||
|
data: None,
|
||||||
|
message: Some("字典项已删除".to_string()),
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
/// 按编码查询字典项的查询参数。
|
/// 按编码查询字典项的查询参数。
|
||||||
#[derive(Debug, serde::Deserialize)]
|
#[derive(Debug, serde::Deserialize)]
|
||||||
pub struct ItemsByCodeQuery {
|
pub struct ItemsByCodeQuery {
|
||||||
|
|||||||
@@ -117,3 +117,28 @@ where
|
|||||||
|
|
||||||
Ok(Json(ApiResponse::ok(result)))
|
Ok(Json(ApiResponse::ok(result)))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// DELETE /api/v1/numbering-rules/:id
|
||||||
|
///
|
||||||
|
/// 软删除编号规则,设置 deleted_at 时间戳。
|
||||||
|
/// 需要 `numbering.delete` 权限。
|
||||||
|
pub async fn delete_numbering_rule<S>(
|
||||||
|
State(state): State<ConfigState>,
|
||||||
|
Extension(ctx): Extension<TenantContext>,
|
||||||
|
Path(id): Path<Uuid>,
|
||||||
|
) -> Result<Json<ApiResponse<()>>, AppError>
|
||||||
|
where
|
||||||
|
ConfigState: FromRef<S>,
|
||||||
|
S: Clone + Send + Sync + 'static,
|
||||||
|
{
|
||||||
|
require_permission(&ctx, "numbering.delete")?;
|
||||||
|
|
||||||
|
NumberingService::delete(id, ctx.tenant_id, ctx.user_id, &state.db, &state.event_bus)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(Json(ApiResponse {
|
||||||
|
success: true,
|
||||||
|
data: None,
|
||||||
|
message: Some("编号规则已删除".to_string()),
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|||||||
@@ -76,3 +76,38 @@ pub struct SettingQuery {
|
|||||||
pub scope: Option<String>,
|
pub scope: Option<String>,
|
||||||
pub scope_id: Option<Uuid>,
|
pub scope_id: Option<Uuid>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// DELETE /api/v1/settings/:key
|
||||||
|
///
|
||||||
|
/// 软删除设置值,设置 deleted_at 时间戳。
|
||||||
|
/// 需要 `setting.delete` 权限。
|
||||||
|
pub async fn delete_setting<S>(
|
||||||
|
State(state): State<ConfigState>,
|
||||||
|
Extension(ctx): Extension<TenantContext>,
|
||||||
|
Path(key): Path<String>,
|
||||||
|
Query(query): Query<SettingQuery>,
|
||||||
|
) -> Result<Json<ApiResponse<()>>, AppError>
|
||||||
|
where
|
||||||
|
ConfigState: FromRef<S>,
|
||||||
|
S: Clone + Send + Sync + 'static,
|
||||||
|
{
|
||||||
|
require_permission(&ctx, "setting.delete")?;
|
||||||
|
|
||||||
|
let scope = query.scope.unwrap_or_else(|| "tenant".to_string());
|
||||||
|
|
||||||
|
SettingService::delete(
|
||||||
|
&key,
|
||||||
|
&scope,
|
||||||
|
&query.scope_id,
|
||||||
|
ctx.tenant_id,
|
||||||
|
ctx.user_id,
|
||||||
|
&state.db,
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(Json(ApiResponse {
|
||||||
|
success: true,
|
||||||
|
data: None,
|
||||||
|
message: Some("设置已删除".to_string()),
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|||||||
@@ -44,6 +44,15 @@ impl ConfigModule {
|
|||||||
"/config/dictionaries/items",
|
"/config/dictionaries/items",
|
||||||
get(dictionary_handler::list_items_by_code),
|
get(dictionary_handler::list_items_by_code),
|
||||||
)
|
)
|
||||||
|
.route(
|
||||||
|
"/config/dictionaries/{dict_id}/items",
|
||||||
|
post(dictionary_handler::create_item),
|
||||||
|
)
|
||||||
|
.route(
|
||||||
|
"/config/dictionaries/{dict_id}/items/{item_id}",
|
||||||
|
put(dictionary_handler::update_item)
|
||||||
|
.delete(dictionary_handler::delete_item),
|
||||||
|
)
|
||||||
// Menu routes
|
// Menu routes
|
||||||
.route(
|
.route(
|
||||||
"/config/menus",
|
"/config/menus",
|
||||||
@@ -52,7 +61,9 @@ impl ConfigModule {
|
|||||||
// Setting routes
|
// Setting routes
|
||||||
.route(
|
.route(
|
||||||
"/config/settings/{key}",
|
"/config/settings/{key}",
|
||||||
get(setting_handler::get_setting).put(setting_handler::update_setting),
|
get(setting_handler::get_setting)
|
||||||
|
.put(setting_handler::update_setting)
|
||||||
|
.delete(setting_handler::delete_setting),
|
||||||
)
|
)
|
||||||
// Numbering rule routes
|
// Numbering rule routes
|
||||||
.route(
|
.route(
|
||||||
@@ -62,7 +73,8 @@ impl ConfigModule {
|
|||||||
)
|
)
|
||||||
.route(
|
.route(
|
||||||
"/config/numbering-rules/{id}",
|
"/config/numbering-rules/{id}",
|
||||||
put(numbering_handler::update_numbering_rule),
|
put(numbering_handler::update_numbering_rule)
|
||||||
|
.delete(numbering_handler::delete_numbering_rule),
|
||||||
)
|
)
|
||||||
.route(
|
.route(
|
||||||
"/config/numbering-rules/{id}/generate",
|
"/config/numbering-rules/{id}/generate",
|
||||||
|
|||||||
@@ -26,5 +26,6 @@ erp-server-migration = { path = "migration" }
|
|||||||
erp-auth.workspace = true
|
erp-auth.workspace = true
|
||||||
erp-config.workspace = true
|
erp-config.workspace = true
|
||||||
erp-workflow.workspace = true
|
erp-workflow.workspace = true
|
||||||
|
erp-message.workspace = true
|
||||||
anyhow.workspace = true
|
anyhow.workspace = true
|
||||||
uuid.workspace = true
|
uuid.workspace = true
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ use validator::Validate;
|
|||||||
|
|
||||||
/// BPMN 节点类型
|
/// BPMN 节点类型
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema, PartialEq)]
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema, PartialEq)]
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
pub enum NodeType {
|
pub enum NodeType {
|
||||||
StartEvent,
|
StartEvent,
|
||||||
EndEvent,
|
EndEvent,
|
||||||
@@ -20,7 +19,6 @@ pub enum NodeType {
|
|||||||
|
|
||||||
/// 流程图节点定义
|
/// 流程图节点定义
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
pub struct NodeDef {
|
pub struct NodeDef {
|
||||||
pub id: String,
|
pub id: String,
|
||||||
#[serde(rename = "type")]
|
#[serde(rename = "type")]
|
||||||
@@ -38,7 +36,6 @@ pub struct NodeDef {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
pub struct NodePosition {
|
pub struct NodePosition {
|
||||||
pub x: f64,
|
pub x: f64,
|
||||||
pub y: f64,
|
pub y: f64,
|
||||||
@@ -46,7 +43,6 @@ pub struct NodePosition {
|
|||||||
|
|
||||||
/// 流程图连线定义
|
/// 流程图连线定义
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
pub struct EdgeDef {
|
pub struct EdgeDef {
|
||||||
pub id: String,
|
pub id: String,
|
||||||
pub source: String,
|
pub source: String,
|
||||||
@@ -61,7 +57,6 @@ pub struct EdgeDef {
|
|||||||
|
|
||||||
/// 完整流程图
|
/// 完整流程图
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
pub struct FlowDiagram {
|
pub struct FlowDiagram {
|
||||||
pub nodes: Vec<NodeDef>,
|
pub nodes: Vec<NodeDef>,
|
||||||
pub edges: Vec<EdgeDef>,
|
pub edges: Vec<EdgeDef>,
|
||||||
@@ -98,8 +93,9 @@ pub struct CreateProcessDefinitionReq {
|
|||||||
pub edges: Vec<EdgeDef>,
|
pub edges: Vec<EdgeDef>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, ToSchema)]
|
#[derive(Debug, Deserialize, Validate, ToSchema)]
|
||||||
pub struct UpdateProcessDefinitionReq {
|
pub struct UpdateProcessDefinitionReq {
|
||||||
|
#[validate(length(max = 200, message = "流程名称过长"))]
|
||||||
pub name: Option<String>,
|
pub name: Option<String>,
|
||||||
pub category: Option<String>,
|
pub category: Option<String>,
|
||||||
pub description: Option<String>,
|
pub description: Option<String>,
|
||||||
@@ -126,7 +122,7 @@ pub struct ProcessInstanceResp {
|
|||||||
pub active_tokens: Vec<TokenResp>,
|
pub active_tokens: Vec<TokenResp>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, ToSchema)]
|
#[derive(Debug, Deserialize, Validate, ToSchema)]
|
||||||
pub struct StartInstanceReq {
|
pub struct StartInstanceReq {
|
||||||
pub definition_id: Uuid,
|
pub definition_id: Uuid,
|
||||||
pub business_key: Option<String>,
|
pub business_key: Option<String>,
|
||||||
@@ -175,13 +171,14 @@ pub struct TaskResp {
|
|||||||
pub business_key: Option<String>,
|
pub business_key: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, ToSchema)]
|
#[derive(Debug, Deserialize, Validate, ToSchema)]
|
||||||
pub struct CompleteTaskReq {
|
pub struct CompleteTaskReq {
|
||||||
|
#[validate(length(min = 1, max = 50, message = "审批结果不能为空"))]
|
||||||
pub outcome: String,
|
pub outcome: String,
|
||||||
pub form_data: Option<serde_json::Value>,
|
pub form_data: Option<serde_json::Value>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, ToSchema)]
|
#[derive(Debug, Deserialize, Validate, ToSchema)]
|
||||||
pub struct DelegateTaskReq {
|
pub struct DelegateTaskReq {
|
||||||
pub delegate_to: Uuid,
|
pub delegate_to: Uuid,
|
||||||
}
|
}
|
||||||
@@ -203,8 +200,9 @@ pub struct ProcessVariableResp {
|
|||||||
pub value_date: Option<DateTime<Utc>>,
|
pub value_date: Option<DateTime<Utc>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Deserialize, ToSchema)]
|
#[derive(Debug, Clone, Deserialize, Validate, ToSchema)]
|
||||||
pub struct SetVariableReq {
|
pub struct SetVariableReq {
|
||||||
|
#[validate(length(min = 1, max = 100, message = "变量名不能为空"))]
|
||||||
pub name: String,
|
pub name: String,
|
||||||
pub var_type: Option<String>,
|
pub var_type: Option<String>,
|
||||||
pub value: serde_json::Value,
|
pub value: serde_json::Value,
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ pub struct Model {
|
|||||||
pub updated_by: Uuid,
|
pub updated_by: Uuid,
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
pub deleted_at: Option<DateTimeUtc>,
|
pub deleted_at: Option<DateTimeUtc>,
|
||||||
|
pub version_field: i32,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
|
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
|
||||||
|
|||||||
@@ -18,6 +18,13 @@ pub struct Model {
|
|||||||
pub value_boolean: Option<bool>,
|
pub value_boolean: Option<bool>,
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
pub value_date: Option<DateTimeUtc>,
|
pub value_date: Option<DateTimeUtc>,
|
||||||
|
pub created_at: DateTimeUtc,
|
||||||
|
pub updated_at: DateTimeUtc,
|
||||||
|
pub created_by: Uuid,
|
||||||
|
pub updated_by: Uuid,
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
pub deleted_at: Option<DateTimeUtc>,
|
||||||
|
pub version: i32,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
|
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
|
||||||
|
|||||||
@@ -11,6 +11,12 @@ pub struct Model {
|
|||||||
pub node_id: String,
|
pub node_id: String,
|
||||||
pub status: String,
|
pub status: String,
|
||||||
pub created_at: DateTimeUtc,
|
pub created_at: DateTimeUtc,
|
||||||
|
pub updated_at: DateTimeUtc,
|
||||||
|
pub created_by: Uuid,
|
||||||
|
pub updated_by: Uuid,
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
pub deleted_at: Option<DateTimeUtc>,
|
||||||
|
pub version: i32,
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
pub consumed_at: Option<DateTimeUtc>,
|
pub consumed_at: Option<DateTimeUtc>,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -112,3 +112,19 @@ where
|
|||||||
InstanceService::terminate(id, ctx.tenant_id, ctx.user_id, &state.db).await?;
|
InstanceService::terminate(id, ctx.tenant_id, ctx.user_id, &state.db).await?;
|
||||||
Ok(Json(ApiResponse::ok(())))
|
Ok(Json(ApiResponse::ok(())))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// POST /api/v1/workflow/instances/{id}/resume
|
||||||
|
pub async fn resume_instance<S>(
|
||||||
|
State(state): State<WorkflowState>,
|
||||||
|
Extension(ctx): Extension<TenantContext>,
|
||||||
|
Path(id): Path<Uuid>,
|
||||||
|
) -> Result<Json<ApiResponse<()>>, AppError>
|
||||||
|
where
|
||||||
|
WorkflowState: FromRef<S>,
|
||||||
|
S: Clone + Send + Sync + 'static,
|
||||||
|
{
|
||||||
|
require_permission(&ctx, "workflow:update")?;
|
||||||
|
|
||||||
|
InstanceService::resume(id, ctx.tenant_id, ctx.user_id, &state.db).await?;
|
||||||
|
Ok(Json(ApiResponse::ok(())))
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user