flow: fix bug && fmt (#699)

Author: ZzIsGod1019

backend/middlewares/flow/src/api/ci/flow_ci_model_api.rs

@@ -2,9 +2,10 @@ use bios_basic::helper::bios_ctx_helper::unsafe_fill_ctx;
 use bios_basic::rbum::dto::rbum_filer_dto::RbumBasicFilterReq;
 use bios_basic::rbum::serv::rbum_item_serv::RbumItemCrudOperation;
 use tardis::web::context_extractor::TardisContextExtractor;
-use tardis::web::poem::web::{Json, Query};
 use tardis::web::poem::Request;
 use tardis::web::poem_openapi;
+use tardis::web::poem_openapi::param::Query;
+use tardis::web::poem_openapi::payload::Json;
 use tardis::web::web_resp::{TardisApiResult, TardisResp};
 
 use crate::dto::flow_model_dto::{FlowModelAddCustomModelReq, FlowModelAddCustomModelResp, FlowModelAggResp, FlowModelFilterReq, FlowModelFindRelStateResp};

backend/middlewares/flow/src/api/ci/flow_ci_state_api.rs

@@ -4,9 +4,10 @@ use bios_basic::rbum::helper::rbum_scope_helper;
 use bios_basic::rbum::rbum_enumeration::RbumScopeLevelKind;
 use bios_basic::rbum::serv::rbum_item_serv::RbumItemCrudOperation;
 use tardis::web::context_extractor::TardisContextExtractor;
-use tardis::web::poem::web::{Json, Query};
 use tardis::web::poem::Request;
 use tardis::web::poem_openapi;
+use tardis::web::poem_openapi::param::Query;
+use tardis::web::poem_openapi::payload::Json;
 use tardis::web::web_resp::{TardisApiResult, TardisPage, TardisResp};
 
 use crate::dto::flow_state_dto::{FlowStateCountGroupByStateReq, FlowStateCountGroupByStateResp, FlowStateFilterReq, FlowStateKind, FlowStateSummaryResp, FlowSysStateKind};

backend/spi/spi-search/src/serv/pg/search_pg_item_serv.rs

@@ -1,4 +1,4 @@
-use std::collections::{HashMap};
+use std::collections::HashMap;
 
 use pinyin::{to_pinyin_vec, Pinyin};
 use tardis::{
@@ -1339,7 +1339,6 @@ pub async fn query_metrics(query_req: &SearchQueryMetricsReq, funs: &TardisFunsI
         let sql_part_orders = orders
             .iter()
             .map(|order| {
-                
                 if order.in_ext.unwrap_or(true) {
                     format!("fact.ext ->> '{}' {}", order.code, if order.asc { "ASC" } else { "DESC" })
                 } else {

backend/spi/spi-search/src/serv/search_item_serv.rs

@@ -2,11 +2,9 @@ use bios_basic::spi::spi_constants;
 use bios_basic::spi::spi_funs::SpiBsInstExtractor;
 use bios_basic::spi_dispatch_service;
 
-
 use tardis::basic::result::TardisResult;
 use tardis::web::web_resp::TardisPage;
 
-
 use crate::dto::search_item_dto::{SearchItemAddReq, SearchItemModifyReq, SearchItemSearchReq, SearchItemSearchResp, SearchQueryMetricsReq, SearchQueryMetricsResp};
 use crate::search_initializer;
 

backend/supports/iam/src/basic/serv/clients/iam_log_client.rs

@@ -15,8 +15,7 @@ use tardis::{
     basic::{dto::TardisContext, field::TrimString, result::TardisResult},
     chrono::{DateTime, Utc},
     serde_json::json,
-    tokio,
-    TardisFuns, TardisFunsInst,
+    tokio, TardisFuns, TardisFunsInst,
 };
 
 use crate::{

backend/supports/iam/src/basic/serv/clients/iam_search_client.rs

@@ -1,19 +1,13 @@
 use std::collections::HashSet;
 
-use bios_basic::{
-    rbum::{
-        dto::rbum_filer_dto::{RbumBasicFilterReq},
-        serv::{rbum_item_serv::RbumItemCrudOperation},
-    },
-};
+use bios_basic::rbum::{dto::rbum_filer_dto::RbumBasicFilterReq, serv::rbum_item_serv::RbumItemCrudOperation};
 use bios_sdk_invoke::{
     clients::spi_search_client::{SpiSearchClient, SpiSearchEventExt},
     dto::search_item_dto::{SearchItemAddReq, SearchItemModifyReq, SearchItemVisitKeysReq},
     invoke_config::InvokeConfigApi,
 };
 use itertools::Itertools;
 
-
 use tardis::{
     basic::{dto::TardisContext, field::TrimString, result::TardisResult},
     serde_json::json,
@@ -26,14 +20,11 @@ use crate::{
             iam_account_dto::IamAccountDetailAggResp,
             iam_filer_dto::{IamAccountFilterReq, IamTenantFilterReq},
         },
-        serv::{
-            iam_account_serv::IamAccountServ, iam_role_serv::IamRoleServ, iam_set_serv::IamSetServ,
-            iam_tenant_serv::IamTenantServ,
-        },
+        serv::{iam_account_serv::IamAccountServ, iam_role_serv::IamRoleServ, iam_set_serv::IamSetServ, iam_tenant_serv::IamTenantServ},
     },
     iam_config::IamConfig,
     iam_constants,
-    iam_enumeration::{IamSetKind},
+    iam_enumeration::IamSetKind,
     iam_initializer::{default_search_avatar, ws_search_client},
 };
 pub struct IamSearchClient;
@@ -148,8 +139,7 @@ impl IamSearchClient {
         };
         for set_id in set_ids {
             let set_items = IamSetServ::find_set_items(Some(set_id), None, Some(account_id.to_string()), None, true, None, funs, &mock_ctx).await?;
-            account_resp_dept_id
-                .extend(set_items.iter().filter_map(|s| s.rel_rbum_set_cate_id.clone()).collect::<Vec<_>>());
+            account_resp_dept_id.extend(set_items.iter().filter_map(|s| s.rel_rbum_set_cate_id.clone()).collect::<Vec<_>>());
         }
 
         let tag = funs.conf::<IamConfig>().spi.search_account_tag.clone();

backend/supports/iam/src/console_interface/api/iam_ci_app_set_api.rs

@@ -10,7 +10,6 @@ use tardis::web::web_resp::{TardisApiResult, TardisResp};
 use bios_basic::rbum::dto::rbum_filer_dto::{RbumBasicFilterReq, RbumSetItemFilterReq};
 use bios_basic::rbum::dto::rbum_set_item_dto::RbumSetItemDetailResp;
 
-
 use crate::basic::serv::iam_cert_serv::IamCertServ;
 use crate::basic::serv::iam_set_serv::IamSetServ;
 use crate::iam_constants;

backend/supports/iam/src/console_interface/api/iam_ci_tenant_api.rs

@@ -1,12 +1,10 @@
-
-
 use bios_basic::helper::bios_ctx_helper::unsafe_fill_ctx;
 use bios_basic::helper::request_helper::add_remote_ip;
-use bios_basic::rbum::dto::rbum_filer_dto::{RbumSetTreeFilterReq};
+use bios_basic::rbum::dto::rbum_filer_dto::RbumSetTreeFilterReq;
 use bios_basic::rbum::dto::rbum_set_dto::RbumSetTreeMainResp;
-use bios_basic::rbum::rbum_enumeration::{RbumSetCateLevelQueryKind};
+use bios_basic::rbum::rbum_enumeration::RbumSetCateLevelQueryKind;
 
-use tardis::web::poem::web::{Query};
+use tardis::web::poem::web::Query;
 use tardis::web::poem_openapi;
 
 use tardis::web::{
@@ -15,12 +13,8 @@ use tardis::web::{
     web_resp::{TardisApiResult, TardisResp},
 };
 
-
-
-
-
 use crate::basic::serv::iam_set_serv::IamSetServ;
-use crate::iam_enumeration::{IamSetKind};
+use crate::iam_enumeration::IamSetKind;
 use crate::{
     basic::{
         dto::{iam_filer_dto::IamTenantFilterReq, iam_tenant_dto::IamTenantAggDetailResp},

backend/supports/iam/tests/test_cc_role.rs

@@ -3,7 +3,7 @@ use tardis::basic::dto::TardisContext;
 use tardis::basic::field::TrimString;
 use tardis::basic::result::TardisResult;
 use tardis::log::info;
-use tardis::{TardisFunsInst};
+use tardis::TardisFunsInst;
 
 use bios_basic::rbum::dto::rbum_filer_dto::RbumBasicFilterReq;
 use bios_basic::rbum::serv::rbum_item_serv::RbumItemCrudOperation;