xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加评论功能

Browse Source
This commit is contained in:
陈淳
2022-12-01 16:06:53 +08:00
parent e9bcd29e36
commit 44db5ab150
13 changed files with 289 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
View File

@@ -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>
动态条件分页查询

30
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Community/CommentController.cs
View File

@@ -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));
}
}
}

BIN
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
View File

Binary file not shown.

10
Yi.Framework.Net6/Yi.Framework.Core/Yi.Framework.Core.csproj
View File

@@ -4,6 +4,12 @@
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Hangfire\**" />
<EmbeddedResource Remove="Hangfire\**" />
<None Remove="Hangfire\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="2.0.8" />
<PackageReference Include="Consul" Version="1.6.10.3" />
@@ -22,8 +28,4 @@
<ProjectReference Include="..\Yi.Framework.Task\Yi.Framework.Job.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Hangfire\" />
</ItemGroup>
</Project>

61
Yi.Framework.Net6/Yi.Framework.DTOModel/Vo/CommentVo.cs Normal file
View File

@@ -0,0 +1,61 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Yi.Framework.DTOModel.Vo
{
public class CommentVo
{
public long Id { get; set; }
/// <summary>
/// 评论内容
///</summary>
public string Content { get; set; }
/// <summary>
/// 点赞数
///</summary>
public int? AgreeNum { get; set; }
/// <summary>
/// 创建时间
///</summary>
public DateTime? CreateTime { get; set; }
/// <summary>
/// 是否删除
///</summary>
public bool? IsDeleted { get; set; }
/// <summary>
/// 租户Id
///</summary>
public long? TenantId { get; set; }
/// <summary>
/// 排序字段
///</summary>
public int? OrderNum { get; set; }
/// <summary>
/// 描述
///</summary>
public string Remark { get; set; }
/// <summary>
/// 子评论数
///</summary>
public int? CommentNum { get; set; }
/// <summary>
/// 被回复的用户信息
///</summary>
public UserVo? UserInfo { get; set; }
/// <summary>
/// 创建评论的用户信息
///</summary>
public UserVo? CreateUserInfo { get; set; }
}
}

11
Yi.Framework.Net6/Yi.Framework.Interface/ICommentService.cs Normal file
View File

@@ -0,0 +1,11 @@
using System.Threading.Tasks;
using Yi.Framework.Model.Models;
using Yi.Framework.Repository;
namespace Yi.Framework.Interface
{
public partial interface ICommentService
{
Task<bool> AddAsync(CommentEntity comment);
}
}

24
Yi.Framework.Net6/Yi.Framework.Model/CommentEntity.cs Normal file
View File

@@ -0,0 +1,24 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Yi.Framework.Model.Models
{
public partial class CommentEntity
{
/// <summary>
/// 被回复的用户信息
///</summary>
[Navigate(NavigateType.OneToOne,nameof(UserId),nameof(UserEntity.Id))]
public UserEntity? UserInfo { get; set; }
/// <summary>
/// 创建评论的用户信息
///</summary>
[Navigate(NavigateType.OneToOne, nameof(CreateUser), nameof(UserEntity.Id))]
public UserEntity? CreateUserInfo { get; set; }
}
}

7
Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/CommentEntity.cs
View File

@@ -14,6 +14,9 @@ namespace Yi.Framework.Model.Models
public CommentEntity()
{
this.CreateTime = DateTime.Now;
this.AgreeNum= 0;
this.CommentNum = 0;
this.ParentId= 0;
}
[JsonConverter(typeof(ValueToStringConverter))]
[SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )]
@@ -32,7 +35,7 @@ namespace Yi.Framework.Model.Models
/// 评论内容
///</summary>
[SugarColumn(ColumnName="Content" )]
public string Content { get; set; }
public string? Content { get; set; }
/// <summary>
/// 点赞数
///</summary>
@@ -77,7 +80,7 @@ namespace Yi.Framework.Model.Models
/// 描述
///</summary>
[SugarColumn(ColumnName="Remark" )]
public string Remark { get; set; }
public string? Remark { get; set; }
/// <summary>
/// 子评论数
///</summary>

30
Yi.Framework.Net6/Yi.Framework.Service/CommentService.cs Normal file
View File

@@ -0,0 +1,30 @@
using SqlSugar;
using System.Threading.Tasks;
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 async Task<bool> AddAsync(CommentEntity comment)
{
//如果是一级评论：不用处理
//如果是二级评论：ParentId父节点评论数+1
return await _repository.UseTranAsync(async () =>
{
if (comment.ParentId != 0)
{
var parentData = await _repository.GetByIdAsync(comment.ParentId);
parentData.CommentNum += 1;
await _repository.AsUpdateable(parentData).UpdateColumns(u => new { u.CommentNum }).ExecuteCommandAsync();
}
await _repository.InsertReturnSnowflakeIdAsync(comment);
});
}
}
}

1
Yi.Framework.Net6/Yi.Framework.WebCore/Mapper/Profile/AutoMapperProfile.cs
View File

@@ -16,6 +16,7 @@ namespace Yi.Framework.WebCore.Mapper
{
CreateMap<ArticleEntity, ArticleVo > ();
CreateMap<UserEntity, UserVo>();
CreateMap<CommentEntity, CommentVo>();
}
}