src/DataSharing.Host/Controllers/CityDataExchangeController.cs

@@ -85,7 +85,52 @@ namespace DataSharing.Host.Controllers
             };
             await _dsReceiveDataExchangeDataRepository.AddAsync(data, HttpContext.RequestAborted);
 
-            var orderData = _mapper.Map<AddOrderDto>(dto);
+            var orderData = new AddOrderDto();// _mapper.Map<AddOrderDto>(dto);
+            orderData.CallAddress = dto.CallAddress;
+            orderData.FromPhone = dto.FromPhone;
+            orderData.TransferPhone = dto.TransferPhone;
+            orderData.FromName = dto.FromName;
+            orderData.FromGender = dto.FromGender;
+            orderData.IdentityType = dto.IdentityType;
+            orderData.LicenceTypeCode = dto.LicenceTypeCode;
+            orderData.LicenceType = dto.LicenceType;
+            orderData.LicenceNo = dto.LicenceNo;
+            orderData.AgeRangeCode = dto.AgeRangeCode;
+            orderData.AgeRange = dto.AgeRange;
+            orderData.Contact = dto.Contact;
+            orderData.AcceptSms = dto.AcceptSms;
+            orderData.SmsSended = dto.SmsSended;
+            orderData.IsSecret = dto.IsSecret;
+            orderData.Company = dto.Company;
+            orderData.AcceptType = dto.AcceptType;
+            orderData.AcceptTypeCode = dto.AcceptTypeCode;
+            orderData.Title = dto.Title;
+            orderData.HotspotId = dto.HotspotId;
+            orderData.HotspotName = dto.HotspotName;
+            orderData.HotspotSpliceName = dto.HotspotSpliceName;
+            orderData.HotspotExternal = dto.HotspotExternal;
+            orderData.EventCategoryId = dto.EventCategoryId;
+            orderData.EventCategoryName = dto.EventCategoryName;
+            orderData.EventCategorySpliceName = dto.EventCategorySpliceName;
+            orderData.EventCategoryExternal = dto.EventCategoryExternal;
+            orderData.IncidentTime = dto.IncidentTime;
+            orderData.IncidentPurpose = dto.IncidentPurpose;
+            orderData.DuplicateIds = dto.DuplicateIds;
+            orderData.PushTypeCode = dto.PushTypeCode;
+            orderData.PushType = dto.PushType;
+            orderData.Additions = dto.Additions;
+            orderData.Content = dto.Content;
+            orderData.OrderExtension = dto.OrderExtension;
+            orderData.Files = dto.Files;
+            orderData.IsProvince = dto.IsProvince;
+            orderData.Longitude = dto.Longitude;
+            orderData.Latitude = dto.Latitude;
+            orderData.AreaCode = dto.AreaCode;
+            orderData.Province = dto.Province;
+            orderData.City = dto.City;
+            orderData.County = dto.County;
+            orderData.Town = dto.Town;
+            orderData.Street = dto.Street;
             orderData.SourceChannel = "市州互转";
             orderData.SourceChannelCode = "SZHZ";
             orderData.ExternalId = dto.Id;

src/DataSharing.Host/config/appsettings.Development.json

@@ -74,7 +74,9 @@
 
     //业务系统推送工单
     "HotlineClient": {
-      "AddressUrl": "http://localhost:50100/"
+      "AddressUrl": "http://localhost:50100/",
+      //"AddressUrl": "http://110.188.24.28:50300/"
+      //"AddressUrl": "http://open.hotline.12345lm.cn/"
     },
 
     //业务系统附件上传配置
@@ -117,8 +119,8 @@
 
       //市州数据交换
       "CityHandOver": {
-        "PushOrder": "api/v1/CityDataExchange/city_hand_data",
-        "PushOpinion": "api/v1/CityDataExchange/city_undertak_advice_data"
+        "PushOrder": "api/v1/CityDataExchange/city_exchange_add_order",
+        "PushOpinion": "api/v1/CityDataExchange/city_exchange_add_opinion"
       },
 
       //新老数据交换配置
@@ -206,8 +208,8 @@
 
       //市州数据交换
       "CityHandOver": {
-        "PushOrder": "api/v1/CityDataExchange/city_hand_data",
-        "PushOpinion": "api/v1/CityDataExchange/city_undertak_advice_data"
+        "PushOrder": "api/v1/CityDataExchange/city_exchange_add_order",
+        "PushOpinion": "api/v1/CityDataExchange/city_exchange_add_opinion"
       },
 
       //新老数据交换配置
@@ -284,8 +286,8 @@
 
       //市州数据交换
       "CityHandOver": {
-        "PushOrder": "api/v1/CityDataExchange/city_hand_data",
-        "PushOpinion": "api/v1/CityDataExchange/city_undertak_advice_data"
+        "PushOrder": "api/v1/CityDataExchange/city_exchange_add_order",
+        "PushOpinion": "api/v1/CityDataExchange/city_exchange_add_opinion"
       },
 
       //新老数据交换配置

src/DataSharing.Share/Dtos/CityStateDataExchange/CityStateDataExchangeResponseDto.cs

@@ -5,7 +5,7 @@
         /// <summary>
         /// 状态
         /// </summary>
-        public string Code { get; set; }
+        public string code { get; set; }
 
         /// <summary>
         /// 消息
@@ -15,11 +15,11 @@
         /// <summary>
         /// 受理编号
         /// </summary>
-        public string AcceptCode { get; set; }
+        public string acceptCode { get; set; }
 
         /// <summary>
         /// 受理密码
         /// </summary>
-        public string AcceptPwd { get; set; }
+        public string acceptPwd { get; set; }
     }
 }

src/DataSharing/CityStateDataExchange/CityStateDataExchangePusherProviderService.cs

@@ -95,7 +95,7 @@ namespace DataSharing.CityStateDataExchange
             {
                 #region 处理待推送数据，如果返回成功则直接删除数据，返回失败更新数据
                 //处理待推送数据，如果返回成功则直接删除数据，返回失败更新数据
-                if (response.Code == "1")
+                if (response.code == "1")
                 {
                     await _dsSendTaskRepository.RemoveAsync(dto, cancellationToken: cancellationToken);
                 }
@@ -127,7 +127,7 @@ namespace DataSharing.CityStateDataExchange
 
                     if (data.FirstTime is null)
                         data.FirstTime = DateTime.Now;
-                    if (response.Code == "1")
+                    if (response.code == "1")
                         data.IsSuccess = ESendTaskState.PushSuccess;
                     else
                         data.IsSuccess = ESendTaskState.PushFail;
@@ -140,10 +140,10 @@ namespace DataSharing.CityStateDataExchange
                     OrderCode = dto.ProvinceNo,
                     SendTimes = dto.SendTimes,
                     Result = Newtonsoft.Json.JsonConvert.SerializeObject(response),
-                    NewCode = response.AcceptCode
+                    NewCode = response.acceptCode
                 };
 
-                if (response.Code == "1")
+                if (response.code == "1")
                 {
                     dsSendTaskInfo.IsSuccess = true;
                     cityRawDataDto.IsSuccess = true;

src/DataSharing/CityStateDataExchange/CityStateDataExchangeService.cs

@@ -76,7 +76,7 @@ namespace DataSharing.CityStateDataExchange
             if (userInfo is null)
                 throw UserFriendlyException.SameMessage("未配置接收市州!");
 
-            var request = JsonSerializer.Serialize(dto, ProvinceJsonSerializerOptions.UnStandardDatetimeJsonOptions);
+            var request = JsonSerializer.Serialize(dto);
             await _initPushDataService.InitDsSendTaskOtherPlatforms(dto.Source.ToString(), config.PushOrder, dto.No,
                 request, request, EPlatformSource.CityDataExchange, cancellationToken: cancellationToken);