feat(webapi): add more apis

Author: DataEraserC

file_classification_cli/src/handlers.rs

@@ -765,7 +765,7 @@ fn handle_file_group_action(
                 file_id, group_id
             )) {
                 let dto = models::FileGroupDTO { file_id, group_id };
-                match service::file_group::delete_file_group(conn, dto) {
+                match service::file_group::delete_file_group_by_dto(conn, dto) {
                     Ok(count) => println!("成功删除 {} 个文件组关联", count),
                     Err(e) => eprintln!("删除文件组关联失败: {:?}", e),
                 }
@@ -846,7 +846,7 @@ fn handle_group_tag_action(
                 group_id, tag_id
             )) {
                 let dto = models::GroupTagDTO { group_id, tag_id };
-                match service::group_tag::delete_group_tag_by_id(conn, dto) {
+                match service::group_tag::delete_group_tag_by_dto(conn, dto) {
                     Ok(count) => println!("成功删除 {} 个组标签关联", count),
                     Err(e) => eprintln!("删除组标签关联失败: {:?}", e),
                 }

file_classification_core/src/model/models.rs

@@ -47,7 +47,7 @@ impl Debug for File {
 /// 创建文件的DTO对象
 /// 
 /// 用于向数据库插入新文件记录时的数据传输对象
-#[derive(Insertable)]
+#[derive(Insertable, Deserialize)]
 #[diesel(table_name = files)]
 pub struct CreateFileDTO {
     /// 文件类型/扩展名
@@ -117,7 +117,7 @@ pub enum FileCondition {
 /// 文件查询选项结构体
 /// 
 /// 定义了文件查询的可选参数，如分页、排序等
-#[derive(Default)]
+#[derive(Default, Deserialize)]
 pub struct FileQueryOptions {
     /// 查询结果限制数量
     pub limit: Option<i64>,
@@ -130,6 +130,7 @@ pub struct FileQueryOptions {
 /// 文件排序字段枚举
 /// 
 /// 定义了可以用于文件查询结果排序的字段
+#[derive(Deserialize)]
 pub enum FileOrderBy {
     /// 按文件ID排序
     Id(OrderDirection),
@@ -335,7 +336,7 @@ pub enum GroupCondition {
 /// 分组查询选项结构体
 /// 
 /// 定义了分组查询的可选参数，如分页、排序等
-#[derive(Default)]
+#[derive(Default, Deserialize)]
 pub struct GroupQueryOptions {
     /// 查询结果限制数量
     pub limit: Option<i64>,
@@ -348,6 +349,7 @@ pub struct GroupQueryOptions {
 /// 分组排序字段枚举
 /// 
 /// 定义了可以用于分组查询结果排序的字段
+#[derive(Deserialize)]
 pub enum GroupOrderBy {
     /// 按分组ID排序
     Id(OrderDirection),
@@ -370,6 +372,7 @@ pub enum GroupOrderBy {
 /// 排序方向枚举
 /// 
 /// 定义了排序的方向，升序或降序
+#[derive(Deserialize)]
 pub enum OrderDirection {
     /// 升序排列
     Asc,
@@ -538,7 +541,7 @@ pub enum TagCondition {
 /// 标签查询选项结构体
 /// 
 /// 定义了标签查询的可选参数，如分页、排序等
-#[derive(Default)]
+#[derive(Default, Deserialize)]
 pub struct TagQueryOptions {
     /// 查询结果限制数量
     pub limit: Option<i64>,
@@ -551,6 +554,7 @@ pub struct TagQueryOptions {
 /// 标签排序字段枚举
 /// 
 /// 定义了可以用于标签查询结果排序的字段
+#[derive(Deserialize)]
 pub enum TagOrderBy {
     /// 按标签ID排序
     Id(OrderDirection),
@@ -666,7 +670,7 @@ pub enum FileGroupCondition {
 /// 文件-分组关联查询选项结构体
 /// 
 /// 定义了文件-分组关联查询的可选参数，如分页、排序等
-#[derive(Default)]
+#[derive(Default, Deserialize)]
 pub struct FileGroupQueryOptions {
     /// 查询结果限制数量
     pub limit: Option<i64>,
@@ -679,6 +683,7 @@ pub struct FileGroupQueryOptions {
 /// 文件-分组关联排序字段枚举
 /// 
 /// 定义了可以用于文件-分组关联查询结果排序的字段
+#[derive(Deserialize)]
 pub enum FileGroupOrderBy {
     /// 按文件ID排序
     FileId(OrderDirection),
@@ -747,7 +752,7 @@ pub enum GroupTagCondition {
 /// 分组-标签关联查询选项结构体
 /// 
 /// 定义了分组-标签关联查询的可选参数，如分页、排序等
-#[derive(Default)]
+#[derive(Default, Deserialize)]
 pub struct GroupTagQueryOptions {
     /// 查询结果限制数量
     pub limit: Option<i64>,
@@ -760,6 +765,7 @@ pub struct GroupTagQueryOptions {
 /// 分组-标签关联排序字段枚举
 /// 
 /// 定义了可以用于分组-标签关联查询结果排序的字段
+#[derive(Deserialize)]
 pub enum GroupTagOrderBy {
     /// 按分组ID排序
     GroupId(OrderDirection),

file_classification_core/src/model/schema.rs

@@ -1,49 +1,49 @@
 // @generated automatically by Diesel CLI.
 
 diesel::table! {
-    file_groups (file_id, group_id) {
-        file_id -> Integer,
-        group_id -> Integer,
-    }
+		file_groups (file_id, group_id) {
+				file_id -> Integer,
+				group_id -> Integer,
+		}
 }
 
 diesel::table! {
-    files (id) {
-        id -> Integer,
-        #[sql_name = "type"]
-        type_ -> Text,
-        path -> Text,
-        reference_count -> Integer,
-        group_id -> Integer,
-    }
+		files (id) {
+				id -> Integer,
+				#[sql_name = "type"]
+				type_ -> Text,
+				path -> Text,
+				reference_count -> Integer,
+				group_id -> Integer,
+		}
 }
 
 diesel::table! {
-    group_tags (group_id, tag_id) {
-        group_id -> Integer,
-        tag_id -> Integer,
-    }
+		group_tags (group_id, tag_id) {
+				group_id -> Integer,
+				tag_id -> Integer,
+		}
 }
 
 diesel::table! {
-    groups (id) {
-        id -> Integer,
-        name -> Text,
-        reference_count -> Integer,
-        is_primary -> Bool,
-        click_count -> Integer,
-        share_count -> Integer,
-        create_time -> Timestamp,
-        modify_time -> Timestamp,
-    }
+		groups (id) {
+				id -> Integer,
+				name -> Text,
+				reference_count -> Integer,
+				is_primary -> Bool,
+				click_count -> Integer,
+				share_count -> Integer,
+				create_time -> Timestamp,
+				modify_time -> Timestamp,
+		}
 }
 
 diesel::table! {
-    tags (id) {
-        id -> Integer,
-        reference_count -> Integer,
-        name -> Text,
-    }
+		tags (id) {
+				id -> Integer,
+				reference_count -> Integer,
+				name -> Text,
+		}
 }
 
 diesel::joinable!(file_groups -> files (file_id));
@@ -52,10 +52,4 @@ diesel::joinable!(files -> groups (group_id));
 diesel::joinable!(group_tags -> groups (group_id));
 diesel::joinable!(group_tags -> tags (tag_id));
 
-diesel::allow_tables_to_appear_in_same_query!(
-    file_groups,
-    files,
-    group_tags,
-    groups,
-    tags,
-);
+diesel::allow_tables_to_appear_in_same_query!(file_groups, files, group_tags, groups, tags,);

file_classification_core/src/service/file_group.rs

@@ -78,7 +78,7 @@ pub fn create_file_group(
 ///    - 减少分组的引用计数
 ///    - 减少文件的引用计数
 ///    - 删除文件-分组关联记录
-pub fn delete_file_group(
+pub fn delete_file_group_by_dto(
     conn: &mut AnyConnection,
     file_group_dto: FileGroupDTO,
 ) -> Result<usize, AppError> {
@@ -178,7 +178,7 @@ pub fn delete_file_groups_by_conditions(
             };
 
             // 调用单个删除函数，复用其业务逻辑和验证规则
-            let deleted_count = delete_file_group(conn, file_group_dto)?;
+            let deleted_count = delete_file_group_by_dto(conn, file_group_dto)?;
             total_deleted += deleted_count;
         }
 

file_classification_core/src/service/files.rs

@@ -140,7 +140,7 @@ pub fn delete_file(conn: &mut AnyConnection, file_id: i32) -> Result<(), AppErro
     Ok(())
 }
 
-/// [已弃用] 根据过滤条件查询文件列表
+/// 根据过滤条件查询文件列表
 ///
 /// 参数:
 /// - `conn`: 数据库连接对象
@@ -149,9 +149,7 @@ pub fn delete_file(conn: &mut AnyConnection, file_id: i32) -> Result<(), AppErro
 ///
 /// 返回值:
 /// 查询成功的文件记录列表或数据库错误
-#[allow(deprecated)]
-#[deprecated]
-pub fn select_files(
+pub fn select_files_by_filter(
     conn: &mut AnyConnection,
     search_input: FileFilter,
     limit: i64,

file_classification_core/src/service/group_tag.rs

@@ -69,7 +69,7 @@ pub fn create_group_tag(
 ///    - 减少分组的引用计数
 ///    - 减少标签的引用计数
 ///    - 删除分组-标签关联记录
-pub fn delete_group_tag_by_id(
+pub fn delete_group_tag_by_dto(
     conn: &mut AnyConnection,
     group_tag_dto: GroupTagDTO,
 ) -> Result<usize, AppError> {
@@ -165,7 +165,7 @@ pub fn delete_group_tags_by_conditions(
             };
 
             // 调用单个删除函数，复用其业务逻辑
-            let deleted_count = delete_group_tag_by_id(conn, group_tag_dto)?;
+            let deleted_count = delete_group_tag_by_dto(conn, group_tag_dto)?;
             total_deleted += deleted_count;
         }
 

file_classification_core/src/service/groups.rs

@@ -122,7 +122,7 @@ pub fn delete_group(
     })
 }
 
-/// [已弃用] 根据过滤条件查询分组列表
+/// 根据过滤条件查询分组列表
 ///
 /// 参数:
 /// - `conn`: 数据库连接对象
@@ -131,9 +131,7 @@ pub fn delete_group(
 ///
 /// 返回值:
 /// 查询成功的分组记录列表或数据库错误
-#[allow(deprecated)]
-#[deprecated]
-pub fn select_groups(
+pub fn select_groups_by_filter(
     conn: &mut AnyConnection,
     search_input: GroupFilter,
     limit: i64,

file_classification_core/src/service/tags.rs

@@ -80,7 +80,7 @@ pub fn delete_tag(conn: &mut AnyConnection, tag_id: i32) -> Result<usize, diesel
 ///
 /// 返回值:
 /// 查询成功的标签记录列表或数据库错误
-pub fn select_tags(
+pub fn select_tags_by_filter(
     conn: &mut AnyConnection,
     search_input: TagFilter,
     limit: i64,

file_classification_webapi/src/bin/file_classification_webapi.rs

@@ -12,33 +12,61 @@ async fn main() -> std::io::Result<()> {
 
     let pool = establish_connection_pool();
 
+    // 在HttpServer::new中添加新的路由
     HttpServer::new(move || {
         App::new()
             .app_data(web::Data::new(pool.clone()))
             .wrap(Logger::default())
-            .service(handlers::files::api_list_files)
+            // 文件相关路由
+            .service(handlers::files::api_list_files_by_filter)
+            .service(handlers::files::api_get_file_by_id)
             .service(handlers::files::api_list_files_by_conditions)
-            // .service(handlers::files::api_create_file)
+            .service(handlers::files::api_list_files_by_conditions_with_options)
+            .service(handlers::files::api_list_files_by_group_id)
+            .service(handlers::files::api_create_file)
             .service(handlers::files::api_update_files_by_conditions)
-            .service(handlers::files::api_delete_file)
-            .service(handlers::groups::api_list_groups)
+            .service(handlers::files::api_update_file_by_id)
+            .service(handlers::files::api_delete_file_by_id)
+            .service(handlers::files::api_delete_files_by_conditions)
+            // 组相关路由
+            .service(handlers::groups::api_list_groups_by_filter)
+            .service(handlers::groups::api_get_group_by_id)
             .service(handlers::groups::api_list_groups_by_conditions)
+            .service(handlers::groups::api_list_groups_by_conditions_with_options)
+            .service(handlers::groups::api_list_groups_by_file_id)
+            .service(handlers::groups::api_list_groups_by_tag_id)
             .service(handlers::groups::api_create_group)
             .service(handlers::groups::api_update_groups_by_conditions)
-            .service(handlers::groups::api_delete_group)
-            .service(handlers::tags::api_list_tags)
+            .service(handlers::groups::api_update_group_by_id)
+            .service(handlers::groups::api_delete_group_by_id)
+            .service(handlers::groups::api_delete_groups_by_conditions)
+            // 标签相关路由
+            .service(handlers::tags::api_list_tags_by_filter)
+            .service(handlers::tags::api_get_tag_by_id)
             .service(handlers::tags::api_list_tags_by_conditions)
+            .service(handlers::tags::api_list_tags_by_conditions_with_options)
+            .service(handlers::tags::api_list_tags_by_group_id)
             .service(handlers::tags::api_create_tag)
             .service(handlers::tags::api_update_tags_by_conditions)
-            .service(handlers::tags::api_delete_tag)
+            .service(handlers::tags::api_update_tag_by_id)
+            .service(handlers::tags::api_delete_tag_by_id)
+            .service(handlers::tags::api_delete_tags_by_conditions)
+            // 文件组关联路由
             .service(handlers::file_groups::api_list_file_groups_by_conditions)
+            .service(handlers::file_groups::api_list_file_groups_by_conditions_with_options)
             .service(handlers::file_groups::api_create_file_group)
             .service(handlers::file_groups::api_delete_file_group)
+            .service(handlers::file_groups::api_delete_file_groups_by_conditions)
+            // 组标签关联路由
             .service(handlers::group_tags::api_list_group_tags_by_conditions)
+            .service(handlers::group_tags::api_list_group_tags_by_conditions_with_options)
             .service(handlers::group_tags::api_create_group_tag)
             .service(handlers::group_tags::api_delete_group_tag)
+            .service(handlers::group_tags::api_delete_group_tags_by_conditions)
     })
-    .bind("127.0.0.1:8080")?
+
+
+    .bind("127.0.0.1:8082")?
     .run()
     .await
 }