添加评论功能

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml

@@ -162,6 +162,25 @@
             <param name="entity"></param>
             <returns></returns>
         </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.CommentController.GetListByArticleId(System.Int64)">
+            <summary>
+            获取文章的全部一级评论
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.CommentController.GetById(System.Int64)">
+            <summary>
+            获取一级评论详情
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.CommentController.Add(Yi.Framework.Model.Models.CommentEntity)">
+            <summary>
+            回复文章或回复评论
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Yi.Framework.ApiMicroservice.Controllers.SkuController.PageList(Yi.Framework.Model.Models.SkuEntity,Yi.Framework.Common.Models.PageParModel)">
             <summary>
             动态条件分页查询

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Community/CommentController.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Authorization;
+using AutoMapper;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using System;
@@ -6,6 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Yi.Framework.Common.Models;
+using Yi.Framework.DTOModel.Vo;
 using Yi.Framework.Interface;
 using Yi.Framework.Model.Models;
 using Yi.Framework.Repository;
@@ -20,19 +22,24 @@ namespace Yi.Framework.ApiMicroservice.Controllers
     public class CommentController : BaseSimpleCrudController<CommentEntity>
     {
         private ICommentService _iCommentService;
-        public CommentController(ILogger<CommentEntity> logger, ICommentService iCommentService) : base(logger, iCommentService)
+        private IMapper _mapper;
+        public CommentController(ILogger<CommentEntity> logger, ICommentService iCommentService, IMapper mapper) : base(logger, iCommentService)
         {
             _iCommentService = iCommentService;
+            _mapper = mapper;
         }
 
         /// <summary>
-        /// 获取全部一级评论
+        /// 获取文章的全部一级评论
         /// </summary>
         /// <returns></returns>
-        public override async Task<Result> GetList()
+        [HttpGet]
+        [Route("{articleId}")]
+        public async Task<Result> GetListByArticleId(long articleId)
         {
-            var data = await _repository.GetListAsync(u=>u.UserId==null);
-            return Result.Success().SetData(data);
+            //一级评论被回复的用户id为空
+            var data = await _repository._DbQueryable.Where(u => u.ParentId == 0 && u.ArticleId == articleId).Includes(u => u.CreateUserInfo).OrderByDescending(u=>u.CreateTime).ToListAsync();
+            return Result.Success().SetData(_mapper.Map<List<CommentVo>>(data));
         }
 
         /// <summary>
@@ -40,9 +47,10 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        public override Task<Result> GetById([FromRoute] long id)
+        public override async Task<Result> GetById([FromRoute] long id)
         {
-            return base.GetById(id);
+            var data = await _repository._DbQueryable.Includes(u => u.CreateUserInfo).Includes(u => u.UserInfo).FirstAsync(u => u.Id == id);
+            return Result.Success().SetData(_mapper.Map<CommentVo>(data));
         }
 
         /// <summary>
@@ -50,9 +58,9 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public async Task<Result> Comment()
-        { 
-        
+        public override async Task<Result> Add(CommentEntity comment)
+        {
+           return Result.Success().SetStatus(await _iCommentService.AddAsync(comment));
         }
     }
 }