评论建表

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

@@ -0,0 +1,58 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Yi.Framework.Common.Models;
+using Yi.Framework.Interface;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+using Yi.Framework.WebCore;
+using Yi.Framework.WebCore.AttributeExtend;
+using Yi.Framework.WebCore.AuthorizationPolicy;
+
+namespace Yi.Framework.ApiMicroservice.Controllers
+{
+    [ApiController]
+    [Route("api/[controller]/[action]")]
+    public class CommentController : BaseSimpleCrudController<CommentEntity>
+    {
+        private ICommentService _iCommentService;
+        public CommentController(ILogger<CommentEntity> logger, ICommentService iCommentService) : base(logger, iCommentService)
+        {
+            _iCommentService = iCommentService;
+        }
+
+        /// <summary>
+        /// 获取全部一级评论
+        /// </summary>
+        /// <returns></returns>
+        public override async Task<Result> GetList()
+        {
+            var data = await _repository.GetListAsync(u=>u.UserId==null);
+            return Result.Success().SetData(data);
+        }
+
+        /// <summary>
+        /// 获取一级评论详情
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public override Task<Result> GetById([FromRoute] long id)
+        {
+            return base.GetById(id);
+        }
+
+        /// <summary>
+        /// 回复文章或回复评论
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<Result> Comment()
+        { 
+        
+        }
+    }
+}

Yi.Framework.Net6/Yi.Framework.Interface/IAgreeService.cs

@@ -6,6 +6,6 @@ namespace Yi.Framework.Interface
 {
     public partial interface IAgreeService : IBaseService<AgreeEntity>
     {
-        Task<bool> OperateAsync(long articleId, long userId);
+        Task<bool> OperateAsync(long articleOrCommentId, long userId);
     }
 }

Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ICommentService.cs

@@ -0,0 +1,9 @@
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+
+namespace Yi.Framework.Interface
+{
+   public partial interface ICommentService:IBaseService<CommentEntity>
+    {   
+    }
+}

Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/AgreeEntity.cs

@@ -24,10 +24,10 @@ namespace Yi.Framework.Model.Models
          [SugarColumn(ColumnName="UserId"    )]
          public long? UserId { get; set; }
         /// <summary>
-        /// 文章id 
+        /// 文章或评论id 
         ///</summary>
-         [SugarColumn(ColumnName="ArticleId"    )]
+         [SugarColumn(ColumnName="ArticleOrCommentId"    )]
-         public long? ArticleId { get; set; }
+         public long? ArticleOrCommentId { get; set; }
         /// <summary>
         /// 创建者 
         ///</summary>

Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/CommentEntity.cs

@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Serialization;
+using SqlSugar;
+namespace Yi.Framework.Model.Models
+{
+    /// <summary>
+    /// 评论表
+    ///</summary>
+    [SugarTable("Comment")]
+    public partial class CommentEntity:IBaseModelEntity
+    {
+        public CommentEntity()
+        {
+            this.CreateTime = DateTime.Now;
+        }
+        [JsonConverter(typeof(ValueToStringConverter))]
+        [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true   )]
+         public long Id { get; set; }
+        /// <summary>
+        /// 文章id 
+        ///</summary>
+         [SugarColumn(ColumnName="ArticleId"    )]
+         public long? ArticleId { get; set; }
+        /// <summary>
+        /// 被回复用户id 
+        ///</summary>
+         [SugarColumn(ColumnName="UserId"    )]
+         public long? UserId { get; set; }
+        /// <summary>
+        /// 评论内容 
+        ///</summary>
+         [SugarColumn(ColumnName="Content"    )]
+         public string Content { get; set; }
+        /// <summary>
+        /// 点赞数 
+        ///</summary>
+         [SugarColumn(ColumnName="AgreeNum"    )]
+         public int? AgreeNum { get; set; }
+        /// <summary>
+        /// 创建者 
+        ///</summary>
+         [SugarColumn(ColumnName="CreateUser"    )]
+         public long? CreateUser { get; set; }
+        /// <summary>
+        /// 创建时间 
+        ///</summary>
+         [SugarColumn(ColumnName="CreateTime"    )]
+         public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 修改者 
+        ///</summary>
+         [SugarColumn(ColumnName="ModifyUser"    )]
+         public long? ModifyUser { get; set; }
+        /// <summary>
+        /// 修改时间 
+        ///</summary>
+         [SugarColumn(ColumnName="ModifyTime"    )]
+         public DateTime? ModifyTime { get; set; }
+        /// <summary>
+        /// 是否删除 
+        ///</summary>
+         [SugarColumn(ColumnName="IsDeleted"    )]
+         public bool? IsDeleted { get; set; }
+        /// <summary>
+        /// 租户Id 
+        ///</summary>
+         [SugarColumn(ColumnName="TenantId"    )]
+         public long? TenantId { get; set; }
+        /// <summary>
+        /// 排序字段 
+        ///</summary>
+         [SugarColumn(ColumnName="OrderNum"    )]
+         public int? OrderNum { get; set; }
+        /// <summary>
+        /// 描述 
+        ///</summary>
+         [SugarColumn(ColumnName="Remark"    )]
+         public string Remark { get; set; }
+        /// <summary>
+        /// 子评论数 
+        ///</summary>
+         [SugarColumn(ColumnName="CommentNum"    )]
+         public int? CommentNum { get; set; }
+        /// <summary>
+        /// 父级评论id 
+        ///</summary>
+         [SugarColumn(ColumnName="ParentId"    )]
+         public long? ParentId { get; set; }
+    }
+}

Yi.Framework.Net6/Yi.Framework.Service/AgreeService.cs

@@ -12,17 +12,17 @@ namespace Yi.Framework.Service
         /// 点赞操作
         /// </summary>
         /// <returns></returns>
-        public async Task<bool> OperateAsync(long articleId, long userId)
+        public async Task<bool> OperateAsync(long articleOrCommentId, long userId)
         {
             var _articleRepositoty = _repository.ChangeRepository<Repository<ArticleEntity>>();
-            var article = await _articleRepositoty.GetByIdAsync(articleId);
+            var article = await _articleRepositoty.GetByIdAsync(articleOrCommentId);
-            if (await _repository.IsAnyAsync(u => u.UserId == userId && u.ArticleId == articleId))
+            if (await _repository.IsAnyAsync(u => u.UserId == userId && u.ArticleOrCommentId == articleOrCommentId))
             {
                 //已点赞，取消点赞
                 await _repository.UseTranAsync(async () =>
                 {
-                    await _repository.DeleteAsync(u => u.UserId == userId && u.ArticleId == articleId);
+                    await _repository.DeleteAsync(u => u.UserId == userId && u.ArticleOrCommentId == articleOrCommentId);
-                    await _articleRepositoty.UpdateIgnoreNullAsync(new ArticleEntity { Id = articleId, AgreeNum = article.AgreeNum - 1 });
+                    await _articleRepositoty.UpdateIgnoreNullAsync(new ArticleEntity { Id = articleOrCommentId, AgreeNum = article.AgreeNum - 1 });
 
                 });
                 return false;
@@ -32,8 +32,8 @@ namespace Yi.Framework.Service
                 //未点赞，添加点赞记录
                 await _repository.UseTranAsync(async () =>
                 {
-                    await _repository.InsertReturnSnowflakeIdAsync(new AgreeEntity { UserId = userId, ArticleId = articleId });
+                    await _repository.InsertReturnSnowflakeIdAsync(new AgreeEntity { UserId = userId, ArticleOrCommentId = articleOrCommentId });
-                    await _articleRepositoty.UpdateIgnoreNullAsync(new ArticleEntity { Id = articleId, AgreeNum = article.AgreeNum + 1 });
+                    await _articleRepositoty.UpdateIgnoreNullAsync(new ArticleEntity { Id = articleOrCommentId, AgreeNum = article.AgreeNum + 1 });
                 });
                 return true;
             }

Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/CommentService.cs

@@ -0,0 +1,14 @@
+using SqlSugar;
+using Yi.Framework.Interface;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+
+namespace Yi.Framework.Service
+{
+    public partial class CommentService : BaseService<CommentEntity>, ICommentService
+    {
+        public CommentService(IRepository<CommentEntity> repository) : base(repository)
+        {
+        }
+    }
+}