tangjiang 7 月之前
父节点
当前提交
911520d030

+ 1 - 14
src/DataSharing.Host/Controllers/YiBin/WllzYBController.cs

@@ -4,12 +4,10 @@ using DataSharing.Share.Dtos;
 using DataSharing.Share.Dtos.HotlineSetting;
 using DataSharing.Share.Dtos.YiBin.ZzptPlatformsYB;
 using DataSharing.YiBin.ConvergenceMedia;
-using DotNetCore.CAP;
 using Hotline.Share.Dtos.DataSharingSearch;
 using Hotline.Share.Dtos.Order;
 using Hotline.Share.Enums.Order;
 using MapsterMapper;
-using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using XF.Domain.Filters;
@@ -23,9 +21,6 @@ namespace DataSharing.Host.Controllers.YiBin
     public class WllzYBController : BaseController
     {
         private readonly IMapper _mapper;
-        private readonly IMediator _mediator;
-        private readonly ICapPublisher _capPublisher;
-        private readonly IRepository<DsOrder> _dataOrderRepository;
         private readonly IRepository<DsReceiveMediaData> _dsReceiveMediaDataRepository;
         private readonly FwClient _fwClient;
         private readonly IDsUserTokenInfoService _dsUserTokenInfoService;
@@ -34,23 +29,15 @@ namespace DataSharing.Host.Controllers.YiBin
         /// 
         /// </summary>
         /// <param name="mapper"></param>
-        /// <param name="mediator"></param>
-        /// <param name="capPublisher"></param>
-        /// <param name="dataOrderRepository"></param>
         /// <param name="dsReceiveMediaDataRepository"></param>
         /// <param name="fwClient"></param>
         /// <param name="dsUserTokenInfoService"></param>
-        public WllzYBController(IMapper mapper, IMediator mediator,
-            ICapPublisher capPublisher,
-            IRepository<DsOrder> dataOrderRepository,
+        public WllzYBController(IMapper mapper,
             IRepository<DsReceiveMediaData> dsReceiveMediaDataRepository,
             FwClient fwClient,
             IDsUserTokenInfoService dsUserTokenInfoService)
         {
             _mapper = mapper;
-            _mediator = mediator;
-            _capPublisher = capPublisher;
-            _dataOrderRepository = dataOrderRepository;
             _dsReceiveMediaDataRepository = dsReceiveMediaDataRepository;
             _fwClient = fwClient;
             _dsUserTokenInfoService = dsUserTokenInfoService;

+ 1 - 15
src/DataSharing.Host/Controllers/YiBin/ZhYBController.cs

@@ -2,15 +2,12 @@
 using DataSharing.RawData;
 using DataSharing.Share.Dtos;
 using DataSharing.Share.Dtos.HotlineSetting;
-using DataSharing.Share.Dtos.YiBin.ConvergenceMedia;
 using DataSharing.Share.Dtos.YiBin.ZzptPlatformsYB;
 using DataSharing.YiBin.ConvergenceMedia;
-using DotNetCore.CAP;
 using Hotline.Share.Dtos.DataSharingSearch;
 using Hotline.Share.Dtos.Order;
 using Hotline.Share.Enums.Order;
 using MapsterMapper;
-using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using XF.Domain.Filters;
@@ -24,9 +21,6 @@ namespace DataSharing.Host.Controllers.YiBin
     public class ZhYBController : BaseController
     {
         private readonly IMapper _mapper;
-        private readonly IMediator _mediator;
-        private readonly ICapPublisher _capPublisher;
-        private readonly IRepository<DsOrder> _dataOrderRepository;
         private readonly IRepository<DsOrderWorkFlow> _dataOrderWorkFlowRepository;
         private readonly IRepository<DsReceiveMediaData> _dsReceiveMediaDataRepository;
         private readonly FwClient _fwClient;
@@ -36,25 +30,17 @@ namespace DataSharing.Host.Controllers.YiBin
         /// 
         /// </summary>
         /// <param name="mapper"></param>
-        /// <param name="mediator"></param>
-        /// <param name="capPublisher"></param>
-        /// <param name="dataOrderRepository"></param>
         /// <param name="dataOrderWorkFlowRepository"></param>
         /// <param name="dsReceiveMediaDataRepository"></param>
         /// <param name="fwClient"></param>
         /// <param name="dsUserTokenInfoService"></param>
-        public ZhYBController(IMapper mapper, IMediator mediator,
-            ICapPublisher capPublisher,
-            IRepository<DsOrder> dataOrderRepository,
+        public ZhYBController(IMapper mapper,
             IRepository<DsOrderWorkFlow> dataOrderWorkFlowRepository,
             IRepository<DsReceiveMediaData> dsReceiveMediaDataRepository,
             FwClient fwClient,
             IDsUserTokenInfoService dsUserTokenInfoService)
         {
             _mapper = mapper;
-            _mediator = mediator;
-            _capPublisher = capPublisher;
-            _dataOrderRepository = dataOrderRepository;
             _dataOrderWorkFlowRepository = dataOrderWorkFlowRepository;
             _dsReceiveMediaDataRepository = dsReceiveMediaDataRepository;
             _fwClient = fwClient;

+ 2 - 10
src/DataSharing.Host/Controllers/YiBin/ZzptYBController.cs

@@ -8,7 +8,6 @@ using DotNetCore.CAP;
 using Hotline.Share.Dtos.DataSharingSearch;
 using Hotline.Share.Dtos.Order;
 using MapsterMapper;
-using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using XF.Domain.Filters;
@@ -22,9 +21,7 @@ namespace DataSharing.Host.Controllers.YiBin
     public class ZzptYBController : BaseController
     {
         private readonly IMapper _mapper;
-        private readonly IMediator _mediator;
         private readonly ICapPublisher _capPublisher;
-        private readonly IRepository<DsOrder> _dataOrderRepository;
         private readonly IRepository<DsReceiveMediaData> _dsReceiveMediaDataRepository;
         private readonly FwClient _fwClient;
         private readonly IDsUserTokenInfoService _dsUserTokenInfoService;
@@ -33,23 +30,18 @@ namespace DataSharing.Host.Controllers.YiBin
         /// 
         /// </summary>
         /// <param name="mapper"></param>
-        /// <param name="mediator"></param>
         /// <param name="capPublisher"></param>
-        /// <param name="dataOrderRepository"></param>
         /// <param name="dsReceiveMediaDataRepository"></param>
         /// <param name="fwClient"></param>
         /// <param name="dsUserTokenInfoService"></param>
-        public ZzptYBController(IMapper mapper, IMediator mediator,
+        public ZzptYBController(IMapper mapper,
             ICapPublisher capPublisher,
-            IRepository<DsOrder> dataOrderRepository,
             IRepository<DsReceiveMediaData> dsReceiveMediaDataRepository,
             FwClient fwClient,
             IDsUserTokenInfoService dsUserTokenInfoService)
         {
             _mapper = mapper;
-            _mediator = mediator;
             _capPublisher = capPublisher;
-            _dataOrderRepository = dataOrderRepository;
             _dsReceiveMediaDataRepository = dsReceiveMediaDataRepository;
             _fwClient = fwClient;
             _dsUserTokenInfoService = dsUserTokenInfoService;
@@ -190,7 +182,7 @@ namespace DataSharing.Host.Controllers.YiBin
                 "Post", System.Text.Json.JsonSerializer.Serialize(getOrder));
 
             if (result == null || result.code != 0 || result.result == null)
-                return OpenResponse.Ok(OtherPlatformsDeResponse<string>.Failed("该工单不属于12345", "0"))
+                return OpenResponse.Ok(OtherPlatformsDeResponse<string>.Failed("该工单不属于12345", "0"));
 
             var count = await _dsReceiveMediaDataRepository.Queryable()
             .Where(p => p.ServiceInterface == "e_WriteResult" && p.PlatformsName == accountDto.PlatformSourceName && p.OrderCode == dto.strCode)