t

TrackCenter.sln

@@ -12,8 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0E2537C3-6
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrackCenter.Repository", "src\TrackCenter.Repository\TrackCenter.Repository.csproj", "{D9CF5706-1972-414F-821E-AA32C13B8570}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrackCenter.Application.Contract", "src\TrackCenter.Application.Contract\TrackCenter.Application.Contract.csproj", "{390A44FB-0DB5-4B66-86AB-7712DC3030F5}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SJZY.Track.Test", "test\SJZY.Track.Test\SJZY.Track.Test.csproj", "{3A53539C-4A85-4E5D-A071-7B4B193AB0E0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrackCenter.Domain", "src\TrackCenter.Domain\TrackCenter.Domain.csproj", "{073EB297-E752-49AC-BED8-B4AEBAB518F6}"
@@ -45,10 +43,6 @@ Global
 		{D9CF5706-1972-414F-821E-AA32C13B8570}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D9CF5706-1972-414F-821E-AA32C13B8570}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D9CF5706-1972-414F-821E-AA32C13B8570}.Release|Any CPU.Build.0 = Release|Any CPU
-		{390A44FB-0DB5-4B66-86AB-7712DC3030F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{390A44FB-0DB5-4B66-86AB-7712DC3030F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{390A44FB-0DB5-4B66-86AB-7712DC3030F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{390A44FB-0DB5-4B66-86AB-7712DC3030F5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3A53539C-4A85-4E5D-A071-7B4B193AB0E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3A53539C-4A85-4E5D-A071-7B4B193AB0E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3A53539C-4A85-4E5D-A071-7B4B193AB0E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -65,7 +59,6 @@ Global
 		{5F1A9619-A5A3-4F5F-AEFF-880707A251E1} = {DAC93270-5A25-40E5-B851-E7CA398DBC31}
 		{E052AEB3-A86F-431E-A685-769D3E59CB8A} = {DAC93270-5A25-40E5-B851-E7CA398DBC31}
 		{D9CF5706-1972-414F-821E-AA32C13B8570} = {DAC93270-5A25-40E5-B851-E7CA398DBC31}
-		{390A44FB-0DB5-4B66-86AB-7712DC3030F5} = {DAC93270-5A25-40E5-B851-E7CA398DBC31}
 		{3A53539C-4A85-4E5D-A071-7B4B193AB0E0} = {0E2537C3-6EF3-4085-9BD2-CF923E53F82A}
 		{073EB297-E752-49AC-BED8-B4AEBAB518F6} = {DAC93270-5A25-40E5-B851-E7CA398DBC31}
 	EndGlobalSection

src/TrackCenter.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs

@@ -1,5 +0,0 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackOrder;
-
-public class TrackPushRecordItem
-{
-}

src/TrackCenter.Application.Contract/Events/ClearRulCacheEvent.cs

@@ -1,8 +0,0 @@
-using TrackCenter.Application.Contract.Dtos.Forewarning;
-
-namespace TrackCenter.Application.Contract.Events;
-
-public class ClearRulCacheEvent
-{
-    public List<RuleAreaBaseInfo> Items { get; set; }
-}

src/TrackCenter.Application.Contract/GlobalUsings.cs

@@ -1,4 +0,0 @@
-// Global using directives
-
-global using SJZY.Expand.ABP.Common.Enums;
-global using SJZY.Expand.ABP.Core.Common.Dto;

src/TrackCenter.Application.Contract/Services/IBroadcastingService.cs

@@ -1,42 +0,0 @@
-using TrackCenter.Application.Contract.Dtos.TrackPush;
-using TrackCenter.Application.Contract.Events;
-using Volo.Abp.DependencyInjection;
-
-namespace TrackCenter.Application.Contract.Services;
-
-public interface IBroadcastingService : ITransientDependency
-{
-    /// <summary>
-    /// 轨迹变更广播(新增/修改)
-    /// </summary>
-    /// <param name="eto"></param>
-    /// <param name="contentIsExternal"></param>
-    /// <param name="subSystemCode"></param>
-    /// <param name="trackStatusCode"></param>
-    void TrackChangePublicTopic(TrackUpsertEvent eto,bool contentIsExternal, string subSystemCode, string trackStatusCode);
-
-    /// <summary>
-    /// 轨迹变更广播（删除）
-    /// </summary>
-    /// <param name="eto"></param>
-    /// <param name="subSystemCode"></param>
-    void TrackChangePublicTopic(TrackChangeEto eto, string subSystemCode);
-
-    /// <summary>
-    /// 轨迹推送完成广播（推送完成回调）
-    /// </summary>
-    /// <param name="list"></param>
-    void TrackPushCompletedPublicTopic(List<TrackPushRecordDto> list);
-
-    /// <summary>
-    /// 轨迹推送完成广播（推送完成回调）
-    /// </summary>
-    /// <param name="log"></param>
-    void TrackPushCompletedPublicTopic(TrackPushRecordDto log);
-
-    /// <summary>
-    /// 轨迹推送失败广播（推送前置被拦截，或调用接口通失败）
-    /// </summary>
-    /// <param name="log"></param>
-    void TrackPushFailedPubilcTopic(TrackPushRecordDto log);
-}

src/TrackCenter.Application.Contract/Services/IKpiAreaCacheService.cs

@@ -1,5 +0,0 @@
-namespace TrackCenter.Application.Contract.Services;
-
-public interface IKpiAreaCacheService
-{
-}

src/TrackCenter.Application.Contract/Services/ITrackFlagService.cs

@@ -1,5 +0,0 @@
-namespace TrackCenter.Application.Contract.Services;
-
-public interface ITrackFlagService
-{
-}

src/TrackCenter.Application.Contract/Services/ITrackPullCacheService.cs

@@ -1,24 +0,0 @@
-using TrackCenter.Application.Contract.Dtos.TrackPull;
-
-namespace TrackCenter.Application.Contract.Services;
-
-public interface ITrackPullCacheService
-{
-    string TrackPullKey(int subSystemId, string serviceProviderCode);
-
-    /// <summary>
-    /// 获取服务商拉取配置
-    /// </summary>
-    /// <param name="subSystemId">子系统id</param>
-    /// <param name="serviceProviderCode">服务商code</param>
-    /// <returns></returns>
-    Task<TrackPullParamsWithContentDto?>
-        GetPullParamsWithContentAsync(int subSystemId, string serviceProviderCode);
-
-    /// <summary>
-    /// 设置拉取配置缓存
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    Task<TrackPullParamsWithContentDto?> SetPullConfigAsync(int id);
-}

src/TrackCenter.Application.Contract/Services/ITrackPushCacheService.cs

@@ -1,22 +0,0 @@
-using TrackCenter.Application.Contract.Dtos.TrackPush;
-
-namespace TrackCenter.Application.Contract.Services;
-
-public interface ITrackPushCacheService
-{
-    /// <summary>
-    /// 获取服务商拉取配置
-    /// </summary>
-    /// <param name="subSystemId">子系统id</param>
-    /// <param name="customId">服务商id</param>
-    /// <returns></returns>
-    Task<List<TrackPushContentConfigDto>?> GetPushContentConfigsAsync(int subSystemId, int customId);
-
-    /// <summary>
-    /// 设置服务商拉取配置缓存
-    /// </summary>
-    /// <param name="subSystemId"></param>
-    /// <param name="customId"></param>
-    /// <returns></returns>
-    Task<List<TrackPushContentConfigDto>?> SetPushContentConfigsAsync(int subSystemId, int customId);
-}

src/TrackCenter.Application.Contract/Services/ITrackPushConfigService.cs

@@ -1,15 +0,0 @@
-using TrackCenter.Application.Contract.Dtos.ProvideServices;
-using Volo.Abp;
-
-namespace TrackCenter.Application.Contract.Services;
-
-public interface ITrackPushConfigService : IRemoteService
-{
-    /// <summary>
-    /// 查询轨迹推送配置关系
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    Task<UnifyResultDto<List<QueryTrackPullMappingsInfo>>> QueryTrackPullMappingsAsync(
-        QueryTrackPullMappingsInput input);
-}

src/TrackCenter.Application.Contract/Services/ITrackStatusService.cs

@@ -1,5 +0,0 @@
-namespace TrackCenter.Application.Contract.Services;
-
-public interface ITrackStatusService
-{
-}

src/TrackCenter.Application.Contract/Services/ProvideServices/IOrderService.cs

@@ -1,35 +0,0 @@
-using TrackCenter.Application.Contract.Dtos.ProvideServices;
-using Volo.Abp;
-
-namespace TrackCenter.Application.Contract.Services.ProvideServices;
-
-public interface IOrderService : IRemoteService
-{
-    /// <summary>
-    /// 创建订单，订单已存在则视为更新
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    Task<UnifyResultDto<IdBaseDto>> UpsertAsync(UpsertOrderInput input);
-
-    /// <summary>
-    /// 删除订单
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    Task<UnifyResultDto<IdBaseDto>> DeleteOrderAsync(DeleteOrderInput input);
-
-    /// <summary>
-    /// 关联订单
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    Task<UnifyResultDto> LinkOrderAsync(LinkOrderInput input);
-
-    /// <summary>
-    /// 修改服务商拉取信息
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    public Task<UnifyResultDto> UpdateOrderPullConfigsAsync(UpdateOrderPullConfigsInput input);
-}

src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackContentService.cs

@@ -1,14 +0,0 @@
-using TrackCenter.Application.Contract.Dtos.TrackContents;
-using Volo.Abp;
-
-namespace TrackCenter.Application.Contract.Services.ProvideServices;
-
-public interface ITrackContentService : IRemoteService
-{
-    /// <summary>
-    /// 通过子系统id查询轨迹内容列表
-    /// </summary>
-    /// <param name="subSystemId"></param>
-    /// <returns></returns>
-    Task<UnifyResultDto<List<TrackContentOutput>>> GetTrackContentsAsync(int subSystemId);
-}

src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackPullService.cs

@@ -1,14 +0,0 @@
-using TrackCenter.Application.Contract.Dtos.ProvideServices;
-using Volo.Abp;
-
-namespace TrackCenter.Application.Contract.Services.ProvideServices;
-
-public interface ITrackPullService : IRemoteService
-{
-    /// <summary>
-    /// 刷新轨迹
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    public Task<bool> RefreshTrackAsync(RefreshTrackInput input);
-}

src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackPushService.cs

@@ -1,38 +0,0 @@
-using TrackCenter.Application.Contract.Dtos.ProvideServices;
-using TrackCenter.Application.Contract.Dtos.TrackOrder;
-using TrackCenter.Application.Contract.Dtos.TrackPush;
-using Volo.Abp;
-
-namespace TrackCenter.Application.Contract.Services.ProvideServices;
-
-public interface ITrackPushService : IRemoteService
-{
-    /// <summary>
-    /// 推送轨迹
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    public Task<UnifyResultDto> PushTrackAsync(PushTrackInput input);
-
-    /// <summary>
-    /// 获取轨迹推送内容
-    /// </summary>
-    /// <returns></returns>
-    /// <param name="subSystemId">子系统id</param>
-    /// <param name="customerId">客户id</param>
-    public Task<UnifyResultDto<List<TrackPushContentDto>>> GetTrackPushContentListAsync(int subSystemId, int customerId);
-
-    /// <summary>
-    /// 获取轨迹推送记录
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    public Task<UnifyResultDto<List<TrackPushRecordOutput>>> GetTrackPushRecordsAsync(OrderNoInfo input);
-
-    /// <summary>
-    /// 获取推送记录（批量）
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    public Task<UnifyResultDto<List<TrackPushRecordOutput>>> QueryTrackPushRecordsAsync(QueryPushRecordInput input);
-}

src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackService.cs

@@ -1,51 +0,0 @@
-using TrackCenter.Application.Contract.Dtos.ProvideServices;
-using Volo.Abp;
-
-namespace TrackCenter.Application.Contract.Services.ProvideServices;
-
-public interface ITrackService : IRemoteService
-{
-    /// <summary>
-    /// 新增/更新订单轨迹接口
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    Task<UnifyResultDto> UpsertTrackAsync(UpsertTrackInput input);
-
-    /// <summary>
-    /// 批量新增/更新订单轨迹接口
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    Task<UnifyResultDto> BatchUpsertTrackAsync(BatchUpsertTrackInput input);
-
-    /// <summary>
-    /// 删除轨迹
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    Task<UnifyResultDto> DeleteTrackAsync(DeleteTrackInput input);
-
-    /// <summary>
-    /// 批量删除轨迹
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    Task<UnifyResultDto> BatchDeleteTrackAsync(BatchDeleteTrackInput input);
-
-    /// <summary>
-    /// 根据订单号获取轨迹
-    /// 支持模板，传入时区补正，按轨迹发生时间升序降序
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    Task<UnifyResultDto<List<GetTrackOutput>>> QueryAsync(GetTrackInput input);
-
-    /// <summary>
-    /// 根据订单号获取轨迹
-    /// 不支持模板，无时区补正，可按轨迹发生时间升序降序
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    Task<UnifyResultDto<List<GetTrackOutput>>> QueryV2Async(GetTrackInputV2 input);
-}

src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackTemplateService.cs

@@ -1,7 +0,0 @@
-using Volo.Abp;
-
-namespace TrackCenter.Application.Contract.Services.ProvideServices;
-
-public interface ITrackTemplateService : IRemoteService
-{
-}

src/TrackCenter.Application.Contract/SjzyTrackApplicationContractModule.cs

@@ -1,10 +0,0 @@
-using Volo.Abp.Modularity;
-
-namespace TrackCenter.Application.Contract;
-
-public class SjzyTrackApplicationContractModule : FakeModule
-{
-    public override void PreConfigureServices(ServiceConfigurationContext context)
-    {
-    }
-}

src/TrackCenter.Application.Contract/TrackCenter.Application.Contract.csproj

@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <Import Project="../../common.props" />
-
-    <PropertyGroup>
-        <TargetFramework>net8</TargetFramework>
-        <GenerateDocumentationFile>True</GenerateDocumentationFile>
-        <Version>7.0.24</Version>
-        <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    </PropertyGroup>
-
-</Project>

src/TrackCenter.Application/AutoMapper/OrderAutoMapperProfile.cs

@@ -1,7 +1,7 @@
 using AutoMapper;
 using Fake.Application.Dtos;
-using TrackCenter.Application.Contract.Dtos.ProvideServices;
-using TrackCenter.Application.Contract.Dtos.TrackOrder;
+using TrackCenter.Application.Dtos.ProvideServices;
+using TrackCenter.Application.Dtos.TrackOrder;
 using TrackCenter.Domain.Aggregates.OrderAggregate;
 using TrackCenter.Domain.Aggregates.TrackDetailsAggregate;
 using TrackCenter.Domain.Aggregates.TrackPushAggregate;

src/TrackCenter.Application/AutoMapper/TrackAutoMapperProfile.cs

@@ -1,6 +1,6 @@
 using AutoMapper;
-using TrackCenter.Application.Contract.Dtos.ProvideServices;
-using TrackCenter.Application.Contract.Events;
+using TrackCenter.Application.Dtos.ProvideServices;
+using TrackCenter.Application.Events;
 
 namespace TrackCenter.Application.AutoMapper;
 

src/TrackCenter.Application/AutoMapper/TrackContentAutoMapperProfile.cs

@@ -1,6 +1,6 @@
 using AutoMapper;
 using Fake.Application.Dtos;
-using TrackCenter.Application.Contract.Dtos.TrackContents;
+using TrackCenter.Application.Dtos.TrackContents;
 using TrackCenter.Domain.Aggregates.TrackContentAggregate;
 using TrackCenter.Domain.Aggregates.TrackDetailsAggregate;
 using TrackCenter.Domain.Dtos.TrackContents;
@@ -21,6 +21,6 @@ public class TrackContentAutoMapperProfile : Profile
         CreateMap<TrackContentVO, TrackContentOutput>(MemberList.None);
 
         CreateMap<TrackDetailsIndex, GetContentDetailOutput>(MemberList.None).ReverseMap();
-        CreateMap<TrackCenter.Domain.Aggregates.TrackDetailsAggregate.FileItem, TrackCenter.Application.Contract.Dtos.TrackContents.FileItem>(MemberList.None).ReverseMap();
+        CreateMap<TrackCenter.Domain.Aggregates.TrackDetailsAggregate.FileItem, TrackCenter.Application.Dtos.TrackContents.FileItem>(MemberList.None).ReverseMap();
     }
 }

src/TrackCenter.Application/AutoMapper/TrackFlagAutoMapperProfile.cs

@@ -1,6 +1,6 @@
 using AutoMapper;
 using Fake.Application.Dtos;
-using TrackCenter.Application.Contract.Dtos.TrackFlags;
+using TrackCenter.Application.Dtos.TrackFlags;
 using TrackCenter.Domain.Aggregates.TrackFlagAggregate;
 using TrackCenter.Domain.Dtos.TrackFlags;
 

src/TrackCenter.Application/AutoMapper/TrackNodeMapperProfile.cs

@@ -1,6 +1,6 @@
 using AutoMapper;
-using TrackCenter.Application.Contract.Dtos.TrackNode;
-using TrackCenter.Application.Contract.Dtos.TrackStatus;
+using TrackCenter.Application.Dtos.TrackNode;
+using TrackCenter.Application.Dtos.TrackStatus;
 using TrackCenter.Domain.Aggregates.TrackNodeAggregate;
 using TrackCenter.Domain.Dtos.TrackNode;
 

src/TrackCenter.Application/AutoMapper/TrackPullAutoMapperProfile.cs

@@ -1,6 +1,6 @@
 using AutoMapper;
-using TrackCenter.Application.Contract.Dtos.ProvideServices;
-using TrackCenter.Application.Contract.Dtos.TrackPull;
+using TrackCenter.Application.Dtos.ProvideServices;
+using TrackCenter.Application.Dtos.TrackPull;
 using TrackCenter.Domain.Aggregates.TrackPullAggregate;
 using TrackCenter.Domain.Dtos.Order;
 using TrackCenter.Domain.Dtos.TrackPull;

src/TrackCenter.Application/AutoMapper/TrackPushAutoMapperProfile.cs

@@ -1,5 +1,5 @@
 using AutoMapper;
-using TrackCenter.Application.Contract.Dtos.TrackPush;
+using TrackCenter.Application.Dtos.TrackPush;
 using TrackCenter.Domain.Aggregates.TrackPushAggregate;
 using TrackCenter.Domain.Dtos.TrackPush;
 

src/TrackCenter.Application/AutoMapper/TrackPushConfigAutoMapperProfile.cs

@@ -1,6 +1,6 @@
 using AutoMapper;
-using TrackCenter.Application.Contract.Dtos.ProvideServices;
-using TrackCenter.Application.Contract.Dtos.TrackPush;
+using TrackCenter.Application.Dtos.ProvideServices;
+using TrackCenter.Application.Dtos.TrackPush;
 using TrackCenter.Domain.Dtos.TrackPush;
 
 namespace TrackCenter.Application.AutoMapper;

src/TrackCenter.Application/AutoMapper/TrackStatusAutoMapperProfile.cs

@@ -1,6 +1,6 @@
 using AutoMapper;
 using Fake.Application.Dtos;
-using TrackCenter.Application.Contract.Dtos.TrackStatus;
+using TrackCenter.Application.Dtos.TrackStatus;
 using TrackCenter.Domain.Aggregates.TrackStatusAggregate;
 using TrackCenter.Domain.Dtos.TrackStatus;
 

src/TrackCenter.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs

@@ -1,7 +1,7 @@
 using AutoMapper;
 using Fake.Application.Dtos;
-using TrackCenter.Application.Contract.Dtos.ProvideServices;
-using TrackCenter.Application.Contract.Dtos.TrackTemplates;
+using TrackCenter.Application.Dtos.ProvideServices;
+using TrackCenter.Application.Dtos.TrackTemplates;
 using TrackCenter.Domain.Aggregates.TrackTemplateAggregate;
 using TrackCenter.Domain.Dtos.TrackTemplate;
 

src/TrackCenter.Application/AutoMapper/WarningMapperProfile.cs

@@ -1,7 +1,7 @@
 using AutoMapper;
-using TrackCenter.Application.Contract.Dtos.Warning.Complete;
-using TrackCenter.Application.Contract.Dtos.Warning.Return;
-using TrackCenter.Application.Contract.Dtos.Warning.Transport;
+using TrackCenter.Application.Dtos.Warning.Complete;
+using TrackCenter.Application.Dtos.Warning.Return;
+using TrackCenter.Application.Dtos.Warning.Transport;
 using TrackCenter.Domain.Dtos.Warning;
 
 namespace TrackCenter.Application.AutoMapper;

src/TrackCenter.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs

@@ -1,11 +1,9 @@
 using DotNetCore.CAP;
 using Fake.DependencyInjection;
-using SJZY.Expand.ABP.Core.Logger;
-using TrackCenter.Application.Contract.Events;
+using TrackCenter.Application.Events;
 using TrackCenter.Application.Services.Warning.Handlers;
 using TrackCenter.Domain.Aggregates.OrderAggregate;
 using TrackCenter.Domain.Extensions;
-using Volo.Abp.DependencyInjection;
 
 namespace TrackCenter.Application.CAP.EventHandlers;
 

src/TrackCenter.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs

@@ -1,18 +1,19 @@
 using System.Collections.Immutable;
 using DotNetCore.CAP;
-using SJZY.Expand.ABP.Core.Logger;
-using SJZY.Expand.ABP.Core.PublicMethords;
-using TrackCenter.Application.Contract.Dtos.ProvideServices;
-using TrackCenter.Application.Contract.Events;
-using TrackCenter.Application.Contract.Services;
+using Fake.Application;
+using Fake.DependencyInjection;
+using InterfaceForward.Domain.Shared.Helpers;
+using TrackCenter.Application.Dtos.ProvideServices;
+using TrackCenter.Application.Events;
 using TrackCenter.Application.Kafka;
+using TrackCenter.Application.Queries;
+using TrackCenter.Application.Services.Broadcasting;
 using TrackCenter.Application.Services.Warning.Signals;
 using TrackCenter.Domain.Aggregates.OrderAggregate;
 using TrackCenter.Domain.Aggregates.TrackDetailsAggregate;
 using TrackCenter.Domain.Enums;
 using TrackCenter.Domain.Extensions;
-using TrackCenter.Domain.Queries;
-using Volo.Abp.DependencyInjection;
+using TrackCenter.Repository.Aggregates.OrderAggregate;
 
 namespace TrackCenter.Application.CAP.EventHandlers;
 
@@ -21,18 +22,18 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe
     private readonly ICapPublisher _capPublisher;
     private readonly IOrderOperationRecordEsRepository _orderOperationRecordEsRepository;
     private readonly IOrderRepository _orderRepository;
-    private readonly IProvideQueries _provideQueries;
+    private readonly ProvideQueries _provideQueries;
     private readonly ITrackDetailsEsRepository _trackDetailsEsRepository;
-    private readonly IBroadcastingService _broadcastingService;
+    private readonly BroadcastingService _broadcastingService;
     private readonly WarningSignalPublisher _warningSignalPublisher;
 
     public TrackDeleteEventHandler(
-        IProvideQueries provideQueries,
+        ProvideQueries provideQueries,
         IOrderRepository orderRepository,
         ICapPublisher capPublisher,
         ITrackDetailsEsRepository trackDetailsEsRepository,
         IOrderOperationRecordEsRepository orderOperationRecordEsRepository,
-        IBroadcastingService broadcastingService,
+        BroadcastingService broadcastingService,
         WarningSignalPublisher warningSignalPublisher
     )
     {
@@ -119,7 +120,7 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe
 
     private static bool CanDelete(TrackDeleteEvent @event)
     {
-        if (@event.OrderIds == null)
+        if (@event.OrderIds.IsEmpty())
             return true;
 
         // 订单循环关联检测
@@ -338,7 +339,6 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe
                     }).ToList(),
                     Remarks = track.Remarks,
                     Source = track.Source,
-                    IsVisibility = track.IsVisibility,
                     IsExternal = track.IsExternal,
                     TrackTimeZone = track.TrackTimeZone,
                     TrackTime = track.TrackTime,

src/TrackCenter.Application/CAP/EventHandlers/TrackPushEventHandler.cs

@@ -1,16 +1,21 @@
 using System.Collections.Immutable;
 using System.Text.Json;
 using DotNetCore.CAP;
+using Fake.Application;
+using Fake.DependencyInjection;
+using InterfaceForward.Domain.Shared.Helpers;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 using SJZY.Expand.ABP.Core.PublicMethords;
 using SJZY.InterfaceRelay.Application.Contracts;
 using SJZY.OTel;
-using TrackCenter.Application.Contract.Dtos.TrackPush;
-using TrackCenter.Application.Contract.Events;
-using TrackCenter.Application.Contract.Services;
+using TrackCenter.Application.Dtos.TrackPush;
+using TrackCenter.Application.Events;
+using TrackCenter.Application.Services;
 using TrackCenter.Application.Helpers;
 using TrackCenter.Application.Options;
+using TrackCenter.Application.Services.Broadcasting;
+using TrackCenter.Application.Services.TrackPush;
 using TrackCenter.Application.Track2InterfaceRelay;
 using TrackCenter.Domain.Aggregates.OrderAggregate;
 using TrackCenter.Domain.Aggregates.TrackDetailsAggregate;
@@ -27,20 +32,20 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
     private readonly IHttpClientProxy<IInterfaceForwardServiceV2> _httpClientProxy;
     private readonly IOptionsMonitor<InterfaceRelayParamsConfigOptions> _options;
     private readonly IOrderRepository _orderRepository;
-    private readonly ITrackPushCacheService _trackPushCacheService;
+    private readonly TrackPushCacheService _trackPushCacheService;
     private readonly ITrackPushRecordEsRepository _trackPushRecordEsRepository;
     private readonly ITrackDetailsEsRepository _trackDetailsEsRepository;
-    private readonly IBroadcastingService _broadcastingService;
+    private readonly BroadcastingService _broadcastingService;
     private List<OrderEntity> _orders = null!;
     private List<TrackPushContentConfigDto> _pushConfigs = null!;
     private Dictionary<int, List<TrackPushContentConfigDto>> _orderTypeSortedConfigsDict = null!; //订单类型,根据sort从小到大排序后的配置字典
 
     public TrackPushEventHandler(IHttpClientProxy<IInterfaceForwardServiceV2> httpClientProxy,
         IOrderRepository orderRepository,
-        ITrackPushCacheService trackPushCacheService,
+        TrackPushCacheService trackPushCacheService,
         ITrackPushRecordEsRepository trackPushRecordEsRepository,
         IOptionsMonitor<InterfaceRelayParamsConfigOptions> options,
-        IBroadcastingService broadcastingService,
+        BroadcastingService broadcastingService,
         ITrackDetailsEsRepository trackDetailsEsRepository)
     {
         _httpClientProxy = httpClientProxy;

src/TrackCenter.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs

@@ -1,19 +1,19 @@
 using DotNetCore.CAP;
+using Fake.DependencyInjection;
+using InterfaceForward.Domain.Shared.Helpers;
 using Microsoft.Extensions.Logging;
-using SJZY.Expand.ABP.Core.Logger;
-using SJZY.Expand.ABP.Core.PublicMethords;
-using SJZY.OTel;
-using TrackCenter.Application.Contract.Events;
-using TrackCenter.Application.Contract.Services;
+using TrackCenter.Application.Events;
 using TrackCenter.Application.Kafka;
+using TrackCenter.Application.Queries;
+using TrackCenter.Application.Services.Broadcasting;
 using TrackCenter.Application.Services.Warning.Signals;
 using TrackCenter.Domain.Aggregates.OrderAggregate;
 using TrackCenter.Domain.Aggregates.TrackDetailsAggregate;
 using TrackCenter.Domain.Dtos.TrackContents;
 using TrackCenter.Domain.Enums;
-using TrackCenter.Domain.Queries;
-using Volo.Abp.DependencyInjection;
-using OrderIdentifier = TrackCenter.Application.Contract.Events.OrderIdentifier;
+using TrackCenter.Domain.Extensions;
+using TrackCenter.Repository.Aggregates.OrderAggregate;
+using OrderIdentifier = TrackCenter.Application.Events.OrderIdentifier;
 
 namespace TrackCenter.Application.CAP.EventHandlers;
 
@@ -21,9 +21,9 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
 {
     private readonly ICapPublisher _capPublisher;
     private readonly IOrderRepository _orderRepository;
-    private readonly IProvideQueries _provideQueries;
+    private readonly ProvideQueries _provideQueries;
     private readonly ITrackDetailsEsRepository _trackDetailsEsRepository;
-    private readonly IBroadcastingService _broadcastingService;
+    private readonly BroadcastingService _broadcastingService;
     private readonly ILogger<TrackUpsertEventHandler> _logger;
     private readonly IOrderOperationRecordEsRepository _orderOperationRecordEsRepository;
     private readonly WarningSignalPublisher _warningSignalPublisher;
@@ -31,10 +31,10 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
     public TrackUpsertEventHandler(
         IOrderRepository orderRepository,
         ICapPublisher capPublisher,
-        IProvideQueries provideQueries,
+        ProvideQueries provideQueries,
         ITrackDetailsEsRepository trackDetailsEsRepository,
         IOrderOperationRecordEsRepository orderOperationRecordEsRepository,
-        IBroadcastingService broadcastingService,
+        BroadcastingService broadcastingService,
         ILogger<TrackUpsertEventHandler> logger,
         WarningSignalPublisher warningSignalPublisher
     )
@@ -404,8 +404,6 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
         //跨子系统?
         track.TrackContent = string.IsNullOrWhiteSpace(@event.Content) ? trackContent.TrackContent : @event.Content;
         track.TrackEnContent = string.IsNullOrWhiteSpace(@event.EnStatus) ? trackContent.TrackEnContent : @event.EnStatus;
-        //S06新增
-        track.IsVisibility = @event.IsVisibility;
         //当传入的IsExternal为空，则使用轨迹内容中的IsExternal
         track.IsExternal = @event.IsExternal ?? trackContent.IsExternal;
         track.Remarks = @event.Remarks ?? GlobalConst.EmptyString;
@@ -453,8 +451,6 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
             TrackContentId = trackContent.TrackContentId,
             TrackContent = string.IsNullOrWhiteSpace(@event.Content) ? trackContent.TrackContent : @event.Content,
             TrackEnContent = string.IsNullOrWhiteSpace(@event.EnStatus) ? trackContent.TrackEnContent : @event.EnStatus,
-            //S06新增轨迹明细字段
-            IsVisibility = @event.IsVisibility,
             //当传入的IsExternal为空，则使用轨迹内容中的IsExternal
             IsExternal = @event.IsExternal ?? trackContent.IsExternal,
             Source = @event.Source,

src/TrackCenter.Application/Caching/CustomAbbreviationDictCache.cs

@@ -1,9 +1,6 @@
 using Fake.DependencyInjection;
-using SJZY.Expand.ABP.Core;
 using TrackCenter.Domain.Extensions;
-using TrackCenter.Domain.Queries;
 using TrackCenter.Repository.Redis;
-using Volo.Abp.DependencyInjection;
 
 namespace TrackCenter.Application.Caching;
 

src/TrackCenter.Application/Caching/TrackStatusNameDictCache.cs

@@ -1,9 +1,7 @@
 using Fake.DependencyInjection;
-using SJZY.Expand.ABP.Core;
 using TrackCenter.Domain.Aggregates.TrackStatusAggregate;
 using TrackCenter.Domain.Extensions;
 using TrackCenter.Repository.Redis;
-using Volo.Abp.DependencyInjection;
 
 namespace TrackCenter.Application.Caching;
 

src/TrackCenter.Application/Dtos/Forewarning/AreaCacheEntry.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.Forewarning;
+namespace TrackCenter.Application.Dtos.Forewarning;
 
 public class AreaCacheEntry
 {

src/TrackCenter.Application/Dtos/Forewarning/RuleAreaBaseInfo.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.Forewarning;
+namespace TrackCenter.Application.Dtos.Forewarning;
 
 public class RuleAreaBaseInfo
 {

src/TrackCenter.Application/Dtos/ProvideServices/BatchDeleteTrackByEsIdInput.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 public class BatchDeleteTrackByEsIdInput
 {

src/TrackCenter.Application/Dtos/ProvideServices/BatchDeleteTrackInput.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 public class BatchDeleteTrackInput : OrderNosInfo
 {

src/TrackCenter.Application/Dtos/ProvideServices/BatchUpsertTrackInput.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 public class BatchUpsertTrackInput : OrderNosInfo
 {

src/TrackCenter.Application/Dtos/ProvideServices/DeleteOrderInput.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 public class DeleteOrderInput : OrderNoInfo
 {

src/TrackCenter.Application/Dtos/ProvideServices/FileItemDto.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 public class FileItemDto
 {

src/TrackCenter.Application/Dtos/ProvideServices/GetDetailTimelineInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 public class GetDetailTimelineInput
 {

src/TrackCenter.Application/Dtos/ProvideServices/GetDetailTimelineOutput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 public class GetDetailTimelineOutput
 {

src/TrackCenter.Application/Dtos/ProvideServices/GetOrderDetailsInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 public class TrackOrderDetailDto
 {

src/TrackCenter.Application/Dtos/ProvideServices/GetPageTrackOrderInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 public class GetPageTrackOrderInput : PageInfoInput
 {

src/TrackCenter.Application/Dtos/ProvideServices/GetPageTrackTemplateListInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 public class GetPageTrackTemplateListInput : PageInfoInput
 {

src/TrackCenter.Application/Dtos/ProvideServices/GetTrackInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 /// <summary>
 /// 支持模板，传入时区补正，按轨迹发生时间升序降序

src/TrackCenter.Application/Dtos/ProvideServices/GetTrackOutput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 public class GetTrackOutput
 {

src/TrackCenter.Application/Dtos/ProvideServices/GetTrackTemplateListInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 public class GetTrackTemplateListInput
 {

src/TrackCenter.Application/Dtos/ProvideServices/LinkOrderInput.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 public class LinkOrderInput
 {

src/TrackCenter.Application/Dtos/ProvideServices/OrderNoInfo.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 /// <summary>
 /// 子系统id+订单类型+订单号 确定唯一订单

src/TrackCenter.Application/Dtos/ProvideServices/PushTrackInput.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 public class PushTrackInput : OrderNosInfo
 {

src/TrackCenter.Application/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 /// <summary>
 /// 查询轨迹推送映射关系入参

src/TrackCenter.Application/Dtos/ProvideServices/RefreshTrackInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 public class RefreshTrackInput
 {

src/TrackCenter.Application/Dtos/ProvideServices/TrackIdentifierDto.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 /// <summary>
 /// 轨迹标识符,用于唯一标识一个轨迹

src/TrackCenter.Application/Dtos/ProvideServices/TrackTemplateContentDto.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 public class TrackTemplateOutput
 {

src/TrackCenter.Application/Dtos/ProvideServices/UpdateOrderInput.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 public class UpdateOrderInput : OrderNoInfo
 {

src/TrackCenter.Application/Dtos/ProvideServices/UpdateOrderStatusInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 public class UpdateOrderStatusInput
 {

src/TrackCenter.Application/Dtos/ProvideServices/UpdateServiceProviderPullConfigsInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 public class UpdateOrderPullConfigsInput : OrderNosInfo
 {

src/TrackCenter.Application/Dtos/ProvideServices/UpsertOrderInput.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 public class UpsertOrderInput : UpdateOrderInput
 {

src/TrackCenter.Application/Dtos/ProvideServices/UpsertTrackInput.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace TrackCenter.Application.Contract.Dtos.ProvideServices;
+namespace TrackCenter.Application.Dtos.ProvideServices;
 
 public class UpsertTrackInput : OrderNoInfo
 {

src/TrackCenter.Application/Dtos/TrackContents/EditTrackContentInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackContents;
+namespace TrackCenter.Application.Dtos.TrackContents;
 
 public class EditTrackContentInput
 {

src/TrackCenter.Application/Dtos/TrackContents/EditTrackContentMapInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackContents;
+namespace TrackCenter.Application.Dtos.TrackContents;
 
 public class EditTrackContentMapInput
 {

src/TrackCenter.Application/Dtos/TrackContents/GetAvailableContentInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackContents;
+namespace TrackCenter.Application.Dtos.TrackContents;
 
 public class GetAvailableContentInput
 {

src/TrackCenter.Application/Dtos/TrackContents/GetAvailableContentOutput.cs

@@ -1,6 +1,6 @@
-using TrackCenter.Application.Contract.Dtos.ProvideServices;
+using TrackCenter.Application.Dtos.ProvideServices;
 
-namespace TrackCenter.Application.Contract.Dtos.TrackContents;
+namespace TrackCenter.Application.Dtos.TrackContents;
 
 public class GetAvailableContentOutput
 {

src/TrackCenter.Application/Dtos/TrackContents/GetContentDetailInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackContents;
+namespace TrackCenter.Application.Dtos.TrackContents;
 
 public class GetContentDetailInput
 {

src/TrackCenter.Application/Dtos/TrackContents/GetContentDetailOutput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackContents;
+namespace TrackCenter.Application.Dtos.TrackContents;
 
 public class GetContentDetailOutput
 {

src/TrackCenter.Application/Dtos/TrackContents/GetPageTrackContentInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackContents;
+namespace TrackCenter.Application.Dtos.TrackContents;
 
 public class GetPageTrackContentInput : PageInfoInput
 {

src/TrackCenter.Application/Dtos/TrackContents/GetTrackContentByCodeInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackContents;
+namespace TrackCenter.Application.Dtos.TrackContents;
 
 public class GetTrackContentByCodeInput
 {

src/TrackCenter.Application/Dtos/TrackContents/GetTrackContentByCodeOutput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackContents;
+namespace TrackCenter.Application.Dtos.TrackContents;
 
 public class GetTrackContentByCodeOutput
 {

src/TrackCenter.Application/Dtos/TrackContents/TrackContentOutput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackContents;
+namespace TrackCenter.Application.Dtos.TrackContents;
 
 public sealed class TrackContentOutput
 {

src/TrackCenter.Application/Dtos/TrackFlags/EditTrackFlagInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackFlags;
+namespace TrackCenter.Application.Dtos.TrackFlags;
 
 public class EditTrackFlagInput
 {

src/TrackCenter.Application/Dtos/TrackFlags/GetTrackFlagListDto.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackFlags;
+namespace TrackCenter.Application.Dtos.TrackFlags;
 
 public class GetTrackFlagListDto
 {

src/TrackCenter.Application/Dtos/TrackNode/TrackNodeInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackNode;
+namespace TrackCenter.Application.Dtos.TrackNode;
 
 public class EditTrackNodeInput
 {

src/TrackCenter.Application/Dtos/TrackOrder/GetTrackCounterOutput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackOrder;
+namespace TrackCenter.Application.Dtos.TrackOrder;
 
 public class GetTrackCounterOutput
 {

src/TrackCenter.Application/Dtos/TrackOrder/TrackPushRecordItem.cs

@@ -0,0 +1,5 @@
+namespace TrackCenter.Application.Dtos.TrackOrder;
+
+public class TrackPushRecordItem
+{
+}

src/TrackCenter.Application/Dtos/TrackOrder/TrackPushRecordOutput.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace TrackCenter.Application.Contract.Dtos.TrackOrder;
+namespace TrackCenter.Application.Dtos.TrackOrder;
 
 public class TrackPushRecordOutput
 {

src/TrackCenter.Application/Dtos/TrackPull/EditTrackPullConfigInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackPull;
+namespace TrackCenter.Application.Dtos.TrackPull;
 
 public class EditTrackPullConfigInput
 {

src/TrackCenter.Application/Dtos/TrackPull/EditTrackPullContentInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackPull;
+namespace TrackCenter.Application.Dtos.TrackPull;
 
 public class EditTrackPullContentInput
 {

src/TrackCenter.Application/Dtos/TrackPull/TrackPullContentConfigDto.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackPull;
+namespace TrackCenter.Application.Dtos.TrackPull;
 
 public class TrackPullContentConfigDto
 {

src/TrackCenter.Application/Dtos/TrackPull/TrackPullParamConfigDto.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackPull;
+namespace TrackCenter.Application.Dtos.TrackPull;
 
 public class TrackPullParamConfigDto
 {

src/TrackCenter.Application/Dtos/TrackPull/TrackPullParamWithContentConfigDto.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackPull;
+namespace TrackCenter.Application.Dtos.TrackPull;
 
 public class TrackPullParamsWithContentDto
 {

src/TrackCenter.Application/Dtos/TrackPull/TrackPullPayload.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackPull;
+namespace TrackCenter.Application.Dtos.TrackPull;
 
 public class TrackPullPayload
 {

src/TrackCenter.Application/Dtos/TrackPull/TrackRefreshAttach.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackPull;
+namespace TrackCenter.Application.Dtos.TrackPull;
 
 public class TrackRefreshAttach
 {

src/TrackCenter.Application/Dtos/TrackPull/TrackRefreshContext.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackPull;
+namespace TrackCenter.Application.Dtos.TrackPull;
 
 public class TrackRefreshContext
 {

src/TrackCenter.Application/Dtos/TrackPush/EditTrackPushConfigInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackPush;
+namespace TrackCenter.Application.Dtos.TrackPush;
 
 public class EditTrackPushConfigInput
 {

src/TrackCenter.Application/Dtos/TrackPush/EditTrackPushContentInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackPush;
+namespace TrackCenter.Application.Dtos.TrackPush;
 
 public class EditTrackPushContentInput
 {

src/TrackCenter.Application/Dtos/TrackPush/QueryPushRecordInput.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace TrackCenter.Application.Contract.Dtos.TrackPush;
+namespace TrackCenter.Application.Dtos.TrackPush;
 
 public class QueryPushRecordInput
 {

src/TrackCenter.Application/Dtos/TrackPush/SortTrackPushContentInput.cs

@@ -1,6 +1,4 @@
-using SJZY.Expand.ABP.Core.PublicMethords;
-
-namespace TrackCenter.Application.Contract.Dtos.TrackPush;
+namespace TrackCenter.Application.Dtos.TrackPush;
 
 public class SortTrackPushContentInput
 {

src/TrackCenter.Application/Dtos/TrackPush/TrackPushAfterUpdateOrderDto.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackPush;
+namespace TrackCenter.Application.Dtos.TrackPush;
 
 public class TrackPushAfterUpdateOrderDto
 {

src/TrackCenter.Application/Dtos/TrackPush/TrackPushConfigTagDto.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackPush;
+namespace TrackCenter.Application.Dtos.TrackPush;
 
 public class TrackPushConfigTagDto
 {

src/TrackCenter.Application/Dtos/TrackPush/TrackPushContentConfigDto.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackPush;
+namespace TrackCenter.Application.Dtos.TrackPush;
 
 public class TrackPushContentConfigDto
 {

src/TrackCenter.Application/Dtos/TrackPush/TrackPushContentDto.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackPush;
+namespace TrackCenter.Application.Dtos.TrackPush;
 
 public class TrackPushContentDto
 {

src/TrackCenter.Application/Dtos/TrackPush/TrackPushInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackPush;
+namespace TrackCenter.Application.Dtos.TrackPush;
 
 public class TrackPushInput
 {

src/TrackCenter.Application/Dtos/TrackPush/TrackPushRecordDto.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackPush;
+namespace TrackCenter.Application.Dtos.TrackPush;
 
 public class TrackPushRecordDto
 {

src/TrackCenter.Application/Dtos/TrackStatus/EditTrackStatusInput.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackStatus;
+namespace TrackCenter.Application.Dtos.TrackStatus;
 
 public class EditTrackStatusInput
 {

src/TrackCenter.Application/Dtos/TrackStatus/GetTrackStatusDetailDto.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackStatus;
+namespace TrackCenter.Application.Dtos.TrackStatus;
 
 public class GetTrackStatusDetailDto
 {

src/TrackCenter.Application/Dtos/TrackStatus/GetTrackStatusListDto.cs

@@ -1,4 +1,4 @@
-namespace TrackCenter.Application.Contract.Dtos.TrackStatus;
+namespace TrackCenter.Application.Dtos.TrackStatus;
 
 public class GetTrackStatusListDto
 {