소스 검색

fix: virture method

xf 9 달 전
부모
커밋
35a9092a91

+ 15 - 15
src/Hotline.Application/CallCenter/DefaultCallApplication.cs

@@ -68,7 +68,7 @@ public abstract class DefaultCallApplication : ICallApplication
     /// <summary>
     /// 查询分机
     /// </summary>
-    public async Task<IReadOnlyList<TelDto>> QueryTelsAsync(CancellationToken cancellationToken)
+    public virtual async Task<IReadOnlyList<TelDto>> QueryTelsAsync(CancellationToken cancellationToken)
     {
         return await _telRepository.Queryable()
             .Select<TelDto>()
@@ -78,7 +78,7 @@ public abstract class DefaultCallApplication : ICallApplication
     /// <summary>
     /// 查询分机组
     /// </summary>
-    public async Task<IReadOnlyList<TelGroupDto>> QueryTelGroupsAsync(CancellationToken cancellationToken)
+    public virtual async Task<IReadOnlyList<TelGroupDto>> QueryTelGroupsAsync(CancellationToken cancellationToken)
     {
         return await _telGroupRepository.Queryable()
             .Select<TelGroupDto>()
@@ -103,7 +103,7 @@ public abstract class DefaultCallApplication : ICallApplication
     /// <summary>
     /// 签入
     /// </summary>
-    public async Task<TrOnDutyResponseDto> SignInAsync(SignInDto dto, CancellationToken cancellationToken)
+    public virtual async Task<TrOnDutyResponseDto> SignInAsync(SignInDto dto, CancellationToken cancellationToken)
     {
         if (string.IsNullOrEmpty(dto.TelNo))
             throw UserFriendlyException.SameMessage("无效分机号");
@@ -139,7 +139,7 @@ public abstract class DefaultCallApplication : ICallApplication
     /// <summary>
     /// 签出
     /// </summary>
-    public async Task SingOutAsync(CancellationToken cancellationToken)
+    public virtual async Task SingOutAsync(CancellationToken cancellationToken)
     {
         var work = _userCacheManager.GetWorkByUserNoExp(_sessionContext.RequiredUserId);
         if (work is null) return;
@@ -161,7 +161,7 @@ public abstract class DefaultCallApplication : ICallApplication
     /// <summary>
     /// 签出
     /// </summary>
-    public async Task SingOutAsync(string telNo, CancellationToken cancellationToken)
+    public virtual async Task SingOutAsync(string telNo, CancellationToken cancellationToken)
     {
         var work = _userCacheManager.GetWorkByTelNoExp(telNo);
         if (work is null) return;
@@ -185,7 +185,7 @@ public abstract class DefaultCallApplication : ICallApplication
     /// </summary>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    public async Task<TrOnDutyResponseDto> GetTelStateAsync(CancellationToken cancellationToken)
+    public virtual async Task<TrOnDutyResponseDto> GetTelStateAsync(CancellationToken cancellationToken)
     {
         var work = _userCacheManager.GetWorkByUserNoExp(_sessionContext.RequiredUserId);
         if (work is null) return null;
@@ -201,7 +201,7 @@ public abstract class DefaultCallApplication : ICallApplication
     /// <summary>
     /// 定量查询通话记录
     /// </summary>
-    public async Task<IReadOnlyList<CallNativeDto>> QueryCallsFixedAsync(QueryCallsFixedDto dto, CancellationToken cancellationToken)
+    public virtual async Task<IReadOnlyList<CallNativeDto>> QueryCallsFixedAsync(QueryCallsFixedDto dto, CancellationToken cancellationToken)
     {
         return await _callNativeRepository.Queryable(includeDeleted: true)
             .LeftJoin<Order>((d, o) => d.CallNo == o.CallId)
@@ -230,7 +230,7 @@ public abstract class DefaultCallApplication : ICallApplication
     /// <summary>
     /// 查询分机操作记录(定量)
     /// </summary>
-    public async Task<IReadOnlyList<TelOperation>> QueryTelOperationsAsync(QueryTelOperationsFixedDto dto, CancellationToken cancellationToken)
+    public virtual async Task<IReadOnlyList<TelOperation>> QueryTelOperationsAsync(QueryTelOperationsFixedDto dto, CancellationToken cancellationToken)
     {
         return await _telOperationRepository.Queryable()
             .WhereIF(!string.IsNullOrEmpty(dto.UserName), d => d.UserName == dto.UserName)
@@ -244,7 +244,7 @@ public abstract class DefaultCallApplication : ICallApplication
     /// <summary>
     /// 依据通话记录编号获取映射后的callId
     /// </summary>
-    public async Task<string> GetOrSetCallIdAsync(string callNo, CancellationToken cancellationToken)
+    public virtual async Task<string> GetOrSetCallIdAsync(string callNo, CancellationToken cancellationToken)
     {
         var callOrder = await _callIdRelationRepository.GetAsync(callNo, cancellationToken);
         if (callOrder == null)
@@ -270,7 +270,7 @@ public abstract class DefaultCallApplication : ICallApplication
     /// <summary>
     /// 批量获取callId
     /// </summary>
-    public async Task<List<(string callNo, string callId)>> GetOrSetCallIdRangeAsync(List<string> callNos,
+    public virtual async Task<List<(string callNo, string callId)>> GetOrSetCallIdRangeAsync(List<string> callNos,
         CancellationToken cancellationToken)
     {
         var relations = await _callIdRelationRepository.Queryable()
@@ -305,7 +305,7 @@ public abstract class DefaultCallApplication : ICallApplication
     /// <summary>
     /// 查询通话记录
     /// </summary>
-    public Task<CallNative?> GetCallAsync(string callId, CancellationToken cancellationToken)
+    public virtual Task<CallNative?> GetCallAsync(string callId, CancellationToken cancellationToken)
     {
         if (string.IsNullOrEmpty(callId)) return null;
         return _callNativeRepository.GetAsync(callId, cancellationToken);
@@ -314,7 +314,7 @@ public abstract class DefaultCallApplication : ICallApplication
     /// <summary>
     /// 查询通话记录
     /// </summary>
-    public async Task<List<CallNative>> QueryCallsAsync(
+    public virtual async Task<List<CallNative>> QueryCallsAsync(
         string? phone,
         ECallDirection? direction,
         DateTime? callStartTimeStart,
@@ -334,7 +334,7 @@ public abstract class DefaultCallApplication : ICallApplication
 
     #region tianrun 临时方案
 
-    public Task<TrCallRecord?> GetTianrunCallAsync(string callId, CancellationToken cancellationToken)
+    public virtual Task<TrCallRecord?> GetTianrunCallAsync(string callId, CancellationToken cancellationToken)
     {
         throw new NotImplementedException();
     }
@@ -342,7 +342,7 @@ public abstract class DefaultCallApplication : ICallApplication
     /// <summary>
     /// 关联通话记录与order(添润)
     /// </summary>
-    public Task RelateTianrunCallWithOrderAsync(string callId, string orderId,
+    public virtual Task RelateTianrunCallWithOrderAsync(string callId, string orderId,
         CancellationToken cancellationToken)
     {
         throw new NotImplementedException();
@@ -351,7 +351,7 @@ public abstract class DefaultCallApplication : ICallApplication
     /// <summary>
     /// 查询通话记录
     /// </summary>
-    public Task<List<TrCallRecord>> QueryTianrunCallsAsync(
+    public virtual Task<List<TrCallRecord>> QueryTianrunCallsAsync(
         string? phone = null, 
         ECallDirection? direction = null,
         DateTime? callStartTimeStart = null,

+ 1 - 7
src/Hotline.Application/CallCenter/ICallApplication.cs

@@ -1,16 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Hotline.CallCenter.BlackLists;
+using Hotline.CallCenter.BlackLists;
 using Hotline.CallCenter.Calls;
 using Hotline.CallCenter.Tels;
 using Hotline.Share.Dtos;
 using Hotline.Share.Dtos.CallCenter;
 using Hotline.Share.Dtos.TrCallCenter;
 using Hotline.Share.Enums.CallCenter;
-using XingTang.Sdk;
 
 namespace Hotline.Application.CallCenter
 {

+ 12 - 12
src/Hotline.Application/CallCenter/TianRunCallApplication.cs

@@ -71,16 +71,16 @@ namespace Hotline.Application.CallCenter
         /// <summary>
         /// 签入
         /// </summary>
-        public new async Task<TrOnDutyResponseDto> SignInAsync(SignInDto dto, CancellationToken cancellationToken) =>
+        public override async Task<TrOnDutyResponseDto> SignInAsync(SignInDto dto, CancellationToken cancellationToken) =>
             await _trApplication.OnSign(_sessionContext.RequiredUserId, dto.TelNo, (ETelModel)dto.TelModelState, cancellationToken);
 
         /// <summary>
         /// 签出
         /// </summary>
-        public new Task SingOutAsync(CancellationToken cancellationToken) =>
+        public override Task SingOutAsync(CancellationToken cancellationToken) =>
             _telApplication.SignOutAsync(_sessionContext.RequiredUserId, cancellationToken);
 
-        public new Task SingOutAsync(string telNo, CancellationToken cancellationToken) =>
+        public override Task SingOutAsync(string telNo, CancellationToken cancellationToken) =>
             _telApplication.SignOutByTelNoAsync(telNo, cancellationToken);
 
         /// <summary>
@@ -88,11 +88,11 @@ namespace Hotline.Application.CallCenter
         /// </summary>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public new Task<TrOnDutyResponseDto> GetTelStateAsync(CancellationToken cancellationToken) =>
+        public override Task<TrOnDutyResponseDto> GetTelStateAsync(CancellationToken cancellationToken) =>
             _trApplication.TelState(_sessionContext.RequiredUserId, cancellationToken);
 
 
-        public new async Task<TrCallRecord?> GetTianrunCallAsync(string callId, CancellationToken cancellationToken)
+        public override async Task<TrCallRecord?> GetTianrunCallAsync(string callId, CancellationToken cancellationToken)
         {
             if (string.IsNullOrEmpty(callId)) return null;
             var callRecord = await _trCallRecordRepository.GetAsync(
@@ -103,7 +103,7 @@ namespace Hotline.Application.CallCenter
         /// <summary>
         /// 关联通话记录与order(添润)
         /// </summary>
-        public new async Task RelateTianrunCallWithOrderAsync(string callId, string orderId, CancellationToken cancellationToken)
+        public override async Task RelateTianrunCallWithOrderAsync(string callId, string orderId, CancellationToken cancellationToken)
         {
             var callRecord = await _trCallRecordRepository.GetAsync(
                 p => p.OtherAccept == callId && string.IsNullOrEmpty(p.OtherAccept) == false, cancellationToken);
@@ -118,12 +118,12 @@ namespace Hotline.Application.CallCenter
         /// <summary>
         /// 查询通话记录
         /// </summary>
-        public new async Task<List<TrCallRecord>> QueryTianrunCallsAsync(
-            string? phone,
-            ECallDirection? direction,
-            DateTime? callStartTimeStart,
-            DateTime? callStartTimeEnd,
-            CancellationToken cancellationToken)
+        public override async Task<List<TrCallRecord>> QueryTianrunCallsAsync(
+            string? phone = null,
+            ECallDirection? direction = null,
+            DateTime? callStartTimeStart = null,
+            DateTime? callStartTimeEnd = null,
+            CancellationToken cancellationToken = default)
         {
             return await _trCallRecordRepository.Queryable()
                 .WhereIF(!string.IsNullOrEmpty(phone), d => d.CPN == phone || d.CDPN == phone)