Dun.Jason 1 年之前
父节点
当前提交
62d71873fb

+ 1 - 1
src/CallCenter.Api/StartupExtensions.cs

@@ -17,7 +17,7 @@ using CallCenter.CacheManager;
 using FluentValidation;
 using FluentValidation.AspNetCore;
 using CallCenter.Settings;
-using Identity.Admin.HttpClient;
+//using Identity.Admin.HttpClient;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.IdentityModel.Tokens;
 using Serilog;

+ 0 - 4
src/CallCenter.Application/CallCenter.Application.csproj

@@ -6,10 +6,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Identity.Admin.HttpClient" Version="1.0.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\CallCenter.Application.Contracts\CallCenter.Application.Contracts.csproj" />
     <ProjectReference Include="..\CallCenter.CacheManager\CallCenter.CacheManager.csproj" />

+ 9 - 0
src/CallCenter.Application/Handlers/FlowControl/CdrNotificationHandler.cs

@@ -88,6 +88,11 @@ namespace CallCenter.Application.Handlers
                         OutCallDto callDto = new OutCallDto();
                         callDto.CallId = callDetail.CallId;
                         callDto.InfoType = EInfoType.Call;
+                        if (call.CallType== ECallType.Comments)
+                        {
+                            callDto.InfoType =  EInfoType.Comments;
+                        }
+                        
                         callDto.Direction = callModel.CallDirection;
                         callDto.Cpn = callModel.FromNo ?? "";
                         callDto.Cdpn = callModel.ToNo ?? "";
@@ -103,6 +108,10 @@ namespace CallCenter.Application.Handlers
                             callDto.OnTime = call.CallDetails?.FirstOrDefault(x => x.EventName == "ANSWER")?.CreationTime ?? call.CallDetails?.FirstOrDefault(x => x.EventName == "ANSWERED")?.CreationTime ?? null;
                             callDto.OnState = call.CallDetails?.Any(x => x.EventName == "ANSWER" || x.EventName == "ANSWERED") == true ? EOnState.On : EOnState.NoOn;
                         }
+                        if (callDto.InfoType == EInfoType.Comments)
+                        {
+                            callDto.OnState = EOnState.On;
+                        }
                         callDto.BeginTime = call.CreationTime;
                         callDto.ByeTime = call.CallDetails?.FirstOrDefault(x => x.EventName == "BYE")?.CreationTime ?? DateTime.Now;
                         callDto.TalkTime = call.Duration;

+ 1 - 1
src/CallCenter.Share/CallCenter.Share.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="MediatR.Contracts" Version="1.0.1" />
-    <PackageReference Include="XF.Utility.EnumExtensions" Version="1.0.2" />
+    <PackageReference Include="XF.Utility.EnumExtensions" Version="1.0.5" />
   </ItemGroup>
 
 </Project>