src/DataSharing.Host/Controllers/ConvergenceMediaController.cs

@@ -609,7 +609,8 @@ namespace DataSharing.Host.Controllers
             data.Files = fileDtos;
 
             //推送数据
-            await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderCreation, data, cancellationToken: HttpContext.RequestAborted);
+            //    await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderCreation, data, cancellationToken: HttpContext.RequestAborted);
+            var result = await _hotlineClient.ReceiveOrderAsync(data, HttpContext.RequestAborted);
             return OpenResponse.Ok(ConvergenceMediaDeResponse<WriteOrderResponseDto>.Success(null, "上传成功"));
         }
 

src/DataSharing.Host/Controllers/PoliceDSController.cs

@@ -4,6 +4,7 @@ using DataSharing.RawData;
 using DataSharing.Share.Dtos;
 using DataSharing.Share.Dtos.DaoShu110;
 using DotNetCore.CAP;
+using Hotline.Api.Sdk;
 using MapsterMapper;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
@@ -32,6 +33,7 @@ namespace DataSharing.Host.Controllers
         private readonly IRepository<DsKnowledgeRawData> _dsKnowledgeRawDataRepository;
         private readonly IRepository<DsOrder> _dsOrderRepository;
         private readonly IRepository<DsReceivePoliceData> _dsReceivePoliceDataRepository;
+        private readonly IHotlineClient _hotlineClient;
 
         /// <summary>
         /// 
@@ -45,6 +47,7 @@ namespace DataSharing.Host.Controllers
         /// <param name="dsKnowledgeRawDataRepository"></param>
         /// <param name="dsOrderRepository"></param>
         /// <param name="dsReceivePoliceDataRepository"></param>
+        /// <param name="hotlineClient"></param>
         public PoliceDSController(IMapper mapper,
             ICapPublisher capPublisher,
             IMediator mediator,
@@ -53,7 +56,8 @@ namespace DataSharing.Host.Controllers
             IRepository<DsPoliceSendChainDealDs> dsPoliceSendChainDealDsRepository,
             IRepository<DsKnowledgeRawData> dsKnowledgeRawDataRepository,
             IRepository<DsOrder> dsOrderRepository,
-            IRepository<DsReceivePoliceData> dsReceivePoliceDataRepository)
+            IRepository<DsReceivePoliceData> dsReceivePoliceDataRepository,
+            IHotlineClient hotlineClient)
         {
             _mapper = mapper;
             _capPublisher = capPublisher;
@@ -64,6 +68,7 @@ namespace DataSharing.Host.Controllers
             _dsKnowledgeRawDataRepository = dsKnowledgeRawDataRepository;
             _dsOrderRepository = dsOrderRepository;
             _dsReceivePoliceDataRepository = dsReceivePoliceDataRepository;
+            _hotlineClient = hotlineClient;
         }
         #endregion
 
@@ -137,8 +142,9 @@ namespace DataSharing.Host.Controllers
                             SourceChannelCode = "YB110"
                         };
                         //业务系统推送数据
-                        await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderCreation, orderDto, cancellationToken: HttpContext.RequestAborted);
-
+                       // await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderCreation, orderDto, cancellationToken: HttpContext.RequestAborted);
+                        //调用工单创建接口
+                        var result = await _hotlineClient.ReceiveOrderAsync(orderDto, HttpContext.RequestAborted);
                         //if (result != null && !string.IsNullOrEmpty(result.Id))
                         //{
                         //    data.Id = id;

src/DataSharing.Host/Controllers/ProvinceController.cs

@@ -6,6 +6,7 @@ using DataSharing.Share.Dtos.FwDataExchange;
 using DataSharing.Share.Dtos.Province;
 using DataSharing.Share.Dtos.Province.XieTong.Receive;
 using DotNetCore.CAP;
+using Hotline.Api.Sdk;
 using Hotline.Share.Dtos.DataSharing.PusherHotlineDto;
 using Hotline.Share.Dtos.File;
 using Hotline.Share.Dtos.Order;
@@ -36,6 +37,7 @@ namespace DataSharing.Host.Controllers
         private readonly XieTongClient _xieTongClient;
         private readonly FwClient _fwClient;
         private readonly IRepository<SendFwErrorData> _sendFwErrorDataRepository;
+        private readonly IHotlineClient _hotlineClient;
 
         /// <summary>
         /// 
@@ -63,7 +65,8 @@ namespace DataSharing.Host.Controllers
              IRepository<DsSendCaseInfo> sendCaseInfoRepository,
              XieTongClient xieTongClient,
              FwClient fwClient,
-             IRepository<SendFwErrorData> sendFwErrorDataRepository)
+             IRepository<SendFwErrorData> sendFwErrorDataRepository,
+             IHotlineClient hotlineClient)
         {
             _mapper = mapper;
             _mediator = mediator;
@@ -77,6 +80,7 @@ namespace DataSharing.Host.Controllers
             _xieTongClient = xieTongClient;
             _fwClient = fwClient;
             _sendFwErrorDataRepository = sendFwErrorDataRepository;
+            _hotlineClient = hotlineClient;
         }
         #endregion
 
@@ -157,7 +161,7 @@ namespace DataSharing.Host.Controllers
             {
                 data.IsProvince = true; 
                 data.SourceChannel = "省12345平台";
-                data.SourceChannelCode = "S12345";
+                //data.SourceChannelCode = "S12345";
             }
                
 
@@ -214,7 +218,8 @@ namespace DataSharing.Host.Controllers
             if (!string.IsNullOrEmpty(id))
             {
                 data.Files = await GetFileData(dto.CliengGuid, dto.CaseSerial, "受理上传");
-                await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderCreation, data, cancellationToken: HttpContext.RequestAborted);
+                //await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderCreation, data, cancellationToken: HttpContext.RequestAborted);
+                var result = await _hotlineClient.ReceiveOrderAsync(data, HttpContext.RequestAborted);
                 return OpenResponse.Ok(GetDataBaseReponse<string>.Success("您已成功提交数据！"));
             }
             else
@@ -957,7 +962,8 @@ namespace DataSharing.Host.Controllers
                                 ProvinceNo = tmpCaseMaterialInfo.CaseSerial,
                                 Files = listFiles
                             };
-                            await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderCreation, addOrder, cancellationToken: HttpContext.RequestAborted);
+                           // await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderCreation, addOrder, cancellationToken: HttpContext.RequestAborted);
+                            var result = await _hotlineClient.ReceiveOrderAsync(addOrder, HttpContext.RequestAborted);
                             break;
                         case "get_case_back_result":
                             var data = await _getCaseBackApplyRepository.GetAsync(p => p.CaseSerial == tmpCaseMaterialInfo.CaseSerial, HttpContext.RequestAborted);

src/DataSharing.Host/Controllers/WebPortalController.cs

@@ -431,7 +431,7 @@ namespace DataSharing.Host.Controllers
             }
             data.ExternalId = Guid.NewGuid().ToString();
 
-            await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderCreation, data, cancellationToken: HttpContext.RequestAborted);
+          //  await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderCreation, data, cancellationToken: HttpContext.RequestAborted);
 
             //调用工单创建接口
             var result = await _hotlineClient.ReceiveOrderAsync(data, HttpContext.RequestAborted);

src/DataSharing.Share/Dtos/Province/XieTong/Receive/ReceiveCaseInfoRequest.cs

@@ -277,7 +277,7 @@ namespace DataSharing.Share.Dtos.Province.XieTong.Receive
         /// </summary>
         [JsonPropertyName("COMPLAIN_TYPE")]
         [MDisplayName("投诉类型")]
-        [VStringLength(0, 100)]
+        [VStringLength(0, 500)]
         public string ComplainType { get; set; }
 
         /// <summary>