libin 2 сар өмнө
parent
commit
45773159d5

+ 38 - 10
src/DataSharing.LuZhou/LuZhou110Service.cs

@@ -6,8 +6,7 @@ using Hotline.Share.Dtos.Order;
 using Hotline.Share.Enums.Order;
 using MapsterMapper;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using SqlSugar;
+using System.Text.Json;
 using XF.Domain.Dependency;
 using XF.Domain.Repository;
 
@@ -59,6 +58,11 @@ namespace DataSharing.LuZhou
 
                 #region 接受数据汇聚 工单基础信息
 
+                var serializeOptions = new JsonSerializerOptions
+                {
+                    PropertyNamingPolicy = new JsonPascalNamingPolicy(),
+                };
+
                 var gender = "";
                 if (order.FromGender == EGender.Female)
                     gender = "女";
@@ -91,8 +95,12 @@ namespace DataSharing.LuZhou
                 {
                     GDJCXXInfoObject = GDJCXXInfoObject
                 };
-                await InitSendData(order.Id, order.No, "0", LZ110Defaults.SendBasicInfo, JsonConvert.SerializeObject(basicInfoDto), JsonConvert.SerializeObject(GDJCXXInfo), cancellationToken);
-                
+
+                await InitSendData(order.Id, order.No, "0", LZ110Defaults.SendBasicInfo,
+                    System.Text.Json.JsonSerializer.Serialize(basicInfoDto, serializeOptions),
+                    System.Text.Json.JsonSerializer.Serialize(GDJCXXInfo, serializeOptions),
+                    cancellationToken);
+
                 #endregion
 
                 #region 接受数据汇聚 工单流转信息
@@ -138,8 +146,11 @@ namespace DataSharing.LuZhou
                 {
                     GDLZBLInfoObject = GDLZBLInfoObject
                 };
-                await InitSendData(order.Id, order.No, "0", LZ110Defaults.SendFlowed, JsonConvert.SerializeObject(flowedDto), JsonConvert.SerializeObject(GDLZBLInfo), cancellationToken);
-                
+                await InitSendData(order.Id, order.No, "0", LZ110Defaults.SendFlowed,
+                    JsonSerializer.Serialize(flowedDto, serializeOptions),
+                    JsonSerializer.Serialize(GDLZBLInfo, serializeOptions),
+                    cancellationToken);
+
                 #endregion
 
                 #region 接受数据汇聚 工单办理结果
@@ -159,7 +170,10 @@ namespace DataSharing.LuZhou
                 {
                     GDBLJGInfoObject = GDBLJGInfoObject
                 };
-                await InitSendData(order.Id, order.No, "0", LZ110Defaults.SendHandResult, JsonConvert.SerializeObject(handResultDto), JsonConvert.SerializeObject(GDBLJGInfo), cancellationToken);
+                await InitSendData(order.Id, order.No, "0", LZ110Defaults.SendHandResult,
+                    System.Text.Json.JsonSerializer.Serialize(handResultDto, serializeOptions),
+                    System.Text.Json.JsonSerializer.Serialize(GDBLJGInfo, serializeOptions),
+                    cancellationToken);
 
                 #endregion
 
@@ -177,7 +191,10 @@ namespace DataSharing.LuZhou
                 {
                     GDBLZTInfoObject = GDBLZTInfoObject
                 };
-                await InitSendData(order.Id, order.No, "0", LZ110Defaults.SendUpdateStatus, JsonConvert.SerializeObject(updateStatusDto), JsonConvert.SerializeObject(GDBLZTInfo), cancellationToken);
+                await InitSendData(order.Id, order.No, "0", LZ110Defaults.SendUpdateStatus,
+                    System.Text.Json.JsonSerializer.Serialize(updateStatusDto, serializeOptions),
+                    System.Text.Json.JsonSerializer.Serialize(GDBLZTInfo, serializeOptions),
+                    cancellationToken);
 
                 #endregion
 
@@ -203,7 +220,10 @@ namespace DataSharing.LuZhou
                     {
                         GDYQSQInfoObject = GDYQSQInfoObject
                     };
-                    await InitSendData(order.Id, order.No, "0", LZ110Defaults.SendExtensionRequest, JsonConvert.SerializeObject(extensionRequestDto), JsonConvert.SerializeObject(GDYQSQInfo), cancellationToken);
+                    await InitSendData(order.Id, order.No, "0", LZ110Defaults.SendExtensionRequest,
+                        System.Text.Json.JsonSerializer.Serialize(extensionRequestDto, serializeOptions),
+                        System.Text.Json.JsonSerializer.Serialize(GDYQSQInfo, serializeOptions),
+                        cancellationToken);
 
                 }
 
@@ -229,6 +249,11 @@ namespace DataSharing.LuZhou
             {
                 #region 接受数据汇聚 工单回访信息
 
+                var serializeOptions = new JsonSerializerOptions
+                {
+                    PropertyNamingPolicy = new JsonPascalNamingPolicy(),
+                };
+
                 var visitMethod = "3";
                 if (dto.VisitType == EVisitType.CallVisit)
                     visitMethod = "1";
@@ -269,7 +294,10 @@ namespace DataSharing.LuZhou
                 {
                     GDHFXXInfoObject = GDHFXXInfoObject
                 };
-                await InitSendData(order.Id, order.No, "0", LZ110Defaults.SendCallBack, JsonConvert.SerializeObject(callBackDto), JsonConvert.SerializeObject(GDHFXXInfo), cancellationToken);
+                await InitSendData(order.Id, order.No, "0", LZ110Defaults.SendCallBack,
+                    System.Text.Json.JsonSerializer.Serialize(callBackDto, serializeOptions),
+                    System.Text.Json.JsonSerializer.Serialize(GDHFXXInfo, serializeOptions),
+                    cancellationToken);
 
                 #endregion
             }

+ 2 - 0
src/DataSharing/LuZhou/LuZhou110/LZ110Invoker.cs

@@ -82,6 +82,8 @@ namespace DataSharing.LuZhou.LuZhou110
             _logger.LogInformation($"发起请求LZ110地址:{url}");
             _logger.LogInformation($"发起请求LZ110内容:{stringContent}");
             //var result = await client.PostAsJsonAsync(url, new StringContent(stringContent, Encoding.UTF8, new MediaTypeWithQualityHeaderValue("application/json")), serializeOptions, cancellationToken);
+            
+            
             var result = await client.PostAsJsonAsync(url, stringContent, serializeOptions, cancellationToken);
 
             if (result is null || !result.IsSuccessStatusCode)