扩展文章搜索功能

Author: luoyunchong

src/LinCms.Application.Contracts/Blog/Articles/ArticleSearchDto.cs

@@ -12,6 +12,7 @@ public class ArticleSearchDto : PageDto
     public Guid? ChannelId { get; set; }
     public Guid? TagId { get; set; }
     public string Title { get; set; }
+    public Guid? ArticleId { get; set; }
     public long? UserId { get; set; }
 
     /// <summary>

src/LinCms.Application.Contracts/Blog/Articles/IArticleService.cs

@@ -19,6 +19,9 @@ public interface IArticleService
     Task<ArticleDto> GetAsync(Guid id);
     #endregion
 
+
+    Task<PagedResultDto<ArticleListDto>> GetAllArticleAsync(ArticleSearchDto searchDto);
+
     /// <summary>
     /// 得到我关注的人发布的随笔
     /// </summary>

src/LinCms.Application/Blog/Articles/ArticleService.cs

@@ -1,4 +1,5 @@
-using IGeekFan.FreeKit.Extras.Dto;
+using AutoMapper;
+using IGeekFan.FreeKit.Extras.Dto;
 using IGeekFan.FreeKit.Extras.FreeSql;
 using LinCms.Blog.Classifys;
 using LinCms.Blog.UserSubscribes;
@@ -10,6 +11,7 @@
 using LinCms.Extensions;
 using LinCms.IRepositories;
 using LinCms.Security;
+using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -126,7 +128,7 @@ public async Task DeleteAsync(Guid id)
             }
         }
 
-        await articleRepository.DeleteAsync(new Article {Id = id});
+        await articleRepository.DeleteAsync(new Article { Id = id });
         await tagArticleRepository.DeleteAsync(r => r.ArticleId == id);
         await commentRepository.DeleteAsync(r => r.SubjectId == id);
         await userLikeRepository.DeleteAsync(r => r.SubjectId == id);
@@ -175,7 +177,7 @@ public async Task<Guid> CreateAsync(CreateUpdateArticleDto createArticle)
         Article article = Mapper.Map<Article>(createArticle);
         article.Archive = DateTime.Now.ToString("yyy年MM月");
         article.WordNumber = createArticle.Content.Length;
-        article.ReadingTime = (long) TextAnalysisUtil.GetReadingTime(createArticle.Content).Minutes;
+        article.ReadingTime = (long)TextAnalysisUtil.GetReadingTime(createArticle.Content).Minutes;
 
         article.Tags = new List<Tag>();
         foreach (var articleTagId in createArticle.TagIds)
@@ -224,7 +226,7 @@ public async Task UpdateAsync(Guid id, CreateUpdateArticleDto updateArticleDto)
 
         Mapper.Map(updateArticleDto, article);
         article.WordNumber = article.Content.Length;
-        article.ReadingTime = (long) TextAnalysisUtil.GetReadingTime(article.Content).Minutes;
+        article.ReadingTime = (long)TextAnalysisUtil.GetReadingTime(article.Content).Minutes;
         await articleRepository.UpdateAsync(article);
 
         ArticleDraft articleDraft = Mapper.Map<ArticleDraft>(article);
@@ -243,6 +245,22 @@ public async Task UpdateAsync(Guid id, CreateUpdateArticleDto updateArticleDto)
 
     #endregion
 
+
+    public async Task<PagedResultDto<ArticleListDto>> GetAllArticleAsync(ArticleSearchDto searchDto)
+    {
+        var articles = (await articleRepository
+            .Select
+            .WhereCascade(r => r.IsDeleted == false)
+            .WhereIf(searchDto.ArticleId.HasValue, r => r.Id == searchDto.ArticleId)
+            .WhereIf(searchDto.Title.IsNotNullOrEmpty(), r => r.Title.Contains(searchDto.Title))
+            .OrderByDescending(r => r.CreateTime)
+            .ToPagerListAsync(searchDto, out long totalCount))
+            .Select(a => Mapper.Map<ArticleListDto>(a))
+            .ToList();
+
+        return new PagedResultDto<ArticleListDto>(articles, totalCount);
+    }
+
     /// <summary>
     ///  随笔选择多个标签
     /// </summary>

src/LinCms.Web/Controllers/Blog/ArticleController.cs

@@ -29,10 +29,10 @@ namespace LinCms.Controllers.Blog;
 [ApiController]
 [Authorize]
 public class ArticleController(
-        IAuditBaseRepository<Article> articleRepository, 
+        IAuditBaseRepository<Article> articleRepository,
         IMapper mapper,
         ICurrentUser currentUser,
-        IArticleService articleService, 
+        IArticleService articleService,
         IRedisClient redisClient)
     : ControllerBase
 {
@@ -159,18 +159,9 @@ public async Task<UnifyResponseDto> UpdateAsync(Guid id, [FromBody] CreateUpdate
     /// <returns></returns>
     [HttpGet("all")]
     [LinCmsAuthorize("所有随笔", "随笔")]
-    public PagedResultDto<ArticleListDto> GetAllArticles([FromQuery] ArticleSearchDto searchDto)
+    public async Task<PagedResultDto<ArticleListDto>> GetAllArticleAsync([FromQuery] ArticleSearchDto searchDto)
     {
-        var articles = articleRepository
-            .Select
-            .WhereCascade(r => r.IsDeleted == false)
-            .WhereIf(searchDto.Title.IsNotNullOrEmpty(), r => r.Title.Contains(searchDto.Title))
-            .OrderByDescending(r => r.CreateTime)
-            .ToPagerList(searchDto, out long totalCount)
-            .Select(a => mapper.Map<ArticleListDto>(a))
-            .ToList();
-
-        return new PagedResultDto<ArticleListDto>(articles, totalCount);
+        return await articleService.GetAllArticleAsync(searchDto);
     }
 
     /// <summary>