1

gx_api/GxPress/Api/GxPress.Api/AppControllers/AppMeetingController.cs

@@ -86,7 +86,7 @@ namespace GxPress.Api.AppControllers
         /// </summary>
         /// <returns></returns>
         [HttpGet("rooms/{id}")]
-        public async Task<MeetingRoomResult> RoomGet([FromRoute]int id)
+        public async Task<MeetingRoomResult> RoomGet([FromRoute] int id)
         {
             var room = await _meetingRoomRepository.GetAsync(id);
             room.Address = await _meetingLocationRepository.GetAddress(room.LocationId);
@@ -94,15 +94,12 @@ namespace GxPress.Api.AppControllers
             var orders = new SortedDictionary<string, List<int>>();
             foreach (var meetingOrder in orderList)
             {
-
                 var data = meetingOrder.Date.ToString().Insert(4, "-").Insert(7, "-");
                 var key = StringUtils.GetDate(Convert.ToDateTime(data)).ToString();
                 // var key = StringUtils.GetDate(meetingOrder.CreatedDate).ToString();
-
                 if (orders.TryGetValue(key, out var hourList))
                 {
                     hourList.Add(meetingOrder.Hour);
-
                 }
                 else
                 {
@@ -114,20 +111,29 @@ namespace GxPress.Api.AppControllers
             }
             var orderLists = new List<TimeDictionary>();
             //新版
-            foreach (var item in orderList.Select(n => n.Date).Distinct())
+            foreach (var item in orderList)
             {
-                var timeDictionary = new TimeDictionary();
-                timeDictionary.TimeKey = item.ToString();
-                timeDictionary.TimeValues = orderList.Where(n => n.Date == item).Select(n => n.Hour).Distinct().ToList();
+                if (orderLists.Any(n => n.TimeKey == item.Date.ToString()))
+                    continue;
+                var timeDictionary = new TimeDictionary()
+                {
+                    TimeKey = item.Date.ToString(),
+                };
+                foreach (var data in orderList.Where(n => n.Date == Convert.ToInt32(item.Date)).Distinct().ToList())
+                    timeDictionary.TimeValues.Add(new TimeValue { Key = data.Hour, Value = data.UserName });
                 orderLists.Add(timeDictionary);
             }
-
+            // foreach (var item in orderLists)
+            // {
+            //     foreach (var data in orderList.Where(n => n.Date == Convert.ToInt32(item.TimeKey)).Distinct().ToList())
+            //         item.TimeValues.Add(new TimeValue { Key = data.Hour, Value = data.UserName });
+            // }
             return new MeetingRoomResult
             {
                 RoomName = room.Name,
                 Disabled = room.Disabled,
                 Orders = orders,
-                OrderList = orderLists
+                OrderList = orderLists.Distinct().ToList()
             };
         }
 
@@ -136,7 +142,7 @@ namespace GxPress.Api.AppControllers
         /// </summary>
         /// <returns></returns>
         [HttpPost("rooms/{id}/actions/order")]
-        public async Task<DefaultResult> Order([FromRoute]int id, [FromBody] MeetingOrderRequest request)
+        public async Task<DefaultResult> Order([FromRoute] int id, [FromBody] MeetingOrderRequest request)
         {
             var room = await _meetingRoomRepository.GetAsync(id);
             var meeting = new Meeting();
@@ -387,7 +393,7 @@ namespace GxPress.Api.AppControllers
                 foreach (var item in request.AddresseeUserMiddles)
                 {
                     item.DataSourceId = id;
-                    item.MiddleType =  GxPress.EnumConst.AllTypeConst.MeetingSummary.GetHashCode();
+                    item.MiddleType = GxPress.EnumConst.AllTypeConst.MeetingSummary.GetHashCode();
                 }
                 await _userMiddleService.AddUserMiddleAsync(request.AddresseeUserMiddles);
                 var users = await _userMiddleService.FindUsersAsync(request.AddresseeUserMiddles, summary.UserId);
@@ -432,7 +438,7 @@ namespace GxPress.Api.AppControllers
             var meeting = await _meetingRepository.GetAsync(summary.MeetingId);
             var address = await _meetingLocationRepository.GetAddress(meeting.LocationId);
             //获取新版
-            var addresseeUserMiddles = await _userMiddleService.FindUserMiddlesAsync( GxPress.EnumConst.AllTypeConst.MeetingSummary.GetHashCode(), id);
+            var addresseeUserMiddles = await _userMiddleService.FindUserMiddlesAsync(GxPress.EnumConst.AllTypeConst.MeetingSummary.GetHashCode(), id);
             var meetingSummaryResult = new MeetingSummaryResult
             {
                 Id = summary.Id,
@@ -555,7 +561,7 @@ namespace GxPress.Api.AppControllers
                     var meetingTime = meetingTimeList.FirstOrDefault();
                     var TimeValuelast = meetingTime.TimeValues.Last();
                     var data = meetingTime.TimeKey.ToString().Insert(4, "-").Insert(7, "-");
-                    var key = Convert.ToDateTime(data).AddHours(TimeValuelast);
+                    var key = Convert.ToDateTime(data).AddHours(TimeValuelast.Key);
                     if (key < DateTime.Now)
                         status = 1;
                 }
@@ -622,7 +628,7 @@ namespace GxPress.Api.AppControllers
                     var meetingTime = meetingTimeList.FirstOrDefault();
                     var TimeValuelast = meetingTime.TimeValues.Last();
                     var data = meetingTime.TimeKey.ToString().Insert(4, "-").Insert(7, "-");
-                    var key = Convert.ToDateTime(data).AddHours(TimeValuelast);
+                    var key = Convert.ToDateTime(data).AddHours(TimeValuelast.Key);
                     if (key < DateTime.Now)
                         status = 1;
                 }
@@ -682,11 +688,14 @@ namespace GxPress.Api.AppControllers
             var orderLists = new List<TimeDictionary>();
             var orderAllList = await _meetingOrderRepository.GetListAsyncSinceNow(room.Id);
             //新版
-            foreach (var item in orderAllList.Select(n => n.Date).Distinct())
+            foreach (var item in orderAllList)
             {
+                if (orderLists.Any(n => n.TimeKey == item.Date.ToString()))
+                    continue;
                 var timeDictionary = new TimeDictionary();
-                timeDictionary.TimeKey = item.ToString();
-                timeDictionary.TimeValues = orderAllList.Where(n => n.Date == item).OrderBy(n => n.Hour).Select(n => n.Hour).Distinct().ToList();
+                timeDictionary.TimeKey = item.Date.ToString();
+                foreach (var date in orderAllList.Where(n => n.Date == item.Date).OrderBy(n => n.Hour).Select(n => n.Hour).Distinct().ToList())
+                    timeDictionary.TimeValues.Add(new TimeValue { Key = date, Value = item.UserName });
                 orderLists.Add(timeDictionary);
             }
             #endregion
@@ -723,7 +732,7 @@ namespace GxPress.Api.AppControllers
         /// </summary>
         /// <returns></returns>
         [HttpPost("{id}/actions/cancel")]
-        public async Task<DefaultResult> Cancel([FromRoute]int id)
+        public async Task<DefaultResult> Cancel([FromRoute] int id)
         {
             await _meetingRepository.DeleteAsync(id);
 
@@ -738,7 +747,7 @@ namespace GxPress.Api.AppControllers
         /// </summary>
         /// <returns></returns>
         [HttpPost("actions/users")]
-        public async Task<IEnumerable<MeetingUserResult>> GetUsers([FromBody]MeetingUsersRequest request)
+        public async Task<IEnumerable<MeetingUserResult>> GetUsers([FromBody] MeetingUsersRequest request)
         {
             return await _meetingRepository.GetUserByMeeting(request);
         }

gx_api/GxPress/Api/GxPress.Api/AppControllers/ReplyController.cs

@@ -33,7 +33,7 @@ namespace GxPress.Api.AppControllers
         public async Task<IEnumerable<ReplyResult>> GetReplyNoteOrTopicResults(ReplyRequest request)
         {
             request.UserId = _loginContext.AccountId;
-            return await replyService.GetReplyNoteOrTopicResults(request);
+            return await replyService.GetReplyResults(request);
         }
         /// <summary>
         /// 获取我收到的赞

gx_api/GxPress/Api/GxPress.Api/WebControllers/WebMeetingController.cs

@@ -115,11 +115,16 @@ namespace GxPress.Api.WebControllers
             }
             var orderLists = new List<TimeDictionary>();
             //新版
-            foreach (var item in orderList.Select(n => n.Date).Distinct())
+            foreach (var item in orderList)
             {
+                if (orderLists.Any(n => n.TimeKey == item.Date.ToString()))
+                    continue;
                 var timeDictionary = new TimeDictionary();
                 timeDictionary.TimeKey = item.ToString();
-                timeDictionary.TimeValues = orderList.Where(n => n.Date == item).Select(n => n.Hour).Distinct().ToList();
+                foreach (var date in orderList.Where(n => n.Date == item.Date).OrderBy(n => n.Hour).Select(n => n.Hour).Distinct().ToList())
+                {
+                    timeDictionary.TimeValues.Add(new TimeValue { Key = date, Value = item.UserName });
+                }
                 orderLists.Add(timeDictionary);
             }
 
@@ -558,7 +563,7 @@ namespace GxPress.Api.WebControllers
                     var meetingTime = meetingTimeList.FirstOrDefault();
                     var TimeValuelast = meetingTime.TimeValues.Last();
                     var data = meetingTime.TimeKey.ToString().Insert(4, "-").Insert(7, "-");
-                    var key = Convert.ToDateTime(data).AddHours(TimeValuelast);
+                    var key = Convert.ToDateTime(data).AddHours(TimeValuelast.Key);
                     if (key < DateTime.Now)
                         status = 1;
                 }
@@ -625,7 +630,7 @@ namespace GxPress.Api.WebControllers
                     var meetingTime = meetingTimeList.FirstOrDefault();
                     var TimeValuelast = meetingTime.TimeValues.Last();
                     var data = meetingTime.TimeKey.ToString().Insert(4, "-").Insert(7, "-");
-                    var key = Convert.ToDateTime(data).AddHours(TimeValuelast);
+                    var key = Convert.ToDateTime(data).AddHours(TimeValuelast.Key);
                     if (key < DateTime.Now)
                         status = 1;
                 }
@@ -685,11 +690,12 @@ namespace GxPress.Api.WebControllers
             var orderLists = new List<TimeDictionary>();
             var orderAllList = await _meetingOrderRepository.GetListAsyncSinceNow(room.Id);
             //新版
-            foreach (var item in orderAllList.Select(n => n.Date).Distinct())
+            foreach (var item in orderAllList)
             {
                 var timeDictionary = new TimeDictionary();
-                timeDictionary.TimeKey = item.ToString();
-                timeDictionary.TimeValues = orderAllList.Where(n => n.Date == item).OrderBy(n => n.Hour).Select(n => n.Hour).Distinct().ToList();
+                timeDictionary.TimeKey = item.Date.ToString();
+                foreach (var date in orderAllList.Where(n => n.Date == item.Date).OrderBy(n => n.Hour).Select(n => n.Hour).Distinct().ToList())
+                    timeDictionary.TimeValues.Add(new TimeValue { Key = date, Value = item.UserName });
                 orderLists.Add(timeDictionary);
             }
             #endregion

gx_api/GxPress/Model/GxPress.Request/App/WorkMeeting/MeetingRoomResult.cs

@@ -38,6 +38,10 @@ namespace GxPress.Request.App.WorkMeeting
     /// </summary>
     public class TimeDictionary
     {
+        public TimeDictionary()
+        {
+            TimeValues = new List<TimeValue>();
+        }
         /// <summary>
         /// 日期
         /// </summary>
@@ -47,6 +51,19 @@ namespace GxPress.Request.App.WorkMeeting
         /// 时间
         /// </summary>
         /// <value></value>
-        public List<int> TimeValues { get; set; }
+        public List<TimeValue> TimeValues { get; set; }
+    }
+    public class TimeValue
+    {
+        /// <summary>
+        /// 小时
+        /// </summary>
+        /// <value></value>
+        public int Key { get; set; }
+        /// <summary>
+        /// 用户名称
+        /// </summary>
+        /// <value></value>
+        public string Value { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.Result/Meeting/MeetingOrderResult.cs

@@ -0,0 +1,40 @@
+namespace GxPress.Result.Meeting
+{
+    public class MeetingOrderResult
+    {
+        /// <summary>
+        /// 用户Id
+        /// </summary>
+
+        public int UserId { get; set; }
+
+        /// <summary>
+        /// 会议室Id
+        /// </summary>
+
+        public int RoomId { get; set; }
+
+        /// <summary>
+        /// 会议Id
+        /// </summary>
+
+        public int MeetingId { get; set; }
+
+        /// <summary>
+        /// 预定时段
+        /// </summary>
+
+        public int Date { get; set; }
+
+        /// <summary>
+        /// 预定时段
+        /// </summary>
+
+        public int Hour { get; set; }
+        /// <summary>
+        /// 用户名称
+        /// </summary>
+        /// <value></value>
+        public string UserName { get; set; }
+    }
+}

gx_api/GxPress/Model/GxPress.Result/Reply/ReplyResult.cs

@@ -10,7 +10,7 @@ namespace GxPress.Result.Reply
         /// <value></value>
         public int Id { get; set; }
         /// <summary>
-        /// 话题或者笔记ID
+        /// 来源ID
         /// </summary>
         /// <value></value>
         public int SourceId { get; set; }
@@ -60,11 +60,6 @@ namespace GxPress.Result.Reply
         /// <value></value>
         public int UserId { get; set; }
         /// <summary>
-        /// 是否话题
-        /// </summary>
-        /// <value></value>
-        public bool IsTopic { get; set; }
-        /// <summary>
         /// 当前用户姓名
         /// </summary>
         /// <value></value>
@@ -79,5 +74,25 @@ namespace GxPress.Result.Reply
         /// </summary>
         /// <value></value>
         public bool IsRead { get; set; }
+        /// <summary>
+        /// 小组Id
+        /// </summary>
+        /// <value></value>
+        public int GroupId { get; set; }
+        /// <summary>
+        /// 小组名称
+        /// </summary>
+        /// <value></value>
+        public string GroupName { get; set; }
+        /// <summary>
+        /// 是否小组
+        /// </summary>
+        /// <value></value>
+        public bool IsGroup { get; set; }
+        /// <summary>
+        /// 是否评论
+        /// </summary>
+        /// <value></value>
+        public bool IsComment { get; set; }
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Implement/WorkMeeting/MeetingOrderRepository.cs

@@ -1,11 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Dapper;
 using Datory;
 using GxPress.Common.AppOptions;
 using GxPress.Common.Tools;
 using GxPress.Entity.WorkMeeting;
 using GxPress.Repository.Interface.WorkMeeting;
+using GxPress.Result.Meeting;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Options;
 using SqlKata;
@@ -42,12 +44,25 @@ namespace GxPress.Repository.Implement.WorkMeeting
             return await _repository.GetAllAsync(Q.Where(nameof(MeetingOrder.MeetingId), meetingId).OrderByDesc(nameof(MeetingOrder.Date)));
         }
 
-        public async Task<IEnumerable<MeetingOrder>> GetListAsyncSinceNow(int roomId)
+        public async Task<IEnumerable<MeetingOrderResult>> GetListAsyncSinceNow(int roomId)
         {
-            return await _repository.GetAllAsync(Q
-                .Where(nameof(MeetingOrder.Date), ">=",
-                StringUtils.GetDate(DateTime.Now)).Where(nameof(MeetingOrder.RoomId), roomId)
-            );
+            // return await _repository.GetAllAsync(Q
+            //     .Where(nameof(MeetingOrder.Date), ">=",
+            //     StringUtils.GetDate(DateTime.Now)).Where(nameof(MeetingOrder.RoomId), roomId)
+            // );
+            string sql = $@"SELECT 
+                                a.*,c.Id as UserId,c.Name as UserName
+                            FROM
+                                tede_meeting_order a
+                                    INNER JOIN
+                                tede_meeting b ON a.MeetingId = b.Id
+                                    INNER JOIN
+                                tede_user c ON c.Id = b.UserId
+                            WHERE
+                                a.RoomId ={roomId} AND a.Date >= date_format(NOW() , '%Y%m%d')";
+            var database = new Database(DatabaseType.MySql, ConfigHelper.GetValue("Database:ConnectionString"));
+            var connection = database.GetConnection();
+            return await connection.QueryAsync<MeetingOrderResult>(sql);
         }
 
 

gx_api/GxPress/Repository/GxPress.Repository.Interface/WorkMeeting/IMeetingOrderRepository.cs

@@ -4,6 +4,7 @@ using GxPress.Entity.WorkFlow;
 using GxPress.Request.App.Flow;
 using Datory;
 using GxPress.Entity.WorkMeeting;
+using GxPress.Result.Meeting;
 
 namespace GxPress.Repository.Interface.WorkMeeting
 {
@@ -15,7 +16,7 @@ namespace GxPress.Repository.Interface.WorkMeeting
 
         Task<IEnumerable<MeetingOrder>> GetListByMeetingIdAsync(int meetingId);
 
-        Task<IEnumerable<MeetingOrder>> GetListAsyncSinceNow(int roomId);
+        Task<IEnumerable<MeetingOrderResult>> GetListAsyncSinceNow(int roomId);
 
         Task<bool> DeleteAsync(int orderId);
         Task<bool> DeleteAsync(SqlKata.Query query);

gx_api/GxPress/Service/GxPress.Service.Implement/Meeting/MeetingService.cs

@@ -59,16 +59,20 @@ namespace GxPress.Service.Implement.Meeting
             var orderLists = new List<TimeDictionary>();
             List<MeetingTime> meetingTimes = new List<MeetingTime>();
             //
-            var dataList = orderList.OrderByDescending(n => n.Date).Select(n => n.Date).Distinct();
+            // var dataList = orderList.OrderByDescending(n => n.Date).Select(n => n.Date).Distinct();
             //新版
-            foreach (var item in dataList)
+            foreach (var item in orderList)
             {
+                if (orderLists.Any(n => n.TimeKey == item.Date.ToString()))
+                    continue;
                 var timeDictionary = new TimeDictionary();
                 timeDictionary.TimeKey = item.ToString();
-                timeDictionary.TimeValues = orderList.Where(n => n.Date == item).OrderBy(n => n.Hour).Select(n => n.Hour).Distinct().ToList();
+                var timeValues = orderList.Where(n => n.Date == item.Date).OrderBy(n => n.Hour).Select(n => n.Hour).Distinct().ToList();
+                foreach (var timeValue in timeValues)
+                    timeDictionary.TimeValues.Add(new TimeValue { Key = timeValue, Value = "" });
                 orderLists.Add(timeDictionary);
                 //获取相邻的
-                var nearTimeDictionary = GetDictionary(timeDictionary.TimeValues);
+                var nearTimeDictionary = GetDictionary(timeValues);
                 foreach (var ntd in nearTimeDictionary)
                 {
                     var meetingTime = new MeetingTime();
@@ -87,7 +91,7 @@ namespace GxPress.Service.Implement.Meeting
                     meetingTime.WeekValue = week;
                     //获取相邻的数据集
                     meetingTime.BeginHour = ntd.Value.First();
-                    meetingTime.EndHour = ntd.Value.Last()+1;
+                    meetingTime.EndHour = ntd.Value.Last() + 1;
                     meetingTimes.Add(meetingTime);
                 }
             }

gx_api/GxPress/Service/GxPress.Service.Implement/Reply/ReplyService.Comment.cs

@@ -0,0 +1,158 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Dapper;
+using Datory;
+using GxPress.Common.Tools;
+using GxPress.EnumConst;
+using GxPress.Result.Reply;
+
+namespace GxPress.Service.Implement.Reply
+{
+    /// <summary>
+    /// 获取我收到的或者我回复的评论
+    /// </summary>
+    public partial class ReplyService
+    {
+        /// <summary>
+        /// 获取我收到的评论
+        /// </summary>
+        /// <returns></returns>
+        public async Task<IEnumerable<ReplyResult>> GetReceiptCommentResult(int userId)
+        {
+            //获取回复我的
+            string sql = $@"SELECT 
+                                    a.Id,
+                                    a.ArticleId AS SourceId,
+                                    a.Content AS CommentContent,
+                                    a.TypeValue,
+                                    a.CreatedDate,
+                                    a.Pid,
+                                    b.Id AS UserId,
+                                    b.Name as UserName
+                                FROM
+                                    tede_comment a
+                                        INNER JOIN
+                                    tede_user b ON a.UserId = b.Id
+                                WHERE
+                                    a.Pid IN (SELECT 
+                                            id
+                                        FROM
+                                            tede_comment
+                                        WHERE
+                                            id IN (SELECT 
+                                                    Pid
+                                                FROM
+                                                    tede_comment
+                                                WHERE
+                                                    pid > 0)
+                                                AND userId = {userId})";
+            var database = new Database(DatabaseType.MySql, ConfigHelper.GetValue("Database:ConnectionString"));
+            var connection = database.GetConnection();
+            var receipt = await connection.QueryAsync<ReplyResult>(sql);
+            sql = $@"SELECT 
+                            a.Id,
+                            a.ArticleId AS SourceId,
+                            a.Content AS CommentContent,
+                            a.TypeValue,
+                            a.CreatedDate,
+                            a.Pid,
+                            b.Id AS UserId,
+                            b.Name
+                        FROM
+                            tede_comment a
+                                INNER JOIN
+                            tede_user b ON a.UserId = b.Id
+                        WHERE
+                            a.id IN (SELECT 
+                                    Pid
+                                FROM
+                                    tede_comment
+                                WHERE
+                                    pid > 0)
+                                AND userId = {userId}";
+            var my = await connection.QueryAsync<ReplyResult>(sql);
+            foreach (var item in receipt)
+            {
+                if (item.Pid > 0)
+                {
+                    ReplyResult replyResult1 = my.FirstOrDefault(n => n.Id == item.Pid);
+                    ReplyResult replyResult = replyResult1;
+                    item.Title = replyResult.CommentContent;
+                    item.Name = replyResult.Name;
+                }
+                item.AvatarUrl = StringUtils.AddDomainMin(item.AvatarUrl);
+                if (item.TypeValue == AllTypeConst.Note.GetHashCode())
+                    item.TypeValue = AllTypeConst.Topic.GetHashCode();
+                item.Remark = ((AllTypeConst)item.TypeValue).GetDescriptionOriginal();
+                item.IsComment = true;
+            }
+            return receipt;
+        }
+        /// <summary>
+        /// 获取我回复的评论
+        /// </summary>
+        /// <returns></returns>
+        public async Task<IEnumerable<ReplyResult>> GetMyReceiptCommentResult(int userId)
+        {
+            //获取回复我的
+            string sql = $@"SELECT 
+                                a.Id,
+                                a.ArticleId AS SourceId,
+                                a.Content AS CommentContent,
+                                a.TypeValue,
+                                a.CreatedDate,
+                                a.Pid,
+                                b.Id AS UserId,
+                                b.Name AS UserName
+                            FROM
+                                tede_comment a
+                                    INNER JOIN
+                                tede_user b ON a.UserId = b.Id
+                            WHERE
+                                a.pid > 0 AND a.userId = {userId}";
+            var database = new Database(DatabaseType.MySql, ConfigHelper.GetValue("Database:ConnectionString"));
+            var connection = database.GetConnection();
+            var receipt = await connection.QueryAsync<ReplyResult>(sql);
+            sql = $@"SELECT 
+                            a.Id,
+                            a.ArticleId AS SourceId,
+                            a.Content AS CommentContent,
+                            a.TypeValue,
+                            a.CreatedDate,
+                            a.Pid,
+                            b.Id AS UserId,
+                            b.Name
+                        FROM
+                            tede_comment a
+                                INNER JOIN
+                            tede_user b ON a.UserId = b.Id
+                        WHERE
+                            a.id IN (SELECT 
+                                            a.Pid
+                                        FROM
+                                            tede_comment a
+                                                INNER JOIN
+                                            tede_user b ON a.UserId = b.Id
+                                        WHERE
+                                            a.pid > 0 AND a.userId = {userId})";
+            var my = await connection.QueryAsync<ReplyResult>(sql);
+            foreach (var item in receipt)
+            {
+                if (item.Pid > 0)
+                {
+                    ReplyResult replyResult1 = my.FirstOrDefault(n => n.Id == item.Pid);
+                    ReplyResult replyResult = replyResult1;
+                    item.Title = replyResult.CommentContent;
+                    item.Name = replyResult.Name;
+                }
+                item.AvatarUrl = StringUtils.AddDomainMin(item.AvatarUrl);
+                if (item.TypeValue == AllTypeConst.Note.GetHashCode())
+                    item.TypeValue = AllTypeConst.Topic.GetHashCode();
+                item.Remark = ((AllTypeConst)item.TypeValue).GetDescriptionOriginal();
+                item.IsComment = true;
+            }
+            return receipt;
+        }
+    }
+}

gx_api/GxPress/Service/GxPress.Service.Implement/Reply/ReplyService.Note.Topic.cs

@@ -70,17 +70,87 @@ namespace GxPress.Service.Implement.Reply
                         {
                             result.UserName = user != null ? user.Name : "";
                             result.AvatarUrl = StringUtils.AddDomainMin(user.AvatarUrl);
-                            result.IsTopic = note.IsTop;
                             result.Title = string.IsNullOrEmpty(note.Title) ? GetTitleText(note.Content) : note.Title; ;
                             //result.Content = note.Content;
                             result.CreatedDate = note.CreatedDate;
+                            result.Content = string.Empty;
                             result.Name = userModel.Name;
-                            result.Remark = result.IsTopic ? AllTypeConst.Topic.GetDescriptionOriginal() : AllTypeConst.Note.GetDescriptionOriginal();
+                            result.Remark = result.TypeValue == AllTypeConst.Note.GetHashCode() ? AllTypeConst.Topic.GetDescriptionOriginal() : AllTypeConst.Note.GetDescriptionOriginal();
                             return result;
                         }, splitOn: "Id,Title,Name,Name");
 
         }
-
+        /// <summary>
+        /// 获取回复我的小组话题
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public async Task<IEnumerable<ReplyResult>> GetReplyGroupTopicResults(ReplyRequest request)
+        {
+            var topicConstValue = AllTypeConst.Topic.GetHashCode();
+            string sqlStr = string.Empty;
+            if (!string.IsNullOrEmpty(request.KeyWord))
+            {
+                sqlStr = $@" AND (c.Name LIKE '%{request.KeyWord}%'
+                                            OR a.Content LIKE '%{request.KeyWord}%'
+                                            OR b.Title LIKE '%{request.KeyWord}%'
+                                            OR b.Content LIKE '%{request.KeyWord}%')";
+            }
+            if (request.TypeValue == 0)
+                sqlStr = $@" and b.UserId = {request.UserId}";
+            else
+                sqlStr = $@" and a.UserId = {request.UserId}";
+            string sql = $@"
+                                SELECT 
+                                        a.Id,
+                                        a.UserId,
+                                        a.ArticleId AS SourceId,
+                                        a.Content AS CommentContent,
+                                        a.Pid,
+                                        a.TypeValue,
+                                        b.Title,
+                                        b.Content,
+                                        b.CreatedDate,
+                                        b.GroupId,
+                                        c.Name AS UserName,
+                                        c.AvatarUrl,
+                                        d.Name,
+                                        g.Id AS GroupId,
+                                        g.Name AS GroupName
+                                    FROM
+                                        tede_comment a
+                                            INNER JOIN
+                                        tede_topic b ON a.ArticleId = b.Id
+                                            INNER JOIN
+                                        tede_user c ON c.Id = a.UserId
+                                            INNER JOIN
+                                        tede_user d ON d.Id = b.UserId
+                                            INNER JOIN
+                                        tede_middle e ON e.MiddleId = b.Id
+                                            INNER JOIN
+                                        tede_group g ON g.id = b.GroupId
+                                    WHERE
+                                        1 = 1 AND a.TypeValue = {topicConstValue}
+                                            AND b.GroupId > 0
+                                            AND e.IsDelete = 0
+                                            AND a.Content <> ''
+                                            {sqlStr}
+                                    ORDER BY a.CreatedDate DESC
+          ";
+            var database = new Database(DatabaseType.MySql, ConfigHelper.GetValue("Database:ConnectionString"));
+            var connection = database.GetConnection();
+            var result = await connection.QueryAsync<ReplyResult>(sql);
+            foreach (var item in result)
+            {
+                item.AvatarUrl = StringUtils.AddDomainMin(item.AvatarUrl);
+                item.Title = string.IsNullOrEmpty(item.Title) ? GetTitleText(item.Content) : item.Title; ;
+                //result.Content = note.Content;
+                item.Remark = item.GroupName;
+                item.Content = string.Empty;
+                item.IsGroup = true;
+            }
+            return result;
+        }
         public string GetTitleText(string content)
         {
             var data = JsonConvert.DeserializeObject<List<CollectionContentJsonData>>(content);
@@ -98,5 +168,71 @@ namespace GxPress.Service.Implement.Reply
             }
             return string.Empty;
         }
+
+        /// <summary>
+        /// 获取回复我的通知站内信
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public async Task<IEnumerable<ReplyResult>> GetReplyNoticeTopicResults(ReplyRequest request)
+        {
+            var topicConstValue = AllTypeConst.Topic.GetHashCode();
+            string sqlStr = string.Empty;
+            if (!string.IsNullOrEmpty(request.KeyWord))
+            {
+                sqlStr = $@" AND (c.Name LIKE '%{request.KeyWord}%'
+                                            OR a.Content LIKE '%{request.KeyWord}%'
+                                            OR b.Title LIKE '%{request.KeyWord}%'
+                                            OR b.Content LIKE '%{request.KeyWord}%')";
+            }
+            if (request.TypeValue == 0)
+                sqlStr = $@" and b.UserId = {request.UserId}";
+            else
+                sqlStr = $@" and a.UserId = {request.UserId}";
+            string sql = $@"
+                               SELECT 
+                                        a.Id,
+                                        a.UserId,
+                                        a.ArticleId AS SourceId,
+                                        a.Content AS CommentContent,
+                                        a.Pid,
+                                        a.TypeValue,
+                                        b.Title,
+                                        b.Content,
+                                        b.CreatedDate,
+                                        c.Name AS UserName,
+                                        c.AvatarUrl,
+                                        d.Name
+                                    FROM
+                                        tede_comment a
+                                            INNER JOIN
+                                        tede_notice b ON a.ArticleId = b.Id
+                                            INNER JOIN
+                                        tede_user c ON c.Id = a.UserId
+                                            INNER JOIN
+                                        tede_user d ON d.Id = b.UserId
+                                            INNER JOIN
+                                        tede_middle e ON e.MiddleId = b.Id
+                                    WHERE
+                                        1 = 1 
+                                            AND e.IsDelete = 0 and e.UserId=b.UserId
+                                            AND a.Content <> '' and a.TypeValue in(5,6)
+                                            {sqlStr}
+                                    ORDER BY a.CreatedDate DESC
+          ";
+            var database = new Database(DatabaseType.MySql, ConfigHelper.GetValue("Database:ConnectionString"));
+            var connection = database.GetConnection();
+            var result = await connection.QueryAsync<ReplyResult>(sql);
+            foreach (var item in result)
+            {
+                item.AvatarUrl = StringUtils.AddDomainMin(item.AvatarUrl);
+                item.Title = string.IsNullOrEmpty(item.Title) ? GetTitleText(item.Content) : item.Title; ;
+                //result.Content = note.Content;
+                item.Remark = ((AllTypeConst)item.TypeValue).GetDescriptionOriginal();
+                item.Content = string.Empty;
+
+            }
+            return result;
+        }
     }
 }

gx_api/GxPress/Service/GxPress.Service.Implement/Reply/ReplyService.Praise.cs

@@ -62,12 +62,11 @@ namespace GxPress.Service.Implement.Reply
                         {
                             result.UserName = user != null ? user.Name : "";
                             result.AvatarUrl = StringUtils.AddDomainMin(user.AvatarUrl);
-                            result.IsTopic = note.IsTop;
                             result.Title = string.IsNullOrEmpty(note.Title) ? GetTitleText(note.Content) : note.Title;
                             //result.Content = note.Content;
                             result.CreatedDate = note.CreatedDate;
                             result.Name = userModel.Name;
-                            result.Remark = result.IsTopic ? AllTypeConst.Topic.GetDescriptionOriginal() : AllTypeConst.Note.GetDescriptionOriginal();
+                            result.Remark = result.TypeValue==AllTypeConst.Note.GetHashCode() ? AllTypeConst.Topic.GetDescriptionOriginal() : AllTypeConst.Note.GetDescriptionOriginal();
                             return result;
                         }, splitOn: "Id,Title,Name,Name");
         }

gx_api/GxPress/Service/GxPress.Service.Implement/Reply/ReplyService.cs

@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using GxPress.Request.Reply;
 using GxPress.Result.Reply;
 using GxPress.Service.Interface.Reply;
-
+using System.Linq;
 namespace GxPress.Service.Implement.Reply
 {
     /// <summary>
@@ -15,5 +15,25 @@ namespace GxPress.Service.Implement.Reply
         {
 
         }
+        /// <summary>
+        /// 获取我收到和我回复的评论
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public async Task<IEnumerable<ReplyResult>> GetReplyResults(ReplyRequest request)
+        {
+            var result = new List<ReplyResult>();
+            result.AddRange(await GetReplyNoteOrTopicResults(request));
+            //小组话题
+            result.AddRange(await GetReplyGroupTopicResults(request));
+            if (request.TypeValue == 0)
+                result.AddRange(await GetReceiptCommentResult(request.UserId));
+            else
+                result.AddRange(await GetMyReceiptCommentResult(request.UserId));
+            //站内信 通知
+            result.AddRange(await GetReplyNoticeTopicResults(request));
+            result.OrderByDescending(n => n.CreatedDate);
+            return result;
+        }
     }
 }

gx_api/GxPress/Service/GxPress.Service.Interface/Reply/IReplyService.cs

@@ -8,6 +8,12 @@ namespace GxPress.Service.Interface.Reply
     public interface IReplyService : IService
     {
         /// <summary>
+        /// 获取我收到和我回复的评论
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        Task<IEnumerable<ReplyResult>> GetReplyResults(ReplyRequest request);
+        /// <summary>
         /// 获取回复我的笔记或者话题
         /// </summary>
         /// <param name="request"></param>
@@ -20,5 +26,16 @@ namespace GxPress.Service.Interface.Reply
         /// <param name="request"></param>
         /// <returns></returns>
         Task<IEnumerable<ReplyResult>> GetPraiseAsync(ReplyRequest request);
+
+        /// <summary>
+        /// 获取我收到的评论
+        /// </summary>
+        /// <returns></returns>
+        Task<IEnumerable<ReplyResult>> GetReceiptCommentResult(int userId);
+        /// <summary>
+        /// 获取我回复的评论
+        /// </summary>
+        /// <returns></returns>
+        Task<IEnumerable<ReplyResult>> GetMyReceiptCommentResult(int userId);
     }
 }