Merge branch 'main' of https://github.com/ideal-world/bios

Author: ljl

backend/basic/src/process/task_processor.rs

@@ -312,9 +312,9 @@ impl TaskProcessor {
         Ok(())
     }
 
-    /// Fetch the asynchronous task IDs in the context
+    /// Fetch the asynchronous task id set in the context
     ///
-    /// 获取异步任务IDs
+    /// 获取异步任务id集合
     ///
     /// Use ``,`` to separate multiple tasks
     ///

backend/basic/src/rbum/domain/rbum_rel.rs

@@ -4,26 +4,26 @@ use tardis::db::sea_orm::prelude::*;
 use tardis::db::sea_orm::*;
 use tardis::{TardisCreateEntity, TardisEmptyBehavior, TardisEmptyRelation};
 /// Resource relationship model
-/// 
+///
 /// 资源关联模型
-/// 
+///
 /// Used to describe the relationship between different resources.
-/// 
+///
 /// 用于描述不同资源间的关联关系。
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, TardisCreateEntity, TardisEmptyBehavior, TardisEmptyRelation)]
 #[sea_orm(table_name = "rbum_rel")]
 pub struct Model {
     /// Relationship id
-    /// 
+    ///
     /// 关联id
     #[sea_orm(primary_key, auto_increment = false)]
     pub id: String,
     /// Relationship tag
-    /// 
+    ///
     /// 关联标签
-    /// 
+    ///
     /// Used to distinguish different relationships.
-    /// 
+    ///
     /// 用于区分不同的关联关系。
     #[index(index_id = "from_index", repeat(index_id = "to_index"))]
     pub tag: String,
@@ -32,31 +32,31 @@ pub struct Model {
     /// 关联备注
     pub note: String,
     /// Relationship source type ([`crate::rbum::rbum_enumeration::RbumRelFromKind`])
-    /// 
+    ///
     /// 关联来源方的类型（[`crate::rbum::rbum_enumeration::RbumRelFromKind`]）
     #[index(index_id = "from_index")]
     pub from_rbum_kind: i16,
     /// Relationship source id
-    /// 
+    ///
     /// 关联来源方的id
     #[index(index_id = "from_index")]
     pub from_rbum_id: String,
     /// Relationship target id
-    /// 
+    ///
     /// 关联目标方的id
     #[index(index_id = "to_index")]
     pub to_rbum_item_id: String,
     /// Relationship target ownership path
-    /// 
+    ///
     /// 关联目标方的所有权路径
     pub to_own_paths: String,
     /// Relationship extension information
     ///
     /// 关联扩展信息
-    /// 
+    ///
     /// E.g. the record from or to is in another service, to avoid remote calls,
     /// you can redundantly add the required information to this field.
-    /// 
+    ///
     /// 例如：记录来源或目标在另一个服务中，为避免远程调用，可以将所需信息冗余添加到此字段。
     pub ext: String,
 

backend/basic/src/rbum/dto/rbum_filer_dto.rs

@@ -43,7 +43,7 @@ pub struct RbumBasicFilterReq {
     ///
     /// 所有权路径
     pub own_paths: Option<String>,
-    /// Object ids
+    /// Object id set
     ///
     /// 对象id集合
     pub ids: Option<Vec<String>>,
@@ -157,11 +157,11 @@ pub struct RbumCertFilterReq {
     ///
     /// 关联的对象id
     pub rel_rbum_id: Option<String>,
-    /// Associated object ids
+    /// Associated object id set
     ///
     /// 关联的对象id集合
     pub rel_rbum_ids: Option<Vec<String>>,
-    /// Associated resource certificate configuration ids
+    /// Associated resource certificate configuration id set
     ///
     /// 关联的凭证配置id集合
     pub rel_rbum_cert_conf_ids: Option<Vec<String>>,
@@ -390,7 +390,7 @@ pub struct RbumSetItemFilterReq {
     ///
     /// 资源分类（节点）sys_code 列表
     pub rel_rbum_set_cate_sys_codes: Option<Vec<String>>,
-    /// Resource category (node) ids
+    /// Resource category (node) id set
     ///
     /// 资源分类（节点）id 列表
     pub rel_rbum_set_cate_ids: Option<Vec<String>>,
@@ -406,19 +406,18 @@ pub struct RbumSetItemFilterReq {
     ///
     /// 默认为 ``true``
     pub rel_rbum_item_can_not_exist: Option<bool>,
-    /// Associated resource item ids
-    ///
+    /// Associated resource item id set
     /// 关联的资源项id列表
     pub rel_rbum_item_ids: Option<Vec<String>>,
     /// Associated resource item scope level
     ///
     /// 关联的资源项作用域级别
     pub rel_rbum_item_scope_level: Option<RbumScopeLevelKind>,
-    /// Associated resource item kind ids
+    /// Associated resource item kind id set
     ///
     /// 关联的资源项类型id列表
     pub rel_rbum_item_kind_ids: Option<Vec<String>>,
-    /// Associated resource item domain ids
+    /// Associated resource item domain id set
     ///
     /// 关联的资源项域id列表
     pub rel_rbum_item_domain_ids: Option<Vec<String>>,
@@ -478,23 +477,23 @@ pub struct RbumSetTreeFilterReq {
     ///
     /// 仅当 ``fetch_cate_item = true`` 时有效。
     pub hide_cate_with_empty_item: bool,
-    /// Associated resource item ids
+    /// Associated resource item id set
     ///
     /// 关联的资源项id列表
     ///
     /// Only valid when ``fetch_cate_item = true``.
     ///
     /// 仅当 ``fetch_cate_item = true`` 时有效。
     pub rel_rbum_item_ids: Option<Vec<String>>,
-    /// Associated resource item kind ids
+    /// Associated resource item kind id set
     ///
     /// 关联的资源项类型id列表
     ///
     /// Only valid when ``fetch_cate_item = true``.
     ///
     /// 仅当 ``fetch_cate_item = true`` 时有效。
     pub rel_rbum_item_kind_ids: Option<Vec<String>>,
-    /// Associated resource item domain ids
+    /// Associated resource item domain id set
     ///
     /// 关联的资源项域id列表
     ///
@@ -510,12 +509,19 @@ pub struct RbumSetTreeFilterReq {
 #[derive(poem_openapi::Object, Serialize, Deserialize, Debug, Clone, Default)]
 #[serde(default)]
 pub struct RbumSetItemRelFilterReq {
-    /// 同时根据set_id cate_code 二元组限制
-    /// TODO
+    /// Resource set id and resource category (node) id set
+    ///
+    /// 资源集Id与资源分类（节点）Id集合
+    ///
+    /// There is an ``or`` relationship between different resource sets, and the Id set of each resource category (node) in the same resource set is an ``or`` relationship.
+    ///
+    /// 不同资源集之间为 ``or`` 关系，同一资源集的每个资源分类（节点）Id集合为 ``or`` 关系。
     pub set_ids_and_cate_codes: Option<HashMap<String, Vec<String>>>,
-    /// TODO
+    /// Whether the resource category (node) is associated with descendants
+    ///
+    /// 资源分类（节点）是否包含子孙级
     pub with_sub_set_cate_codes: bool,
-    /// Associated object ids
+    /// Associated object id set
     ///
     /// 关联的对象id集合
     pub rel_item_ids: Option<Vec<String>>,
@@ -578,7 +584,7 @@ pub struct RbumItemRelFilterReq {
     ///
     /// 关联的对象id
     pub rel_item_id: Option<String>,
-    /// Associated object ids
+    /// Associated object id set
     ///
     /// 关联的对象id集合
     pub rel_item_ids: Option<Vec<String>>,

backend/basic/src/rbum/dto/rbum_item_attr_dto.rs

@@ -53,9 +53,9 @@ pub struct RbumItemAttrsAddOrModifyReq {
     ///
     /// 添加或修改的值集合
     ///
-    /// Format: ``{ "field name": "field value" }``
+    /// Format: ``{ "attribute name": "attribute value" }``
     ///
-    /// ``field name``: [`crate::rbum::dto::rbum_kind_attr_dto::RbumKindAttrDetailResp::name`]
+    /// ``attribute name``: [`crate::rbum::dto::rbum_kind_attr_dto::RbumKindAttrDetailResp::name`]
     pub values: HashMap<String, String>,
     /// Associated [resource item](crate::rbum::dto::rbum_item_dto::RbumItemDetailResp) id
     ///

backend/basic/src/rbum/serv/rbum_crud_serv.rs

@@ -22,9 +22,11 @@ use crate::rbum::helper::{rbum_event_helper, rbum_scope_helper};
 #[cfg(feature = "with-mq")]
 use crate::rbum::rbum_config::RbumConfigApi;
 
+pub const ID_FIELD_NAME: &str = "id";
+
 lazy_static! {
     pub static ref OWNER_TABLE: Alias = Alias::new("t_owner");
-    pub static ref ID_FIELD: Alias = Alias::new("id");
+    pub static ref ID_FIELD: Alias = Alias::new(ID_FIELD_NAME);
     pub static ref OWNER_FIELD: Alias = Alias::new("owner");
     pub static ref OWN_PATHS_FIELD: Alias = Alias::new("own_paths");
     pub static ref CREATE_TIME_FIELD: Alias = Alias::new("create_time");