src/DataSharing.Application/DataSharing.Application.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Hotline.Api.Sdk" Version="1.0.7" />
-    <PackageReference Include="Hotline.Share" Version="1.0.63" />
+    <PackageReference Include="Hotline.Share" Version="1.0.64" />
     <PackageReference Include="Polly.Core" Version="8.2.0" />
     <PackageReference Include="FluentValidation" Version="11.6.0" />
   </ItemGroup>

src/DataSharing.Host/Controllers/ConvergenceMediaController.cs

@@ -42,20 +42,20 @@ namespace DataSharing.Host.Controllers
         private readonly IRepository<DsUserTokenInfo> _dsUserTokenInfoRepository;
         private readonly FwClient _fwClient;
 
-       /// <summary>
-       /// 
-       /// </summary>
-       /// <param name="mapper"></param>
-       /// <param name="mediator"></param>
-       /// <param name="capPublisher"></param>
-       /// <param name="channelConfigurationManager"></param>
-       /// <param name="dataOrderRepository"></param>
-       /// <param name="dataOrderWorkFlowRepository"></param>
-       /// <param name="dsReceiveMediaDataRepository"></param>
-       /// <param name="hotlineClient"></param>
-       /// <param name="bulletinRepository"></param>
-       /// <param name="dsUserTokenInfoRepository"></param>
-       /// <param name="fwClient"></param>
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="mapper"></param>
+        /// <param name="mediator"></param>
+        /// <param name="capPublisher"></param>
+        /// <param name="channelConfigurationManager"></param>
+        /// <param name="dataOrderRepository"></param>
+        /// <param name="dataOrderWorkFlowRepository"></param>
+        /// <param name="dsReceiveMediaDataRepository"></param>
+        /// <param name="hotlineClient"></param>
+        /// <param name="bulletinRepository"></param>
+        /// <param name="dsUserTokenInfoRepository"></param>
+        /// <param name="fwClient"></param>
         public ConvergenceMediaController(IMapper mapper, IMediator mediator,
             ICapPublisher capPublisher,
             IChannelConfigurationManager channelConfigurationManager,
@@ -211,14 +211,8 @@ namespace DataSharing.Host.Controllers
             data.Address = "四川省宜宾市" + areaName;
 
             //调用工单创建接口
-
-            // await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderCreation, data, cancellationToken: HttpContext.RequestAborted);
-            // return OpenResponse.Ok(ConvergenceMediaDeResponse<WriteOrderResponseDto>.Failed(new WriteOrderResponseDto() { AcceptCode = "", AcceptPwd = "", msg = "接口调用失败", Code = "0" }, "1", description: "接口调用失败！"));
-
-            //调用工单创建接口
-            //    var result = await _hotlineClient.ReceiveOrderAsync(data, HttpContext.RequestAborted);
             var result = await _fwClient.RequestNoTokenAsync<HotlineClientResponse>("api/v1/Order/add-anonymous", "Post", System.Text.Json.JsonSerializer.Serialize(data));
-            if (result!=null&&result.code==0)
+            if (result != null && result.code == 0)
             {
                 dsReceiveMediaData.ExternalId = result.result.id;
                 dsReceiveMediaData.OrderCode = result.result.no;
@@ -524,103 +518,15 @@ namespace DataSharing.Host.Controllers
                 });
             }
 
-            var dataOrder = System.Text.Json.JsonSerializer.Deserialize<MediaDataReceiveDto>(dataRaw.ReceiveData);
-
-            //组装工单数据
-            Hotline.Share.Dtos.Order.AddOrderDto data = new()
+            UpdateOrderFilesDto updateOrderFiles = new()
             {
-                Title = dataOrder.Title,
-                FromName = dataOrder.LinkName,
-                Contact = dataOrder.Mobile,
-                Address = dataOrder.Address,
-                Content = dataOrder.Content,
-                IsSecret = dataOrder.Secrecy == 0 ? false : true,
-                Source = (Hotline.Share.Enums.Order.ESource)Enum.Parse(typeof(Hotline.Share.Enums.Order.ESource), accountDto.PlatformSource),
-                FromGender = dataOrder.Gender switch
-                {
-                    "1" => Hotline.Share.Enums.Order.EGender.Male,
-                    "2" => Hotline.Share.Enums.Order.EGender.Female,
-                    _ => Hotline.Share.Enums.Order.EGender.Unknown,
-                }
+                Files = fileDtos,
+                Id = dataRaw.ExternalId,
+                OrderNo = dataRaw.OrderCode
             };
-            switch (dataOrder.PurTypeName)
-            {
-                case 17:
-                    data.AcceptType = "咨询";
-                    data.AcceptTypeCode = "10";
-                    break;
-                case 18:
-                    data.AcceptType = "举报";
-                    data.AcceptTypeCode = "30";
-                    break;
-                case 19:
-                    data.AcceptType = "投诉";
-                    data.AcceptTypeCode = "35";
-                    break;
-                case 20:
-                    data.AcceptType = "求助";
-                    data.AcceptTypeCode = "20";
-                    break;
-                case 21:
-                    data.AcceptType = "建议";
-                    data.AcceptTypeCode = "15";
-                    break;
-                case 25:
-                    data.AcceptType = "其他";
-                    data.AcceptTypeCode = "40";
-                    break;
-                default:
-                    data.AcceptType = "其他";
-                    data.AcceptTypeCode = "40";
-                    break;
-            }
-
-            string areaName = "";
-            switch (dataOrder.AreaID)
-            {
-                case 2:
-                    data.AreaCode = "511504"; areaName = "叙州区";
-                    break;
-                case 3:
-                    data.AreaCode = "511503"; areaName = "翠屏区";
-                    break;
-                case 4:
-                    data.AreaCode = "511504"; areaName = "南溪区";
-                    break;
-                case 5:
-                    data.AreaCode = "511524"; areaName = "长宁县";
-                    break;
-                case 6:
-                    data.AreaCode = "511528"; areaName = "兴文县";
-                    break;
-                case 7:
-                    data.AreaCode = "511526"; areaName = "珙县";
-                    break;
-                case 8:
-                    data.AreaCode = "511525"; areaName = "高县";
-                    break;
-                case 9:
-                    data.AreaCode = "511527"; areaName = "筠连县";
-                    break;
-                case 10:
-                    data.AreaCode = "511523"; areaName = "江安县";
-                    break;
-                case 11:
-                    data.AreaCode = "511529"; areaName = "屏山县";
-                    break;
-                case 12:
-                    data.AreaCode = "511504"; areaName = "叙州区";
-                    break;
-                default:
-                    break;
-            }
-            data.Address = "四川省宜宾市" + areaName;
-            data.Files = fileDtos;
 
             //推送数据
-            //    await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderCreation, data, cancellationToken: HttpContext.RequestAborted);
-            //  var result = await _hotlineClient.ReceiveOrderAsync(data, HttpContext.RequestAborted);
-            var result = await _fwClient.RequestNoTokenAsync<HotlineClientResponse>("api/v1/Order/add-anonymous", "Post", System.Text.Json.JsonSerializer.Serialize(data));
+            var result = await _fwClient.RequestNoTokenAsync<HotlineClientResponse>("api/v1/Order/update-orderfiles", "Post", System.Text.Json.JsonSerializer.Serialize(updateOrderFiles));
             return OpenResponse.Ok(ConvergenceMediaDeResponse<WriteOrderResponseDto>.Success(null, "上传成功"));
         }