src/Hotline.Api/Controllers/CallController.cs

@@ -1,8 +1,12 @@
 using Hotline.Application.CallCenter;
 using Hotline.CallCenter.BlackLists;
+using Hotline.CallCenter.Calls;
+using Hotline.CallCenter.Tels;
 using Hotline.Share.Dtos.CallCenter;
 using Hotline.Share.Dtos.TrCallCenter;
+using Hotline.Share.Enums.CallCenter;
 using Microsoft.AspNetCore.Mvc;
+using XF.Utility.EnumExtensions;
 
 namespace Hotline.Api.Controllers
 {
@@ -19,14 +23,14 @@ namespace Hotline.Api.Controllers
         /// 查询分机
         /// </summary>
         [HttpGet("tels")]
-        public Task<IReadOnlyList<TelDto>> QueryTelsAsync()
+        public Task<IReadOnlyList<TelDto>> QueryTels()
             => _callApplication.QueryTelsAsync(HttpContext.RequestAborted);
 
         /// <summary>
         /// 查询分机组
         /// </summary>
         [HttpGet("groups")]
-        public Task<IReadOnlyList<TelGroupDto>> QueryTelGroupsAsync()
+        public Task<IReadOnlyList<TelGroupDto>> QueryTelGroups()
             => _callApplication.QueryTelGroupsAsync(HttpContext.RequestAborted);
 
         #region 黑名单
@@ -41,14 +45,71 @@ namespace Hotline.Api.Controllers
         /// 签入
         /// </summary>
         [HttpPost("signin")]
-        public Task<TrOnDutyResponseDto> SignInAsync([FromBody] SignInDto dto)
+        public Task<TrOnDutyResponseDto> SignIn([FromBody] SignInDto dto)
             => _callApplication.SignInAsync(dto, HttpContext.RequestAborted);
 
         /// <summary>
         /// 签出
         /// </summary>
         [HttpPost("signout")]
-        public Task SingOutAsync()
-            => _callApplication.QueryTelsAsync(HttpContext.RequestAborted);
+        public Task SignOut()
+            => _callApplication.SingOutAsync(HttpContext.RequestAborted);
+
+        /// <summary>
+        /// 签出
+        /// </summary>
+        [HttpPost("signout/{telNo}")]
+        public Task SignOut(string telNo)
+            => _callApplication.SingOutAsync(telNo, HttpContext.RequestAborted);
+
+        /// <summary>
+        /// 查询当前用户的分机状态
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("tel-state")]
+        public Task GetTelState()
+            => _callApplication.GetTelStateAsync(HttpContext.RequestAborted);
+
+        /// <summary>
+        /// 查询通话记录（固定数据量）
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpGet("calls-fixed")]
+        public Task<IReadOnlyList<CallNativeDto>> QueryCallsFixed([FromQuery] QueryCallsFixedDto dto)
+            => _callApplication.QueryCallsFixedAsync(dto, HttpContext.RequestAborted);
+
+        /// <summary>
+        /// 通话记录基础数据
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("base-data")]
+        public async Task<object> BaseData()
+        {
+            return new
+            {
+                Direction = EnumExts.GetDescriptions<ECallDirection>(),
+                EndBy = EnumExts.GetDescriptions<EEndBy>(),
+            };
+        }
+
+        /// <summary>
+        /// 关联通话记录与工单或回访
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("relate-call-to-order")]
+        public Task RelateCallToOrder([FromBody] LinkCallRecordDto dto) =>
+            _callApplication.RelateCallToOrderAsync(dto, HttpContext.RequestAborted);
+
+        ///// <summary>
+        ///// 查询坐席操作记录(固定数据量)
+        ///// </summary>
+        ///// <param name="dto"></param>
+        ///// <returns></returns>
+        //[HttpGet("tel-operations-fixed")]
+        //public Task<IReadOnlyList<TelOperation>> QueryTelOperationsFixed([FromQuery] QueryTelOperationsFixedDto dto)
+        //{
+
+        //}
     }
 }

src/Hotline.Api/Controllers/OrderController.cs

@@ -2313,13 +2313,13 @@ public class OrderController : BaseController
     /// <summary>
     /// 查询工单(固定数据量)
     /// </summary>
-    [HttpGet("constant")]
-    public async Task<IReadOnlyList<OrderDto>> QueryConstant([FromQuery] QueryOrderConstantDto dto)
+    [HttpGet("fixed")]
+    public async Task<IReadOnlyList<OrderDto>> QueryFixed([FromQuery] QueryOrderFixedDto dto)
     {
-        var count = int.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.ConstantQueryCount)
+        var count = int.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.FixedQueryCount)
             .SettingValue[0]);
         var query = _orderApplication.QueryOrders(dto);
-        var orders = await query.Skip(dto.QueryIndex * count).Take(count).ToListAsync(HttpContext.RequestAborted);
+        var orders = await query.ToFixedListAsync(dto.QueryIndex, count, HttpContext.RequestAborted);
         return _mapper.Map<IReadOnlyList<OrderDto>>(orders);
     }
 
@@ -2327,7 +2327,7 @@ public class OrderController : BaseController
     /// 查询总数
     /// </summary>
     [HttpGet("count")]
-    public async Task<int> Count([FromQuery] QueryOrderConstantDto dto)
+    public async Task<int> Count([FromQuery] QueryOrderFixedDto dto)
     {
         var query = _orderApplication.QueryOrders(dto);
         return await query.CountAsync(HttpContext.RequestAborted);

src/Hotline.Api/StartupHelper.cs

@@ -263,8 +263,8 @@ namespace Hotline.Api
                 switch (callCenterConfiguration.CallCenterType)
                 {
                     case "XingTang":
-                        var getCallsJobKey = new JobKey(nameof(GetCallsJob));
-                        d.AddJob<GetCallsJob>(getCallsJobKey);
+                        var getCallsJobKey = new JobKey(nameof(GetXingTangCallsJob));
+                        d.AddJob<GetXingTangCallsJob>(getCallsJobKey);
                         d.AddTrigger(d => d
                             .WithIdentity("get-callsxt-trigger")
                             .ForJob(getCallsJobKey)

src/Hotline.Application/CallCenter/ICallApplication.cs

@@ -4,8 +4,10 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Hotline.CallCenter.BlackLists;
+using Hotline.CallCenter.Calls;
 using Hotline.Share.Dtos.CallCenter;
 using Hotline.Share.Dtos.TrCallCenter;
+using XingTang.Sdk;
 
 namespace Hotline.Application.CallCenter
 {
@@ -38,5 +40,23 @@ namespace Hotline.Application.CallCenter
         /// 签出
         /// </summary>
         Task SingOutAsync(CancellationToken cancellationToken);
+        Task SingOutAsync(string telNo, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// 查询当前用户的分机状态
+        /// </summary>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        Task<TrOnDutyResponseDto> GetTelStateAsync(CancellationToken cancellationToken);
+
+        /// <summary>
+        /// 定量查询通话记录
+        /// </summary>
+        Task<IReadOnlyList<CallNativeDto>> QueryCallsFixedAsync(QueryCallsFixedDto dto, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// 关联通话记录与工单或回访
+        /// </summary>
+        Task RelateCallToOrderAsync(LinkCallRecordDto dto, CancellationToken cancellationToken);
     }
 }

src/Hotline.Application/CallCenter/TianRunCallApplication.cs

@@ -5,7 +5,10 @@ using System.Text;
 using System.Threading.Tasks;
 using Hotline.Application.CallCenter.Calls;
 using Hotline.Application.Tels;
+using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.BlackLists;
+using Hotline.CallCenter.Calls;
+using Hotline.Settings;
 using Hotline.Share.Dtos.CallCenter;
 using Hotline.Share.Dtos.TrCallCenter;
 using Hotline.Share.Enums.CallCenter;
@@ -19,22 +22,32 @@ namespace Hotline.Application.CallCenter
         private readonly ISessionContext _sessionContext;
         private readonly ITrApplication _trApplication;
         private readonly ITelApplication _telApplication;
+        private readonly ISystemSettingCacheManager _systemSettingCacheManager;
 
         public TianRunCallApplication(
             ISessionContext sessionContext,
             ITrApplication trApplication,
-            ITelApplication telApplication)
+            ITelApplication telApplication,
+            ISystemSettingCacheManager systemSettingCacheManager
+            )
         {
             _sessionContext = sessionContext;
             _trApplication = trApplication;
             _telApplication = telApplication;
+            _systemSettingCacheManager = systemSettingCacheManager;
         }
 
+        /// <summary>
+        /// 查询分机
+        /// </summary>
         public Task<IReadOnlyList<TelDto>> QueryTelsAsync(CancellationToken cancellationToken)
         {
             throw new NotImplementedException();
         }
 
+        /// <summary>
+        /// 查询分机组
+        /// </summary>
         public Task<IReadOnlyList<TelGroupDto>> QueryTelGroupsAsync(CancellationToken cancellationToken)
         {
             throw new NotImplementedException();
@@ -55,14 +68,51 @@ namespace Hotline.Application.CallCenter
             throw new NotImplementedException();
         }
 
-        public async Task<TrOnDutyResponseDto> SignInAsync(SignInDto dto, CancellationToken cancellationToken)
+        /// <summary>
+        /// 签入
+        /// </summary>
+        public Task<TrOnDutyResponseDto> SignInAsync(SignInDto dto, CancellationToken cancellationToken) =>
+            _trApplication.OnSign(_sessionContext.RequiredUserId, dto.TelNo, (ETelModel)dto.TelModelState, cancellationToken);
+
+        /// <summary>
+        /// 签出
+        /// </summary>
+        public Task SingOutAsync(CancellationToken cancellationToken) =>
+            _telApplication.SignOutAsync(_sessionContext.RequiredUserId, cancellationToken);
+
+        public Task SingOutAsync(string telNo, CancellationToken cancellationToken) =>
+            _telApplication.SignOutByTelNoAsync(telNo, cancellationToken);
+
+        /// <summary>
+        /// 查询当前用户的分机状态
+        /// </summary>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public Task<TrOnDutyResponseDto> GetTelStateAsync(CancellationToken cancellationToken) =>
+            _trApplication.TelState(_sessionContext.RequiredUserId, cancellationToken);
+
+        /// <summary>
+        /// 定量查询通话记录
+        /// </summary>
+        Task<IReadOnlyList<CallNativeDto>> ICallApplication.QueryCallsFixedAsync(QueryCallsFixedDto dto, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// 关联通话记录与工单或回访
+        /// </summary>
+        public Task RelateCallToOrderAsync(LinkCallRecordDto dto, CancellationToken cancellationToken)
         {
-            return await _trApplication.OnSign(_sessionContext.RequiredUserId, dto.TelNo, (ETelModel)dto.TelModelState, cancellationToken);
+            throw new NotImplementedException();
         }
 
-        public async Task SingOutAsync(CancellationToken cancellationToken)
+        /// <summary>
+        /// 定量查询通话记录
+        /// </summary>
+        public async Task<IReadOnlyList<CallNative>> QueryCallsFixedAsync(QueryCallsFixedDto dto, CancellationToken cancellationToken)
         {
-            await _telApplication.SignOutAsync(_sessionContext.RequiredUserId, cancellationToken);
+            throw new NotImplementedException();
         }
     }
 }

src/Hotline.Application/CallCenter/XingTangCallApplication.cs

@@ -3,13 +3,24 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using DotNetCore.CAP;
 using Hotline.Caching.Interfaces;
+using Hotline.Caching.Services;
 using Hotline.CallCenter.BlackLists;
+using Hotline.CallCenter.Calls;
 using Hotline.CallCenter.Tels;
+using Hotline.Orders;
 using Hotline.Repository.SqlSugar.CallCenter;
+using Hotline.Repository.SqlSugar.Extensions;
+using Hotline.Repository.SqlSugar.Orders;
+using Hotline.Settings;
 using Hotline.Share.Dtos.CallCenter;
+using Hotline.Share.Dtos.Order;
 using Hotline.Share.Dtos.TrCallCenter;
+using Hotline.Share.Enums.CallCenter;
 using Hotline.Users;
+using MapsterMapper;
+using Microsoft.AspNetCore.Http;
 using XF.Domain.Authentications;
 using XF.Domain.Cache;
 using XF.Domain.Exceptions;
@@ -23,28 +34,49 @@ namespace Hotline.Application.CallCenter
         private readonly IRepository<TelGroup> _telGroupRepository;
         private readonly IWorkRepository _workRepository;
         private readonly ITelRestRepository _telRestRepository;
+        private readonly IRepository<CallNative> _callNativeRepository;
+        private readonly IOrderRepository _orderRepository;
+        private readonly IRepository<OrderVisit> _orderVisitRepository;
         private readonly ITypedCache<Work> _cacheWork;
         private readonly IUserCacheManager _userCacheManager;
+        private readonly ISystemSettingCacheManager _systemSettingCacheManager;
+        private readonly ICapPublisher _capPublisher;
         private readonly ISessionContext _sessionContext;
+        private readonly IMapper _mapper;
 
         public XingTangCallApplication(
             IRepository<Tel> telRepository,
             IRepository<TelGroup> telGroupRepository,
             IWorkRepository workRepository,
             ITelRestRepository telRestRepository,
+            IRepository<CallNative> callNativeRepository,
+            IOrderRepository orderRepository,
+            IRepository<OrderVisit> orderVisitRepository,
             ITypedCache<Work> cacheWork,
             IUserCacheManager userCacheManager,
-            ISessionContext sessionContext)
+            ISystemSettingCacheManager systemSettingCacheManager,
+            ICapPublisher capPublisher,
+            ISessionContext sessionContext,
+            IMapper mapper)
         {
             _telRepository = telRepository;
             _telGroupRepository = telGroupRepository;
             _workRepository = workRepository;
             _telRestRepository = telRestRepository;
+            _callNativeRepository = callNativeRepository;
+            _orderRepository = orderRepository;
+            _orderVisitRepository = orderVisitRepository;
             _cacheWork = cacheWork;
             _userCacheManager = userCacheManager;
+            _systemSettingCacheManager = systemSettingCacheManager;
+            _capPublisher = capPublisher;
             _sessionContext = sessionContext;
+            _mapper = mapper;
         }
 
+        /// <summary>
+        /// 查询分机
+        /// </summary>
         public async Task<IReadOnlyList<TelDto>> QueryTelsAsync(CancellationToken cancellationToken)
         {
             return await _telRepository.Queryable()
@@ -52,6 +84,9 @@ namespace Hotline.Application.CallCenter
                 .ToListAsync(cancellationToken);
         }
 
+        /// <summary>
+        /// 查询分机组
+        /// </summary>
         public async Task<IReadOnlyList<TelGroupDto>> QueryTelGroupsAsync(CancellationToken cancellationToken)
         {
             return await _telGroupRepository.Queryable()
@@ -59,21 +94,24 @@ namespace Hotline.Application.CallCenter
                 .ToListAsync(cancellationToken);
         }
 
-        public Task<string> AddBlackListAsync(AddBlacklistDto dto, CancellationToken cancellationToken)
+        public async Task<string> AddBlackListAsync(AddBlacklistDto dto, CancellationToken cancellationToken)
         {
             throw new NotImplementedException();
         }
 
-        public Task RemoveBlackListAsync(string id, CancellationToken cancellationToken)
+        public async Task RemoveBlackListAsync(string id, CancellationToken cancellationToken)
         {
             throw new NotImplementedException();
         }
 
-        public Task<List<Blacklist>> QueryBlackListsAsync(CancellationToken cancellationToken)
+        public async Task<List<Blacklist>> QueryBlackListsAsync(CancellationToken cancellationToken)
         {
             throw new NotImplementedException();
         }
 
+        /// <summary>
+        /// 签入
+        /// </summary>
         public async Task<TrOnDutyResponseDto> SignInAsync(SignInDto dto, CancellationToken cancellationToken)
         {
             if (string.IsNullOrEmpty(dto.TelNo))
@@ -107,6 +145,9 @@ namespace Hotline.Application.CallCenter
             };
         }
 
+        /// <summary>
+        /// 签出
+        /// </summary>
         public async Task SingOutAsync(CancellationToken cancellationToken)
         {
             var work = _userCacheManager.GetWorkByUser(_sessionContext.RequiredUserId);
@@ -121,8 +162,106 @@ namespace Hotline.Application.CallCenter
 
             work.OffDuty();
             await _workRepository.UpdateAsync(work, cancellationToken);
-            _cacheWork.Remove(work.GetKey(KeyMode.UserId));
-            _cacheWork.Remove(work.GetKey(KeyMode.TelNo));
+            await _cacheWork.RemoveAsync(work.GetKey(KeyMode.UserId), cancellationToken);
+            await _cacheWork.RemoveAsync(work.GetKey(KeyMode.TelNo), cancellationToken);
+        }
+
+        public async Task SingOutAsync(string telNo, CancellationToken cancellationToken)
+        {
+            var work = _userCacheManager.GetWorkByTelNoExp(telNo);
+            if (work is null) return;
+
+            var telRest = await _telRestRepository.GetAsync(x => x.TelNo == work.TelNo && !x.EndTime.HasValue, cancellationToken);
+            if (telRest is not null)
+            {
+                telRest.EndRest();
+                await _telRestRepository.UpdateAsync(telRest, cancellationToken);
+            }
+
+            work.OffDuty();
+            await _workRepository.UpdateAsync(work, cancellationToken);
+            await _cacheWork.RemoveAsync(work.GetKey(KeyMode.UserId), cancellationToken);
+            await _cacheWork.RemoveAsync(work.GetKey(KeyMode.TelNo), cancellationToken);
+        }
+
+        /// <summary>
+        /// 查询当前用户的分机状态
+        /// </summary>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public async Task<TrOnDutyResponseDto> GetTelStateAsync(CancellationToken cancellationToken)
+        {
+            var work = _userCacheManager.GetWorkByUserNoExp(_sessionContext.RequiredUserId);
+            if (work is null) return null;
+            return await Task.FromResult(new TrOnDutyResponseDto
+            {
+                TelNo = work.TelNo,
+                QueueId = work.QueueId,
+                StartTime = work.StartTime,
+            });
+        }
+
+        /// <summary>
+        /// 定量查询通话记录
+        /// </summary>
+        public async Task<IReadOnlyList<CallNativeDto>> QueryCallsFixedAsync(QueryCallsFixedDto dto, CancellationToken cancellationToken)
+        {
+            var count = int.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.FixedQueryCount).SettingValue[0]);
+            return await _callNativeRepository.Queryable()
+                .LeftJoin<Order>((d, o) => d.CallNo == o.CallId)
+                .WhereIF(!string.IsNullOrEmpty(dto.OrderNo), (d, o) => o.No == dto.OrderNo)
+                .WhereIF(!string.IsNullOrEmpty(dto.FromNo), d => d.FromNo == dto.FromNo)
+                .WhereIF(!string.IsNullOrEmpty(dto.ToNo), d => d.FromNo == dto.ToNo)
+                .WhereIF(!string.IsNullOrEmpty(dto.UserName), d => d.FromNo == dto.UserName)
+                .WhereIF(!string.IsNullOrEmpty(dto.TelNo), d => d.FromNo == dto.TelNo)
+                .WhereIF(dto.HangupBy != null, d => d.HangupBy == dto.HangupBy)
+                .WhereIF(dto.CallStartTimeBT != null, d => d.BeginIvrTime >= dto.CallStartTimeBT)
+                .WhereIF(dto.CallStartTimeLT != null, d => d.BeginIvrTime <= dto.CallStartTimeLT)
+                .WhereIF(dto.IsConnected != null, d => d.AnsweredTime != null)
+                .WhereIF(dto.Direction != null, d => d.Direction == dto.Direction)
+                .Select((d, o) => new CallNativeDto
+                {
+                    OrderId = o.Id,
+                    OrderNo = o.No,
+                    Title = o.Title,
+                }, true)
+                .ToFixedListAsync(dto, count, cancellationToken);
+        }
+
+        /// <summary>
+        /// 关联通话记录与工单或回访
+        /// </summary>
+        public async Task RelateCallToOrderAsync(LinkCallRecordDto dto, CancellationToken cancellationToken)
+        {
+            var call = await _callNativeRepository.GetAsync(d => d.CallNo == dto.CallId, cancellationToken);
+            if (call is null) throw UserFriendlyException.SameMessage("无效通话记录编号");
+            if (dto.IsOrder)
+            {
+                //工单
+                var order = await _orderRepository.GetAsync(x => x.Id == dto.Id, cancellationToken);
+                if (order is null) throw UserFriendlyException.SameMessage("无效工单编号");
+                if (!string.IsNullOrEmpty(order.CallId))
+                    throw UserFriendlyException.SameMessage("通话记录已经关联工单");
+
+                order.CallId = dto.CallId;
+                order.FromPhone = call.FromNo;
+                order.TransferPhone = call.ToNo;
+                await _orderRepository.UpdateAsync(order, cancellationToken);
+
+                //推省上
+                await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineCallConnectWithOrder, 
+                    new PublishCallRecrodDto() { 
+                        Order = _mapper.Map<OrderDto>(order), 
+                        TrCallRecordDto = _mapper.Map<TrCallDto>(call) });
+            }
+            else
+            {
+                //回访
+                var visit = await _orderVisitRepository.GetAsync(x => x.Id == dto.Id, cancellationToken);
+                if (visit is null) throw UserFriendlyException.SameMessage("无效回访记录编号");
+                visit.CallId = dto.CallId;
+                await _orderVisitRepository.UpdateAsync(visit, cancellationToken);
+            }
         }
     }
 }

src/Hotline.Application/Jobs/GetCallsJob.cs → src/Hotline.Application/Jobs/GetXingTangCallsJob.cs

@@ -1,41 +1,34 @@
 using Quartz;
 using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Hotline.CallCenter.Calls;
 using Hotline.Repository.SqlSugar;
-using Hotline.Share.Enums.CallCenter;
 using Hotline.Users;
 using MapsterMapper;
 using Microsoft.Extensions.Logging;
-using XF.Domain.Cache;
 using XF.Domain.Repository;
 using XingTang.Sdk;
 
 namespace Hotline.Application.Jobs
 {
     /// <summary>
-    /// 查询通话记录
+    /// 查询兴唐通话记录
     /// </summary>
-    public class GetCallsJob : IJob, IDisposable
+    public class GetXingTangCallsJob : IJob, IDisposable
     {
-        private readonly IRepository<TrCallRecord> _trcallRepository;
+        private readonly IRepository<CallNative> _callRepository;
         private readonly IRepository<User> _userRepository;
         private readonly IMapper _mapper;
-        private readonly ILogger<GetCallsJob> _logger;
+        private readonly ILogger<GetXingTangCallsJob> _logger;
         private readonly ISqlSugarClient _db;
 
-        public GetCallsJob(
+        public GetXingTangCallsJob(
             ISugarUnitOfWork<XingTangDbContext> uow,
-            IRepository<TrCallRecord> trcallRepository,
+            IRepository<CallNative> callRepository,
             IRepository<User> userRepository,
             IMapper mapper,
-            ILogger<GetCallsJob> logger)
+            ILogger<GetXingTangCallsJob> logger)
         {
-            _trcallRepository = trcallRepository;
+            _callRepository = callRepository;
             _userRepository = userRepository;
             _mapper = mapper;
             _logger = logger;
@@ -44,13 +37,13 @@ namespace Hotline.Application.Jobs
 
         public async Task Execute(IJobExecutionContext context)
         {
-            var calls = await _db.Queryable<XingtangCall>()
+            var xingtangCalls = await _db.Queryable<CallXingtang>()
                 .Where(d => (d.IsSync == null || !d.IsSync) && (d.Tries == null || d.Tries <= 50))
                 .Take(10)
                 .ToListAsync(context.CancellationToken);
 
-            var occupyCalls = new List<XingtangCall>();
-            foreach (var call in calls)
+            var occupyCalls = new List<CallXingtang>();
+            foreach (var call in xingtangCalls)
             {
                 call.IsSync = true;
                 call.Tries += 1;
@@ -63,14 +56,14 @@ namespace Hotline.Application.Jobs
 
             try
             {
-                var trCalls = _mapper.Map<List<TrCallRecord>>(occupyCalls);
+                var calls = _mapper.Map<List<CallNative>>(occupyCalls);
                 //填充user信息
-                var staffNos = calls.Select(d => d.UserCode).ToList();
+                var staffNos = calls.Select(d => d.StaffNo).ToList();
                 var users = await _userRepository.Queryable()
                     .Where(d => staffNos.Contains(d.StaffNo))
                     .ToListAsync(context.CancellationToken);
 
-                foreach (var trCall in trCalls)
+                foreach (var trCall in calls)
                 {
                     //if (trCall.CallDirection is ECallDirection.Out &&
                     //    string.IsNullOrEmpty(trCall.RecordingAbsolutePath))
@@ -85,7 +78,7 @@ namespace Hotline.Application.Jobs
                     }
                 }
 
-                await _trcallRepository.AddRangeAsync(trCalls, context.CancellationToken);
+                await _callRepository.AddRangeAsync(calls, context.CancellationToken);
             }
             catch (Exception e)
             {
@@ -105,7 +98,7 @@ namespace Hotline.Application.Jobs
         /// <summary>Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.</summary>
         public void Dispose()
         {
-            _logger.LogInformation($"{nameof(GetCallsJob)} disposed");
+            _logger.LogInformation($"{nameof(GetXingTangCallsJob)} disposed");
         }
     }
 }

src/Hotline.Application/Mappers/CallMapperConfigs.cs

@@ -61,30 +61,41 @@ namespace Hotline.Application.Mappers
                 .Map(d => d.CallAccept, x => x.call_accept)
                 .Map(d => d.Type, x => x.type);
 
-            config.ForType<XingtangCall, TrCallRecord>()
-                .Map(d => d.OtherAccept, s => s.CallGuid)
-                .Map(d => d.CallDirection, s => s.CallType)
-                .Map(d => d.CPN, s => s.Caller)
-                .Map(d => d.CDPN, s => s.Called)
+            config.ForType<CallXingtang, CallNative>()
+                .Map(d => d.CallNo, s => s.CallGuid)
+                .Map(d => d.Direction, s => s.CallType)
+                .Map(d => d.FromNo, s => s.Caller)
+                .Map(d => d.ToNo, s => s.Called)
                 .Map(d => d.TelNo, s => s.Ext)
-                .Map(d => d.StaffNo, s => s.UserCode)
-                .Map(d => d.AnsweredTime, s => s.ReceiveEndTime)
-                .Map(d => d.OverTime, s => s.CallEndTime)
                 .Map(d => d.BeginIvrTime, s => s.CallStartTime)
                 .Map(d => d.EndIvrTime, s => s.EnqueueTime)
+                .Map(d => d.BeginQueueTime, s => s.EnqueueTime)
+                .Map(d => d.EndQueueTime, s => s.DequeueTime)
                 .Map(d => d.BeginRingTime, s => s.RingStartTime)
-                .Map(d => d.EndRingTimg, s => s.ReceiveEndTime.HasValue ? s.ReceiveEndTime : s.CallEndTime)
-                .Map(d => d.OlaQueue, s => s.SkillId.ToString())
+                .Map(d => d.EndRingTime, s => s.ReceiveEndTime.HasValue ? s.ReceiveEndTime : s.CallEndTime)
+                .Map(d => d.AnsweredTime, s => s.ReceiveEndTime)
+                .Map(d => d.EndTime, s => s.CallEndTime)
+                .Map(d => d.GroupId, s => s.SkillId.ToString())
+                .Map(d => d.StaffNo, s => s.UserCode)
                 .Map(d => d.Duration, s => s.Duration)
-                .Map(d => d.RingTimes, s => s.RingTime)
-                .Map(d => d.QueueTims, s => s.WaitTime)
-                .Map(d => d.RecordingAbsolutePath, s => s.AudioFile)
-                .Map(d => d.Gateway, s => s.Called)
+                .Map(d => d.RingDuration, s => s.RingTime)
+                .Map(d => d.WaitDuration, s => s.WaitTime)
+                .Map(d => d.AudioFile, s => s.AudioFile)
                 .AfterMapping((s, d) =>
                 {
-                    d.CreatedTime = DateTime.Now;
-                    d.OnState = s.ReceiveEndTime.HasValue ? EOnState.On : EOnState.NoOn;
+                    d.HangupBy = EHangupBy.Outside;
                 });
+
+            config.ForType<CallNative, TrCallDto>()
+                .Map(d => d.CallDirection, s => s.Direction)
+                .Map(d => d.CPN, s => s.FromNo)
+                .Map(d => d.CDPN, s => s.ToNo)
+                .Map(d => d.CreatedTime, s => s.CreationTime)
+                .Map(d => d.OverTime, s => s.EndTime)
+                .Map(d => d.Gateway, s => s.ToNo)
+                .Map(d => d.EndRingTimg, s => s.EndRingTime)
+                ;
+
         }
 
         private DateTime? FormatDateTime(string? time)

src/Hotline.Repository.SqlSugar/Extensions/SqlSugarRepositoryExtensions.cs

@@ -4,7 +4,9 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
 using System.Threading.Tasks;
+using Hotline.Share;
 using Hotline.Share.Requests;
+using Microsoft.AspNetCore.Http;
 using SqlSugar;
 using XF.Domain.Entities;
 
@@ -27,5 +29,21 @@ namespace Hotline.Repository.SqlSugar.Extensions
             var items = await query.ToPageListAsync(dto.PageIndex, dto.PageSize, total, cancellationToken);
             return (total.Value, items);
         }
+
+        /// <summary>
+        /// 分批次查询固定数量
+        /// </summary>
+        /// <returns></returns>
+        public static Task<List<TEntity>> ToFixedListAsync<TEntity>(this ISugarQueryable<TEntity> query, QueryFixedDto dto, int count, CancellationToken cancellationToken)
+        where TEntity : class, new()
+        {
+            return query.Skip(dto.QueryIndex * count).Take(count).ToListAsync(cancellationToken);
+        }
+
+        public static Task<List<TEntity>> ToFixedListAsync<TEntity>(this ISugarQueryable<TEntity> query, int queryIndex, int count, CancellationToken cancellationToken)
+            where TEntity : class, new()
+        {
+            return query.Skip(queryIndex * count).Take(count).ToListAsync(cancellationToken);
+        }
     }
 }

src/Hotline.Share/Dtos/CallCenter/CallNativeDto.cs

@@ -0,0 +1,123 @@
+using Hotline.Share.Enums.CallCenter;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Hotline.Share.Dtos.CallCenter
+{
+    public class CallNativeDto
+    {
+        /// <summary>
+        /// 通话记录编号
+        /// </summary>
+        public string CallNo { get; set; }
+
+        public ECallDirection Direction { get; set; }
+
+        /// <summary>
+        /// 主叫
+        /// </summary>
+        public string FromNo { get; set; }
+
+        /// <summary>
+        /// 被叫
+        /// </summary>
+        public string ToNo { get; set; }
+
+        /// <summary>
+        /// 响应分机号
+        /// </summary>
+        public string TelNo { get; set; }
+
+        /// <summary>
+        /// 挂断方
+        /// </summary>
+        public EHangupBy? HangupBy { get; set; }
+
+        /// <summary>
+        /// IVR开始时间
+        /// </summary>
+        public DateTime? BeginIvrTime { get; set; }
+        /// <summary>
+        /// IVR结束时间
+        /// </summary>
+        public DateTime? EndIvrTime { get; set; }
+        /// <summary>
+        /// 开始等待时间
+        /// </summary>
+        public DateTime? BeginQueueTime { get; set; }
+        /// <summary>
+        /// 结束等待时间
+        /// </summary>
+        public DateTime? EndQueueTime { get; set; }
+        /// <summary>
+        /// 开始振铃时间
+        /// </summary>
+        public DateTime? BeginRingTime { get; set; }
+        /// <summary>
+        /// 结束振铃时间
+        /// </summary>
+        public DateTime? EndRingTime { get; set; }
+        /// <summary>
+        /// 接听时间
+        /// </summary>
+        public DateTime? AnsweredTime { get; set; }
+        /// <summary>
+        /// 挂机时间
+        /// </summary>
+        public DateTime EndTime { get; set; }
+
+        /// <summary>
+        /// 分机组id(技能组Id)
+        /// </summary>
+        public string? GroupId { get; set; }
+
+        /// <summary>
+        /// 工号
+        /// </summary>
+        public string? StaffNo { get; set; }
+
+        /// <summary>
+        /// 话务员id
+        /// </summary>
+        public string? UserId { get; set; }
+
+        /// <summary>
+        /// 话务员姓名
+        /// </summary>
+        public string? UserName { get; set; }
+
+        /// <summary>
+        /// 评分
+        /// </summary>
+        public int Score { get; set; }
+
+        /// <summary>
+        /// 通话时长(秒)
+        /// </summary>
+        public int Duration { get; set; }
+
+        /// <summary>
+        /// 响铃时长（秒）
+        /// </summary>
+        public int RingDuration { get; set; }
+
+        /// <summary>
+        /// 等待时长
+        /// </summary>
+        public int WaitDuration { get; set; }
+
+        /// <summary>
+        /// 通话录音
+        /// </summary>
+        public string AudioFile { get; set; }
+
+        public string? OrderId { get; set; }
+
+        public string? OrderNo { get; set; }
+
+        public string? Title { get; set; }
+    }
+}

src/Hotline.Share/Dtos/CallCenter/QueryCallsFixedDto.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Hotline.Share.Enums.CallCenter;
+
+namespace Hotline.Share.Dtos.CallCenter
+{
+    public class QueryCallsFixedDto : QueryFixedDto
+    {
+        public string? OrderNo { get; set; }
+
+        public string? FromNo { get; set; }
+
+        public string? ToNo { get; set; }
+
+        public string? UserName { get; set; }
+
+        public string? TelNo { get; set; }
+
+        public EEndBy? EndBy { get; set; }
+
+        /// <summary>
+        /// 呼入时间
+        /// </summary>
+        public DateTime? CallStartTimeBT { get; set; }
+
+        /// <summary>
+        /// 呼入时间
+        /// </summary>
+        public DateTime? CallStartTimeLT { get; set; }
+
+        /// <summary>
+        /// 是否接通
+        /// </summary>
+        public bool? IsConnected { get; set; }
+
+        /// <summary>
+        /// 通话方向
+        /// </summary>
+        public ECallDirection? Direction { get; set; }
+    }
+}

src/Hotline.Share/Dtos/CallCenter/TelDto.cs

@@ -64,7 +64,7 @@ namespace Hotline.Share.Dtos.CallCenter
 
         public List<TelGroupDto> Groups { get; set; }
 
-        #region 兼容添润字段
+        #region 添润
         
         public string Name { get; set; }
 

src/Hotline.Share/Dtos/Order/QueryOrderConstantDto.cs → src/Hotline.Share/Dtos/Order/QueryOrderFixedDto.cs

@@ -3,7 +3,7 @@
 /// <summary>
 /// 定量查询工单
 /// </summary>
-public record QueryOrderConstantDto : QueryOrderDto
+public record QueryOrderFixedDto : QueryOrderDto
 {
     /// <summary>
     /// 查询批次

src/Hotline.Share/Enums/CallCenter/EHangupBy.cs

@@ -0,0 +1,15 @@
+using System.ComponentModel;
+
+namespace Hotline.Share.Enums.CallCenter;
+
+/// <summary>
+/// 通话结束方
+/// </summary>
+public enum EHangupBy
+{
+    [Description("外线")]
+    Outside = 0,
+
+    [Description("坐席")]
+    Seat = 1
+}

src/Hotline.Share/QueryFixedDto.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Hotline.Share
+{
+    public class QueryFixedDto
+    {
+        /// <summary>
+        /// 查询批次
+        /// </summary>
+        public int QueryIndex { get; set; }
+    }
+}

src/Hotline/CallCenter/Calls/CallNative.cs

@@ -3,7 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Hotline.Orders;
 using Hotline.Share.Enums.CallCenter;
+using SqlSugar;
 using XF.Domain.Repository;
 
 namespace Hotline.CallCenter.Calls
@@ -11,12 +13,13 @@ namespace Hotline.CallCenter.Calls
     /// <summary>
     /// 本地通话记录
     /// </summary>
+    [SugarIndex("index_call_callid", nameof(CallNative.CallNo), OrderByType.Asc)]
     public class CallNative : CreationEntity
     {
         /// <summary>
-        /// 通话id
+        /// 通话记录编号
         /// </summary>
-        public string CallId { get; set; }
+        public string CallNo { get; set; }
 
         public ECallDirection Direction { get; set; }
 
@@ -33,7 +36,12 @@ namespace Hotline.CallCenter.Calls
         /// <summary>
         /// 响应分机号
         /// </summary>
-        public string Ext { get; set; }
+        public string TelNo { get; set; }
+
+        /// <summary>
+        /// 挂断方
+        /// </summary>
+        public EHangupBy? HangupBy { get; set; }
 
         /// <summary>
         /// IVR开始时间
@@ -79,9 +87,14 @@ namespace Hotline.CallCenter.Calls
         public string? StaffNo { get; set; }
 
         /// <summary>
-        /// 挂断方
+        /// 话务员id
+        /// </summary>
+        public string? UserId { get; set; }
+
+        /// <summary>
+        /// 话务员姓名
         /// </summary>
-        public EEndBy EndBy { get; set; }
+        public string? UserName { get; set; }
 
         /// <summary>
         /// 评分
@@ -107,5 +120,12 @@ namespace Hotline.CallCenter.Calls
         /// 通话录音
         /// </summary>
         public string AudioFile { get; set; }
+
+        //public string? ExternalId { get; set; }
+
+        //public string? OrderNo { get; set; }
+
+        //public string? Title { get; set; }
+
     }
 }

src/Hotline/CallCenter/Tels/TelOperation.cs

@@ -0,0 +1,44 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using XF.Domain.Repository;
+
+namespace Hotline.CallCenter.Tels
+{
+    [Description("话机操作记录")]
+    public class TelOperation : CreationEntity
+    {
+        /// <summary>
+        /// 工号
+        /// </summary>
+        public string? StaffNo { get; set; }
+
+        public string? UserId { get; set; }
+
+        public string? UserName { get; set; }
+
+        /// <summary>
+        /// 分机号
+        /// </summary>
+        public string? TelNo { get; set; }
+
+        public string? GroupId { get; set; }
+
+        /// <summary>
+        /// 执行状态
+        /// 0：签入 1：接听 2：置忙 3：置闲 16：签出 17：呼出 30：挂机
+        /// </summary>
+        public int? OperateState { get; set; }
+
+        public string? OperateStateText { get; set; }
+
+        public DateTime? OperateTime { get; set; }
+        public int? Channel { get; set; }
+        public string? CompanyId { get; set; }
+        public string? Remark { get; set; }
+    }
+}

src/Hotline/Settings/SettingConstants.cs

@@ -348,7 +348,7 @@ namespace Hotline.Settings
         /// <summary>
         /// 定量查询数据条数上限
         /// </summary>
-        public const string ConstantQueryCount = "ConstantQueryCount";
+        public const string FixedQueryCount = "FixedQueryCount";
 
         /// <summary>
         /// 是否开启重复工单

src/XingTang.Sdk/XingtangCall.cs → src/XingTang.Sdk/CallXingtang.cs

@@ -3,9 +3,9 @@
 namespace XingTang.Sdk;
 
 [SugarTable("call_cti_trafficlist")]
-public class XingtangCall
+public class CallXingtang
 {
-    [SugarColumn(IsPrimaryKey = true, ColumnName = "ID")]
+    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
     public int Id { get; set; }
 
     /// <summary>

src/XingTang.Sdk/SeatOperation.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SqlSugar;
+
+namespace XingTang.Sdk
+{
+    /// <summary>
+    /// 坐席操作记录
+    /// </summary>
+    [SugarTable("call_cti_seatingoperation")]
+    public class SeatOperation
+    {
+        [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 工号
+        /// </summary>
+        public string? UserCode { get; set; }
+
+        /// <summary>
+        /// 分机号
+        /// </summary>
+        public string? Ext { get; set; }
+
+        /// <summary>
+        /// 执行状态
+        /// 0：签入 1：接听 2：置忙 3：置闲 16：签出 17：呼出 30：挂机
+        /// </summary>
+        public int? ExecutionState { get; set; }
+
+        public string? ExtutionStateText => ExecutionState.HasValue
+            ? ExecutionState switch
+            {
+                0 => "签入",
+                1 => "接听",
+                2 => "置忙",
+                3 => "置闲",
+                16 => "签出",
+                17 => "呼出",
+                30 => "挂机",
+                _ => "未知"
+            }
+            : string.Empty;
+
+        /// <summary>
+        /// 操作时间
+        /// </summary>
+        public DateTime? ExecutionTime { get; set; }
+
+        /// <summary>
+        /// 通道号
+        /// </summary>
+        public int? Channel { get; set; }
+
+        /// <summary>
+        /// 公司号
+        /// </summary>
+        public string? CompanyId { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string? Remark { get; set; }
+
+        //弃用
+        public DateTime? EndTime { get; set; }
+
+        #region 自建
+
+        public bool IsSync { get; set; }
+
+        public int Tries { get; set; }
+
+        [SugarColumn(IsEnableUpdateVersionValidation = true)]
+        public long Ver { get; set; }
+
+        #endregion
+    }
+}