1

gx_api/GxPress/Api/GxPress.Api/WebControllers/WebVisitController.cs

@@ -0,0 +1,38 @@
+using System.Threading.Tasks;
+using GxPress.Auth;
+using GxPress.Common.Page;
+using GxPress.Repository.Interface.Visit;
+using GxPress.Request.App.Visit;
+using GxPress.Result.App.Visit;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace GxPress.Api.WebControllers
+{
+    /// <summary>
+    /// 访问
+    /// </summary>
+    [Route("/api/web/visit")]
+    [ApiController]
+    [Authorize]
+    public class WebVisitController : ControllerBase
+    {
+        private readonly IVisitRepository _visitRepository;
+        private readonly ILoginContext _loginContext;
+        public WebVisitController(IVisitRepository visitRepository, ILoginContext loginContext)
+        {
+            _visitRepository = visitRepository;
+            _loginContext = loginContext;
+        }
+        /// <summary>
+        /// 通知查询
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("page")]
+        public async Task<PagedList<VisitResult>> GetVisitResultAsync(VisitPageSearchRequest request)
+        {
+            return await _visitRepository.GetVisitResultAsync(request);
+        }
+    }
+}

gx_api/GxPress/Model/GxPress.Request/App/Visit/VisitPageSearchRequest.cs

@@ -5,17 +5,17 @@ namespace GxPress.Request.App.Visit
     /// <summary>
     /// 访问列表
     /// </summary>
-    public class VisitPageSearchRequest:PageParameter
+    public class VisitPageSearchRequest : PageParameter
     {
         /// <summary>
-        /// 类型1文章 2话题 3 收藏 4笔记 5通知 6站内信 7小组 8 会议详情
+        /// 文章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 TypeId{get;set;}
+        public int TypeId { get; set; }
         /// <summary>
         /// 来源ID
         /// </summary>
         /// <value></value>
-        public int SouceId{get;set;}
+        public int SouceId { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.Request/Notice/NoticeReadListRequest.cs

@@ -22,5 +22,10 @@ namespace GxPress.Request.Notice
         /// </summary>
         /// <value></value>
         public string Key { 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 SourceType { get; set; }
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Implement/AddresseeRepository.cs

@@ -99,6 +99,8 @@ namespace GxPress.Repository.Implement
                 sqlValue += " and a.IsRead=1";
             else if (request.ReadType == 2)
                 sqlValue += " and a.IsRead=0";
+            if (request.SourceType > 0)
+                sqlValue += $" and a.SourceType={request.SourceType}";
             if (!string.IsNullOrWhiteSpace(request.Key))
                 sqlValue += $" and b.Name like '%{request.Key}%'";
             var sql = $"SELECT a.*,b.Name,b.AvatarUrl,c.Name FROM tede_addressee a inner join tede_user b on a.UserId=b.Id inner join tede_department c on c.Id=b.DepartmentId where a.SourceId={request.NoticeId} {sqlValue} order by a.LastModifiedDate desc";