Revert "refactor(core): 优化文件分类核心服务导入结构"

This reverts commit ed13668.

Author: DataEraserC

file_classification_webapi/src/bin/handlers/files.rs

@@ -1,11 +1,11 @@
 use crate::utils::database::DbPool;
 use crate::utils::models::{ApiError, ApiResponse};
 use actix_web::{delete, get, post, put, web, HttpResponse, Result};
-use file_classification_core::service::files::{create_file, delete_files_by_conditions, delete_files_by_ids, select_file_by_group_id, select_files_by_conditions_with_limit, select_files_by_conditions_with_options, select_files_by_conditions_with_pagination, select_files_by_filter_with_limit, select_files_by_filter_with_options, select_files_by_filter_with_pagination, update_file_by_id};
+use file_classification_core::service::files::{create_file, delete_files_by_conditions, delete_files_by_ids, select_file_by_group_id, select_files_by_conditions_with_options, select_files_by_conditions_with_pagination, select_files_by_filter_with_options, select_files_by_filter_with_pagination, update_file_by_id};
 use file_classification_core::{
     model::models::{FileCondition, FileFilter, FileQueryOptions, UpdateFileDTO},
     service::files::{
-        delete_file, get_file_by_id, update_files_by_conditions,
+        delete_file, get_file_by_id, select_files_by_conditions_with_limit, select_files_by_filter_with_limit, update_files_by_conditions,
     }
     ,
 };

file_classification_webapi/src/bin/handlers/group_relations.rs

@@ -3,13 +3,13 @@ use crate::utils::models::{ApiError, ApiResponse};
 use actix_web::{delete, get, post, web, HttpResponse, Result};
 use file_classification_core::model::models::GroupRelation;
 use file_classification_core::service::group_relations::{
-    delete_group_relations_by_conditions, delete_group_relations_by_dtos, select_group_relations_by_conditions_with_limit, select_group_relations_by_conditions_with_options, select_group_relations_by_conditions_with_pagination, select_group_relations_by_filter_with_limit, select_group_relations_by_filter_with_options, select_group_relations_by_filter_with_pagination
+    delete_group_relations_by_conditions, delete_group_relations_by_dtos, select_group_relations_by_conditions_with_options, select_group_relations_by_conditions_with_pagination, select_group_relations_by_filter_with_limit, select_group_relations_by_filter_with_options, select_group_relations_by_filter_with_pagination,
 };
 use file_classification_core::{
     model::models::{GroupRelationCondition, GroupRelationFilter},
     service::group_relations::{
-        create_group_relation, delete_group_relation,
-    }
+        create_group_relation, delete_group_relation, select_group_relations_by_conditions_with_limit,
+    },
 };
 use serde_json::json;
 

file_classification_webapi/src/bin/handlers/group_tags.rs

@@ -3,12 +3,12 @@ use crate::utils::models::{ApiError, ApiResponse};
 use actix_web::{delete, get, post, web, HttpResponse, Result};
 use file_classification_core::model::models::GroupTagDTO;
 use file_classification_core::service::group_tag::{
-    delete_group_tags_by_conditions, delete_group_tags_by_dtos, select_group_tags_by_conditions_with_limit, select_group_tags_by_conditions_with_options, select_group_tags_by_conditions_with_pagination, select_group_tags_by_filter_with_limit, select_group_tags_by_filter_with_options, select_group_tags_by_filter_with_pagination
+    delete_group_tags_by_conditions, delete_group_tags_by_dtos, select_group_tags_by_conditions_with_options, select_group_tags_by_conditions_with_pagination, select_group_tags_by_filter_with_limit, select_group_tags_by_filter_with_options, select_group_tags_by_filter_with_pagination,
 };
 use file_classification_core::{
     model::models::{GroupTagCondition, GroupTagFilter},
     service::group_tag::{
-        create_group_tag, delete_group_tag_by_dto,
+        create_group_tag, delete_group_tag_by_dto, select_group_tags_by_conditions_with_limit,
     }
     ,
 };

file_classification_webapi/src/bin/handlers/groups.rs

@@ -2,11 +2,12 @@ use crate::utils::database::DbPool;
 use crate::utils::models::{ApiError, ApiResponse};
 use actix_web::{delete, get, post, put, web, HttpResponse, Result};
 use file_classification_core::model::models::GroupQueryOptions;
-use file_classification_core::service::groups::{delete_groups_by_conditions, delete_groups_by_ids, get_group_by_id, select_group_by_file_id, select_group_by_tag_id, select_groups_by_conditions_with_limit, select_groups_by_conditions_with_options, select_groups_by_conditions_with_pagination, select_groups_by_filter_with_limit, select_groups_by_filter_with_options, select_groups_by_filter_with_pagination, update_group_by_id};
+use file_classification_core::service::groups::{delete_groups_by_conditions, delete_groups_by_ids, get_group_by_id, select_group_by_file_id, select_group_by_tag_id, select_groups_by_conditions_with_options, select_groups_by_conditions_with_pagination, select_groups_by_filter_with_options, select_groups_by_filter_with_pagination, update_group_by_id};
 use file_classification_core::{
     model::models::{GroupCondition, GroupFilter, UpdateGroupDTO},
     service::groups::{
-        create_group, delete_group, get_group_tree, update_groups_by_conditions,
+        create_group, delete_group, get_group_tree, select_groups_by_conditions_with_limit,
+        select_groups_by_filter_with_limit, update_groups_by_conditions,
     }
     ,
 };

file_classification_webapi/src/bin/handlers/tags.rs

@@ -2,11 +2,12 @@ use crate::utils::database::DbPool;
 use crate::utils::models::{ApiError, ApiResponse};
 use actix_web::{delete, get, post, put, web, HttpResponse, Result};
 use file_classification_core::model::models::{CreateTagDTO, TagQueryOptions};
-use file_classification_core::service::tags::{delete_tags_by_conditions, delete_tags_by_ids, select_tag_by_group_id, select_tags_by_conditions_with_limit, select_tags_by_conditions_with_options, select_tags_by_conditions_with_pagination, select_tags_by_filter_with_limit, select_tags_by_filter_with_options, select_tags_by_filter_with_pagination, update_tag_by_id};
+use file_classification_core::service::tags::{delete_tags_by_conditions, delete_tags_by_ids, select_tag_by_group_id, select_tags_by_conditions_with_options, select_tags_by_conditions_with_pagination, select_tags_by_filter_with_options, select_tags_by_filter_with_pagination, update_tag_by_id};
 use file_classification_core::{
     model::models::{TagCondition, TagFilter, UpdateTagDTO},
     service::tags::{
-        create_tag, delete_tag, get_tag_by_id, update_tags_by_conditions,
+        create_tag, delete_tag, get_tag_by_id, select_tags_by_conditions_with_limit, select_tags_by_filter_with_limit,
+        update_tags_by_conditions,
     }
     ,
 };