TANG JIANG 1 рік тому
батько
коміт
050dfb9fc5

+ 2 - 6
src/Sharing.Api/Controllers/HotlineMessageReceiveController.cs

@@ -300,7 +300,7 @@ namespace Sharing.Api.Controllers
                 PushType = "",
 
             };
-
+            submitCaseInfo.CaseSerial = "";
             //处理诉求渠道
             switch (dto.Channel)
             {
@@ -401,11 +401,7 @@ namespace Sharing.Api.Controllers
                     break;
             }
 
-
-
-
-
-            submitCaseInfo.Id = await _submitCaseInfoRepository.AddAsync(submitCaseInfo, HttpContext.RequestAborted);
+          //  submitCaseInfo.Id = await _submitCaseInfoRepository.AddAsync(submitCaseInfo, HttpContext.RequestAborted);
 
             await _mediator.Publish(new OrderCreatedNotification(submitCaseInfo));
         }

+ 22 - 15
src/Sharing.Province/Controllers/ProvinceController.cs

@@ -3,9 +3,12 @@ using MapsterMapper;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Sharing.Notifications.Knowledge;
 using Sharing.Province.Dtos;
 using Sharing.Province.Dtos.HuiJu.Send;
+using Sharing.Province.Dtos.XieTong.Knowledge;
 using Sharing.Province.Dtos.XieTong.Send;
+using Sharing.Province.XieTong.Knowledge;
 using Sharing.WebCore;
 
 namespace Sharing.Province.Controllers
@@ -17,14 +20,17 @@ namespace Sharing.Province.Controllers
         private readonly ICapPublisher _capPublisher;
         private readonly IMapper _mapper;
         private readonly IMediator _mediator;
+        private readonly IGetKnowledgeInfoSendRepository _getKnowledgeInfoSendRepository;
 
-        public ProvinceController(IChannelConfigurationManager channelConfigurationManager, PusherProvider pusherProvider, ICapPublisher capPublisher, IMapper mapper, IMediator mediator)
+        public ProvinceController(IChannelConfigurationManager channelConfigurationManager, PusherProvider pusherProvider, 
+            ICapPublisher capPublisher, IMapper mapper, IMediator mediator, IGetKnowledgeInfoSendRepository getKnowledgeInfoSendRepository)
         {
             _channelConfigurationManager = channelConfigurationManager;
             _pusherProvider = pusherProvider;
             _capPublisher = capPublisher;
             _mapper = mapper;
             _mediator = mediator;
+            _getKnowledgeInfoSendRepository = getKnowledgeInfoSendRepository;
         }
 
         [HttpGet("test")]
@@ -47,27 +53,28 @@ namespace Sharing.Province.Controllers
         /// <returns></returns>
         [HttpPost("getcaseresultreceive")]
         [AllowAnonymous]
-        public async Task<string> GetCaseResultReceive([FromBody] GetCaseResultReceiveInfo dto)
+        public async Task<string> GetCaseResultReceive([FromBody] KnowledgeInfoSendInfo dto)
         {
+            var data = _mapper.Map<GetKnowledgeInfoSend>(dto);
+
+            //将上报信息写入本地库
+            var id = await _getKnowledgeInfoSendRepository.AddAsync(data);
+
+            data.Id = id;
+            //信息上报
+             _mediator.Publish(new GetKnowledgeInfoSendNotification(data));
+            return id;
             //var data = _mapper.Map<GetCaseResultReceive>(dto);
 
-            var pusher = _pusherProvider.CreatePusher(_channelConfigurationManager);
+            //var pusher = _pusherProvider.CreatePusher(_channelConfigurationManager);
 
-            //var dataReceive = _mapper.Map<GetCaseResultReceiveInfo>(data);
-            //var datarequest = new GetCaseResultReceiveData
-            //{
-            //    GetCaseResultReceiveInfos = new List<GetCaseResultReceiveInfo>
-            //    {
-            //        dto
-            //    }
-            //};
 
-            var request = new GetCaseResultReceiveRequest();
-            request.SetData(dto);
+            //var request = new GetKnowledgeInfoSendRequest();
+            //request.SetData(dto);
 
-            var response = await pusher.PushGetCaseResultReceiveAsync(request, cancellationToken: default);
+            //var response = await pusher.PushGetKnowledgeInfoSendAsync(request, cancellationToken: default);
 
-            return response.Description;
+            //return response.Description;
 
             //将上报信息写入本地库
             // await _getCaseResultReceiveRepository.AddAsync(data);