11

gx_api/GxPress/Api/GxPress.Api/AppControllers/OftenContactController.cs

@@ -41,19 +41,33 @@ namespace GxPress.Api.AppControllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("list")]
-        public async Task<System.Collections.Generic.IEnumerable<OftenContactInfo>> GetOftenContactsAsync(OftenContactSearchRequest request)
+        public async Task<IEnumerable<OftenContactInfo>> GetOftenContactsAsync(OftenContactSearchRequest request)
         {
             request.UserId = _loginContext.AccountId;
             return await _oftenContactService.GetOftenContacts(request);
         }
-
+        /// <summary>
+        /// 获取聊天界面和验证最新时间
+        /// </summary>
+        /// <param name="individualGroupId"></param>
+        /// <returns></returns>
+        [HttpGet("list/{individualGroupId}")]
+        public async Task<OftenContactInfoGenericResult> GetOftenContactInfoGenericResult(int individualGroupId)
+        {
+            var request = new OftenContactSearchRequest()
+            {
+                UserId = _loginContext.AccountId,
+                IndividualGroupId = individualGroupId
+            };
+            return await _oftenContactService.GetOftenContactInfoGenericResult(request);
+        }
         /// <summary>
         /// 根据文件ID获取用户和下面的数据
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("all-list")]
-        public async Task<System.Collections.Generic.IEnumerable<OftenContactInfo>> GetOftenContactAllAsync(OftenContactSearchRequest request)
+        public async Task<IEnumerable<OftenContactInfo>> GetOftenContactAllAsync(OftenContactSearchRequest request)
         {
             request.UserId = _loginContext.AccountId;
             return await _oftenContactService.GetOftenContactsAll(request);

gx_api/GxPress/Model/GxPress.Request/GroupChatUser/GroupChatUserSearchRequest.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace GxPress.Request.GroupChatUser
 {
     /// <summary>

gx_api/GxPress/Model/GxPress.Result/App/OftenContact/OftenContactResult.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-
 namespace GxPress.Result.App.OftenContact
 {
 
@@ -80,4 +79,20 @@ namespace GxPress.Result.App.OftenContact
         /// <value></value>
         public bool IsTop { get; set; }
     }
+    /// <summary>
+    /// 
+    /// </summary>
+    public class OftenContactInfoGenericResult
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <value></value>
+        public IEnumerable<OftenContactInfo> OftenContactInfos { get; set; }
+        /// <summary>
+        /// 验证时间
+        /// </summary>
+        /// <value></value>
+        public string ConfirmationDate { get; set; }
+    }
 }

gx_api/GxPress/Repository/GxPress.Repository.Implement/AdminVerify/AdminVerifyRepository.cs

@@ -131,5 +131,18 @@ namespace GxPress.Repository.Implement.AdminVerify
         {
             return await _repository.UpdateAsync(query) > 0;
         }
+        /// <summary>
+        /// 获取用户的验证时间信息
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public async Task<string> GetConfirmationDate(int userId)
+        {
+            var query = Q.NewQuery();
+            query.Select(nameof(Entity.AdminVerify.CreatedDate));
+            query.Where(nameof(Entity.AdminVerify.AdminId), userId);
+            query.OrderByDesc(nameof(Entity.AdminVerify.CreatedDate));
+            return await _repository.GetAsync<string>(query);
+        }
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Interface/AdminVerify/IAdminVerifyRepository.cs

@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 using Datory;
 using GxPress.EnumConst;
@@ -59,13 +57,19 @@ namespace GxPress.Repository.Interface.AdminVerify
         /// <returns></returns>
         Task<int> GetUDisposeCount(int userId);
 
-         /// <summary>
+        /// <summary>
         /// 根据ID查询
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-         Task<Entity.AdminVerify> GetAsync(SqlKata.Query query);
-         Task<bool> InsertAsync(List<Entity.AdminVerify> adminVerifys);
+        Task<Entity.AdminVerify> GetAsync(SqlKata.Query query);
+        Task<bool> InsertAsync(List<Entity.AdminVerify> adminVerifys);
+        /// <summary>
+        /// 获取用户的验证时间信息
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        Task<string> GetConfirmationDate(int userId);
 
     }
 }

gx_api/GxPress/Service/GxPress.Service.Implement/OftenContact/OftenContactService.Get.cs

@@ -6,6 +6,7 @@ using GxPress.Common.Tools;
 using GxPress.Request.App.OftenContact;
 using GxPress.Request.GroupChatUser;
 using GxPress.Result.App.OftenContact;
+using System;
 
 namespace GxPress.Service.Implement.OftenContact
 {
@@ -18,7 +19,6 @@ namespace GxPress.Service.Implement.OftenContact
         /// <returns></returns>
         public async Task<IEnumerable<OftenContactInfo>> GetOftenContacts(OftenContactSearchRequest request)
         {
-
             //获取文件夹数据
             var result = new List<OftenContactInfo>();
             var data = await _repository.GetContactInfosAsync(request);
@@ -53,6 +53,20 @@ namespace GxPress.Service.Implement.OftenContact
             result = data.ToList();
             return result;
         }
+        /// <summary>
+        /// 获取聊天界面和验证最新时间
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public async Task<OftenContactInfoGenericResult> GetOftenContactInfoGenericResult(OftenContactSearchRequest request)
+        {
+            var result = new OftenContactInfoGenericResult();
+            result.OftenContactInfos = await GetOftenContacts(request);
+            result.ConfirmationDate = await adminVerifyRepository.GetConfirmationDate(request.UserId);
+            if (!string.IsNullOrEmpty(result.ConfirmationDate))
+                result.ConfirmationDate = Convert.ToDateTime(result.ConfirmationDate).ToString("yyyy-MM-dd hh:mm:ss");
+            return result;
+        }
 
         /// <summary>
         /// 获取用户

gx_api/GxPress/Service/GxPress.Service.Implement/OftenContact/OftenContactService.cs

@@ -1,4 +1,5 @@
 using GxPress.Repository.Interface;
+using GxPress.Repository.Interface.AdminVerify;
 using GxPress.Service.Interface.OftenContact;
 namespace GxPress.Service.Implement.OftenContact
 {
@@ -9,13 +10,15 @@ namespace GxPress.Service.Implement.OftenContact
         private readonly IUserRepository _userRepository;
         private readonly IGroupChatRepository _groupChatRepository;
         private readonly IGroupChatUserRepository groupChatUserRepository;
-        public OftenContactService(IOftenContactRepository repository,IMiddleRepository middleRepository, IUserRepository userRepository,IGroupChatRepository groupChatRepository,IGroupChatUserRepository groupChatUserRepository)
+        private readonly IAdminVerifyRepository adminVerifyRepository;
+        public OftenContactService(IOftenContactRepository repository, IMiddleRepository middleRepository, IUserRepository userRepository, IGroupChatRepository groupChatRepository, IGroupChatUserRepository groupChatUserRepository, IAdminVerifyRepository adminVerifyRepository)
         {
             _repository = repository;
             _middleRepository = middleRepository;
             _userRepository = userRepository;
-            _groupChatRepository=groupChatRepository;
-            this.groupChatUserRepository=groupChatUserRepository;
+            _groupChatRepository = groupChatRepository;
+            this.groupChatUserRepository = groupChatUserRepository;
+            this.adminVerifyRepository = adminVerifyRepository;
         }
     }
 }

gx_api/GxPress/Service/GxPress.Service.Interface/OftenContact/IOftenContactService.cs

@@ -5,7 +5,7 @@ using GxPress.Result.App.OftenContact;
 
 namespace GxPress.Service.Interface.OftenContact
 {
-    public interface IOftenContactService: IService
+    public interface IOftenContactService : IService
     {
         /// <summary>
         /// 删除
@@ -18,7 +18,7 @@ namespace GxPress.Service.Interface.OftenContact
         /// <param name="individualGroupId"></param>
         /// <returns></returns>
         Task<IEnumerable<OftenContactInfo>> GetOftenContacts(OftenContactSearchRequest request);
-         /// <summary>
+        /// <summary>
         ///获取用户的所有聊天界面
         /// </summary>
         /// <param name="individualGroupId"></param>
@@ -38,5 +38,11 @@ namespace GxPress.Service.Interface.OftenContact
         /// <param name="blackUserId"></param>
         /// <returns></returns>
         Task<bool> SetBlackUserAsync(int userId, int blackUserId);
+        /// <summary>
+        /// 获取聊天界面和验证最新时间
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        Task<OftenContactInfoGenericResult> GetOftenContactInfoGenericResult(OftenContactSearchRequest request);
     }
 }