Merge branch 'feature/callcenter_xingtang' into dev

src/Hotline.Application/CallCenter/XingTangCallApplication.cs

@@ -197,7 +197,7 @@ namespace Hotline.Application.CallCenter
         /// </summary>
         public async Task<IReadOnlyList<CallNativeDto>> QueryCallsFixedAsync(QueryCallsFixedDto dto, CancellationToken cancellationToken)
         {
-            return await _callNativeRepository.Queryable()
+            return await _callNativeRepository.Queryable(includeDeleted: true)
                 .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)
@@ -217,7 +217,7 @@ namespace Hotline.Application.CallCenter
                 }, true)
                 .ToFixedListAsync(dto, cancellationToken);
         }
-        
+
         /// <summary>
         /// 查询分机操作记录（定量）
         /// </summary>

src/Hotline.Application/Jobs/XingTangCallsSyncJob.cs

@@ -37,12 +37,12 @@ namespace Hotline.Application.Jobs
 
         public async Task Execute(IJobExecutionContext context)
         {
-            var xingtangCalls = await _db.Queryable<CallXingtang>()
+            var xingtangCalls = await _db.Queryable<XingtangCall>()
                 .Where(d => (d.IsSync == null || !d.IsSync) && (d.Tries == null || d.Tries <= 50))
                 .Take(10)
                 .ToListAsync(context.CancellationToken);
 
-            var occupyCalls = new List<CallXingtang>();
+            var occupyCalls = new List<XingtangCall>();
             foreach (var call in xingtangCalls)
             {
                 call.IsSync = true;

src/Hotline.Application/Jobs/XingTangTelOperationSyncJob.cs

@@ -4,24 +4,20 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 
 namespace Hotline.Application.Jobs
 {
     public class XingTangTelOperationSyncJob : IJob, IDisposable
     {
-        /// <summary>
-        /// Called by the <see cref="T:Quartz.IScheduler" /> when a <see cref="T:Quartz.ITrigger" />
-        /// fires that is associated with the <see cref="T:Quartz.IJob" />.
-        /// </summary>
-        /// <remarks>
-        /// The implementation may wish to set a  result object on the
-        /// JobExecutionContext before this method exits.  The result itself
-        /// is meaningless to Quartz, but may be informative to
-        /// <see cref="T:Quartz.IJobListener" />s or
-        /// <see cref="T:Quartz.ITriggerListener" />s that are watching the job's
-        /// execution.
-        /// </remarks>
-        /// <param name="context">The execution context.</param>
+        private readonly ILogger<XingTangTelOperationSyncJob> _logger;
+
+        public XingTangTelOperationSyncJob(
+            ILogger<XingTangTelOperationSyncJob> logger)
+        {
+            _logger = logger;
+        }
+
         public async Task Execute(IJobExecutionContext context)
         {
             throw new NotImplementedException();
@@ -30,7 +26,7 @@ namespace Hotline.Application.Jobs
         /// <summary>Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.</summary>
         public void Dispose()
         {
-            throw new NotImplementedException();
+            _logger.LogInformation($"{nameof(XingTangTelOperationSyncJob)} disposed");
         }
     }
 }

src/Hotline.Application/Mappers/CallMapperConfigs.cs

@@ -61,7 +61,7 @@ namespace Hotline.Application.Mappers
                 .Map(d => d.CallAccept, x => x.call_accept)
                 .Map(d => d.Type, x => x.type);
 
-            config.ForType<CallXingtang, CallNative>()
+            config.ForType<XingtangCall, CallNative>()
                 .Map(d => d.CallNo, s => s.CallGuid)
                 .Map(d => d.Direction, s => s.CallType)
                 .Map(d => d.FromNo, s => s.Caller)

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

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

src/XingTang.Sdk/SeatOperation.cs → src/XingTang.Sdk/XingtangSeatOperation.cs

@@ -11,7 +11,7 @@ namespace XingTang.Sdk
     /// 坐席操作记录
     /// </summary>
     [SugarTable("call_cti_seatingoperation")]
-    public class SeatOperation
+    public class XingtangSeatOperation
     {
         [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
         public int Id { get; set; }