1

gx_api/GxPress/Api/GxPress.Api/AdminControllers/AdminCommentController.cs

@@ -1,5 +1,7 @@
 using System.Threading.Tasks;
 using GxPress.Common.Page;
+using GxPress.Common.Tools;
+using GxPress.EnumConst;
 using GxPress.Repository.Interface;
 using GxPress.Request.Comment;
 using GxPress.Result.Comment;
@@ -13,7 +15,8 @@ namespace GxPress.Api.AdminControllers
     /// </summary>
     [Route("api/admin/comment")]
     [ApiController]
-    public class AdminCommentController : ControllerBase
+    [Authorize]
+    public class AdminCommentController : Controller
     {
         private readonly ICommentRepository _commentRepository;
         public AdminCommentController(ICommentRepository commentRepository)
@@ -21,7 +24,7 @@ namespace GxPress.Api.AdminControllers
             _commentRepository = commentRepository;
         }
 
-       
+
         /// <summary>
         /// 分页显示数据
         /// </summary>
@@ -38,10 +41,24 @@ namespace GxPress.Api.AdminControllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpDelete("delete")]
-        [AllowAnonymous]
         public async Task<bool> Delete([FromBody] CommentDeleteRequest request)
         {
             return await _commentRepository.DeleteCommentAsync(request);
         }
+        /// <summary>
+        /// 后台评论分页列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("list")]
+        public async Task<PagedList<CommentResult>> GetAllAsync(CommentSearchRequest request)
+        {
+            var result = await _commentRepository.GetAllAsync(request);
+            foreach (var item in result.Items)
+            {
+                item.TypeValueString = ((AllTypeConst)item.TypeValue).GetDescriptionOriginal();
+            }
+            return result;
+        }
     }
 }

gx_api/GxPress/Infrastructure/GxPress.Common/Tools/StringUtils.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -113,7 +114,14 @@ namespace GxPress.Common.Tools
             return builder.ToString();
         }
 
-
+        public static string GetDescriptionOriginal(this Enum @this)
+        {
+            var name = @this.ToString();
+            var field = @this.GetType().GetField(name);
+            if (field == null) return name;
+            var att = System.Attribute.GetCustomAttribute(field, typeof(DescriptionAttribute), false);
+            return att == null ? field.Name : ((DescriptionAttribute)att).Description;
+        }
         public static string ObjectCollectionToString(IEnumerable<string> collection, int length)
         {
             var builder = new StringBuilder();
@@ -125,7 +133,7 @@ namespace GxPress.Common.Tools
                     builder.Append(obj.Trim()).Append(",");
                     if (i >= length)
                         break;
-                        i++;
+                    i++;
                 }
                 if (builder.Length != 0) builder.Remove(builder.Length - 1, 1);
             }

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

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Datory;
 using Datory.Annotations;
 
 namespace GxPress.Entity
@@ -13,7 +9,7 @@ namespace GxPress.Entity
     public class Comment : Datory.Entity
     {
         /// <summary>
-        /// 文章ID
+        /// 数据ID
         /// </summary>
         [DataColumn] public int ArticleId { get; set; }
         /// <summary>
@@ -36,12 +32,17 @@ namespace GxPress.Entity
         /// 是否讨论
         /// </summary>
         [DataColumn] public bool IsUnderstand { get; set; }
-         /// <summary>
-         /// 状态 10 会议纪要 0 文章 1 话题 2 通知 3 笔记  4站内信
-         /// </summary>
-         /// <value></value>
+        /// <summary>
+        /// 状态 文章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>
         [DataColumn]
-        public int TypeValue{get;set;}
-
+        public int TypeValue { get; set; }
+        /// <summary>
+        /// 标题
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public string Title { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.EnumConst/AllTypeConst.cs

@@ -8,7 +8,7 @@ namespace GxPress.EnumConst
     public enum AllTypeConst
     {
         [Description("文章")]
-        Article = 1,
+        Article = 100,
         [Description("话题")]
         Topic = 2,
         [Description("收藏")]
@@ -41,5 +41,23 @@ namespace GxPress.EnumConst
         PersonnelReport = 602,
         [Description("出版报表")]
         PublishReport = 603,
+        // [Description("文章")]
+        // Article = 1,
+        [Description("书籍")]
+        Book = 20,
+        [Description("课程")]
+        Curriculum = 30,
+        [Description("音频")]
+        Audio = 40,
+        [Description("期刊")]
+        Journal = 50,
+        [Description("视频")]
+        Video = 60,
+        [Description("名栏")]
+        StarColumn = 90,
+        [Description("公众号")]
+        PublicNumber = 110,
+        [Description("刊期")]
+        Magazine = 120
     }
 }

gx_api/GxPress/Model/GxPress.EnumConst/VipTypeConst.cs

@@ -62,7 +62,7 @@ namespace GxPress.EnumConst
         StarColumn = 1,
         [Description("公众号")]
         PublicNumber = 2,
-        [Description("期刊")]
-        Journal = 3
+        [Description("刊期")]
+        Magazine = 3
     }
 }

gx_api/GxPress/Model/GxPress.Mappings/CommentMapping.cs

@@ -0,0 +1,15 @@
+using AutoMapper;
+using GxPress.Entity;
+using GxPress.Result.Comment;
+
+namespace GxPress.Mappings
+{
+    public class CommentMapping : Profile
+    {
+        public CommentMapping()
+        {
+            CreateMap<Comment, CommentResult>();
+        }
+
+    }
+}

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

@@ -23,5 +23,18 @@ namespace GxPress.Request.Comment
         /// </summary>
         /// <value></value>
         public int Total { get; set; }
+
+    }
+    /// <summary>
+    /// 评论分页
+    /// </summary>
+    public class CommentSearchRequest : PageParameter
+    {
+
+        /// <summary>
+        /// 搜索字段
+        /// </summary>
+        /// <value></value>
+        public string KeyWord { get; set; }
     }
 }

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

@@ -54,7 +54,7 @@ namespace GxPress.Result.Comment
         /// 当前用户是否点赞
         /// </summary>
         public bool IsLaud { get; set; }
-       
+
     }
     /// <summary>
     /// 被回复评论
@@ -95,4 +95,53 @@ namespace GxPress.Result.Comment
         /// </summary>
         public bool IsUnderstand { get; set; }
     }
+
+
+    /// <summary>
+    /// 被回复评论
+    /// </summary>
+    public class CommentResult
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        /// <value></value>
+        public int Id { get; set; }
+        /// <summary>
+        /// 数据ID
+        /// </summary>
+        public int ArticleId { get; set; }
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public int UserId { get; set; }
+        /// <summary>
+        /// 内容
+        /// </summary>
+        public string Content { get; set; }
+
+
+        /// <summary>
+        /// 状态 文章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 string TypeValueString { get; set; }
+        /// <summary>
+        /// 标题
+        /// </summary>
+        /// <value></value>
+
+        public string Title { get; set; }
+        /// <summary>
+        /// 评论时间
+        /// </summary>
+        /// <value></value>
+        public DateTime? CreatedDate { get; set; }
+    }
 }

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

@@ -94,6 +94,25 @@ namespace GxPress.Repository.Implement
             return pagedList;
         }
         /// <summary>
+        /// 后台评论分页列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public async Task<PagedList<CommentResult>> GetAllAsync(CommentSearchRequest request)
+        {
+            var result = new PagedList<CommentResult>();
+            var query = Q.NewQuery();
+            if (!string.IsNullOrEmpty(request.KeyWord))
+            {
+                query.OrWhereLike(nameof(Comment.Content), $"%{request.KeyWord}%");
+                query.OrWhereLike(nameof(Comment.Title), $"%{request.KeyWord}%");
+            }
+            result.Total = await _repository.CountAsync(query);
+            var commentResult = await _repository.GetAllAsync(query.ForPage(request.Page, request.PerPage));
+            result.Items = commentResult.Select(n => _mapper.Map<CommentResult>(n));
+            return result;
+        }
+        /// <summary>
         /// 获取总条数
         /// </summary>
         /// <param name="articleId"></param>

gx_api/GxPress/Repository/GxPress.Repository.Interface/ICommentRepository.cs

@@ -48,6 +48,12 @@ namespace GxPress.Repository.Interface
 
         Task<int> CountAsync(SqlKata.Query query);
         Task<bool> UpdateCommentAsync(CommentUpdateRequest request);
+        /// <summary>
+        /// 后台评论分页列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+       Task<PagedList<CommentResult>> GetAllAsync(CommentSearchRequest request)
     }
 }