1

gx_api/GxPress/Api/GxPress.Api/WebControllers/WebCommentController.cs

@@ -0,0 +1,76 @@
+using System.Threading.Tasks;
+using GxPress.Auth;
+using GxPress.Common.Page;
+using GxPress.Repository.Interface;
+using GxPress.Request.Comment;
+using GxPress.Result.Comment;
+using Microsoft.AspNetCore.Mvc;
+using GxPress.Common.Exceptions;
+using Microsoft.AspNetCore.Authorization;
+
+namespace GxPress.Api.WebControllers
+{
+    /// <summary>
+    /// 评论
+    /// </summary>
+    [Route("api/web/comment")]
+    [ApiController]
+    [Authorize]
+    public class WebCommentController : Controller
+    {
+        private readonly ICommentRepository _commentRepository;
+        private readonly ILoginContext _loginContext;
+        public WebCommentController(ICommentRepository commentRepository, ILoginContext loginContext)
+        {
+            _commentRepository = commentRepository;
+            _loginContext = loginContext;
+        }
+
+        /// <summary>
+        /// 添加评论
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("add")]
+        public async Task<bool> Add([FromBody] CommentInRequest request)
+        {
+            // request.Content = StringUtils.RemoveEmoji(request.Content);
+            request.UserId = _loginContext.AccountId;
+            if (string.IsNullOrWhiteSpace(request.Content))
+                throw new BusinessException("评论内容为空");
+            return await _commentRepository.CommentInAsync(request) > 0;
+        }
+        /// <summary>
+        /// 分页显示数据
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("list")]
+        public async Task<PagedList<CommentPageResult>> GetPagedList([FromBody] CommentSearchPageRequest request)
+        {
+            return await _commentRepository.GetPagedList(request);
+        }
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpDelete("delete")]
+        public async Task<bool> Delete([FromBody] CommentDeleteRequest request)
+        {
+            return await _commentRepository.DeleteCommentAsync(request);
+        }
+
+        /// <summary>
+        /// 修改评论
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPut("update")]
+        public async Task<bool> UpdateComment([FromBody] CommentUpdateRequest request)
+        {
+            request.UserId = _loginContext.AccountId;
+            return await _commentRepository.UpdateCommentAsync(request);
+        }
+    }
+}

gx_api/GxPress/Model/GxPress.Entity/Comment.cs

@@ -44,5 +44,11 @@ namespace GxPress.Entity
         /// <value></value>
         [DataColumn]
         public string Title { get; set; }
+        /// <summary>
+        /// 评分
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public decimal Score { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.Request/Comment/CommentInRequest.cs

@@ -26,10 +26,16 @@ namespace GxPress.Request.Comment
         public int Pid { get; set; }
 
         /// <summary>
-        /// 状态 10 会议纪要 0 文章 1 话题 2 通知 3 笔记 
+        /// 状态 文章100,话题2,收藏3,笔记4,通知5,站内信6,小组7,收藏文件夹12,笔记文件夹13,工作流审批14,文件300,图片301,会议纪要8,会议详情500,财务报表601,人事报表602,出版报表603,书籍20,课程30,音频40,期刊50,视频60,名栏90,公众号110,刊期120
         /// </summary>
         /// <value></value>
         public int TypeValue{get;set;}
 
+         /// <summary>
+        /// 评分
+        /// </summary>
+        /// <value></value>
+        public decimal Score { get; set; }
+
     }
 }

gx_api/GxPress/Model/GxPress.Request/Comment/CommentUpdateRequest.cs

@@ -19,5 +19,10 @@ namespace GxPress.Request.Comment
         /// </summary>
         /// <value></value>
         public int UserId { get; set; }
+        /// <summary>
+        /// 评分
+        /// </summary>
+        /// <value></value>
+        public decimal Score { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.Result/Comment/CommentPageResult.cs

@@ -55,6 +55,12 @@ namespace GxPress.Result.Comment
         /// </summary>
         public bool IsLaud { get; set; }
 
+        /// <summary>
+        /// 评分
+        /// </summary>
+        /// <value></value>
+        public decimal Score { get; set; }
+
     }
     /// <summary>
     /// 被回复评论

gx_api/GxPress/Repository/GxPress.Repository.Implement/CommentRepository.cs

@@ -61,7 +61,8 @@ namespace GxPress.Repository.Implement
                 Content = request.Content,
                 UserId = request.UserId,
                 Pid = request.Pid,
-                TypeValue = request.TypeValue
+                TypeValue = request.TypeValue,
+                Score = request.Score
             };
             //是否被回复
             if (request.Pid > 0)
@@ -158,7 +159,8 @@ namespace GxPress.Repository.Implement
                     LaudCount = await LaudCommentAsync(item.Id),
                     UserId = item.UserId,
                     //是否点赞
-                    IsLaud = await IsLaudCommentAsync(item.Id, item.UserId)
+                    IsLaud = await IsLaudCommentAsync(item.Id, item.UserId),
+                    Score = item.Score
                 };
                 if (request.Sort == "asc")
                     commentPageResult.FloorCount = $"第{((request.Page - 1) * request.PerPage) + i}楼";
@@ -323,6 +325,8 @@ namespace GxPress.Repository.Implement
                 throw new Common.Exceptions.BusinessException("该评论不属于该用户！");
             //修改
             comment.Content = request.Content;
+            if (request.Score > 0)
+                comment.Score = request.Score;
             return await UpdateAsync(comment);
         }
     }