src/DataSharing.Host/Controllers/PoliceDSController.cs → src/DataSharing.Host/Controllers/Police110/PoliceDSController.cs

@@ -19,7 +19,7 @@ using XF.Domain.Repository;
 using DataSharing.Police110.Encryption;
 using DataSharing.Share.Dtos.Police110.DaoShu110;
 
-namespace DataSharing.Host.Controllers
+namespace DataSharing.Host.Controllers.Police110
 {
     /// <summary>
     /// 110
@@ -148,7 +148,7 @@ namespace DataSharing.Host.Controllers
                             SourceChannel = "宜宾110平台",
                             SourceChannelCode = "YB110",
                             Source = ESource.Police110,
-                            IdentityType = Hotline.Share.Enums.Order.EIdentityType.Citizen,
+                            IdentityType = EIdentityType.Citizen,
                             Transpond = false,
                             IsEnforcementOrder = false,
                             Title = string.Empty
@@ -167,7 +167,7 @@ namespace DataSharing.Host.Controllers
                         apiR = DaoShuDeResponse<string>.Failed(strResult);
                 }
             }
-            catch (System.Exception)
+            catch (Exception)
             {
                 apiR = DaoShuDeResponse<string>.Failed("接口异常");
             }
@@ -179,7 +179,7 @@ namespace DataSharing.Host.Controllers
             string base64 = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResult);
 
             var resp = new HttpResponseMessage(HttpStatusCode.OK);
-            resp.Content = new StringContent(base64, System.Text.Encoding.UTF8, "text/plain");
+            resp.Content = new StringContent(base64, Encoding.UTF8, "text/plain");
             #endregion
 
             return OpenResponse.Ok(resp);
@@ -258,7 +258,7 @@ namespace DataSharing.Host.Controllers
 
                 }
             }
-            catch (System.Exception)
+            catch (Exception)
             {
                 apiR = DaoShuDeResponse<string>.Failed("接口异常");
             }
@@ -269,7 +269,7 @@ namespace DataSharing.Host.Controllers
             string base64 = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResult);
 
             var resp = new HttpResponseMessage(HttpStatusCode.OK);
-            resp.Content = new StringContent(base64, System.Text.Encoding.UTF8, "text/plain");
+            resp.Content = new StringContent(base64, Encoding.UTF8, "text/plain");
             return OpenResponse.Ok(resp);
         }
 
@@ -348,7 +348,7 @@ namespace DataSharing.Host.Controllers
                     }
                 }
             }
-            catch (System.Exception)
+            catch (Exception)
             {
                 apiR = DaoShuDeResponse<string>.Failed("接口异常");
             }
@@ -359,7 +359,7 @@ namespace DataSharing.Host.Controllers
             string base64 = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResult);
 
             var resp = new HttpResponseMessage(HttpStatusCode.OK);
-            resp.Content = new StringContent(base64, System.Text.Encoding.UTF8, "text/plain");
+            resp.Content = new StringContent(base64, Encoding.UTF8, "text/plain");
             return OpenResponse.Ok(resp);
         }
 
@@ -445,7 +445,7 @@ namespace DataSharing.Host.Controllers
                     }
                 }
             }
-            catch (System.Exception)
+            catch (Exception)
             {
                 apiR = DaoShuDeResponse<string>.Failed("接口异常");
             }
@@ -456,7 +456,7 @@ namespace DataSharing.Host.Controllers
             string base64 = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResult);
 
             var resp = new HttpResponseMessage(HttpStatusCode.OK);
-            resp.Content = new StringContent(base64, System.Text.Encoding.UTF8, "text/plain");
+            resp.Content = new StringContent(base64, Encoding.UTF8, "text/plain");
             return OpenResponse.Ok(resp);
         }
 
@@ -543,7 +543,7 @@ namespace DataSharing.Host.Controllers
                     }
                 }
             }
-            catch (System.Exception)
+            catch (Exception)
             {
                 apiR = DaoShuDeResponse<string>.Failed("接口异常");
             }
@@ -554,7 +554,7 @@ namespace DataSharing.Host.Controllers
             string base64 = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResult);
 
             var resp = new HttpResponseMessage(HttpStatusCode.OK);
-            resp.Content = new StringContent(base64, System.Text.Encoding.UTF8, "text/plain");
+            resp.Content = new StringContent(base64, Encoding.UTF8, "text/plain");
             return OpenResponse.Ok(resp);
         }
 
@@ -618,7 +618,7 @@ namespace DataSharing.Host.Controllers
                     }
                 }
             }
-            catch (System.Exception)
+            catch (Exception)
             {
                 apiR = DaoShuDeResponse<string>.Failed("接口异常");
             }
@@ -629,7 +629,7 @@ namespace DataSharing.Host.Controllers
             string base64 = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResult);
 
             var resp = new HttpResponseMessage(HttpStatusCode.OK);
-            resp.Content = new StringContent(base64, System.Text.Encoding.UTF8, "text/plain");
+            resp.Content = new StringContent(base64, Encoding.UTF8, "text/plain");
             return OpenResponse.Ok(resp);
         }
 
@@ -652,18 +652,18 @@ namespace DataSharing.Host.Controllers
 
             if (policeReceiveChainDealDs.DisposalType == 1)//正常办理
             {
-                Hotline.Share.Dtos.DataSharing.PusherHotlineDto.OrderResultDto orderResultDto = new()
+                OrderResultDto orderResultDto = new()
                 {
                     OrderId = orderData.OrderId,
                     FinishType = "1",
                     Opinion = policeReceiveChainDealDs.DisposalSituation,
                     Source = "110"
                 };
-                await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderReultSend, orderResultDto, cancellationToken: HttpContext.RequestAborted);
+                await _capPublisher.PublishAsync(Share.Mq.EventNames.SharingOrderReultSend, orderResultDto, cancellationToken: HttpContext.RequestAborted);
             }
             else if (policeReceiveChainDealDs.DisposalType == 2)//退回 
             {
-                Hotline.Share.Dtos.DataSharing.PusherHotlineDto.OrderResultDto orderResultDto = new()
+                OrderResultDto orderResultDto = new()
                 {
                     OrderId = orderData.OrderId,
                     FinishType = "0",
@@ -671,7 +671,7 @@ namespace DataSharing.Host.Controllers
                     Source = "110"
                 };
                 //向业务系统推送消息
-                await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderReultSend, orderResultDto, cancellationToken: HttpContext.RequestAborted);
+                await _capPublisher.PublishAsync(Share.Mq.EventNames.SharingOrderReultSend, orderResultDto, cancellationToken: HttpContext.RequestAborted);
 
             }
             else if (policeReceiveChainDealDs.DisposalType == 3)//回访 
@@ -682,7 +682,7 @@ namespace DataSharing.Host.Controllers
                     VisitTime = Convert.ToDateTime(policeReceiveChainDealDs.RevisitTime),
                     VisitContent = policeReceiveChainDealDs.VisitContent,
                     //  OrgProcessingResults = policeReceiveChainDealDs.VisitResult,
-                    VisitType = Hotline.Share.Enums.Order.EVisitType.ArtificialVisit
+                    VisitType = EVisitType.ArtificialVisit
                 };
                 orderVisitDto.OrgProcessingResults = policeReceiveChainDealDs.VisitResult switch
                 {
@@ -693,7 +693,7 @@ namespace DataSharing.Host.Controllers
                 };
 
                 //向业务系统推送消息
-                await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderEvlResult, orderVisitDto, cancellationToken: HttpContext.RequestAborted);
+                await _capPublisher.PublishAsync(Share.Mq.EventNames.SharingOrderEvlResult, orderVisitDto, cancellationToken: HttpContext.RequestAborted);
             }
         }
 
@@ -766,7 +766,7 @@ namespace DataSharing.Host.Controllers
                     result = "【dcsm】错误";
                 }
             }
-            catch (System.Exception)
+            catch (Exception)
             {
                 result = "【dcsm】不能为空";
             }

src/DataSharing.Host/Controllers/ConvergenceMediaController.cs → src/DataSharing.Host/Controllers/YiBin/ConvergenceMediaController.cs

@@ -17,7 +17,7 @@ using SqlSugar;
 using XF.Domain.Filters;
 using XF.Domain.Repository;
 
-namespace DataSharing.Host.Controllers
+namespace DataSharing.Host.Controllers.YiBin
 {
     /// <summary>
     /// 融媒体、I宜宾
@@ -112,7 +112,7 @@ namespace DataSharing.Host.Controllers
             };
             dsReceiveMediaData.Id = await _dsReceiveMediaDataRepository.AddAsync(dsReceiveMediaData, HttpContext.RequestAborted);
 
-            Hotline.Share.Dtos.Order.AddOrderDto data = new()
+            AddOrderDto data = new()
             {
                 Title = mediaDataReceiveDto.Title,
                 FromName = mediaDataReceiveDto.LinkName,
@@ -477,7 +477,7 @@ namespace DataSharing.Host.Controllers
                 FlowID = it.Id,
                 RowID = SqlFunc.RowNumber($"{it.CaseDate} desc "),
                 Code = it.OrderNo,
-                Title = it.Title,
+                it.Title,
                 AddDate = it.CaseDate,
                 FromName = it.CaseSource,
                 PurTypeName = it.CaseType,

src/DataSharing.Host/Controllers/EnterpriseController.cs → src/DataSharing.Host/Controllers/YiBin/EnterpriseController.cs

@@ -17,7 +17,7 @@ using XF.Domain.Filters;
 using XF.Domain.Options;
 using XF.Domain.Repository;
 
-namespace DataSharing.Host.Controllers
+namespace DataSharing.Host.Controllers.YiBin
 {
     /// <summary>
     /// 企业专班
@@ -178,7 +178,7 @@ namespace DataSharing.Host.Controllers
                             Files = Files,
                             Source = "yb-enterprise"
                         };
-                        await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderReultSend, orderResultDto, cancellationToken: HttpContext.RequestAborted);
+                        await _capPublisher.PublishAsync(Share.Mq.EventNames.SharingOrderReultSend, orderResultDto, cancellationToken: HttpContext.RequestAborted);
                     }
                 }
                 else
@@ -202,7 +202,7 @@ namespace DataSharing.Host.Controllers
                     };
 
                     if (order != null)
-                        await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderAddTraces, addOrderTracesDto, cancellationToken: HttpContext.RequestAborted);
+                        await _capPublisher.PublishAsync(Share.Mq.EventNames.SharingOrderAddTraces, addOrderTracesDto, cancellationToken: HttpContext.RequestAborted);
                 }
 
                 //这里往业务系统推送数据

src/DataSharing.Host/Controllers/OtherPlatformsYBController.cs → src/DataSharing.Host/Controllers/YiBin/OtherPlatformsYBController.cs

@@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Mvc;
 using XF.Domain.Filters;
 using XF.Domain.Repository;
 
-namespace DataSharing.Host.Controllers
+namespace DataSharing.Host.Controllers.YiBin
 {
     /// <summary>
     /// 智慧宜宾

src/DataSharing.Host/Controllers/WllzYBController.cs → src/DataSharing.Host/Controllers/YiBin/WllzYBController.cs

@@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Mvc;
 using XF.Domain.Filters;
 using XF.Domain.Repository;
 
-namespace DataSharing.Host.Controllers
+namespace DataSharing.Host.Controllers.YiBin
 {
     /// <summary>
     /// 网络理政

src/DataSharing.Host/Controllers/ZzptYBController.cs → src/DataSharing.Host/Controllers/YiBin/ZzptYBController.cs

@@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Mvc;
 using XF.Domain.Filters;
 using XF.Domain.Repository;
 
-namespace DataSharing.Host.Controllers
+namespace DataSharing.Host.Controllers.YiBin
 {
     /// <summary>
     /// 综治平台
@@ -203,7 +203,7 @@ namespace DataSharing.Host.Controllers
                     Opinion = dto.strResult,
                     Source = "zzpt"
                 };
-                await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderReultSend, orderResultDto, cancellationToken: HttpContext.RequestAborted);
+                await _capPublisher.PublishAsync(Share.Mq.EventNames.SharingOrderReultSend, orderResultDto, cancellationToken: HttpContext.RequestAborted);
             }
             return OpenResponse.Ok(OtherPlatformsDeResponse<string>.Success("新增成功"));
 

src/DataSharing.Host/StartupExtensions.cs

@@ -1,4 +1,6 @@
 using DataSharing.Repository.Extensions;
+using DataSharing.SendTask;
+using DataSharing.YiBin;
 using FluentValidation;
 using FluentValidation.AspNetCore;
 using Hotline.Application;
@@ -102,9 +104,9 @@ internal static class StartupExtensions
         //        //.AddTimeout(TimeSpan.FromSeconds(5));
         //});
 
+        services.AddScoped<ISendTaskDataService, SendTaskDataService>();
         //job
         services.RegisterJob();
-
         //services.AddSingleton<IAuthorizationPolicyProvider, AuthorizationPolicyProvider>();
         //services.AddSingleton<IAuthorizationHandler, PermissionHandler>();