From 4ecced34a2d7b0fd605b46e63255f9ba921d3d6e Mon Sep 17 00:00:00 2001 From: xiaolipro <2357729423@qq.com> Date: Mon, 14 Jul 2025 10:30:46 +0800 Subject: [PATCH] t --- TrackCenter.sln | 7 --- .../Dtos/TrackOrder/TrackPushRecordItem.cs | 5 -- .../Events/ClearRulCacheEvent.cs | 8 --- .../GlobalUsings.cs | 4 -- .../Services/IBroadcastingService.cs | 42 --------------- .../Services/IKpiAreaCacheService.cs | 5 -- .../Services/ITrackFlagService.cs | 5 -- .../Services/ITrackPullCacheService.cs | 24 --------- .../Services/ITrackPushCacheService.cs | 22 -------- .../Services/ITrackPushConfigService.cs | 15 ------ .../Services/ITrackStatusService.cs | 5 -- .../Services/ProvideServices/IOrderService.cs | 35 ------------- .../ProvideServices/ITrackContentService.cs | 14 ----- .../ProvideServices/ITrackPullService.cs | 14 ----- .../ProvideServices/ITrackPushService.cs | 38 -------------- .../Services/ProvideServices/ITrackService.cs | 51 ------------------- .../ProvideServices/ITrackTemplateService.cs | 7 --- .../SjzyTrackApplicationContractModule.cs | 10 ---- .../TrackCenter.Application.Contract.csproj | 12 ----- .../AutoMapper/OrderAutoMapperProfile.cs | 4 +- .../AutoMapper/TrackAutoMapperProfile.cs | 4 +- .../TrackContentAutoMapperProfile.cs | 4 +- .../AutoMapper/TrackFlagAutoMapperProfile.cs | 2 +- .../AutoMapper/TrackNodeMapperProfile.cs | 4 +- .../AutoMapper/TrackPullAutoMapperProfile.cs | 4 +- .../AutoMapper/TrackPushAutoMapperProfile.cs | 2 +- .../TrackPushConfigAutoMapperProfile.cs | 4 +- .../TrackStatusAutoMapperProfile.cs | 2 +- .../TrackTemplateAutoMapperProfile.cs | 4 +- .../AutoMapper/WarningMapperProfile.cs | 6 +-- ...TrackChangeAfterUpdateOrderEventHandler.cs | 4 +- .../EventHandlers/TrackDeleteEventHandler.cs | 26 +++++----- .../EventHandlers/TrackPushEventHandler.cs | 19 ++++--- .../EventHandlers/TrackUpsertEventHandler.cs | 28 +++++----- .../Caching/CustomAbbreviationDictCache.cs | 3 -- .../Caching/TrackStatusNameDictCache.cs | 2 - .../Dtos/Forewarning/AreaCacheEntry.cs | 2 +- .../Dtos/Forewarning/RuleAreaBaseInfo.cs | 2 +- .../BatchDeleteTrackByEsIdInput.cs | 2 +- .../ProvideServices/BatchDeleteTrackInput.cs | 2 +- .../ProvideServices/BatchUpsertTrackInput.cs | 2 +- .../Dtos/ProvideServices/DeleteOrderInput.cs | 2 +- .../Dtos/ProvideServices/FileItemDto.cs | 2 +- .../ProvideServices/GetDetailTimelineInput.cs | 2 +- .../GetDetailTimelineOutput.cs | 2 +- .../ProvideServices/GetOrderDetailsInput.cs | 2 +- .../ProvideServices/GetPageTrackOrderInput.cs | 2 +- .../GetPageTrackTemplateListInput.cs | 2 +- .../Dtos/ProvideServices/GetTrackInput.cs | 2 +- .../Dtos/ProvideServices/GetTrackOutput.cs | 2 +- .../GetTrackTemplateListInput.cs | 2 +- .../Dtos/ProvideServices/LinkOrderInput.cs | 2 +- .../Dtos/ProvideServices/OrderNoInfo.cs | 2 +- .../Dtos/ProvideServices/PushTrackInput.cs | 2 +- .../QueryTrackPullMappingsInput.cs | 2 +- .../Dtos/ProvideServices/RefreshTrackInput.cs | 2 +- .../ProvideServices/TrackIdentifierDto.cs | 2 +- .../TrackTemplateContentDto.cs | 2 +- .../Dtos/ProvideServices/UpdateOrderInput.cs | 2 +- .../ProvideServices/UpdateOrderStatusInput.cs | 2 +- .../UpdateServiceProviderPullConfigsInput.cs | 2 +- .../Dtos/ProvideServices/UpsertOrderInput.cs | 2 +- .../Dtos/ProvideServices/UpsertTrackInput.cs | 2 +- .../TrackContents/EditTrackContentInput.cs | 2 +- .../TrackContents/EditTrackContentMapInput.cs | 2 +- .../TrackContents/GetAvailableContentInput.cs | 2 +- .../GetAvailableContentOutput.cs | 4 +- .../TrackContents/GetContentDetailInput.cs | 2 +- .../TrackContents/GetContentDetailOutput.cs | 2 +- .../TrackContents/GetPageTrackContentInput.cs | 2 +- .../GetTrackContentByCodeInput.cs | 2 +- .../GetTrackContentByCodeOutput.cs | 2 +- .../Dtos/TrackContents/TrackContentOutput.cs | 2 +- .../Dtos/TrackFlags/EditTrackFlagInput.cs | 2 +- .../Dtos/TrackFlags/GetTrackFlagListDto.cs | 2 +- .../Dtos/TrackNode/TrackNodeInput.cs | 2 +- .../Dtos/TrackOrder/GetTrackCounterOutput.cs | 2 +- .../Dtos/TrackOrder/TrackPushRecordItem.cs | 5 ++ .../Dtos/TrackOrder/TrackPushRecordOutput.cs | 2 +- .../TrackPull/EditTrackPullConfigInput.cs | 2 +- .../TrackPull/EditTrackPullContentInput.cs | 2 +- .../TrackPull/TrackPullContentConfigDto.cs | 2 +- .../Dtos/TrackPull/TrackPullParamConfigDto.cs | 2 +- .../TrackPullParamWithContentConfigDto.cs | 2 +- .../Dtos/TrackPull/TrackPullPayload.cs | 2 +- .../Dtos/TrackPull/TrackRefreshAttach.cs | 2 +- .../Dtos/TrackPull/TrackRefreshContext.cs | 2 +- .../TrackPush/EditTrackPushConfigInput.cs | 2 +- .../TrackPush/EditTrackPushContentInput.cs | 2 +- .../Dtos/TrackPush/QueryPushRecordInput.cs | 2 +- .../TrackPush/SortTrackPushContentInput.cs | 4 +- .../TrackPush/TrackPushAfterUpdateOrderDto.cs | 2 +- .../Dtos/TrackPush/TrackPushConfigTagDto.cs | 2 +- .../TrackPush/TrackPushContentConfigDto.cs | 2 +- .../Dtos/TrackPush/TrackPushContentDto.cs | 2 +- .../Dtos/TrackPush/TrackPushInput.cs | 2 +- .../Dtos/TrackPush/TrackPushRecordDto.cs | 2 +- .../Dtos/TrackStatus/EditTrackStatusInput.cs | 2 +- .../TrackStatus/GetTrackStatusDetailDto.cs | 2 +- .../Dtos/TrackStatus/GetTrackStatusListDto.cs | 2 +- .../Dtos/TrackStatus/QueryTrackNodeRequest.cs | 2 +- .../EditTrackTemplateContentInput.cs | 2 +- .../GetPageTrackTemplateInput.cs | 2 +- .../Dtos/TrackTemplates/GetTrackDetailDto.cs | 2 +- .../SortTrackTemplateContentInput.cs | 4 +- .../Complete/CompleteWarningDetailsDto.cs | 4 +- .../Complete/CompleteWarningRuleItemDto.cs | 4 +- .../EditCompleteWarningRuleItemInput.cs | 4 +- .../GetCompleteWarningRuleItemInput.cs | 4 +- .../GetPageCompleteWarningDetailsInput.cs | 2 +- .../DataAnnotations/IdRequiredAttribute.cs | 2 +- .../Dtos/Warning/GetWarningRuleInput.cs | 2 +- .../Dtos/Warning/NotifyUserDto.cs | 4 +- .../Return/EditReturnWarningRuleItemInput.cs | 4 +- .../GetPageReturnWarningDetailsInput.cs | 2 +- .../Return/GetReturnMessageRecordInput.cs | 2 +- .../Return/GetReturnWarningRuleItemInput.cs | 4 +- .../Warning/Return/ReturnMessageRecordDto.cs | 2 +- .../Dtos/Warning/Return/ReturnPushInput.cs | 2 +- .../Warning/Return/ReturnWarningDetailsDto.cs | 2 +- .../Return/ReturnWarningRuleItemDto.cs | 2 +- .../DeleteTransportWarningSceneInput.cs | 4 +- .../EditTransportWarningSceneRuleItemInput.cs | 4 +- .../GetPageTransportWarningDetailsInput.cs | 2 +- .../GetTransportWarningSceneInput.cs | 4 +- .../GetTransportWarningSceneRuleItemInput.cs | 4 +- .../Transport/TransportWarningDetailsDto.cs | 2 +- .../Transport/TransportWarningSceneDto.cs | 2 +- .../TransportWarningSceneRuleItemDto.cs | 2 +- .../UpsertTransportWarningSceneInput.cs | 4 +- .../Dtos/Warning/UpdateEnabledStatusInput.cs | 4 +- .../Dtos/Warning/UpsertWarningRuleInput.cs | 4 +- .../Dtos/Warning/WarningRuleDto.cs | 2 +- .../Events/ClearRulCacheEvent.cs | 8 +++ .../Events/ModifyWarningEvent.cs | 2 +- .../Events/OrderIdentifier.cs | 2 +- .../Events/PushWarningEvent.cs | 2 +- .../TrackChangeAfterUpdateOrderEvent.cs | 2 +- .../Events/TrackChangeEto.cs | 10 +--- .../Events/TrackDeleteEvent.cs | 8 +-- .../Events/TrackPushCompletedEvent.cs | 2 +- .../Events/TrackPushEvent.cs | 2 +- .../Events/TrackRefreshStruct.cs | 2 +- .../Events/TrackUpsertEvent.cs | 6 +-- .../Events/TrackWarningCalcEvent.cs | 2 +- src/TrackCenter.Application/GlobalUsings.cs | 1 + .../Hangfire/WarningNotifyAggregator.cs | 2 +- .../Hangfire/WarningTaskService.cs | 2 +- .../Helpers/DateTimeHelper.cs | 15 ++++++ .../HostServices/RedisHostService.cs | 2 +- .../Queries/TimezoneQueries.cs | 1 - .../Rabbit/RabbitClient.cs | 51 +++++++++++++++++++ .../Rabbit/TrackPushCompletedEventHandler.cs | 10 ++-- .../Rabbit/TrackRefreshEventHandler.cs | 13 ++--- .../Services/ApplicationServiceBase.cs | 7 +++ .../Broadcasting/BroadcastingService.cs | 25 +++++---- .../Services/DebugApis/NormalService.cs | 2 +- .../Services/DebugApis/OTelService.cs | 2 +- .../_TransportDetailsGenerateService.cs | 2 +- .../DebugApis/_MockReturnWarningService.cs | 4 +- .../KpiAreaCacheService.cs | 2 +- .../ForewarningServices/KpiAreaService.cs | 4 +- .../ProvideServices/OrderService.Link.cs | 4 +- .../OrderService.PullConfigs.cs | 2 +- .../Services/ProvideServices/OrderService.cs | 23 +++++---- .../ProvideServices/TrackContentService.cs | 6 +-- .../ProvideServices/TrackPullService.cs | 8 +-- .../ProvideServices/TrackPushConfigService.cs | 6 +-- .../ProvideServices/TrackPushService.cs | 12 ++--- .../ProvideServices/TrackService.Query.cs | 2 +- .../Services/ProvideServices/TrackService.cs | 22 +++----- .../ProvideServices/TrackTemplateService.cs | 6 +-- .../TimerTaskss/OrderPullStatusScanTask.cs | 2 +- .../TimerTaskss/TrackButtomUpScanTask.cs | 4 +- .../Services/TimerTaskss/TrackPullTask.cs | 6 +-- .../Services/TimerTaskss/TrackPushTask.cs | 2 +- .../TrackContents/TrackContentService.cs | 8 +-- .../Services/TrackFlags/TrackFlagService.cs | 4 +- .../Services/TrackNode/TrackNodeService.cs | 6 +-- .../Services/TrackOrders/TrackOrderService.cs | 6 +-- .../TrackPull/TrackPullCacheService.cs | 4 +- .../Services/TrackPull/TrackPullService.cs | 7 ++- .../TrackPush/TrackPushCacheService.cs | 4 +- .../Services/TrackPush/TrackPushService.cs | 7 ++- .../TrackStatus/TrackStatusService.cs | 4 +- .../TrackTemplates/TrackTemplateService.cs | 4 +- .../Warning/CompleteWarningService.cs | 8 +-- .../Warning/Handlers/IReturnWarningHandler.cs | 2 +- .../Warning/Handlers/ReturnWarningHandler.cs | 4 +- .../Model/CompleteWarningRuleItemBO.cs | 4 +- .../Warning/Model/ReturnWarningRuleItemBO.cs | 4 +- .../Warning/Model/TransportWarningSceneBO.cs | 2 +- .../Model/TransportWarningSceneRuleItemBO.cs | 4 +- .../Services/Warning/ReturnWarningService.cs | 8 +-- .../Warning/TransportWarningService.cs | 6 +-- .../Services/Warning/WarningService.cs | 4 +- .../TrackCenter.Application.csproj | 1 - .../EditTrackContentInputValidation.cs | 2 +- .../EditTrackContentMapInputValidation.cs | 2 +- .../EditTrackFlagInputValidation.cs | 2 +- .../EditTrackPullConfigInputValidation.cs | 2 +- .../EditTrackPullContentInputValidation.cs | 2 +- .../EditTrackStatusInputValidation.cs | 2 +- ...EditTrackTemplateContentInputValidation.cs | 2 +- .../EditTrackTemplateInputValidation.cs | 2 +- .../OrderOperationRecordIndex.cs | 2 +- .../TrackDetailsIndex.cs | 6 --- .../Dtos/Common/DropdownListDataDto.cs | 10 ++++ .../Dtos/Common/IdBaseDto.cs | 6 +++ .../Dtos/Common/OptionTypeNoNull.cs | 10 ++++ .../Extensions/LogHelper.cs | 6 +++ src/TrackCenter.Domain/IBasicRepository.cs | 40 +++++++++++++-- .../Repositories/BasicRepository.cs | 44 +++++++++++++++- test/SJZY.Track.Test/TestModule.cs | 1 - 214 files changed, 525 insertions(+), 691 deletions(-) delete mode 100644 src/TrackCenter.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs delete mode 100644 src/TrackCenter.Application.Contract/Events/ClearRulCacheEvent.cs delete mode 100644 src/TrackCenter.Application.Contract/GlobalUsings.cs delete mode 100644 src/TrackCenter.Application.Contract/Services/IBroadcastingService.cs delete mode 100644 src/TrackCenter.Application.Contract/Services/IKpiAreaCacheService.cs delete mode 100644 src/TrackCenter.Application.Contract/Services/ITrackFlagService.cs delete mode 100644 src/TrackCenter.Application.Contract/Services/ITrackPullCacheService.cs delete mode 100644 src/TrackCenter.Application.Contract/Services/ITrackPushCacheService.cs delete mode 100644 src/TrackCenter.Application.Contract/Services/ITrackPushConfigService.cs delete mode 100644 src/TrackCenter.Application.Contract/Services/ITrackStatusService.cs delete mode 100644 src/TrackCenter.Application.Contract/Services/ProvideServices/IOrderService.cs delete mode 100644 src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackContentService.cs delete mode 100644 src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackPullService.cs delete mode 100644 src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackPushService.cs delete mode 100644 src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackService.cs delete mode 100644 src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackTemplateService.cs delete mode 100644 src/TrackCenter.Application.Contract/SjzyTrackApplicationContractModule.cs delete mode 100644 src/TrackCenter.Application.Contract/TrackCenter.Application.Contract.csproj rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Forewarning/AreaCacheEntry.cs (89%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Forewarning/RuleAreaBaseInfo.cs (82%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/BatchDeleteTrackByEsIdInput.cs (86%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/BatchDeleteTrackInput.cs (91%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/BatchUpsertTrackInput.cs (98%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/DeleteOrderInput.cs (93%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/FileItemDto.cs (83%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/GetDetailTimelineInput.cs (85%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/GetDetailTimelineOutput.cs (96%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/GetOrderDetailsInput.cs (98%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/GetPageTrackOrderInput.cs (98%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/GetPageTrackTemplateListInput.cs (89%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/GetTrackInput.cs (95%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/GetTrackOutput.cs (97%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/GetTrackTemplateListInput.cs (87%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/LinkOrderInput.cs (93%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/OrderNoInfo.cs (94%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/PushTrackInput.cs (88%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs (94%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/RefreshTrackInput.cs (79%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/TrackIdentifierDto.cs (86%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/TrackTemplateContentDto.cs (96%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/UpdateOrderInput.cs (97%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/UpdateOrderStatusInput.cs (74%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/UpdateServiceProviderPullConfigsInput.cs (62%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/UpsertOrderInput.cs (91%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/ProvideServices/UpsertTrackInput.cs (98%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackContents/EditTrackContentInput.cs (97%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackContents/EditTrackContentMapInput.cs (93%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackContents/GetAvailableContentInput.cs (88%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackContents/GetAvailableContentOutput.cs (94%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackContents/GetContentDetailInput.cs (89%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackContents/GetContentDetailOutput.cs (98%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackContents/GetPageTrackContentInput.cs (97%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackContents/GetTrackContentByCodeInput.cs (79%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackContents/GetTrackContentByCodeOutput.cs (84%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackContents/TrackContentOutput.cs (96%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackFlags/EditTrackFlagInput.cs (94%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackFlags/GetTrackFlagListDto.cs (95%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackNode/TrackNodeInput.cs (90%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackOrder/GetTrackCounterOutput.cs (84%) create mode 100644 src/TrackCenter.Application/Dtos/TrackOrder/TrackPushRecordItem.cs rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackOrder/TrackPushRecordOutput.cs (98%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackPull/EditTrackPullConfigInput.cs (96%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackPull/EditTrackPullContentInput.cs (94%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackPull/TrackPullContentConfigDto.cs (93%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackPull/TrackPullParamConfigDto.cs (95%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackPull/TrackPullParamWithContentConfigDto.cs (77%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackPull/TrackPullPayload.cs (70%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackPull/TrackRefreshAttach.cs (91%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackPull/TrackRefreshContext.cs (91%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackPush/EditTrackPushConfigInput.cs (95%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackPush/EditTrackPushContentInput.cs (96%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackPush/QueryPushRecordInput.cs (95%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackPush/SortTrackPushContentInput.cs (61%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackPush/TrackPushAfterUpdateOrderDto.cs (90%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackPush/TrackPushConfigTagDto.cs (80%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackPush/TrackPushContentConfigDto.cs (97%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackPush/TrackPushContentDto.cs (92%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackPush/TrackPushInput.cs (86%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackPush/TrackPushRecordDto.cs (97%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackStatus/EditTrackStatusInput.cs (93%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackStatus/GetTrackStatusDetailDto.cs (94%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackStatus/GetTrackStatusListDto.cs (96%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackStatus/QueryTrackNodeRequest.cs (81%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs (87%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs (90%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackTemplates/GetTrackDetailDto.cs (96%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs (60%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs (94%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/Complete/CompleteWarningRuleItemDto.cs (92%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/Complete/EditCompleteWarningRuleItemInput.cs (91%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/Complete/GetCompleteWarningRuleItemInput.cs (63%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs (95%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/DataAnnotations/IdRequiredAttribute.cs (85%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/GetWarningRuleInput.cs (92%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/NotifyUserDto.cs (68%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/Return/EditReturnWarningRuleItemInput.cs (90%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs (97%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/Return/GetReturnMessageRecordInput.cs (81%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/Return/GetReturnWarningRuleItemInput.cs (63%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/Return/ReturnMessageRecordDto.cs (92%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/Return/ReturnPushInput.cs (79%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/Return/ReturnWarningDetailsDto.cs (98%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/Return/ReturnWarningRuleItemDto.cs (91%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/Transport/DeleteTransportWarningSceneInput.cs (68%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/Transport/EditTransportWarningSceneRuleItemInput.cs (92%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs (94%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/Transport/GetTransportWarningSceneInput.cs (61%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/Transport/GetTransportWarningSceneRuleItemInput.cs (71%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/Transport/TransportWarningDetailsDto.cs (98%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/Transport/TransportWarningSceneDto.cs (94%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/Transport/TransportWarningSceneRuleItemDto.cs (94%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/Transport/UpsertTransportWarningSceneInput.cs (87%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/UpdateEnabledStatusInput.cs (82%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/UpsertWarningRuleInput.cs (88%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Dtos/Warning/WarningRuleDto.cs (95%) create mode 100644 src/TrackCenter.Application/Events/ClearRulCacheEvent.cs rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Events/ModifyWarningEvent.cs (88%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Events/OrderIdentifier.cs (86%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Events/PushWarningEvent.cs (58%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Events/TrackChangeAfterUpdateOrderEvent.cs (96%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Events/TrackChangeEto.cs (92%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Events/TrackDeleteEvent.cs (89%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Events/TrackPushCompletedEvent.cs (97%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Events/TrackPushEvent.cs (97%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Events/TrackRefreshStruct.cs (89%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Events/TrackUpsertEvent.cs (96%) rename src/{TrackCenter.Application.Contract => TrackCenter.Application}/Events/TrackWarningCalcEvent.cs (91%) create mode 100644 src/TrackCenter.Application/Services/ApplicationServiceBase.cs create mode 100644 src/TrackCenter.Domain/Dtos/Common/DropdownListDataDto.cs create mode 100644 src/TrackCenter.Domain/Dtos/Common/IdBaseDto.cs create mode 100644 src/TrackCenter.Domain/Dtos/Common/OptionTypeNoNull.cs diff --git a/TrackCenter.sln b/TrackCenter.sln index 12fa82df..fde6097c 100644 --- a/TrackCenter.sln +++ b/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 diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs b/src/TrackCenter.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs deleted file mode 100644 index 696aa541..00000000 --- a/src/TrackCenter.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace TrackCenter.Application.Contract.Dtos.TrackOrder; - -public class TrackPushRecordItem -{ -} diff --git a/src/TrackCenter.Application.Contract/Events/ClearRulCacheEvent.cs b/src/TrackCenter.Application.Contract/Events/ClearRulCacheEvent.cs deleted file mode 100644 index ac0295f4..00000000 --- a/src/TrackCenter.Application.Contract/Events/ClearRulCacheEvent.cs +++ /dev/null @@ -1,8 +0,0 @@ -using TrackCenter.Application.Contract.Dtos.Forewarning; - -namespace TrackCenter.Application.Contract.Events; - -public class ClearRulCacheEvent -{ - public List Items { get; set; } -} diff --git a/src/TrackCenter.Application.Contract/GlobalUsings.cs b/src/TrackCenter.Application.Contract/GlobalUsings.cs deleted file mode 100644 index 5845e7a0..00000000 --- a/src/TrackCenter.Application.Contract/GlobalUsings.cs +++ /dev/null @@ -1,4 +0,0 @@ -// Global using directives - -global using SJZY.Expand.ABP.Common.Enums; -global using SJZY.Expand.ABP.Core.Common.Dto; diff --git a/src/TrackCenter.Application.Contract/Services/IBroadcastingService.cs b/src/TrackCenter.Application.Contract/Services/IBroadcastingService.cs deleted file mode 100644 index 352e5d4f..00000000 --- a/src/TrackCenter.Application.Contract/Services/IBroadcastingService.cs +++ /dev/null @@ -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 -{ - /// - /// 轨迹变更广播(新增/修改) - /// - /// - /// - /// - /// - void TrackChangePublicTopic(TrackUpsertEvent eto,bool contentIsExternal, string subSystemCode, string trackStatusCode); - - /// - /// 轨迹变更广播（删除） - /// - /// - /// - void TrackChangePublicTopic(TrackChangeEto eto, string subSystemCode); - - /// - /// 轨迹推送完成广播（推送完成回调） - /// - /// - void TrackPushCompletedPublicTopic(List list); - - /// - /// 轨迹推送完成广播（推送完成回调） - /// - /// - void TrackPushCompletedPublicTopic(TrackPushRecordDto log); - - /// - /// 轨迹推送失败广播（推送前置被拦截，或调用接口通失败） - /// - /// - void TrackPushFailedPubilcTopic(TrackPushRecordDto log); -} diff --git a/src/TrackCenter.Application.Contract/Services/IKpiAreaCacheService.cs b/src/TrackCenter.Application.Contract/Services/IKpiAreaCacheService.cs deleted file mode 100644 index e4ce222e..00000000 --- a/src/TrackCenter.Application.Contract/Services/IKpiAreaCacheService.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace TrackCenter.Application.Contract.Services; - -public interface IKpiAreaCacheService -{ -} diff --git a/src/TrackCenter.Application.Contract/Services/ITrackFlagService.cs b/src/TrackCenter.Application.Contract/Services/ITrackFlagService.cs deleted file mode 100644 index 666628a4..00000000 --- a/src/TrackCenter.Application.Contract/Services/ITrackFlagService.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace TrackCenter.Application.Contract.Services; - -public interface ITrackFlagService -{ -} diff --git a/src/TrackCenter.Application.Contract/Services/ITrackPullCacheService.cs b/src/TrackCenter.Application.Contract/Services/ITrackPullCacheService.cs deleted file mode 100644 index 3dc5016c..00000000 --- a/src/TrackCenter.Application.Contract/Services/ITrackPullCacheService.cs +++ /dev/null @@ -1,24 +0,0 @@ -using TrackCenter.Application.Contract.Dtos.TrackPull; - -namespace TrackCenter.Application.Contract.Services; - -public interface ITrackPullCacheService -{ - string TrackPullKey(int subSystemId, string serviceProviderCode); - - /// - /// 获取服务商拉取配置 - /// - /// 子系统id - /// 服务商code - /// - Task - GetPullParamsWithContentAsync(int subSystemId, string serviceProviderCode); - - /// - /// 设置拉取配置缓存 - /// - /// - /// - Task SetPullConfigAsync(int id); -} diff --git a/src/TrackCenter.Application.Contract/Services/ITrackPushCacheService.cs b/src/TrackCenter.Application.Contract/Services/ITrackPushCacheService.cs deleted file mode 100644 index 54c969d9..00000000 --- a/src/TrackCenter.Application.Contract/Services/ITrackPushCacheService.cs +++ /dev/null @@ -1,22 +0,0 @@ -using TrackCenter.Application.Contract.Dtos.TrackPush; - -namespace TrackCenter.Application.Contract.Services; - -public interface ITrackPushCacheService -{ - /// - /// 获取服务商拉取配置 - /// - /// 子系统id - /// 服务商id - /// - Task?> GetPushContentConfigsAsync(int subSystemId, int customId); - - /// - /// 设置服务商拉取配置缓存 - /// - /// - /// - /// - Task?> SetPushContentConfigsAsync(int subSystemId, int customId); -} diff --git a/src/TrackCenter.Application.Contract/Services/ITrackPushConfigService.cs b/src/TrackCenter.Application.Contract/Services/ITrackPushConfigService.cs deleted file mode 100644 index 0b8a51ce..00000000 --- a/src/TrackCenter.Application.Contract/Services/ITrackPushConfigService.cs +++ /dev/null @@ -1,15 +0,0 @@ -using TrackCenter.Application.Contract.Dtos.ProvideServices; -using Volo.Abp; - -namespace TrackCenter.Application.Contract.Services; - -public interface ITrackPushConfigService : IRemoteService -{ - /// - /// 查询轨迹推送配置关系 - /// - /// - /// - Task>> QueryTrackPullMappingsAsync( - QueryTrackPullMappingsInput input); -} diff --git a/src/TrackCenter.Application.Contract/Services/ITrackStatusService.cs b/src/TrackCenter.Application.Contract/Services/ITrackStatusService.cs deleted file mode 100644 index abe0a480..00000000 --- a/src/TrackCenter.Application.Contract/Services/ITrackStatusService.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace TrackCenter.Application.Contract.Services; - -public interface ITrackStatusService -{ -} diff --git a/src/TrackCenter.Application.Contract/Services/ProvideServices/IOrderService.cs b/src/TrackCenter.Application.Contract/Services/ProvideServices/IOrderService.cs deleted file mode 100644 index fed69d70..00000000 --- a/src/TrackCenter.Application.Contract/Services/ProvideServices/IOrderService.cs +++ /dev/null @@ -1,35 +0,0 @@ -using TrackCenter.Application.Contract.Dtos.ProvideServices; -using Volo.Abp; - -namespace TrackCenter.Application.Contract.Services.ProvideServices; - -public interface IOrderService : IRemoteService -{ - /// - /// 创建订单，订单已存在则视为更新 - /// - /// - /// - Task> UpsertAsync(UpsertOrderInput input); - - /// - /// 删除订单 - /// - /// - /// - Task> DeleteOrderAsync(DeleteOrderInput input); - - /// - /// 关联订单 - /// - /// - /// - Task LinkOrderAsync(LinkOrderInput input); - - /// - /// 修改服务商拉取信息 - /// - /// - /// - public Task UpdateOrderPullConfigsAsync(UpdateOrderPullConfigsInput input); -} diff --git a/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackContentService.cs b/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackContentService.cs deleted file mode 100644 index 98577708..00000000 --- a/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackContentService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using TrackCenter.Application.Contract.Dtos.TrackContents; -using Volo.Abp; - -namespace TrackCenter.Application.Contract.Services.ProvideServices; - -public interface ITrackContentService : IRemoteService -{ - /// - /// 通过子系统id查询轨迹内容列表 - /// - /// - /// - Task>> GetTrackContentsAsync(int subSystemId); -} diff --git a/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackPullService.cs b/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackPullService.cs deleted file mode 100644 index 5edafed5..00000000 --- a/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackPullService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using TrackCenter.Application.Contract.Dtos.ProvideServices; -using Volo.Abp; - -namespace TrackCenter.Application.Contract.Services.ProvideServices; - -public interface ITrackPullService : IRemoteService -{ - /// - /// 刷新轨迹 - /// - /// - /// - public Task RefreshTrackAsync(RefreshTrackInput input); -} diff --git a/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackPushService.cs b/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackPushService.cs deleted file mode 100644 index 13564c29..00000000 --- a/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackPushService.cs +++ /dev/null @@ -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 -{ - /// - /// 推送轨迹 - /// - /// - /// - public Task PushTrackAsync(PushTrackInput input); - - /// - /// 获取轨迹推送内容 - /// - /// - /// 子系统id - /// 客户id - public Task>> GetTrackPushContentListAsync(int subSystemId, int customerId); - - /// - /// 获取轨迹推送记录 - /// - /// - /// - public Task>> GetTrackPushRecordsAsync(OrderNoInfo input); - - /// - /// 获取推送记录（批量） - /// - /// - /// - public Task>> QueryTrackPushRecordsAsync(QueryPushRecordInput input); -} diff --git a/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackService.cs b/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackService.cs deleted file mode 100644 index b951694d..00000000 --- a/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackService.cs +++ /dev/null @@ -1,51 +0,0 @@ -using TrackCenter.Application.Contract.Dtos.ProvideServices; -using Volo.Abp; - -namespace TrackCenter.Application.Contract.Services.ProvideServices; - -public interface ITrackService : IRemoteService -{ - /// - /// 新增/更新订单轨迹接口 - /// - /// - /// - Task UpsertTrackAsync(UpsertTrackInput input); - - /// - /// 批量新增/更新订单轨迹接口 - /// - /// - /// - Task BatchUpsertTrackAsync(BatchUpsertTrackInput input); - - /// - /// 删除轨迹 - /// - /// - /// - Task DeleteTrackAsync(DeleteTrackInput input); - - /// - /// 批量删除轨迹 - /// - /// - /// - Task BatchDeleteTrackAsync(BatchDeleteTrackInput input); - - /// - /// 根据订单号获取轨迹 - /// 支持模板，传入时区补正，按轨迹发生时间升序降序 - /// - /// - /// - Task>> QueryAsync(GetTrackInput input); - - /// - /// 根据订单号获取轨迹 - /// 不支持模板，无时区补正，可按轨迹发生时间升序降序 - /// - /// - /// - Task>> QueryV2Async(GetTrackInputV2 input); -} diff --git a/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackTemplateService.cs b/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackTemplateService.cs deleted file mode 100644 index 8be40a48..00000000 --- a/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackTemplateService.cs +++ /dev/null @@ -1,7 +0,0 @@ -using Volo.Abp; - -namespace TrackCenter.Application.Contract.Services.ProvideServices; - -public interface ITrackTemplateService : IRemoteService -{ -} diff --git a/src/TrackCenter.Application.Contract/SjzyTrackApplicationContractModule.cs b/src/TrackCenter.Application.Contract/SjzyTrackApplicationContractModule.cs deleted file mode 100644 index 28e5ee2c..00000000 --- a/src/TrackCenter.Application.Contract/SjzyTrackApplicationContractModule.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Volo.Abp.Modularity; - -namespace TrackCenter.Application.Contract; - -public class SjzyTrackApplicationContractModule : FakeModule -{ - public override void PreConfigureServices(ServiceConfigurationContext context) - { - } -} diff --git a/src/TrackCenter.Application.Contract/TrackCenter.Application.Contract.csproj b/src/TrackCenter.Application.Contract/TrackCenter.Application.Contract.csproj deleted file mode 100644 index f450334d..00000000 --- a/src/TrackCenter.Application.Contract/TrackCenter.Application.Contract.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - net8 - True - 7.0.24 - True - - - diff --git a/src/TrackCenter.Application/AutoMapper/OrderAutoMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/OrderAutoMapperProfile.cs index 6315fbf4..5f41f824 100644 --- a/src/TrackCenter.Application/AutoMapper/OrderAutoMapperProfile.cs +++ b/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; diff --git a/src/TrackCenter.Application/AutoMapper/TrackAutoMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/TrackAutoMapperProfile.cs index 43998907..b4332975 100644 --- a/src/TrackCenter.Application/AutoMapper/TrackAutoMapperProfile.cs +++ b/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; diff --git a/src/TrackCenter.Application/AutoMapper/TrackContentAutoMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/TrackContentAutoMapperProfile.cs index 98fba2f5..6013d563 100644 --- a/src/TrackCenter.Application/AutoMapper/TrackContentAutoMapperProfile.cs +++ b/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(MemberList.None); CreateMap(MemberList.None).ReverseMap(); - CreateMap(MemberList.None).ReverseMap(); + CreateMap(MemberList.None).ReverseMap(); } } diff --git a/src/TrackCenter.Application/AutoMapper/TrackFlagAutoMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/TrackFlagAutoMapperProfile.cs index bb075d84..e721014e 100644 --- a/src/TrackCenter.Application/AutoMapper/TrackFlagAutoMapperProfile.cs +++ b/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; diff --git a/src/TrackCenter.Application/AutoMapper/TrackNodeMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/TrackNodeMapperProfile.cs index 60fa5851..544b38ea 100644 --- a/src/TrackCenter.Application/AutoMapper/TrackNodeMapperProfile.cs +++ b/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; diff --git a/src/TrackCenter.Application/AutoMapper/TrackPullAutoMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/TrackPullAutoMapperProfile.cs index 326b9535..cd016f69 100644 --- a/src/TrackCenter.Application/AutoMapper/TrackPullAutoMapperProfile.cs +++ b/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; diff --git a/src/TrackCenter.Application/AutoMapper/TrackPushAutoMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/TrackPushAutoMapperProfile.cs index 746026b0..76a13bdb 100644 --- a/src/TrackCenter.Application/AutoMapper/TrackPushAutoMapperProfile.cs +++ b/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; diff --git a/src/TrackCenter.Application/AutoMapper/TrackPushConfigAutoMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/TrackPushConfigAutoMapperProfile.cs index 087dc02f..c66328b4 100644 --- a/src/TrackCenter.Application/AutoMapper/TrackPushConfigAutoMapperProfile.cs +++ b/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; diff --git a/src/TrackCenter.Application/AutoMapper/TrackStatusAutoMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/TrackStatusAutoMapperProfile.cs index cace9603..b98d0922 100644 --- a/src/TrackCenter.Application/AutoMapper/TrackStatusAutoMapperProfile.cs +++ b/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; diff --git a/src/TrackCenter.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs index adb36f7e..ccf2a339 100644 --- a/src/TrackCenter.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs +++ b/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; diff --git a/src/TrackCenter.Application/AutoMapper/WarningMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/WarningMapperProfile.cs index 7f7f0bc1..8026706d 100644 --- a/src/TrackCenter.Application/AutoMapper/WarningMapperProfile.cs +++ b/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; diff --git a/src/TrackCenter.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs b/src/TrackCenter.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs index 772c1bb5..8af3f497 100644 --- a/src/TrackCenter.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs +++ b/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; diff --git a/src/TrackCenter.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs b/src/TrackCenter.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs index 5fa4ebf7..57573cf2 100644 --- a/src/TrackCenter.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs +++ b/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, diff --git a/src/TrackCenter.Application/CAP/EventHandlers/TrackPushEventHandler.cs b/src/TrackCenter.Application/CAP/EventHandlers/TrackPushEventHandler.cs index f8bbb9fe..1d16f035 100644 --- a/src/TrackCenter.Application/CAP/EventHandlers/TrackPushEventHandler.cs +++ b/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 _httpClientProxy; private readonly IOptionsMonitor _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 _orders = null!; private List _pushConfigs = null!; private Dictionary> _orderTypeSortedConfigsDict = null!; //订单类型,根据sort从小到大排序后的配置字典 public TrackPushEventHandler(IHttpClientProxy httpClientProxy, IOrderRepository orderRepository, - ITrackPushCacheService trackPushCacheService, + TrackPushCacheService trackPushCacheService, ITrackPushRecordEsRepository trackPushRecordEsRepository, IOptionsMonitor options, - IBroadcastingService broadcastingService, + BroadcastingService broadcastingService, ITrackDetailsEsRepository trackDetailsEsRepository) { _httpClientProxy = httpClientProxy; diff --git a/src/TrackCenter.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs b/src/TrackCenter.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs index d2b7c084..fee8f126 100644 --- a/src/TrackCenter.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs +++ b/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 _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 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, diff --git a/src/TrackCenter.Application/Caching/CustomAbbreviationDictCache.cs b/src/TrackCenter.Application/Caching/CustomAbbreviationDictCache.cs index 37d3c478..3eff8ae6 100644 --- a/src/TrackCenter.Application/Caching/CustomAbbreviationDictCache.cs +++ b/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; diff --git a/src/TrackCenter.Application/Caching/TrackStatusNameDictCache.cs b/src/TrackCenter.Application/Caching/TrackStatusNameDictCache.cs index 35ed3de4..5f5bf16a 100644 --- a/src/TrackCenter.Application/Caching/TrackStatusNameDictCache.cs +++ b/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; diff --git a/src/TrackCenter.Application.Contract/Dtos/Forewarning/AreaCacheEntry.cs b/src/TrackCenter.Application/Dtos/Forewarning/AreaCacheEntry.cs similarity index 89% rename from src/TrackCenter.Application.Contract/Dtos/Forewarning/AreaCacheEntry.cs rename to src/TrackCenter.Application/Dtos/Forewarning/AreaCacheEntry.cs index 835929c2..10c2582e 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Forewarning/AreaCacheEntry.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/Forewarning/RuleAreaBaseInfo.cs b/src/TrackCenter.Application/Dtos/Forewarning/RuleAreaBaseInfo.cs similarity index 82% rename from src/TrackCenter.Application.Contract/Dtos/Forewarning/RuleAreaBaseInfo.cs rename to src/TrackCenter.Application/Dtos/Forewarning/RuleAreaBaseInfo.cs index 142e3b8a..8bed5377 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Forewarning/RuleAreaBaseInfo.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackByEsIdInput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/BatchDeleteTrackByEsIdInput.cs similarity index 86% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackByEsIdInput.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/BatchDeleteTrackByEsIdInput.cs index 2e97e08b..d721168d 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackByEsIdInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackInput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/BatchDeleteTrackInput.cs similarity index 91% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackInput.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/BatchDeleteTrackInput.cs index cee9d063..a94da8ea 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/BatchUpsertTrackInput.cs similarity index 98% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/BatchUpsertTrackInput.cs index 7a1f1a5b..90725a84 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/DeleteOrderInput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/DeleteOrderInput.cs similarity index 93% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/DeleteOrderInput.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/DeleteOrderInput.cs index 9c07f85a..6719c025 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/DeleteOrderInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/FileItemDto.cs b/src/TrackCenter.Application/Dtos/ProvideServices/FileItemDto.cs similarity index 83% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/FileItemDto.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/FileItemDto.cs index 0fb48874..9e1aaa52 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/FileItemDto.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetDetailTimelineInput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/GetDetailTimelineInput.cs similarity index 85% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetDetailTimelineInput.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/GetDetailTimelineInput.cs index 6ed36c39..6456c939 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetDetailTimelineInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetDetailTimelineOutput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/GetDetailTimelineOutput.cs similarity index 96% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetDetailTimelineOutput.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/GetDetailTimelineOutput.cs index 73f10423..f341f5a8 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetDetailTimelineOutput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/GetOrderDetailsInput.cs similarity index 98% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/GetOrderDetailsInput.cs index 4823af77..2a408ee9 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/GetPageTrackOrderInput.cs similarity index 98% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/GetPageTrackOrderInput.cs index 7124907e..7e3640b6 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetPageTrackTemplateListInput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/GetPageTrackTemplateListInput.cs similarity index 89% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetPageTrackTemplateListInput.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/GetPageTrackTemplateListInput.cs index 9ac87b8a..20af8f9c 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetPageTrackTemplateListInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetTrackInput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/GetTrackInput.cs similarity index 95% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetTrackInput.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/GetTrackInput.cs index b267b5ee..39ea09df 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetTrackInput.cs +++ b/src/TrackCenter.Application/Dtos/ProvideServices/GetTrackInput.cs @@ -1,4 +1,4 @@ -namespace TrackCenter.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Dtos.ProvideServices; /// /// 支持模板，传入时区补正，按轨迹发生时间升序降序 diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/GetTrackOutput.cs similarity index 97% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/GetTrackOutput.cs index 5f30053b..75b484db 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetTrackTemplateListInput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/GetTrackTemplateListInput.cs similarity index 87% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetTrackTemplateListInput.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/GetTrackTemplateListInput.cs index 3f04cecc..e3f387e2 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetTrackTemplateListInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/LinkOrderInput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/LinkOrderInput.cs similarity index 93% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/LinkOrderInput.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/LinkOrderInput.cs index 7f94506b..059f08ce 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/LinkOrderInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/OrderNoInfo.cs b/src/TrackCenter.Application/Dtos/ProvideServices/OrderNoInfo.cs similarity index 94% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/OrderNoInfo.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/OrderNoInfo.cs index df32375d..d87c554f 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/OrderNoInfo.cs +++ b/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; /// /// 子系统id+订单类型+订单号 确定唯一订单 diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/PushTrackInput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/PushTrackInput.cs similarity index 88% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/PushTrackInput.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/PushTrackInput.cs index 5fab6cc3..e4ec9f45 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/PushTrackInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs similarity index 94% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs index 40b6d779..dfa0a6a4 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs +++ b/src/TrackCenter.Application/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs @@ -1,4 +1,4 @@ -namespace TrackCenter.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Dtos.ProvideServices; /// /// 查询轨迹推送映射关系入参 diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/RefreshTrackInput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/RefreshTrackInput.cs similarity index 79% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/RefreshTrackInput.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/RefreshTrackInput.cs index 24ff8e3c..cba6b6a8 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/RefreshTrackInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/TrackIdentifierDto.cs b/src/TrackCenter.Application/Dtos/ProvideServices/TrackIdentifierDto.cs similarity index 86% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/TrackIdentifierDto.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/TrackIdentifierDto.cs index c03d2b82..772e82ff 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/TrackIdentifierDto.cs +++ b/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; /// /// 轨迹标识符,用于唯一标识一个轨迹 diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/TrackTemplateContentDto.cs b/src/TrackCenter.Application/Dtos/ProvideServices/TrackTemplateContentDto.cs similarity index 96% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/TrackTemplateContentDto.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/TrackTemplateContentDto.cs index 323fca0e..014634dd 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/TrackTemplateContentDto.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpdateOrderInput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/UpdateOrderInput.cs similarity index 97% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpdateOrderInput.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/UpdateOrderInput.cs index d31a8b77..1ea12841 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpdateOrderInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpdateOrderStatusInput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/UpdateOrderStatusInput.cs similarity index 74% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpdateOrderStatusInput.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/UpdateOrderStatusInput.cs index 8681d59a..dbf09cf9 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpdateOrderStatusInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpdateServiceProviderPullConfigsInput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/UpdateServiceProviderPullConfigsInput.cs similarity index 62% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpdateServiceProviderPullConfigsInput.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/UpdateServiceProviderPullConfigsInput.cs index b241b4b4..49f4a3f4 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpdateServiceProviderPullConfigsInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/UpsertOrderInput.cs similarity index 91% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/UpsertOrderInput.cs index 23c29693..fc6a1020 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/UpsertTrackInput.cs similarity index 98% rename from src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs rename to src/TrackCenter.Application/Dtos/ProvideServices/UpsertTrackInput.cs index 33fe947b..df49f863 100644 --- a/src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs b/src/TrackCenter.Application/Dtos/TrackContents/EditTrackContentInput.cs similarity index 97% rename from src/TrackCenter.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs rename to src/TrackCenter.Application/Dtos/TrackContents/EditTrackContentInput.cs index e84e9d32..c7a2b42c 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackContents/EditTrackContentMapInput.cs b/src/TrackCenter.Application/Dtos/TrackContents/EditTrackContentMapInput.cs similarity index 93% rename from src/TrackCenter.Application.Contract/Dtos/TrackContents/EditTrackContentMapInput.cs rename to src/TrackCenter.Application/Dtos/TrackContents/EditTrackContentMapInput.cs index 0ca19d92..6811642f 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackContents/EditTrackContentMapInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetAvailableContentInput.cs b/src/TrackCenter.Application/Dtos/TrackContents/GetAvailableContentInput.cs similarity index 88% rename from src/TrackCenter.Application.Contract/Dtos/TrackContents/GetAvailableContentInput.cs rename to src/TrackCenter.Application/Dtos/TrackContents/GetAvailableContentInput.cs index 21f1d716..b2c8d567 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetAvailableContentInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetAvailableContentOutput.cs b/src/TrackCenter.Application/Dtos/TrackContents/GetAvailableContentOutput.cs similarity index 94% rename from src/TrackCenter.Application.Contract/Dtos/TrackContents/GetAvailableContentOutput.cs rename to src/TrackCenter.Application/Dtos/TrackContents/GetAvailableContentOutput.cs index 6cb7c374..5740e549 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetAvailableContentOutput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetContentDetailInput.cs b/src/TrackCenter.Application/Dtos/TrackContents/GetContentDetailInput.cs similarity index 89% rename from src/TrackCenter.Application.Contract/Dtos/TrackContents/GetContentDetailInput.cs rename to src/TrackCenter.Application/Dtos/TrackContents/GetContentDetailInput.cs index 092ed824..323b72b7 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetContentDetailInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetContentDetailOutput.cs b/src/TrackCenter.Application/Dtos/TrackContents/GetContentDetailOutput.cs similarity index 98% rename from src/TrackCenter.Application.Contract/Dtos/TrackContents/GetContentDetailOutput.cs rename to src/TrackCenter.Application/Dtos/TrackContents/GetContentDetailOutput.cs index ff76fdf7..c715d38f 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetContentDetailOutput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs b/src/TrackCenter.Application/Dtos/TrackContents/GetPageTrackContentInput.cs similarity index 97% rename from src/TrackCenter.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs rename to src/TrackCenter.Application/Dtos/TrackContents/GetPageTrackContentInput.cs index b6edb2a5..fb09fd22 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetTrackContentByCodeInput.cs b/src/TrackCenter.Application/Dtos/TrackContents/GetTrackContentByCodeInput.cs similarity index 79% rename from src/TrackCenter.Application.Contract/Dtos/TrackContents/GetTrackContentByCodeInput.cs rename to src/TrackCenter.Application/Dtos/TrackContents/GetTrackContentByCodeInput.cs index 1f21299f..11378027 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetTrackContentByCodeInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetTrackContentByCodeOutput.cs b/src/TrackCenter.Application/Dtos/TrackContents/GetTrackContentByCodeOutput.cs similarity index 84% rename from src/TrackCenter.Application.Contract/Dtos/TrackContents/GetTrackContentByCodeOutput.cs rename to src/TrackCenter.Application/Dtos/TrackContents/GetTrackContentByCodeOutput.cs index fd7ab1d1..66f3efcb 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetTrackContentByCodeOutput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackContents/TrackContentOutput.cs b/src/TrackCenter.Application/Dtos/TrackContents/TrackContentOutput.cs similarity index 96% rename from src/TrackCenter.Application.Contract/Dtos/TrackContents/TrackContentOutput.cs rename to src/TrackCenter.Application/Dtos/TrackContents/TrackContentOutput.cs index 91935d9f..9f5bbdfd 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackContents/TrackContentOutput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackFlags/EditTrackFlagInput.cs b/src/TrackCenter.Application/Dtos/TrackFlags/EditTrackFlagInput.cs similarity index 94% rename from src/TrackCenter.Application.Contract/Dtos/TrackFlags/EditTrackFlagInput.cs rename to src/TrackCenter.Application/Dtos/TrackFlags/EditTrackFlagInput.cs index 50ed1419..8342227d 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackFlags/EditTrackFlagInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs b/src/TrackCenter.Application/Dtos/TrackFlags/GetTrackFlagListDto.cs similarity index 95% rename from src/TrackCenter.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs rename to src/TrackCenter.Application/Dtos/TrackFlags/GetTrackFlagListDto.cs index 2b4bcdab..a6c6798b 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackNode/TrackNodeInput.cs b/src/TrackCenter.Application/Dtos/TrackNode/TrackNodeInput.cs similarity index 90% rename from src/TrackCenter.Application.Contract/Dtos/TrackNode/TrackNodeInput.cs rename to src/TrackCenter.Application/Dtos/TrackNode/TrackNodeInput.cs index da4e2e94..a96ba372 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackNode/TrackNodeInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackOrder/GetTrackCounterOutput.cs b/src/TrackCenter.Application/Dtos/TrackOrder/GetTrackCounterOutput.cs similarity index 84% rename from src/TrackCenter.Application.Contract/Dtos/TrackOrder/GetTrackCounterOutput.cs rename to src/TrackCenter.Application/Dtos/TrackOrder/GetTrackCounterOutput.cs index 08acddae..30b41294 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackOrder/GetTrackCounterOutput.cs +++ b/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 { diff --git a/src/TrackCenter.Application/Dtos/TrackOrder/TrackPushRecordItem.cs b/src/TrackCenter.Application/Dtos/TrackOrder/TrackPushRecordItem.cs new file mode 100644 index 00000000..0cb19d96 --- /dev/null +++ b/src/TrackCenter.Application/Dtos/TrackOrder/TrackPushRecordItem.cs @@ -0,0 +1,5 @@ +namespace TrackCenter.Application.Dtos.TrackOrder; + +public class TrackPushRecordItem +{ +} diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackOrder/TrackPushRecordOutput.cs b/src/TrackCenter.Application/Dtos/TrackOrder/TrackPushRecordOutput.cs similarity index 98% rename from src/TrackCenter.Application.Contract/Dtos/TrackOrder/TrackPushRecordOutput.cs rename to src/TrackCenter.Application/Dtos/TrackOrder/TrackPushRecordOutput.cs index 03acfb6f..c647881f 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackOrder/TrackPushRecordOutput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs b/src/TrackCenter.Application/Dtos/TrackPull/EditTrackPullConfigInput.cs similarity index 96% rename from src/TrackCenter.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs rename to src/TrackCenter.Application/Dtos/TrackPull/EditTrackPullConfigInput.cs index cd02f169..0aa6f1b7 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs b/src/TrackCenter.Application/Dtos/TrackPull/EditTrackPullContentInput.cs similarity index 94% rename from src/TrackCenter.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs rename to src/TrackCenter.Application/Dtos/TrackPull/EditTrackPullContentInput.cs index 80d6e4ee..7ba52e3c 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullContentConfigDto.cs b/src/TrackCenter.Application/Dtos/TrackPull/TrackPullContentConfigDto.cs similarity index 93% rename from src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullContentConfigDto.cs rename to src/TrackCenter.Application/Dtos/TrackPull/TrackPullContentConfigDto.cs index 2d2e1f7c..9ec09ec4 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullContentConfigDto.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs b/src/TrackCenter.Application/Dtos/TrackPull/TrackPullParamConfigDto.cs similarity index 95% rename from src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs rename to src/TrackCenter.Application/Dtos/TrackPull/TrackPullParamConfigDto.cs index d5cecaf9..c9d45d68 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullParamWithContentConfigDto.cs b/src/TrackCenter.Application/Dtos/TrackPull/TrackPullParamWithContentConfigDto.cs similarity index 77% rename from src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullParamWithContentConfigDto.cs rename to src/TrackCenter.Application/Dtos/TrackPull/TrackPullParamWithContentConfigDto.cs index 9fc3a8fc..1c292901 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullParamWithContentConfigDto.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullPayload.cs b/src/TrackCenter.Application/Dtos/TrackPull/TrackPullPayload.cs similarity index 70% rename from src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullPayload.cs rename to src/TrackCenter.Application/Dtos/TrackPull/TrackPullPayload.cs index ba6cd29d..c48bdded 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullPayload.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs b/src/TrackCenter.Application/Dtos/TrackPull/TrackRefreshAttach.cs similarity index 91% rename from src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs rename to src/TrackCenter.Application/Dtos/TrackPull/TrackRefreshAttach.cs index d0971c9b..20a6b4cd 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackRefreshContext.cs b/src/TrackCenter.Application/Dtos/TrackPull/TrackRefreshContext.cs similarity index 91% rename from src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackRefreshContext.cs rename to src/TrackCenter.Application/Dtos/TrackPull/TrackRefreshContext.cs index d245b2ef..10e840e0 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackRefreshContext.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs b/src/TrackCenter.Application/Dtos/TrackPush/EditTrackPushConfigInput.cs similarity index 95% rename from src/TrackCenter.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs rename to src/TrackCenter.Application/Dtos/TrackPush/EditTrackPushConfigInput.cs index 3b379d2d..8003c76a 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackPush/EditTrackPushContentInput.cs b/src/TrackCenter.Application/Dtos/TrackPush/EditTrackPushContentInput.cs similarity index 96% rename from src/TrackCenter.Application.Contract/Dtos/TrackPush/EditTrackPushContentInput.cs rename to src/TrackCenter.Application/Dtos/TrackPush/EditTrackPushContentInput.cs index a2546e27..40446b1e 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackPush/EditTrackPushContentInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackPush/QueryPushRecordInput.cs b/src/TrackCenter.Application/Dtos/TrackPush/QueryPushRecordInput.cs similarity index 95% rename from src/TrackCenter.Application.Contract/Dtos/TrackPush/QueryPushRecordInput.cs rename to src/TrackCenter.Application/Dtos/TrackPush/QueryPushRecordInput.cs index 69127bf2..402464c6 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackPush/QueryPushRecordInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackPush/SortTrackPushContentInput.cs b/src/TrackCenter.Application/Dtos/TrackPush/SortTrackPushContentInput.cs similarity index 61% rename from src/TrackCenter.Application.Contract/Dtos/TrackPush/SortTrackPushContentInput.cs rename to src/TrackCenter.Application/Dtos/TrackPush/SortTrackPushContentInput.cs index 6fa38469..f8d35e85 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackPush/SortTrackPushContentInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushAfterUpdateOrderDto.cs b/src/TrackCenter.Application/Dtos/TrackPush/TrackPushAfterUpdateOrderDto.cs similarity index 90% rename from src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushAfterUpdateOrderDto.cs rename to src/TrackCenter.Application/Dtos/TrackPush/TrackPushAfterUpdateOrderDto.cs index 80f0e2c0..3f137911 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushAfterUpdateOrderDto.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushConfigTagDto.cs b/src/TrackCenter.Application/Dtos/TrackPush/TrackPushConfigTagDto.cs similarity index 80% rename from src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushConfigTagDto.cs rename to src/TrackCenter.Application/Dtos/TrackPush/TrackPushConfigTagDto.cs index d5f3f205..c1155803 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushConfigTagDto.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushContentConfigDto.cs b/src/TrackCenter.Application/Dtos/TrackPush/TrackPushContentConfigDto.cs similarity index 97% rename from src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushContentConfigDto.cs rename to src/TrackCenter.Application/Dtos/TrackPush/TrackPushContentConfigDto.cs index beb1054c..f2fec772 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushContentConfigDto.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushContentDto.cs b/src/TrackCenter.Application/Dtos/TrackPush/TrackPushContentDto.cs similarity index 92% rename from src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushContentDto.cs rename to src/TrackCenter.Application/Dtos/TrackPush/TrackPushContentDto.cs index e7af0074..2893226e 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushContentDto.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushInput.cs b/src/TrackCenter.Application/Dtos/TrackPush/TrackPushInput.cs similarity index 86% rename from src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushInput.cs rename to src/TrackCenter.Application/Dtos/TrackPush/TrackPushInput.cs index e8d00217..404f135f 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushRecordDto.cs b/src/TrackCenter.Application/Dtos/TrackPush/TrackPushRecordDto.cs similarity index 97% rename from src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushRecordDto.cs rename to src/TrackCenter.Application/Dtos/TrackPush/TrackPushRecordDto.cs index 8201eeba..2b2681f8 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushRecordDto.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs b/src/TrackCenter.Application/Dtos/TrackStatus/EditTrackStatusInput.cs similarity index 93% rename from src/TrackCenter.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs rename to src/TrackCenter.Application/Dtos/TrackStatus/EditTrackStatusInput.cs index dab95a05..2e344962 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs b/src/TrackCenter.Application/Dtos/TrackStatus/GetTrackStatusDetailDto.cs similarity index 94% rename from src/TrackCenter.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs rename to src/TrackCenter.Application/Dtos/TrackStatus/GetTrackStatusDetailDto.cs index 2c694177..1acb6cfa 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs b/src/TrackCenter.Application/Dtos/TrackStatus/GetTrackStatusListDto.cs similarity index 96% rename from src/TrackCenter.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs rename to src/TrackCenter.Application/Dtos/TrackStatus/GetTrackStatusListDto.cs index 78d54dd7..dca3605b 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs +++ b/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 { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackStatus/QueryTrackNodeRequest.cs b/src/TrackCenter.Application/Dtos/TrackStatus/QueryTrackNodeRequest.cs similarity index 81% rename from src/TrackCenter.Application.Contract/Dtos/TrackStatus/QueryTrackNodeRequest.cs rename to src/TrackCenter.Application/Dtos/TrackStatus/QueryTrackNodeRequest.cs index f5810204..73c86155 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackStatus/QueryTrackNodeRequest.cs +++ b/src/TrackCenter.Application/Dtos/TrackStatus/QueryTrackNodeRequest.cs @@ -1,4 +1,4 @@ -namespace TrackCenter.Application.Contract.Dtos.TrackStatus; +namespace TrackCenter.Application.Dtos.TrackStatus; public class QueryTrackNodeRequest : PageInfoInput { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs b/src/TrackCenter.Application/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs similarity index 87% rename from src/TrackCenter.Application.Contract/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs rename to src/TrackCenter.Application/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs index 6a142f62..ee716a1f 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs +++ b/src/TrackCenter.Application/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs @@ -1,4 +1,4 @@ -namespace TrackCenter.Application.Contract.Dtos.TrackTemplates; +namespace TrackCenter.Application.Dtos.TrackTemplates; /// public class EditTrackTemplateContentInput diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs b/src/TrackCenter.Application/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs similarity index 90% rename from src/TrackCenter.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs rename to src/TrackCenter.Application/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs index 4f5cf413..308573f7 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs +++ b/src/TrackCenter.Application/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs @@ -1,4 +1,4 @@ -namespace TrackCenter.Application.Contract.Dtos.TrackTemplates; +namespace TrackCenter.Application.Dtos.TrackTemplates; /// /// 获取轨迹模版分页输入 diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs b/src/TrackCenter.Application/Dtos/TrackTemplates/GetTrackDetailDto.cs similarity index 96% rename from src/TrackCenter.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs rename to src/TrackCenter.Application/Dtos/TrackTemplates/GetTrackDetailDto.cs index 1e342059..d0d97bdd 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs +++ b/src/TrackCenter.Application/Dtos/TrackTemplates/GetTrackDetailDto.cs @@ -1,4 +1,4 @@ -namespace TrackCenter.Application.Contract.Dtos.TrackTemplates; +namespace TrackCenter.Application.Dtos.TrackTemplates; /// /// 获取轨迹模版详情 diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs b/src/TrackCenter.Application/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs similarity index 60% rename from src/TrackCenter.Application.Contract/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs rename to src/TrackCenter.Application/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs index 80d15c88..4228bb5e 100644 --- a/src/TrackCenter.Application.Contract/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs +++ b/src/TrackCenter.Application/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs @@ -1,6 +1,4 @@ -using SJZY.Expand.ABP.Core.PublicMethords; - -namespace TrackCenter.Application.Contract.Dtos.TrackTemplates; +namespace TrackCenter.Application.Dtos.TrackTemplates; public class SortTrackTemplateContentInput { diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs b/src/TrackCenter.Application/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs similarity index 94% rename from src/TrackCenter.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs rename to src/TrackCenter.Application/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs index 4512a39a..51119adb 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs +++ b/src/TrackCenter.Application/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs @@ -1,6 +1,6 @@ -using TrackCenter.Application.Contract.Dtos.Warning.Return; +using TrackCenter.Application.Dtos.Warning.Return; -namespace TrackCenter.Application.Contract.Dtos.Warning.Complete; +namespace TrackCenter.Application.Dtos.Warning.Complete; /// /// 完整预警明细 diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/Complete/CompleteWarningRuleItemDto.cs b/src/TrackCenter.Application/Dtos/Warning/Complete/CompleteWarningRuleItemDto.cs similarity index 92% rename from src/TrackCenter.Application.Contract/Dtos/Warning/Complete/CompleteWarningRuleItemDto.cs rename to src/TrackCenter.Application/Dtos/Warning/Complete/CompleteWarningRuleItemDto.cs index c96f2566..259b8bac 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/Complete/CompleteWarningRuleItemDto.cs +++ b/src/TrackCenter.Application/Dtos/Warning/Complete/CompleteWarningRuleItemDto.cs @@ -1,6 +1,6 @@ -using TrackCenter.Application.Contract.Dtos.Warning.Return; +using TrackCenter.Application.Dtos.Warning.Return; -namespace TrackCenter.Application.Contract.Dtos.Warning.Complete; +namespace TrackCenter.Application.Dtos.Warning.Complete; /// /// 完整预警规则配置条目 diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/Complete/EditCompleteWarningRuleItemInput.cs b/src/TrackCenter.Application/Dtos/Warning/Complete/EditCompleteWarningRuleItemInput.cs similarity index 91% rename from src/TrackCenter.Application.Contract/Dtos/Warning/Complete/EditCompleteWarningRuleItemInput.cs rename to src/TrackCenter.Application/Dtos/Warning/Complete/EditCompleteWarningRuleItemInput.cs index cab9dfb0..fa334f8e 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/Complete/EditCompleteWarningRuleItemInput.cs +++ b/src/TrackCenter.Application/Dtos/Warning/Complete/EditCompleteWarningRuleItemInput.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; -using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Dtos.Warning.DataAnnotations; -namespace TrackCenter.Application.Contract.Dtos.Warning.Complete; +namespace TrackCenter.Application.Dtos.Warning.Complete; /// /// 编辑完整预警配置 diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/Complete/GetCompleteWarningRuleItemInput.cs b/src/TrackCenter.Application/Dtos/Warning/Complete/GetCompleteWarningRuleItemInput.cs similarity index 63% rename from src/TrackCenter.Application.Contract/Dtos/Warning/Complete/GetCompleteWarningRuleItemInput.cs rename to src/TrackCenter.Application/Dtos/Warning/Complete/GetCompleteWarningRuleItemInput.cs index e2966542..4510e509 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/Complete/GetCompleteWarningRuleItemInput.cs +++ b/src/TrackCenter.Application/Dtos/Warning/Complete/GetCompleteWarningRuleItemInput.cs @@ -1,6 +1,6 @@ -using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Dtos.Warning.DataAnnotations; -namespace TrackCenter.Application.Contract.Dtos.Warning.Complete; +namespace TrackCenter.Application.Dtos.Warning.Complete; /// /// 获取完整预警规则条目列表 diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs b/src/TrackCenter.Application/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs similarity index 95% rename from src/TrackCenter.Application.Contract/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs rename to src/TrackCenter.Application/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs index 5f33f57f..58468aeb 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs +++ b/src/TrackCenter.Application/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace TrackCenter.Application.Contract.Dtos.Warning.Complete; +namespace TrackCenter.Application.Dtos.Warning.Complete; /// /// 分页获取完成预警详情 diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/DataAnnotations/IdRequiredAttribute.cs b/src/TrackCenter.Application/Dtos/Warning/DataAnnotations/IdRequiredAttribute.cs similarity index 85% rename from src/TrackCenter.Application.Contract/Dtos/Warning/DataAnnotations/IdRequiredAttribute.cs rename to src/TrackCenter.Application/Dtos/Warning/DataAnnotations/IdRequiredAttribute.cs index a2537004..62face0b 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/DataAnnotations/IdRequiredAttribute.cs +++ b/src/TrackCenter.Application/Dtos/Warning/DataAnnotations/IdRequiredAttribute.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; +namespace TrackCenter.Application.Dtos.Warning.DataAnnotations; /// /// 要求id存在并且大于0 diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/GetWarningRuleInput.cs b/src/TrackCenter.Application/Dtos/Warning/GetWarningRuleInput.cs similarity index 92% rename from src/TrackCenter.Application.Contract/Dtos/Warning/GetWarningRuleInput.cs rename to src/TrackCenter.Application/Dtos/Warning/GetWarningRuleInput.cs index 2b160f56..7104f4c2 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/GetWarningRuleInput.cs +++ b/src/TrackCenter.Application/Dtos/Warning/GetWarningRuleInput.cs @@ -1,4 +1,4 @@ -namespace TrackCenter.Application.Contract.Dtos.Warning; +namespace TrackCenter.Application.Dtos.Warning; /// /// 获取预警规则主体 diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/NotifyUserDto.cs b/src/TrackCenter.Application/Dtos/Warning/NotifyUserDto.cs similarity index 68% rename from src/TrackCenter.Application.Contract/Dtos/Warning/NotifyUserDto.cs rename to src/TrackCenter.Application/Dtos/Warning/NotifyUserDto.cs index 885defab..aee75155 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/NotifyUserDto.cs +++ b/src/TrackCenter.Application/Dtos/Warning/NotifyUserDto.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; -using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Dtos.Warning.DataAnnotations; -namespace TrackCenter.Application.Contract.Dtos.Warning; +namespace TrackCenter.Application.Dtos.Warning; public sealed class NotifyUserDto { diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/Return/EditReturnWarningRuleItemInput.cs b/src/TrackCenter.Application/Dtos/Warning/Return/EditReturnWarningRuleItemInput.cs similarity index 90% rename from src/TrackCenter.Application.Contract/Dtos/Warning/Return/EditReturnWarningRuleItemInput.cs rename to src/TrackCenter.Application/Dtos/Warning/Return/EditReturnWarningRuleItemInput.cs index d0027d03..51b2c804 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/Return/EditReturnWarningRuleItemInput.cs +++ b/src/TrackCenter.Application/Dtos/Warning/Return/EditReturnWarningRuleItemInput.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; -using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Dtos.Warning.DataAnnotations; -namespace TrackCenter.Application.Contract.Dtos.Warning.Return; +namespace TrackCenter.Application.Dtos.Warning.Return; /// /// 编辑回传时效配置 diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs b/src/TrackCenter.Application/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs similarity index 97% rename from src/TrackCenter.Application.Contract/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs rename to src/TrackCenter.Application/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs index 4e952735..f9006675 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs +++ b/src/TrackCenter.Application/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace TrackCenter.Application.Contract.Dtos.Warning.Return; +namespace TrackCenter.Application.Dtos.Warning.Return; /// /// 分页获取回传预警明细输入 diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/Return/GetReturnMessageRecordInput.cs b/src/TrackCenter.Application/Dtos/Warning/Return/GetReturnMessageRecordInput.cs similarity index 81% rename from src/TrackCenter.Application.Contract/Dtos/Warning/Return/GetReturnMessageRecordInput.cs rename to src/TrackCenter.Application/Dtos/Warning/Return/GetReturnMessageRecordInput.cs index c4ae0df7..165bfaac 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/Return/GetReturnMessageRecordInput.cs +++ b/src/TrackCenter.Application/Dtos/Warning/Return/GetReturnMessageRecordInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace TrackCenter.Application.Contract.Dtos.Warning.Return; +namespace TrackCenter.Application.Dtos.Warning.Return; /// /// 获取回传报文日志 diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/Return/GetReturnWarningRuleItemInput.cs b/src/TrackCenter.Application/Dtos/Warning/Return/GetReturnWarningRuleItemInput.cs similarity index 63% rename from src/TrackCenter.Application.Contract/Dtos/Warning/Return/GetReturnWarningRuleItemInput.cs rename to src/TrackCenter.Application/Dtos/Warning/Return/GetReturnWarningRuleItemInput.cs index e89209f6..198eb9b5 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/Return/GetReturnWarningRuleItemInput.cs +++ b/src/TrackCenter.Application/Dtos/Warning/Return/GetReturnWarningRuleItemInput.cs @@ -1,6 +1,6 @@ -using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Dtos.Warning.DataAnnotations; -namespace TrackCenter.Application.Contract.Dtos.Warning.Return; +namespace TrackCenter.Application.Dtos.Warning.Return; /// /// 获取回传预警规则项目列表 diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnMessageRecordDto.cs b/src/TrackCenter.Application/Dtos/Warning/Return/ReturnMessageRecordDto.cs similarity index 92% rename from src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnMessageRecordDto.cs rename to src/TrackCenter.Application/Dtos/Warning/Return/ReturnMessageRecordDto.cs index 2e6a444b..a9478558 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnMessageRecordDto.cs +++ b/src/TrackCenter.Application/Dtos/Warning/Return/ReturnMessageRecordDto.cs @@ -1,4 +1,4 @@ -namespace TrackCenter.Application.Contract.Dtos.Warning.Return; +namespace TrackCenter.Application.Dtos.Warning.Return; /// /// 回传报文日志 diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnPushInput.cs b/src/TrackCenter.Application/Dtos/Warning/Return/ReturnPushInput.cs similarity index 79% rename from src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnPushInput.cs rename to src/TrackCenter.Application/Dtos/Warning/Return/ReturnPushInput.cs index 429399ee..b959495b 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnPushInput.cs +++ b/src/TrackCenter.Application/Dtos/Warning/Return/ReturnPushInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace TrackCenter.Application.Contract.Dtos.Warning.Return; +namespace TrackCenter.Application.Dtos.Warning.Return; public sealed class ReturnPushInput { diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs b/src/TrackCenter.Application/Dtos/Warning/Return/ReturnWarningDetailsDto.cs similarity index 98% rename from src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs rename to src/TrackCenter.Application/Dtos/Warning/Return/ReturnWarningDetailsDto.cs index 6c6c1b1d..6adad30b 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs +++ b/src/TrackCenter.Application/Dtos/Warning/Return/ReturnWarningDetailsDto.cs @@ -1,4 +1,4 @@ -namespace TrackCenter.Application.Contract.Dtos.Warning.Return; +namespace TrackCenter.Application.Dtos.Warning.Return; /// /// 回传预警明细 diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnWarningRuleItemDto.cs b/src/TrackCenter.Application/Dtos/Warning/Return/ReturnWarningRuleItemDto.cs similarity index 91% rename from src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnWarningRuleItemDto.cs rename to src/TrackCenter.Application/Dtos/Warning/Return/ReturnWarningRuleItemDto.cs index 2d601f4b..976b67e4 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnWarningRuleItemDto.cs +++ b/src/TrackCenter.Application/Dtos/Warning/Return/ReturnWarningRuleItemDto.cs @@ -1,4 +1,4 @@ -namespace TrackCenter.Application.Contract.Dtos.Warning.Return; +namespace TrackCenter.Application.Dtos.Warning.Return; public class ReturnWarningRuleItemDto { diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/DeleteTransportWarningSceneInput.cs b/src/TrackCenter.Application/Dtos/Warning/Transport/DeleteTransportWarningSceneInput.cs similarity index 68% rename from src/TrackCenter.Application.Contract/Dtos/Warning/Transport/DeleteTransportWarningSceneInput.cs rename to src/TrackCenter.Application/Dtos/Warning/Transport/DeleteTransportWarningSceneInput.cs index e2ce7fda..7e474675 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/DeleteTransportWarningSceneInput.cs +++ b/src/TrackCenter.Application/Dtos/Warning/Transport/DeleteTransportWarningSceneInput.cs @@ -1,6 +1,6 @@ -using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Dtos.Warning.DataAnnotations; -namespace TrackCenter.Application.Contract.Dtos.Warning.Transport; +namespace TrackCenter.Application.Dtos.Warning.Transport; public sealed class DeleteTransportWarningSceneInput { diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/EditTransportWarningSceneRuleItemInput.cs b/src/TrackCenter.Application/Dtos/Warning/Transport/EditTransportWarningSceneRuleItemInput.cs similarity index 92% rename from src/TrackCenter.Application.Contract/Dtos/Warning/Transport/EditTransportWarningSceneRuleItemInput.cs rename to src/TrackCenter.Application/Dtos/Warning/Transport/EditTransportWarningSceneRuleItemInput.cs index 9f69e379..04687cbf 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/EditTransportWarningSceneRuleItemInput.cs +++ b/src/TrackCenter.Application/Dtos/Warning/Transport/EditTransportWarningSceneRuleItemInput.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; -using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Dtos.Warning.DataAnnotations; -namespace TrackCenter.Application.Contract.Dtos.Warning.Transport; +namespace TrackCenter.Application.Dtos.Warning.Transport; public class EditTransportWarningSceneRuleItemInput { diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs b/src/TrackCenter.Application/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs similarity index 94% rename from src/TrackCenter.Application.Contract/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs rename to src/TrackCenter.Application/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs index 463cf931..e04ec6b9 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs +++ b/src/TrackCenter.Application/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace TrackCenter.Application.Contract.Dtos.Warning.Transport; +namespace TrackCenter.Application.Dtos.Warning.Transport; /// /// 分页获取运输预警明细 diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneInput.cs b/src/TrackCenter.Application/Dtos/Warning/Transport/GetTransportWarningSceneInput.cs similarity index 61% rename from src/TrackCenter.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneInput.cs rename to src/TrackCenter.Application/Dtos/Warning/Transport/GetTransportWarningSceneInput.cs index 10eefd9a..07956dc6 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneInput.cs +++ b/src/TrackCenter.Application/Dtos/Warning/Transport/GetTransportWarningSceneInput.cs @@ -1,6 +1,6 @@ -using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Dtos.Warning.DataAnnotations; -namespace TrackCenter.Application.Contract.Dtos.Warning.Transport; +namespace TrackCenter.Application.Dtos.Warning.Transport; /// /// 获取运输时效预警规则场景 diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneRuleItemInput.cs b/src/TrackCenter.Application/Dtos/Warning/Transport/GetTransportWarningSceneRuleItemInput.cs similarity index 71% rename from src/TrackCenter.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneRuleItemInput.cs rename to src/TrackCenter.Application/Dtos/Warning/Transport/GetTransportWarningSceneRuleItemInput.cs index 99e4f921..637fe86c 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneRuleItemInput.cs +++ b/src/TrackCenter.Application/Dtos/Warning/Transport/GetTransportWarningSceneRuleItemInput.cs @@ -1,6 +1,6 @@ -using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Dtos.Warning.DataAnnotations; -namespace TrackCenter.Application.Contract.Dtos.Warning.Transport; +namespace TrackCenter.Application.Dtos.Warning.Transport; /// /// 获取运输时效预警场景规则条目列表 diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/TransportWarningDetailsDto.cs b/src/TrackCenter.Application/Dtos/Warning/Transport/TransportWarningDetailsDto.cs similarity index 98% rename from src/TrackCenter.Application.Contract/Dtos/Warning/Transport/TransportWarningDetailsDto.cs rename to src/TrackCenter.Application/Dtos/Warning/Transport/TransportWarningDetailsDto.cs index 466a2efe..969703a2 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/TransportWarningDetailsDto.cs +++ b/src/TrackCenter.Application/Dtos/Warning/Transport/TransportWarningDetailsDto.cs @@ -1,4 +1,4 @@ -namespace TrackCenter.Application.Contract.Dtos.Warning.Transport; +namespace TrackCenter.Application.Dtos.Warning.Transport; /// /// 运输时效预警明细 diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneDto.cs b/src/TrackCenter.Application/Dtos/Warning/Transport/TransportWarningSceneDto.cs similarity index 94% rename from src/TrackCenter.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneDto.cs rename to src/TrackCenter.Application/Dtos/Warning/Transport/TransportWarningSceneDto.cs index f4c0859d..dcaffc58 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneDto.cs +++ b/src/TrackCenter.Application/Dtos/Warning/Transport/TransportWarningSceneDto.cs @@ -1,4 +1,4 @@ -namespace TrackCenter.Application.Contract.Dtos.Warning.Transport; +namespace TrackCenter.Application.Dtos.Warning.Transport; /// /// 预警规则场景 diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneRuleItemDto.cs b/src/TrackCenter.Application/Dtos/Warning/Transport/TransportWarningSceneRuleItemDto.cs similarity index 94% rename from src/TrackCenter.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneRuleItemDto.cs rename to src/TrackCenter.Application/Dtos/Warning/Transport/TransportWarningSceneRuleItemDto.cs index 75bf88ba..60279822 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneRuleItemDto.cs +++ b/src/TrackCenter.Application/Dtos/Warning/Transport/TransportWarningSceneRuleItemDto.cs @@ -1,4 +1,4 @@ -namespace TrackCenter.Application.Contract.Dtos.Warning.Transport; +namespace TrackCenter.Application.Dtos.Warning.Transport; /// /// 运输时效场景规则项目 diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/UpsertTransportWarningSceneInput.cs b/src/TrackCenter.Application/Dtos/Warning/Transport/UpsertTransportWarningSceneInput.cs similarity index 87% rename from src/TrackCenter.Application.Contract/Dtos/Warning/Transport/UpsertTransportWarningSceneInput.cs rename to src/TrackCenter.Application/Dtos/Warning/Transport/UpsertTransportWarningSceneInput.cs index ecf5ab67..78426db4 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/UpsertTransportWarningSceneInput.cs +++ b/src/TrackCenter.Application/Dtos/Warning/Transport/UpsertTransportWarningSceneInput.cs @@ -1,6 +1,6 @@ -using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Dtos.Warning.DataAnnotations; -namespace TrackCenter.Application.Contract.Dtos.Warning.Transport; +namespace TrackCenter.Application.Dtos.Warning.Transport; public sealed class UpsertTransportWarningSceneInput { diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/UpdateEnabledStatusInput.cs b/src/TrackCenter.Application/Dtos/Warning/UpdateEnabledStatusInput.cs similarity index 82% rename from src/TrackCenter.Application.Contract/Dtos/Warning/UpdateEnabledStatusInput.cs rename to src/TrackCenter.Application/Dtos/Warning/UpdateEnabledStatusInput.cs index 426952cb..cda55b58 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/UpdateEnabledStatusInput.cs +++ b/src/TrackCenter.Application/Dtos/Warning/UpdateEnabledStatusInput.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; -using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Dtos.Warning.DataAnnotations; -namespace TrackCenter.Application.Contract.Dtos.Warning; +namespace TrackCenter.Application.Dtos.Warning; public class UpdateEnabledStatusInput { diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/UpsertWarningRuleInput.cs b/src/TrackCenter.Application/Dtos/Warning/UpsertWarningRuleInput.cs similarity index 88% rename from src/TrackCenter.Application.Contract/Dtos/Warning/UpsertWarningRuleInput.cs rename to src/TrackCenter.Application/Dtos/Warning/UpsertWarningRuleInput.cs index cca63c16..7ce8a62a 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/UpsertWarningRuleInput.cs +++ b/src/TrackCenter.Application/Dtos/Warning/UpsertWarningRuleInput.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; -using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Dtos.Warning.DataAnnotations; -namespace TrackCenter.Application.Contract.Dtos.Warning; +namespace TrackCenter.Application.Dtos.Warning; /// /// 更新或者新增预警规则主体 diff --git a/src/TrackCenter.Application.Contract/Dtos/Warning/WarningRuleDto.cs b/src/TrackCenter.Application/Dtos/Warning/WarningRuleDto.cs similarity index 95% rename from src/TrackCenter.Application.Contract/Dtos/Warning/WarningRuleDto.cs rename to src/TrackCenter.Application/Dtos/Warning/WarningRuleDto.cs index dda57f4f..3a46430e 100644 --- a/src/TrackCenter.Application.Contract/Dtos/Warning/WarningRuleDto.cs +++ b/src/TrackCenter.Application/Dtos/Warning/WarningRuleDto.cs @@ -1,4 +1,4 @@ -namespace TrackCenter.Application.Contract.Dtos.Warning; +namespace TrackCenter.Application.Dtos.Warning; /// /// 预警规则主体 diff --git a/src/TrackCenter.Application/Events/ClearRulCacheEvent.cs b/src/TrackCenter.Application/Events/ClearRulCacheEvent.cs new file mode 100644 index 00000000..54cb8ac9 --- /dev/null +++ b/src/TrackCenter.Application/Events/ClearRulCacheEvent.cs @@ -0,0 +1,8 @@ +using TrackCenter.Application.Dtos.Forewarning; + +namespace TrackCenter.Application.Events; + +public class ClearRulCacheEvent +{ + public List Items { get; set; } +} diff --git a/src/TrackCenter.Application.Contract/Events/ModifyWarningEvent.cs b/src/TrackCenter.Application/Events/ModifyWarningEvent.cs similarity index 88% rename from src/TrackCenter.Application.Contract/Events/ModifyWarningEvent.cs rename to src/TrackCenter.Application/Events/ModifyWarningEvent.cs index 05ee0f1a..007b8b72 100644 --- a/src/TrackCenter.Application.Contract/Events/ModifyWarningEvent.cs +++ b/src/TrackCenter.Application/Events/ModifyWarningEvent.cs @@ -1,4 +1,4 @@ -namespace TrackCenter.Application.Contract.Events; +namespace TrackCenter.Application.Events; /// /// redis 的发布订阅事件 diff --git a/src/TrackCenter.Application.Contract/Events/OrderIdentifier.cs b/src/TrackCenter.Application/Events/OrderIdentifier.cs similarity index 86% rename from src/TrackCenter.Application.Contract/Events/OrderIdentifier.cs rename to src/TrackCenter.Application/Events/OrderIdentifier.cs index 24b77c10..c44f085c 100644 --- a/src/TrackCenter.Application.Contract/Events/OrderIdentifier.cs +++ b/src/TrackCenter.Application/Events/OrderIdentifier.cs @@ -1,4 +1,4 @@ -namespace TrackCenter.Application.Contract.Events; +namespace TrackCenter.Application.Events; public struct OrderIdentifier { diff --git a/src/TrackCenter.Application.Contract/Events/PushWarningEvent.cs b/src/TrackCenter.Application/Events/PushWarningEvent.cs similarity index 58% rename from src/TrackCenter.Application.Contract/Events/PushWarningEvent.cs rename to src/TrackCenter.Application/Events/PushWarningEvent.cs index 48f2259a..658a3d13 100644 --- a/src/TrackCenter.Application.Contract/Events/PushWarningEvent.cs +++ b/src/TrackCenter.Application/Events/PushWarningEvent.cs @@ -1,4 +1,4 @@ -namespace TrackCenter.Application.Contract.Events; +namespace TrackCenter.Application.Events; public class PushWarningEvent { diff --git a/src/TrackCenter.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs b/src/TrackCenter.Application/Events/TrackChangeAfterUpdateOrderEvent.cs similarity index 96% rename from src/TrackCenter.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs rename to src/TrackCenter.Application/Events/TrackChangeAfterUpdateOrderEvent.cs index 976e71e0..5259578d 100644 --- a/src/TrackCenter.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs +++ b/src/TrackCenter.Application/Events/TrackChangeAfterUpdateOrderEvent.cs @@ -1,4 +1,4 @@ -namespace TrackCenter.Application.Contract.Events; +namespace TrackCenter.Application.Events; public class TrackChangeAfterUpdateOrderEvent { diff --git a/src/TrackCenter.Application.Contract/Events/TrackChangeEto.cs b/src/TrackCenter.Application/Events/TrackChangeEto.cs similarity index 92% rename from src/TrackCenter.Application.Contract/Events/TrackChangeEto.cs rename to src/TrackCenter.Application/Events/TrackChangeEto.cs index b7f04897..0e439e03 100644 --- a/src/TrackCenter.Application.Contract/Events/TrackChangeEto.cs +++ b/src/TrackCenter.Application/Events/TrackChangeEto.cs @@ -1,6 +1,6 @@ -using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Dtos.ProvideServices; -namespace TrackCenter.Application.Contract.Events; +namespace TrackCenter.Application.Events; public class TrackChangeEto { @@ -69,12 +69,6 @@ public class TrackChangeEto /// public float TrackTimeZone { get; set; } - /// - /// 客户是否可见 - /// - [Obsolete("废弃的，请使用IsExternal")] - public bool IsVisibility { get; set; } - /// /// 是否对外 /// diff --git a/src/TrackCenter.Application.Contract/Events/TrackDeleteEvent.cs b/src/TrackCenter.Application/Events/TrackDeleteEvent.cs similarity index 89% rename from src/TrackCenter.Application.Contract/Events/TrackDeleteEvent.cs rename to src/TrackCenter.Application/Events/TrackDeleteEvent.cs index 7d6a47cb..fa0c5c0b 100644 --- a/src/TrackCenter.Application.Contract/Events/TrackDeleteEvent.cs +++ b/src/TrackCenter.Application/Events/TrackDeleteEvent.cs @@ -1,6 +1,6 @@ -using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Dtos.ProvideServices; -namespace TrackCenter.Application.Contract.Events; +namespace TrackCenter.Application.Events; public class TrackDeleteEvent { @@ -45,9 +45,9 @@ public class TrackDeleteEvent public string? OperationMan { get; set; } /// - /// 操作人姓名 + /// 操作人id /// - public int OperationManId { get; set; } + public Guid OperationManId { get; set; } /// /// 已经处理过的订单 diff --git a/src/TrackCenter.Application.Contract/Events/TrackPushCompletedEvent.cs b/src/TrackCenter.Application/Events/TrackPushCompletedEvent.cs similarity index 97% rename from src/TrackCenter.Application.Contract/Events/TrackPushCompletedEvent.cs rename to src/TrackCenter.Application/Events/TrackPushCompletedEvent.cs index e4972edb..602dd3d6 100644 --- a/src/TrackCenter.Application.Contract/Events/TrackPushCompletedEvent.cs +++ b/src/TrackCenter.Application/Events/TrackPushCompletedEvent.cs @@ -1,4 +1,4 @@ -namespace TrackCenter.Application.Contract.Events; +namespace TrackCenter.Application.Events; /// /// 轨迹推送广播模型 diff --git a/src/TrackCenter.Application.Contract/Events/TrackPushEvent.cs b/src/TrackCenter.Application/Events/TrackPushEvent.cs similarity index 97% rename from src/TrackCenter.Application.Contract/Events/TrackPushEvent.cs rename to src/TrackCenter.Application/Events/TrackPushEvent.cs index 2c7d631a..006a3e26 100644 --- a/src/TrackCenter.Application.Contract/Events/TrackPushEvent.cs +++ b/src/TrackCenter.Application/Events/TrackPushEvent.cs @@ -1,4 +1,4 @@ -namespace TrackCenter.Application.Contract.Events; +namespace TrackCenter.Application.Events; /// /// 轨迹推送事件 diff --git a/src/TrackCenter.Application.Contract/Events/TrackRefreshStruct.cs b/src/TrackCenter.Application/Events/TrackRefreshStruct.cs similarity index 89% rename from src/TrackCenter.Application.Contract/Events/TrackRefreshStruct.cs rename to src/TrackCenter.Application/Events/TrackRefreshStruct.cs index ff4d2c06..add334e5 100644 --- a/src/TrackCenter.Application.Contract/Events/TrackRefreshStruct.cs +++ b/src/TrackCenter.Application/Events/TrackRefreshStruct.cs @@ -1,4 +1,4 @@ -namespace TrackCenter.Application.Contract.Events; +namespace TrackCenter.Application.Events; public struct TrackRefreshStruct { diff --git a/src/TrackCenter.Application.Contract/Events/TrackUpsertEvent.cs b/src/TrackCenter.Application/Events/TrackUpsertEvent.cs similarity index 96% rename from src/TrackCenter.Application.Contract/Events/TrackUpsertEvent.cs rename to src/TrackCenter.Application/Events/TrackUpsertEvent.cs index 767b5c37..b599eb22 100644 --- a/src/TrackCenter.Application.Contract/Events/TrackUpsertEvent.cs +++ b/src/TrackCenter.Application/Events/TrackUpsertEvent.cs @@ -1,6 +1,6 @@ -using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Dtos.ProvideServices; -namespace TrackCenter.Application.Contract.Events; +namespace TrackCenter.Application.Events; public class TrackUpsertEvent { @@ -32,7 +32,7 @@ public class TrackUpsertEvent /// /// 操作人id /// - public int OperationManId { get; set; } + public Guid OperationManId { get; set; } /// /// true新增，false更新 diff --git a/src/TrackCenter.Application.Contract/Events/TrackWarningCalcEvent.cs b/src/TrackCenter.Application/Events/TrackWarningCalcEvent.cs similarity index 91% rename from src/TrackCenter.Application.Contract/Events/TrackWarningCalcEvent.cs rename to src/TrackCenter.Application/Events/TrackWarningCalcEvent.cs index 769e40cd..8f6d6203 100644 --- a/src/TrackCenter.Application.Contract/Events/TrackWarningCalcEvent.cs +++ b/src/TrackCenter.Application/Events/TrackWarningCalcEvent.cs @@ -1,4 +1,4 @@ -namespace TrackCenter.Application.Contract.Events; +namespace TrackCenter.Application.Events; public class TrackWarningCalcEvent { diff --git a/src/TrackCenter.Application/GlobalUsings.cs b/src/TrackCenter.Application/GlobalUsings.cs index ab8d3553..2c817b8d 100644 --- a/src/TrackCenter.Application/GlobalUsings.cs +++ b/src/TrackCenter.Application/GlobalUsings.cs @@ -4,6 +4,7 @@ global using Microsoft.Extensions.DependencyInjection; global using SJZY.Expand.ABP.Common.Enums; global using SJZY.Expand.ABP.Core.Common.Dto; global using TrackCenter.Domain; +global using TrackCenter.Domain.Dtos.Common; global using Volo.Abp; global using Volo.Abp.Application.Services; global using Volo.Abp.Validation; diff --git a/src/TrackCenter.Application/Hangfire/WarningNotifyAggregator.cs b/src/TrackCenter.Application/Hangfire/WarningNotifyAggregator.cs index 99b53a97..1b96db07 100644 --- a/src/TrackCenter.Application/Hangfire/WarningNotifyAggregator.cs +++ b/src/TrackCenter.Application/Hangfire/WarningNotifyAggregator.cs @@ -1,5 +1,5 @@ using Microsoft.Extensions.Options; -using TrackCenter.Application.Contract.Dtos.Warning; +using TrackCenter.Application.Dtos.Warning; using TrackCenter.Application.Options; using TrackCenter.Application.Services.Warning.Model; using TrackCenter.Domain.Aggregates.KPIAreaAggregate; diff --git a/src/TrackCenter.Application/Hangfire/WarningTaskService.cs b/src/TrackCenter.Application/Hangfire/WarningTaskService.cs index b217e402..935083ea 100644 --- a/src/TrackCenter.Application/Hangfire/WarningTaskService.cs +++ b/src/TrackCenter.Application/Hangfire/WarningTaskService.cs @@ -3,7 +3,7 @@ using Hangfire; using Microsoft.Extensions.Options; using SJZY.Expand.ABP.Core.Logger; using SJZY.InterfaceRelay.Application.Contracts; -using TrackCenter.Application.Contract.Dtos.TrackPush; +using TrackCenter.Application.Dtos.TrackPush; using TrackCenter.Domain.Aggregates.WarningAggregate; using TrackCenter.Domain.Aggregates.WarningAggregate.Return; using TrackCenter.Domain.Dtos.Warning; diff --git a/src/TrackCenter.Application/Helpers/DateTimeHelper.cs b/src/TrackCenter.Application/Helpers/DateTimeHelper.cs index fa3544ce..329c2a8a 100644 --- a/src/TrackCenter.Application/Helpers/DateTimeHelper.cs +++ b/src/TrackCenter.Application/Helpers/DateTimeHelper.cs @@ -111,6 +111,21 @@ public static class DateTimeHelper return str; } + /// + /// 如果 is true，按照过滤 + /// + /// 被过滤的enumerable + /// 过滤条件 + /// 过滤表达式 + /// + /// + public static IEnumerable WhereIf(this IEnumerable source, bool condition, Func predicate) + { + return condition + ? source.Where(predicate) + : source; + } + /// /// 转换为utc0时区的时间转化进行Compare /// diff --git a/src/TrackCenter.Application/HostServices/RedisHostService.cs b/src/TrackCenter.Application/HostServices/RedisHostService.cs index 76dd62da..c50480f0 100644 --- a/src/TrackCenter.Application/HostServices/RedisHostService.cs +++ b/src/TrackCenter.Application/HostServices/RedisHostService.cs @@ -1,5 +1,5 @@ using Microsoft.Extensions.Hosting; -using TrackCenter.Application.Contract.Events; +using TrackCenter.Application.Events; using TrackCenter.Application.Helpers; using TrackCenter.Repository.Redis; diff --git a/src/TrackCenter.Application/Queries/TimezoneQueries.cs b/src/TrackCenter.Application/Queries/TimezoneQueries.cs index bcad804b..043ded19 100644 --- a/src/TrackCenter.Application/Queries/TimezoneQueries.cs +++ b/src/TrackCenter.Application/Queries/TimezoneQueries.cs @@ -1,7 +1,6 @@ using Fake.DependencyInjection; using Fake.DomainDrivenDesign.Repositories.SqlSugarCore; using SqlSugar; -using TrackCenter.Domain.Dtos.Common; using TrackCenter.Domain.VEntities; using TrackCenter.Repository.Redis; diff --git a/src/TrackCenter.Application/Rabbit/RabbitClient.cs b/src/TrackCenter.Application/Rabbit/RabbitClient.cs index 97cb1469..356e79ef 100644 --- a/src/TrackCenter.Application/Rabbit/RabbitClient.cs +++ b/src/TrackCenter.Application/Rabbit/RabbitClient.cs @@ -57,6 +57,57 @@ public class RabbitClient( channelAccessor.Channel.BasicPublish(exchange, routingKey, props, data); } + public void PublishByConfirmSelect( + string exchange, + string routingKey, + byte[] data, + Action? options = null + ) + { + using var activity = RabbitInstrumentation.ActivitySource.StartActivity("/" + exchange + "/" + routingKey); + activity?.SetTag("kind", "publish"); + using var channelAccessor = channelPool.Acquire(routingKey); + var basicProperties = channelAccessor.Channel.CreateBasicProperties(); + + // 配置属性 + if (options != null) + options(basicProperties); + var model = channelAccessor.Channel; + + // 启用发布确认 + model.ConfirmSelect(); + var readOnlyMemory = (ReadOnlyMemory) data; + model.BasicPublish(exchange, routingKey, basicProperties, readOnlyMemory); + model.WaitForConfirmsOrDie(); + } + + public void PublishByConfirmSelect( + string exchange, + string routingKey, + IEnumerable datas, + Action? options = null + ) + { + using var activity = RabbitInstrumentation.ActivitySource.StartActivity("/" + exchange + "/" + routingKey); + activity?.SetTag("kind", "publish"); + using var channelAccessor = channelPool.Acquire(routingKey); + var basicProperties = channelAccessor.Channel.CreateBasicProperties(); + + // 配置属性 + if (options != null) + options(basicProperties); + var model = channelAccessor.Channel; + + // 启用发布确认 + model.ConfirmSelect(); + foreach (var data in datas) + { + var readOnlyMemory = (ReadOnlyMemory) data; + model.BasicPublish(exchange, routingKey, basicProperties, readOnlyMemory); + } + model.WaitForConfirmsOrDie(); + } + public void UnSubscribe(string queueName, string exchange, string routingKey, bool deleteQueue = false) { logger.LogInformation( diff --git a/src/TrackCenter.Application/Rabbit/TrackPushCompletedEventHandler.cs b/src/TrackCenter.Application/Rabbit/TrackPushCompletedEventHandler.cs index bf7a010b..413e5685 100644 --- a/src/TrackCenter.Application/Rabbit/TrackPushCompletedEventHandler.cs +++ b/src/TrackCenter.Application/Rabbit/TrackPushCompletedEventHandler.cs @@ -3,13 +3,13 @@ using Fake.Application; using Fake.DependencyInjection; using Newtonsoft.Json; using RabbitMQ.Client.Events; -using TrackCenter.Application.Contract.Dtos.TrackPush; -using TrackCenter.Application.Contract.Services; +using TrackCenter.Application.Dtos.TrackPush; +using TrackCenter.Application.Services; using TrackCenter.Application.Helpers; +using TrackCenter.Application.Services.Broadcasting; using TrackCenter.Application.Services.Warning.Handlers; using TrackCenter.Domain.Aggregates.OrderAggregate; using TrackCenter.Domain.Aggregates.TrackPushAggregate; -using TrackCenter.Domain.Dtos.Common; using TrackCenter.Domain.Enums; using TrackCenter.Domain.Extensions; @@ -19,12 +19,12 @@ public class TrackPushCompletedEventHandler : ITransientDependency, IRabbitHandl { private readonly IOrderRepository _orderRepository; private readonly ITrackPushRecordEsRepository _trackPushRecordEsRepository; - private readonly IBroadcastingService _broadcastingService; + private readonly BroadcastingService _broadcastingService; private readonly IReturnWarningHandler _returnWarningHandler; public TrackPushCompletedEventHandler(IOrderRepository orderRepository, ITrackPushRecordEsRepository trackPushRecordEsRepository, - IBroadcastingService broadcastingService, IReturnWarningHandler returnWarningHandler) + BroadcastingService broadcastingService, IReturnWarningHandler returnWarningHandler) { _orderRepository = orderRepository; _trackPushRecordEsRepository = trackPushRecordEsRepository; diff --git a/src/TrackCenter.Application/Rabbit/TrackRefreshEventHandler.cs b/src/TrackCenter.Application/Rabbit/TrackRefreshEventHandler.cs index 553ca583..d00a7783 100644 --- a/src/TrackCenter.Application/Rabbit/TrackRefreshEventHandler.cs +++ b/src/TrackCenter.Application/Rabbit/TrackRefreshEventHandler.cs @@ -7,10 +7,11 @@ using Microsoft.Extensions.Logging; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using RabbitMQ.Client.Events; -using TrackCenter.Application.Contract.Dtos.TrackPull; -using TrackCenter.Application.Contract.Events; -using TrackCenter.Application.Contract.Services; +using TrackCenter.Application.Dtos.TrackPull; +using TrackCenter.Application.Events; +using TrackCenter.Application.Services; using TrackCenter.Application.Helpers; +using TrackCenter.Application.Services.TrackPull; using TrackCenter.Domain.Aggregates.OrderAggregate; using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; using TrackCenter.Domain.Enums; @@ -23,10 +24,10 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler private readonly ILogger _logger; private readonly IOrderRepository _orderRepository; private readonly ITrackDetailsEsRepository _trackDetailsEsRepository; - private readonly ITrackPullCacheService _trackPullCacheService; + private readonly TrackPullCacheService _trackPullCacheService; public TrackRefreshEventHandler(IOrderRepository orderRepository, - ICapPublisher capPublisher, ITrackPullCacheService trackPullCacheService, + ICapPublisher capPublisher, TrackPullCacheService trackPullCacheService, ITrackDetailsEsRepository trackDetailsEsRepository, ILogger logger) { @@ -37,7 +38,7 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler _logger = logger; } - public ConsumeOptions? Options() + public ConsumeOptions Options() { return new ConsumeOptions() { diff --git a/src/TrackCenter.Application/Services/ApplicationServiceBase.cs b/src/TrackCenter.Application/Services/ApplicationServiceBase.cs new file mode 100644 index 00000000..f83dbc06 --- /dev/null +++ b/src/TrackCenter.Application/Services/ApplicationServiceBase.cs @@ -0,0 +1,7 @@ +using Fake.Application; + +namespace TrackCenter.Application.Services; + +public class ApplicationServiceBase: ApplicationService +{ +} diff --git a/src/TrackCenter.Application/Services/Broadcasting/BroadcastingService.cs b/src/TrackCenter.Application/Services/Broadcasting/BroadcastingService.cs index b9582f6e..c4442021 100644 --- a/src/TrackCenter.Application/Services/Broadcasting/BroadcastingService.cs +++ b/src/TrackCenter.Application/Services/Broadcasting/BroadcastingService.cs @@ -1,8 +1,8 @@ using System.Text; -using SJZY.Expand.ABP.Core.PublicMethords; -using TrackCenter.Application.Contract.Dtos.TrackPush; -using TrackCenter.Application.Contract.Events; -using TrackCenter.Application.Contract.Services; +using Fake.DependencyInjection; +using InterfaceForward.Domain.Shared.Helpers; +using TrackCenter.Application.Dtos.TrackPush; +using TrackCenter.Application.Events; using TrackCenter.Application.Rabbit; namespace TrackCenter.Application.Services.Broadcasting; @@ -10,13 +10,13 @@ namespace TrackCenter.Application.Services.Broadcasting; /// /// 广播服务 /// -public class BroadcastingService : IBroadcastingService +public class BroadcastingService : ITransientDependency { - private readonly RabbitClientBusExt _rabbitClientBus; + private readonly RabbitClient _rabbitClient; - public BroadcastingService(RabbitClientBusExt rabbitClientBus) + public BroadcastingService(RabbitClient rabbitClient) { - _rabbitClientBus = rabbitClientBus; + _rabbitClient = rabbitClient; } /// @@ -43,7 +43,6 @@ public class BroadcastingService : IBroadcastingService Files = eto.Files, Remarks = eto.Remarks, Source = eto.Source, - IsVisibility = eto.IsVisibility, IsExternal = eto.IsExternal ?? contentIsExternal, TrackTimeZone = eto.TrackTimeZone, TrackTime = eto.NewTrackTime ?? eto.TrackTime, @@ -65,14 +64,14 @@ public class BroadcastingService : IBroadcastingService else data.Option = 3; - _rabbitClientBus.PublishByConfirmSelect(GlobalConst.TrackChangeExchange, $"TrackChange.{subSystemCode}", + _rabbitClient.Publish(GlobalConst.TrackChangeExchange, $"TrackChange.{subSystemCode}", Encoding.UTF8.GetBytes(data.ToJson()), prop => { prop.Persistent = true; }); } public void TrackChangePublicTopic(TrackChangeEto eto, string subSystemCode) { eto.Option = 2; - _rabbitClientBus.PublishByConfirmSelect(GlobalConst.TrackChangeExchange, $"TrackChange.{subSystemCode}", + _rabbitClient.Publish(GlobalConst.TrackChangeExchange, $"TrackChange.{subSystemCode}", Encoding.UTF8.GetBytes(eto.ToJson()), prop => { prop.Persistent = true; }); } @@ -87,7 +86,7 @@ public class BroadcastingService : IBroadcastingService .Select(TrackPushRecordDtoToEvent) .Select(x => Encoding.UTF8.GetBytes(x.ToJson())); var log = list.First(); - _rabbitClientBus.PublishByConfirmSelect(GlobalConst.TrackPushExchange, $"TrackPush.{log.SubSystemCode}", datas, prop => { prop.Persistent = true; }); + _rabbitClient.Publish(GlobalConst.TrackPushExchange, $"TrackPush.{log.SubSystemCode}", datas, prop => { prop.Persistent = true; }); } /// @@ -98,7 +97,7 @@ public class BroadcastingService : IBroadcastingService public void TrackPushCompletedPublicTopic(TrackPushRecordDto log) { var data = TrackPushRecordDtoToEvent(log); - _rabbitClientBus.PublishByConfirmSelect(GlobalConst.TrackPushExchange, $"TrackPush.{log.SubSystemCode}", + _rabbitClient.PublishByConfirmSelect(GlobalConst.TrackPushExchange, $"TrackPush.{log.SubSystemCode}", Encoding.UTF8.GetBytes(data.ToJson()), prop => { prop.Persistent = true; }); } diff --git a/src/TrackCenter.Application/Services/DebugApis/NormalService.cs b/src/TrackCenter.Application/Services/DebugApis/NormalService.cs index 501f3be2..815a348e 100644 --- a/src/TrackCenter.Application/Services/DebugApis/NormalService.cs +++ b/src/TrackCenter.Application/Services/DebugApis/NormalService.cs @@ -5,7 +5,7 @@ namespace TrackCenter.Application.Services.DebugApis; [AllowAnonymous] [ApiExplorerSettings(GroupName = "调试专用")] -public class NormalService : ApplicationService +public class NormalService : ApplicationServiceBase { private readonly IOrderRepository _orderRepository; diff --git a/src/TrackCenter.Application/Services/DebugApis/OTelService.cs b/src/TrackCenter.Application/Services/DebugApis/OTelService.cs index a1a96bca..1e0bf633 100644 --- a/src/TrackCenter.Application/Services/DebugApis/OTelService.cs +++ b/src/TrackCenter.Application/Services/DebugApis/OTelService.cs @@ -5,7 +5,7 @@ namespace TrackCenter.Application.Services.DebugApis; [AllowAnonymous] [ApiExplorerSettings(GroupName = "调试专用")] -public class OTelService : ApplicationService +public class OTelService : ApplicationServiceBase { private readonly IBasicRepository _orderRepository; diff --git a/src/TrackCenter.Application/Services/DebugApis/TransportDetailsGenerate/_TransportDetailsGenerateService.cs b/src/TrackCenter.Application/Services/DebugApis/TransportDetailsGenerate/_TransportDetailsGenerateService.cs index fdb8592e..dd834e61 100644 --- a/src/TrackCenter.Application/Services/DebugApis/TransportDetailsGenerate/_TransportDetailsGenerateService.cs +++ b/src/TrackCenter.Application/Services/DebugApis/TransportDetailsGenerate/_TransportDetailsGenerateService.cs @@ -10,7 +10,7 @@ namespace TrackCenter.Application.Services.DebugApis.TransportDetailsGenerate; [AllowAnonymous] [ApiExplorerSettings(GroupName = "调试专用")] [Route("/S07")] -public class _TransportDetailsGenerateService : ApplicationService +public class _TransportDetailsGenerateService : ApplicationServiceBase { private readonly IWarningTaskRepository _warningTaskRepository; private readonly ITransportWarningHandler _transportWarningHandler; diff --git a/src/TrackCenter.Application/Services/DebugApis/_MockReturnWarningService.cs b/src/TrackCenter.Application/Services/DebugApis/_MockReturnWarningService.cs index 7b42d4f9..10f5dbc0 100644 --- a/src/TrackCenter.Application/Services/DebugApis/_MockReturnWarningService.cs +++ b/src/TrackCenter.Application/Services/DebugApis/_MockReturnWarningService.cs @@ -1,5 +1,5 @@ using Microsoft.AspNetCore.Authorization; -using TrackCenter.Application.Contract.Dtos.TrackPush; +using TrackCenter.Application.Dtos.TrackPush; using TrackCenter.Application.Services.Warning.Handlers; using TrackCenter.Domain.Aggregates.TrackPushAggregate; using TrackCenter.Domain.Extensions; @@ -9,7 +9,7 @@ namespace TrackCenter.Application.Services.DebugApis; [AllowAnonymous] [ApiExplorerSettings(GroupName = "调试专用")] [Route("/S07")] -public class _MockReturnWarningService : ApplicationService +public class _MockReturnWarningService : ApplicationServiceBase { private readonly IReturnWarningHandler _returnWarningHandler; diff --git a/src/TrackCenter.Application/Services/ForewarningServices/KpiAreaCacheService.cs b/src/TrackCenter.Application/Services/ForewarningServices/KpiAreaCacheService.cs index 175d34b5..0d04931a 100644 --- a/src/TrackCenter.Application/Services/ForewarningServices/KpiAreaCacheService.cs +++ b/src/TrackCenter.Application/Services/ForewarningServices/KpiAreaCacheService.cs @@ -1,4 +1,4 @@ -using TrackCenter.Application.Contract.Services; +using TrackCenter.Application.Services; using TrackCenter.Domain.Aggregates.KPIAreaAggregate; using Volo.Abp.DependencyInjection; diff --git a/src/TrackCenter.Application/Services/ForewarningServices/KpiAreaService.cs b/src/TrackCenter.Application/Services/ForewarningServices/KpiAreaService.cs index 2492e48c..ef4ba4e8 100644 --- a/src/TrackCenter.Application/Services/ForewarningServices/KpiAreaService.cs +++ b/src/TrackCenter.Application/Services/ForewarningServices/KpiAreaService.cs @@ -1,6 +1,6 @@ using Fake.Application; using Fake.Application.Dtos; -using TrackCenter.Application.Contract.Services; +using TrackCenter.Application.Services; using TrackCenter.Domain.Aggregates.KPIAreaAggregate; using TrackCenter.Domain.Dtos.Forewarning; @@ -8,7 +8,7 @@ namespace TrackCenter.Application.Services.ForewarningServices; [ApiExplorerSettings(GroupName = "预警服务")] [Route("/ForewarningService")] -public class KpiAreaService : ApplicationService +public class KpiAreaService : ApplicationServiceBase { private readonly IKpiAreaRepository _ruleAreaRepository; private readonly IKpiAreaCacheService _kpiAreaCacheService; diff --git a/src/TrackCenter.Application/Services/ProvideServices/OrderService.Link.cs b/src/TrackCenter.Application/Services/ProvideServices/OrderService.Link.cs index c36771f1..23c1f836 100644 --- a/src/TrackCenter.Application/Services/ProvideServices/OrderService.Link.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/OrderService.Link.cs @@ -1,6 +1,6 @@ using DotNetCore.CAP; -using TrackCenter.Application.Contract.Dtos.ProvideServices; -using TrackCenter.Application.Contract.Events; +using TrackCenter.Application.Dtos.ProvideServices; +using TrackCenter.Application.Events; using TrackCenter.Domain.Aggregates.OrderAggregate; using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; diff --git a/src/TrackCenter.Application/Services/ProvideServices/OrderService.PullConfigs.cs b/src/TrackCenter.Application/Services/ProvideServices/OrderService.PullConfigs.cs index dc821436..d877fa7f 100644 --- a/src/TrackCenter.Application/Services/ProvideServices/OrderService.PullConfigs.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/OrderService.PullConfigs.cs @@ -1,6 +1,6 @@ using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ABP.Core.PublicMethords; -using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Dtos.ProvideServices; using TrackCenter.Domain.Dtos.Order; using SJZY.UserCenter.HttpApi.Services; diff --git a/src/TrackCenter.Application/Services/ProvideServices/OrderService.cs b/src/TrackCenter.Application/Services/ProvideServices/OrderService.cs index bb09fa4e..88496128 100644 --- a/src/TrackCenter.Application/Services/ProvideServices/OrderService.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/OrderService.cs @@ -1,14 +1,17 @@ using DotNetCore.CAP; +using Fake.Application; +using InterfaceForward.Domain.Shared.Helpers; using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ABP.Core.PublicMethords; -using TrackCenter.Application.Contract.Dtos.ProvideServices; -using TrackCenter.Application.Contract.Services.ProvideServices; +using TrackCenter.Application.Dtos.ProvideServices; +using TrackCenter.Application.Services.ProvideServices; using TrackCenter.Domain.Aggregates.OrderAggregate; using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; using TrackCenter.Domain.Extensions; using SJZY.UserCenter.HttpApi.Services; using SqlSugar; using TrackCenter.Application.Services.Warning.Handlers; +using TrackCenter.Repository.Aggregates.OrderAggregate; namespace TrackCenter.Application.Services.ProvideServices; @@ -17,7 +20,7 @@ namespace TrackCenter.Application.Services.ProvideServices; /// [ApiExplorerSettings(GroupName = "提供接口")] [Route("/ProviderService")] -public partial class OrderService : ApplicationService, IOrderService +public partial class OrderService : ApplicationServiceBase, IOrderService { private readonly IOrderOperationRecordEsRepository _orderOperationRecordEsRepository; private readonly IOrderRepository _orderRepository; @@ -44,7 +47,7 @@ public partial class OrderService : ApplicationService, IOrderService /// /// [HttpPost("Order/Upsert")] - public async Task> UpsertAsync(UpsertOrderInput input) + public async Task UpsertAsync(UpsertOrderInput input) { // 校验预计到达时间是否不是同时存在或同时不存在 if ((input.EstimatedDeliveryDate.HasValue && input.DestinationTimeZone.HasValue == false) || @@ -53,12 +56,10 @@ public partial class OrderService : ApplicationService, IOrderService throw new BusinessException(message: "【预计签收时间】和【签收地时区】必须同时输入"); } - var currentUser = CurrentUserRequest.CurrentUser; - // 校验订单是否已存在，存在则更新 var order = await _orderRepository.GetFirstAsync(x => x.SubSystemId == input.SubSystemId && x.OrderType == input.OrderType && x.OrderNo == input.OrderNo); - if (order != default) + if (order != null) { // 订单已存在则视为更新 await UpdateOrderAsync(input, order); @@ -69,16 +70,16 @@ public partial class OrderService : ApplicationService, IOrderService OrderNo = input.OrderNo, OptionType = OrderOperationType.修改订单.ToString(), Content = input.ToJson(), - CreateUserId = currentUser.UserId, - CreateUserName = currentUser.Name, + CreateUserId = CurrentUser.Id ?? Guid.Empty, + CreateUserName = CurrentUser.UserName ?? string.Empty, }; _ = _orderOperationRecordEsRepository.AddAsync(index); - return new UnifyResultDto(true, new IdBaseDto + return new IdBaseDto { Id = order.Id - }); + }; } order = ObjectMapper.Map(input); diff --git a/src/TrackCenter.Application/Services/ProvideServices/TrackContentService.cs b/src/TrackCenter.Application/Services/ProvideServices/TrackContentService.cs index 5307fe01..ea294546 100644 --- a/src/TrackCenter.Application/Services/ProvideServices/TrackContentService.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/TrackContentService.cs @@ -1,5 +1,5 @@ -using TrackCenter.Application.Contract.Dtos.TrackContents; -using TrackCenter.Application.Contract.Services.ProvideServices; +using TrackCenter.Application.Dtos.TrackContents; +using TrackCenter.Application.Services.ProvideServices; using TrackCenter.Domain.Aggregates.TrackContentAggregate; using TrackCenter.Domain.Dtos.TrackContents; @@ -10,7 +10,7 @@ namespace TrackCenter.Application.Services.ProvideServices; /// [ApiExplorerSettings(GroupName = "提供接口")] [Route("/ProviderService")] -public class TrackContentService : ApplicationService, ITrackContentService +public class TrackContentService : ApplicationServiceBase, ITrackContentService { private readonly ITrackContentRepository _trackContentRepository; diff --git a/src/TrackCenter.Application/Services/ProvideServices/TrackPullService.cs b/src/TrackCenter.Application/Services/ProvideServices/TrackPullService.cs index aa816ff5..2001239d 100644 --- a/src/TrackCenter.Application/Services/ProvideServices/TrackPullService.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/TrackPullService.cs @@ -3,9 +3,9 @@ using Microsoft.Extensions.Options; using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ABP.Core.PublicMethords; using SJZY.InterfaceRelay.Application.Contracts; -using TrackCenter.Application.Contract.Dtos.ProvideServices; -using TrackCenter.Application.Contract.Dtos.TrackPull; -using TrackCenter.Application.Contract.Services.ProvideServices; +using TrackCenter.Application.Dtos.ProvideServices; +using TrackCenter.Application.Dtos.TrackPull; +using TrackCenter.Application.Services.ProvideServices; using TrackCenter.Application.Helpers; using TrackCenter.Application.Options; using TrackCenter.Application.Rabbit; @@ -20,7 +20,7 @@ namespace TrackCenter.Application.Services.ProvideServices; /// [ApiExplorerSettings(GroupName = "提供接口")] [Route("/ProviderService")] -public class TrackPullService : ApplicationService, ITrackPullService +public class TrackPullService : ApplicationServiceBase, ITrackPullService { private readonly IHttpClientProxy _httpClientProxy; private readonly IOptionsMonitor _options; diff --git a/src/TrackCenter.Application/Services/ProvideServices/TrackPushConfigService.cs b/src/TrackCenter.Application/Services/ProvideServices/TrackPushConfigService.cs index 35deece0..4cd6c140 100644 --- a/src/TrackCenter.Application/Services/ProvideServices/TrackPushConfigService.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/TrackPushConfigService.cs @@ -1,5 +1,5 @@ -using TrackCenter.Application.Contract.Dtos.ProvideServices; -using TrackCenter.Application.Contract.Services; +using TrackCenter.Application.Dtos.ProvideServices; +using TrackCenter.Application.Services; using TrackCenter.Domain.Aggregates.TrackPushAggregate; using TrackCenter.Domain.Dtos.TrackPush; @@ -10,7 +10,7 @@ namespace TrackCenter.Application.Services.ProvideServices; /// [ApiExplorerSettings(GroupName = "提供接口")] [Route("/ProviderService")] -public class TrackPushConfigService : ApplicationService, ITrackPushConfigService +public class TrackPushConfigService : ApplicationServiceBase, ITrackPushConfigService { private readonly ITrackPushConfigRepository _trackPushConfigRepository; diff --git a/src/TrackCenter.Application/Services/ProvideServices/TrackPushService.cs b/src/TrackCenter.Application/Services/ProvideServices/TrackPushService.cs index 6d27fac0..47d4e1b7 100644 --- a/src/TrackCenter.Application/Services/ProvideServices/TrackPushService.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/TrackPushService.cs @@ -1,10 +1,10 @@ using DotNetCore.CAP; using SJZY.Expand.ABP.Core.Common; -using TrackCenter.Application.Contract.Dtos.ProvideServices; -using TrackCenter.Application.Contract.Dtos.TrackOrder; -using TrackCenter.Application.Contract.Dtos.TrackPush; -using TrackCenter.Application.Contract.Events; -using TrackCenter.Application.Contract.Services.ProvideServices; +using TrackCenter.Application.Dtos.ProvideServices; +using TrackCenter.Application.Dtos.TrackOrder; +using TrackCenter.Application.Dtos.TrackPush; +using TrackCenter.Application.Events; +using TrackCenter.Application.Services.ProvideServices; using TrackCenter.Domain.Aggregates.OrderAggregate; using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; using TrackCenter.Domain.Aggregates.TrackPushAggregate; @@ -22,7 +22,7 @@ namespace TrackCenter.Application.Services.ProvideServices; /// [ApiExplorerSettings(GroupName = "提供接口")] [Route("/ProviderService")] -public class TrackPushService : ApplicationService, ITrackPushService +public class TrackPushService : ApplicationServiceBase, ITrackPushService { private readonly ICapPublisher _capPublisher; private readonly IOrderRepository _orderRepository; diff --git a/src/TrackCenter.Application/Services/ProvideServices/TrackService.Query.cs b/src/TrackCenter.Application/Services/ProvideServices/TrackService.Query.cs index 0ab0ea50..3413d6f4 100644 --- a/src/TrackCenter.Application/Services/ProvideServices/TrackService.Query.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/TrackService.Query.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Http; using SJZY.Expand.AliyunOSS; -using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Dtos.ProvideServices; using TrackCenter.Application.Helpers; using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; using TrackCenter.Domain.Aggregates.TrackTemplateAggregate; diff --git a/src/TrackCenter.Application/Services/ProvideServices/TrackService.cs b/src/TrackCenter.Application/Services/ProvideServices/TrackService.cs index 3ec4af4f..429cbf81 100644 --- a/src/TrackCenter.Application/Services/ProvideServices/TrackService.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/TrackService.cs @@ -4,9 +4,9 @@ using InterfaceForward.Domain.Shared.Helpers; using Microsoft.AspNetCore.Http; using SJZY.Expand.ABP.Core.PublicMethords; using SJZY.OTel; -using TrackCenter.Application.Contract.Dtos.ProvideServices; -using TrackCenter.Application.Contract.Events; -using TrackCenter.Application.Contract.Services.ProvideServices; +using TrackCenter.Application.Dtos.ProvideServices; +using TrackCenter.Application.Events; +using TrackCenter.Application.Services.ProvideServices; using TrackCenter.Domain.Aggregates.OrderAggregate; using TrackCenter.Domain.Aggregates.TrackContentAggregate; using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; @@ -26,11 +26,10 @@ namespace TrackCenter.Application.Services.ProvideServices; /// [ApiExplorerSettings(GroupName = "提供接口")] [Route("/ProviderService")] -public partial class TrackService : ApplicationService, ITrackService +public partial class TrackService : ApplicationServiceBase, ITrackService { private readonly ICapPublisher _capPublisher; private readonly IOrderRepository _orderRepository; - private readonly IHttpClientProxy _requestCurrentUserService; private readonly ITrackContentRepository _trackContentRepository; public TrackService( @@ -38,17 +37,13 @@ public partial class TrackService : ApplicationService, ITrackService ICapPublisher capPublisher, ITrackDetailsEsRepository trackDetailsEsRepository, ITrackContentRepository trackContentRepository, - IHttpClientProxy requestCurrentUserService, ITrackTemplateRepository trackTemplateRepository, IHttpContextAccessor contextAccessor, - IVSystemQueries vSystemQueries ) { _orderRepository = orderRepository; _capPublisher = capPublisher; _trackContentRepository = trackContentRepository; - _requestCurrentUserService = requestCurrentUserService; - _vSystemQueries = vSystemQueries; _contextAccessor = contextAccessor; _trackTemplateRepository = trackTemplateRepository; _trackDetailsEsRepository = trackDetailsEsRepository; @@ -61,24 +56,19 @@ public partial class TrackService : ApplicationService, ITrackService /// /// [HttpPost("Track/Delete")] - public async Task DeleteTrackAsync(DeleteTrackInput input) + public async Task DeleteTrackAsync(DeleteTrackInput input) { var orderId = await _orderRepository.GetFirstAsync(x => x.SubSystemId == input.SubSystemId && x.OrderType == input.OrderType && x.OrderNo == input.OrderNo, x => x.Id); + if (orderId == 0) { throw new BusinessException(message: $"订单：{input.OrderNo}不存在"); } - var userInfo = await _requestCurrentUserService.Service.GetCurrentUserBasicInfoAsync(); - if (userInfo.Code != GlobalConst.SuccessCode || userInfo.Data is null) - { - throw new BusinessException(message: $"调用用户中心，获取用户信息失败:{userInfo.Msg}"); - } - // 查询轨迹优先使用esId，tips:考虑删除事件处理直接通过EsId而不是再查询一遍？ List? tracks = null; var esIds = input.EsIds.Distinct().ToArray(); diff --git a/src/TrackCenter.Application/Services/ProvideServices/TrackTemplateService.cs b/src/TrackCenter.Application/Services/ProvideServices/TrackTemplateService.cs index 34b6e357..ed3eff19 100644 --- a/src/TrackCenter.Application/Services/ProvideServices/TrackTemplateService.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/TrackTemplateService.cs @@ -1,5 +1,5 @@ -using TrackCenter.Application.Contract.Dtos.ProvideServices; -using TrackCenter.Application.Contract.Services.ProvideServices; +using TrackCenter.Application.Dtos.ProvideServices; +using TrackCenter.Application.Services.ProvideServices; using TrackCenter.Domain.Aggregates.TrackTemplateAggregate; using TrackCenter.Domain.Dtos.TrackTemplate; @@ -10,7 +10,7 @@ namespace TrackCenter.Application.Services.ProvideServices; /// [ApiExplorerSettings(GroupName = "提供接口")] [Route("/ProviderService")] -public class TrackTemplateService : ApplicationService, ITrackTemplateService +public class TrackTemplateService : ApplicationServiceBase, ITrackTemplateService { private readonly ITrackTemplateRepository _trackTemplateRepository; diff --git a/src/TrackCenter.Application/Services/TimerTaskss/OrderPullStatusScanTask.cs b/src/TrackCenter.Application/Services/TimerTaskss/OrderPullStatusScanTask.cs index bd96c994..98676844 100644 --- a/src/TrackCenter.Application/Services/TimerTaskss/OrderPullStatusScanTask.cs +++ b/src/TrackCenter.Application/Services/TimerTaskss/OrderPullStatusScanTask.cs @@ -12,7 +12,7 @@ namespace TrackCenter.Application.Services.TimerTaskss; /// 订单拉取状态扫描定时任务 /// [ApiExplorerSettings(GroupName = "定时任务")] -public class OrderPullStatusScanTask : ApplicationService +public class OrderPullStatusScanTask : ApplicationServiceBase { private readonly IOptionsSnapshot _options; private readonly IOrderRepository _orderRepository; diff --git a/src/TrackCenter.Application/Services/TimerTaskss/TrackButtomUpScanTask.cs b/src/TrackCenter.Application/Services/TimerTaskss/TrackButtomUpScanTask.cs index a78086a3..2b47dfb7 100644 --- a/src/TrackCenter.Application/Services/TimerTaskss/TrackButtomUpScanTask.cs +++ b/src/TrackCenter.Application/Services/TimerTaskss/TrackButtomUpScanTask.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.Options; using Newtonsoft.Json.Linq; using SJZY.Expand.ABP.Core; using SJZY.Expand.ABP.Core.Logger; -using TrackCenter.Application.Contract.Dtos.TrackPull; +using TrackCenter.Application.Dtos.TrackPull; using TrackCenter.Application.Helpers; using TrackCenter.Application.Options; using TrackCenter.Domain.Aggregates.OrderAggregate; @@ -20,7 +20,7 @@ namespace TrackCenter.Application.Services.TimerTaskss; /// 轨迹兜底扫描定时任务 /// [ApiExplorerSettings(GroupName = "定时任务")] -public class TrackButtomUpScanTask : ApplicationService +public class TrackButtomUpScanTask : ApplicationServiceBase { private readonly IOptionsSnapshot _options; private readonly IOrderRepository _orderRepository; diff --git a/src/TrackCenter.Application/Services/TimerTaskss/TrackPullTask.cs b/src/TrackCenter.Application/Services/TimerTaskss/TrackPullTask.cs index f4b1d465..d78263a4 100644 --- a/src/TrackCenter.Application/Services/TimerTaskss/TrackPullTask.cs +++ b/src/TrackCenter.Application/Services/TimerTaskss/TrackPullTask.cs @@ -4,8 +4,8 @@ using SJZY.Expand.ABP.Core; using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ABP.Core.PublicMethords; using SJZY.InterfaceRelay.Application.Contracts; -using TrackCenter.Application.Contract.Dtos.TrackPull; -using TrackCenter.Application.Contract.Services; +using TrackCenter.Application.Dtos.TrackPull; +using TrackCenter.Application.Services; using TrackCenter.Application.Helpers; using TrackCenter.Application.Options; using TrackCenter.Application.Track2InterfaceRelay; @@ -21,7 +21,7 @@ namespace TrackCenter.Application.Services.TimerTaskss; /// 轨迹拉取定时任务 /// [ApiExplorerSettings(GroupName = "定时任务")] -public class TrackPullTask : ApplicationService, ISingletonDependency +public class TrackPullTask : ApplicationServiceBase, ISingletonDependency { private readonly IServiceScopeFactory _serviceScopeFactory; diff --git a/src/TrackCenter.Application/Services/TimerTaskss/TrackPushTask.cs b/src/TrackCenter.Application/Services/TimerTaskss/TrackPushTask.cs index 43d77f03..c1c32338 100644 --- a/src/TrackCenter.Application/Services/TimerTaskss/TrackPushTask.cs +++ b/src/TrackCenter.Application/Services/TimerTaskss/TrackPushTask.cs @@ -11,7 +11,7 @@ namespace TrackCenter.Application.Services.TimerTaskss; /// 轨迹推送定时任务 /// [ApiExplorerSettings(GroupName = "定时任务")] -public class TrackPushTask : ApplicationService +public class TrackPushTask : ApplicationServiceBase { private readonly IServiceScopeFactory _serviceScopeFactory; diff --git a/src/TrackCenter.Application/Services/TrackContents/TrackContentService.cs b/src/TrackCenter.Application/Services/TrackContents/TrackContentService.cs index 2da29ce1..ac41e761 100644 --- a/src/TrackCenter.Application/Services/TrackContents/TrackContentService.cs +++ b/src/TrackCenter.Application/Services/TrackContents/TrackContentService.cs @@ -3,9 +3,9 @@ using Microsoft.Extensions.Localization; using SJZY.Expand.ABP.Core.Localization; using SJZY.Expand.ABP.Core.PublicMethords; using SJZY.Expand.AliyunOSS; -using TrackCenter.Application.Contract.Dtos.ProvideServices; -using TrackCenter.Application.Contract.Dtos.TrackContents; -using TrackCenter.Application.Contract.Services; +using TrackCenter.Application.Dtos.ProvideServices; +using TrackCenter.Application.Dtos.TrackContents; +using TrackCenter.Application.Services; using TrackCenter.Application.Localization; using TrackCenter.Domain.Aggregates.OrderAggregate; using TrackCenter.Domain.Aggregates.TrackContentAggregate; @@ -24,7 +24,7 @@ namespace TrackCenter.Application.Services.TrackContents; /// [ApiExplorerSettings(GroupName = "轨迹内容")] [Route("/Track/Content")] -public class TrackContentService : ApplicationService +public class TrackContentService : ApplicationServiceBase { private readonly IStringLocalizer _stringLocalizer; private readonly ITrackContentRepository _trackContentRepository; diff --git a/src/TrackCenter.Application/Services/TrackFlags/TrackFlagService.cs b/src/TrackCenter.Application/Services/TrackFlags/TrackFlagService.cs index e3c6f36c..1a27d7d9 100644 --- a/src/TrackCenter.Application/Services/TrackFlags/TrackFlagService.cs +++ b/src/TrackCenter.Application/Services/TrackFlags/TrackFlagService.cs @@ -1,5 +1,5 @@ using Microsoft.Extensions.Localization; -using TrackCenter.Application.Contract.Dtos.TrackFlags; +using TrackCenter.Application.Dtos.TrackFlags; using TrackCenter.Domain.Aggregates.TrackContentAggregate; using TrackCenter.Domain.Aggregates.TrackFlagAggregate; using TrackCenter.Domain.Dtos.TrackFlags; @@ -14,7 +14,7 @@ namespace TrackCenter.Application.Services.TrackFlags; /// [ApiExplorerSettings(GroupName = "轨迹标记")] [Route("/Track/Flag")] -public class TrackFlagService : ApplicationService, ITransientDependency +public class TrackFlagService : ApplicationServiceBase, ITransientDependency { private readonly IStringLocalizer _stringLocalizer; private readonly ITrackContentRepository _trackContentRepository; diff --git a/src/TrackCenter.Application/Services/TrackNode/TrackNodeService.cs b/src/TrackCenter.Application/Services/TrackNode/TrackNodeService.cs index 2422618c..cf4f8abb 100644 --- a/src/TrackCenter.Application/Services/TrackNode/TrackNodeService.cs +++ b/src/TrackCenter.Application/Services/TrackNode/TrackNodeService.cs @@ -1,5 +1,5 @@ -using TrackCenter.Application.Contract.Dtos.TrackNode; -using TrackCenter.Application.Contract.Dtos.TrackStatus; +using TrackCenter.Application.Dtos.TrackNode; +using TrackCenter.Application.Dtos.TrackStatus; using TrackCenter.Application.Helpers; using TrackCenter.Domain.Aggregates.TrackNodeAggregate; using TrackCenter.Domain.Aggregates.TrackStatusAggregate; @@ -13,7 +13,7 @@ namespace TrackCenter.Application.Services.TrackNode; /// [ApiExplorerSettings(GroupName = "轨迹节点")] [Route("/Track/Node")] -public class TrackNodeService : ApplicationService, ITransientDependency +public class TrackNodeService : ApplicationServiceBase, ITransientDependency { private readonly ITrackNodeRepository _trackNodeRepository; private readonly ITrackStatusRepository _trackStatusRepository; diff --git a/src/TrackCenter.Application/Services/TrackOrders/TrackOrderService.cs b/src/TrackCenter.Application/Services/TrackOrders/TrackOrderService.cs index a3a717e8..db19e697 100644 --- a/src/TrackCenter.Application/Services/TrackOrders/TrackOrderService.cs +++ b/src/TrackCenter.Application/Services/TrackOrders/TrackOrderService.cs @@ -1,8 +1,8 @@ using System.Linq.Expressions; using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.AliyunOSS; -using TrackCenter.Application.Contract.Dtos.ProvideServices; -using TrackCenter.Application.Contract.Dtos.TrackOrder; +using TrackCenter.Application.Dtos.ProvideServices; +using TrackCenter.Application.Dtos.TrackOrder; using TrackCenter.Application.Helpers; using TrackCenter.Application.Services.Warning.Handlers; using TrackCenter.Domain.Aggregates.OrderAggregate; @@ -19,7 +19,7 @@ namespace TrackCenter.Application.Services.TrackOrders; /// [ApiExplorerSettings(GroupName = "轨迹订单")] [Route("/Track/Order")] -public class TrackOrderService : ApplicationService +public class TrackOrderService : ApplicationServiceBase { private readonly IOrderOperationRecordEsRepository _orderOperationRecordEsRepository; private readonly IOrderRepository _orderRepository; diff --git a/src/TrackCenter.Application/Services/TrackPull/TrackPullCacheService.cs b/src/TrackCenter.Application/Services/TrackPull/TrackPullCacheService.cs index ee08ce54..8c22a1a7 100644 --- a/src/TrackCenter.Application/Services/TrackPull/TrackPullCacheService.cs +++ b/src/TrackCenter.Application/Services/TrackPull/TrackPullCacheService.cs @@ -1,6 +1,6 @@ using SJZY.Expand.ABP.Core; -using TrackCenter.Application.Contract.Dtos.TrackPull; -using TrackCenter.Application.Contract.Services; +using TrackCenter.Application.Dtos.TrackPull; +using TrackCenter.Application.Services; using TrackCenter.Domain.Aggregates.TrackPullAggregate; using TrackCenter.Domain.Dtos.TrackPull; using Volo.Abp.DependencyInjection; diff --git a/src/TrackCenter.Application/Services/TrackPull/TrackPullService.cs b/src/TrackCenter.Application/Services/TrackPull/TrackPullService.cs index 6c085d1a..e9f24537 100644 --- a/src/TrackCenter.Application/Services/TrackPull/TrackPullService.cs +++ b/src/TrackCenter.Application/Services/TrackPull/TrackPullService.cs @@ -3,10 +3,9 @@ using Microsoft.Extensions.Localization; using Microsoft.Extensions.Options; using SJZY.Expand.ABP.Core.Localization; using SJZY.Expand.ABP.Core.PublicMethords; -using TrackCenter.Application.Contract.Dtos.TrackPull; -using TrackCenter.Application.Contract.Services; +using TrackCenter.Application.Dtos.TrackPull; +using TrackCenter.Application.Services; using TrackCenter.Domain.Aggregates.TrackPullAggregate; -using TrackCenter.Domain.Dtos.Common; using TrackCenter.Domain.Dtos.TrackPull; using SqlSugar; using TrackCenter.Application.Localization; @@ -19,7 +18,7 @@ namespace TrackCenter.Application.Services.TrackPull; /// [ApiExplorerSettings(GroupName = "轨迹拉取")] [Route("/Track/PullConfig")] -public class TrackPullService : ApplicationService +public class TrackPullService : ApplicationServiceBase { private readonly IOptionsMonitor _options; private readonly IStringLocalizer _stringLocalizer; diff --git a/src/TrackCenter.Application/Services/TrackPush/TrackPushCacheService.cs b/src/TrackCenter.Application/Services/TrackPush/TrackPushCacheService.cs index 383ab42d..4ff17b2b 100644 --- a/src/TrackCenter.Application/Services/TrackPush/TrackPushCacheService.cs +++ b/src/TrackCenter.Application/Services/TrackPush/TrackPushCacheService.cs @@ -1,6 +1,6 @@ using SJZY.Expand.ABP.Core; -using TrackCenter.Application.Contract.Dtos.TrackPush; -using TrackCenter.Application.Contract.Services; +using TrackCenter.Application.Dtos.TrackPush; +using TrackCenter.Application.Services; using TrackCenter.Domain.Aggregates.TrackPushAggregate; using Volo.Abp.DependencyInjection; diff --git a/src/TrackCenter.Application/Services/TrackPush/TrackPushService.cs b/src/TrackCenter.Application/Services/TrackPush/TrackPushService.cs index 76878773..ab3f9aa6 100644 --- a/src/TrackCenter.Application/Services/TrackPush/TrackPushService.cs +++ b/src/TrackCenter.Application/Services/TrackPush/TrackPushService.cs @@ -3,14 +3,13 @@ using Microsoft.Extensions.Localization; using SJZY.Expand.ABP.Core.Localization; using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ABP.Core.PublicMethords; -using TrackCenter.Application.Contract.Dtos.TrackPush; -using TrackCenter.Application.Contract.Services; +using TrackCenter.Application.Dtos.TrackPush; +using TrackCenter.Application.Services; using TrackCenter.Application.Helpers; using TrackCenter.Application.Localization; using TrackCenter.Application.Services.Warning.Handlers; using TrackCenter.Domain.Aggregates.OrderAggregate; using TrackCenter.Domain.Aggregates.TrackPushAggregate; -using TrackCenter.Domain.Dtos.Common; using TrackCenter.Domain.Dtos.TrackPush; using TrackCenter.Domain.Enums; using Volo.Abp.DependencyInjection; @@ -22,7 +21,7 @@ namespace TrackCenter.Application.Services.TrackPush; /// [ApiExplorerSettings(GroupName = "轨迹推送")] [Route("/Track/PushConfig")] -public class TrackPushService : ApplicationService, ISingletonDependency +public class TrackPushService : ApplicationServiceBase, ISingletonDependency { private readonly IStringLocalizer _stringLocalizer; private readonly ITrackPushCacheService _trackPushCacheService; diff --git a/src/TrackCenter.Application/Services/TrackStatus/TrackStatusService.cs b/src/TrackCenter.Application/Services/TrackStatus/TrackStatusService.cs index 68a074ae..fd980b23 100644 --- a/src/TrackCenter.Application/Services/TrackStatus/TrackStatusService.cs +++ b/src/TrackCenter.Application/Services/TrackStatus/TrackStatusService.cs @@ -1,4 +1,4 @@ -using TrackCenter.Application.Contract.Dtos.TrackStatus; +using TrackCenter.Application.Dtos.TrackStatus; using TrackCenter.Domain.Aggregates.TrackContentAggregate; using TrackCenter.Domain.Aggregates.TrackStatusAggregate; using TrackCenter.Domain.Dtos.TrackStatus; @@ -10,7 +10,7 @@ namespace TrackCenter.Application.Services.TrackStatus; /// [ApiExplorerSettings(GroupName = "轨迹状态")] [Route("/Track/Status")] -public class TrackStatusService : ApplicationService +public class TrackStatusService : ApplicationServiceBase { private readonly ITrackContentRepository _trackContentRepository; private readonly ITrackStatusRepository _trackStatusRepository; diff --git a/src/TrackCenter.Application/Services/TrackTemplates/TrackTemplateService.cs b/src/TrackCenter.Application/Services/TrackTemplates/TrackTemplateService.cs index a0ac7350..61b1c675 100644 --- a/src/TrackCenter.Application/Services/TrackTemplates/TrackTemplateService.cs +++ b/src/TrackCenter.Application/Services/TrackTemplates/TrackTemplateService.cs @@ -2,7 +2,7 @@ using System.Linq.Expressions; using Microsoft.Extensions.Localization; using SJZY.Expand.ABP.Core.Localization; using SJZY.Expand.ABP.Core.PublicMethords; -using TrackCenter.Application.Contract.Dtos.TrackTemplates; +using TrackCenter.Application.Dtos.TrackTemplates; using TrackCenter.Application.Localization; using TrackCenter.Domain.Aggregates.TrackTemplateAggregate; using TrackCenter.Domain.Dtos.TrackTemplate; @@ -14,7 +14,7 @@ namespace TrackCenter.Application.Services.TrackTemplates; /// [ApiExplorerSettings(GroupName = "轨迹模版")] [Route("/Track/Template")] -public class TrackTemplateService : ApplicationService +public class TrackTemplateService : ApplicationServiceBase { private readonly IStringLocalizer _stringLocalizer; private readonly ITrackTemplateRepository _trackTemplateRepository; diff --git a/src/TrackCenter.Application/Services/Warning/CompleteWarningService.cs b/src/TrackCenter.Application/Services/Warning/CompleteWarningService.cs index fa845ad0..e0de7533 100644 --- a/src/TrackCenter.Application/Services/Warning/CompleteWarningService.cs +++ b/src/TrackCenter.Application/Services/Warning/CompleteWarningService.cs @@ -2,9 +2,9 @@ using Fake.Application; using Fake.Application.Dtos; using InterfaceForward.Domain.Shared.Helpers; using SJZY.Expand.ABP.Core.PublicMethords; -using TrackCenter.Application.Contract.Dtos.Warning; -using TrackCenter.Application.Contract.Dtos.Warning.Complete; -using TrackCenter.Application.Contract.Dtos.Warning.Return; +using TrackCenter.Application.Dtos.Warning; +using TrackCenter.Application.Dtos.Warning.Complete; +using TrackCenter.Application.Dtos.Warning.Return; using TrackCenter.Application.Caching; using TrackCenter.Application.Helpers; using TrackCenter.Application.Services.Warning.Handlers; @@ -24,7 +24,7 @@ namespace TrackCenter.Application.Services.Warning; /// [ApiExplorerSettings(GroupName = "预警服务")] [Route("Warning/Complete")] -public class CompleteWarningService : ApplicationService +public class CompleteWarningService : ApplicationServiceBase { private readonly IOrderRepository _orderRepository; private readonly IWarningRuleRepository _warningRuleRepository; diff --git a/src/TrackCenter.Application/Services/Warning/Handlers/IReturnWarningHandler.cs b/src/TrackCenter.Application/Services/Warning/Handlers/IReturnWarningHandler.cs index 3b1dceec..00dd082c 100644 --- a/src/TrackCenter.Application/Services/Warning/Handlers/IReturnWarningHandler.cs +++ b/src/TrackCenter.Application/Services/Warning/Handlers/IReturnWarningHandler.cs @@ -1,4 +1,4 @@ -using TrackCenter.Application.Contract.Dtos.TrackPush; +using TrackCenter.Application.Dtos.TrackPush; using TrackCenter.Application.Services.Warning.Model; using TrackCenter.Application.Services.Warning.Signals; using TrackCenter.Domain.Aggregates.TrackPushAggregate; diff --git a/src/TrackCenter.Application/Services/Warning/Handlers/ReturnWarningHandler.cs b/src/TrackCenter.Application/Services/Warning/Handlers/ReturnWarningHandler.cs index d4f94e63..b6847321 100644 --- a/src/TrackCenter.Application/Services/Warning/Handlers/ReturnWarningHandler.cs +++ b/src/TrackCenter.Application/Services/Warning/Handlers/ReturnWarningHandler.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.Options; -using TrackCenter.Application.Contract.Dtos.TrackPush; -using TrackCenter.Application.Contract.Services; +using TrackCenter.Application.Dtos.TrackPush; +using TrackCenter.Application.Services; using TrackCenter.Application.Options; using TrackCenter.Application.Services.Warning.Model; using TrackCenter.Application.Services.Warning.Signals; diff --git a/src/TrackCenter.Application/Services/Warning/Model/CompleteWarningRuleItemBO.cs b/src/TrackCenter.Application/Services/Warning/Model/CompleteWarningRuleItemBO.cs index 6064368c..d9ad48c2 100644 --- a/src/TrackCenter.Application/Services/Warning/Model/CompleteWarningRuleItemBO.cs +++ b/src/TrackCenter.Application/Services/Warning/Model/CompleteWarningRuleItemBO.cs @@ -1,5 +1,5 @@ -using TrackCenter.Application.Contract.Dtos.Warning; -using TrackCenter.Application.Contract.Dtos.Warning.Complete; +using TrackCenter.Application.Dtos.Warning; +using TrackCenter.Application.Dtos.Warning.Complete; using TrackCenter.Domain.Aggregates.WarningAggregate.Complete; using TrackCenter.Domain.Extensions; diff --git a/src/TrackCenter.Application/Services/Warning/Model/ReturnWarningRuleItemBO.cs b/src/TrackCenter.Application/Services/Warning/Model/ReturnWarningRuleItemBO.cs index 8f4acf1c..8162811b 100644 --- a/src/TrackCenter.Application/Services/Warning/Model/ReturnWarningRuleItemBO.cs +++ b/src/TrackCenter.Application/Services/Warning/Model/ReturnWarningRuleItemBO.cs @@ -1,5 +1,5 @@ -using TrackCenter.Application.Contract.Dtos.Warning; -using TrackCenter.Application.Contract.Dtos.Warning.Return; +using TrackCenter.Application.Dtos.Warning; +using TrackCenter.Application.Dtos.Warning.Return; using TrackCenter.Domain.Aggregates.WarningAggregate.Return; using TrackCenter.Domain.Extensions; diff --git a/src/TrackCenter.Application/Services/Warning/Model/TransportWarningSceneBO.cs b/src/TrackCenter.Application/Services/Warning/Model/TransportWarningSceneBO.cs index 8c770397..0b89666d 100644 --- a/src/TrackCenter.Application/Services/Warning/Model/TransportWarningSceneBO.cs +++ b/src/TrackCenter.Application/Services/Warning/Model/TransportWarningSceneBO.cs @@ -1,4 +1,4 @@ -using TrackCenter.Application.Contract.Dtos.Warning.Transport; +using TrackCenter.Application.Dtos.Warning.Transport; using TrackCenter.Domain.Aggregates.OrderAggregate; using TrackCenter.Domain.Aggregates.WarningAggregate.Transport; using TrackCenter.Domain.Dtos.Forewarning; diff --git a/src/TrackCenter.Application/Services/Warning/Model/TransportWarningSceneRuleItemBO.cs b/src/TrackCenter.Application/Services/Warning/Model/TransportWarningSceneRuleItemBO.cs index 6b3ee32d..01ba35c9 100644 --- a/src/TrackCenter.Application/Services/Warning/Model/TransportWarningSceneRuleItemBO.cs +++ b/src/TrackCenter.Application/Services/Warning/Model/TransportWarningSceneRuleItemBO.cs @@ -1,5 +1,5 @@ -using TrackCenter.Application.Contract.Dtos.Warning; -using TrackCenter.Application.Contract.Dtos.Warning.Transport; +using TrackCenter.Application.Dtos.Warning; +using TrackCenter.Application.Dtos.Warning.Transport; using TrackCenter.Domain.Aggregates.WarningAggregate.Transport; using TrackCenter.Domain.Extensions; diff --git a/src/TrackCenter.Application/Services/Warning/ReturnWarningService.cs b/src/TrackCenter.Application/Services/Warning/ReturnWarningService.cs index 6197b04a..5c27efce 100644 --- a/src/TrackCenter.Application/Services/Warning/ReturnWarningService.cs +++ b/src/TrackCenter.Application/Services/Warning/ReturnWarningService.cs @@ -1,8 +1,8 @@ using DotNetCore.CAP; using SJZY.Expand.ABP.Core.PublicMethords; -using TrackCenter.Application.Contract.Dtos.Warning; -using TrackCenter.Application.Contract.Dtos.Warning.Return; -using TrackCenter.Application.Contract.Events; +using TrackCenter.Application.Dtos.Warning; +using TrackCenter.Application.Dtos.Warning.Return; +using TrackCenter.Application.Events; using TrackCenter.Domain.Aggregates.OrderAggregate; using TrackCenter.Domain.Aggregates.WarningAggregate; using TrackCenter.Domain.Dtos.Warning; @@ -22,7 +22,7 @@ namespace TrackCenter.Application.Services.Warning; /// [ApiExplorerSettings(GroupName = "预警服务")] [Route("Warning/Return")] -public class ReturnWarningService : ApplicationService +public class ReturnWarningService : ApplicationServiceBase { private readonly IOrderRepository _orderRepository; private readonly IVSystemQueries _vSystemQueries; diff --git a/src/TrackCenter.Application/Services/Warning/TransportWarningService.cs b/src/TrackCenter.Application/Services/Warning/TransportWarningService.cs index ea1b71f2..16d9b4f7 100644 --- a/src/TrackCenter.Application/Services/Warning/TransportWarningService.cs +++ b/src/TrackCenter.Application/Services/Warning/TransportWarningService.cs @@ -1,6 +1,6 @@ using SJZY.Expand.ABP.Core.PublicMethords; -using TrackCenter.Application.Contract.Dtos.Warning; -using TrackCenter.Application.Contract.Dtos.Warning.Transport; +using TrackCenter.Application.Dtos.Warning; +using TrackCenter.Application.Dtos.Warning.Transport; using TrackCenter.Application.Caching; using TrackCenter.Application.Helpers; using TrackCenter.Application.Services.Warning.Handlers; @@ -21,7 +21,7 @@ namespace TrackCenter.Application.Services.Warning; /// [ApiExplorerSettings(GroupName = "预警服务")] [Route("Warning/Transport")] -public class TransportWarningService : ApplicationService +public class TransportWarningService : ApplicationServiceBase { private readonly IOrderRepository _orderRepository; private readonly IKpiAreaRepository _kpiAreaRepository; diff --git a/src/TrackCenter.Application/Services/Warning/WarningService.cs b/src/TrackCenter.Application/Services/Warning/WarningService.cs index eaf884d2..328b74d4 100644 --- a/src/TrackCenter.Application/Services/Warning/WarningService.cs +++ b/src/TrackCenter.Application/Services/Warning/WarningService.cs @@ -1,4 +1,4 @@ -using TrackCenter.Application.Contract.Dtos.Warning; +using TrackCenter.Application.Dtos.Warning; using TrackCenter.Application.Caching; using TrackCenter.Application.Services.Warning.Handlers; using TrackCenter.Domain.Aggregates.WarningAggregate; @@ -11,7 +11,7 @@ namespace TrackCenter.Application.Services.Warning; /// [ApiExplorerSettings(GroupName = "预警服务")] [Route("Warning")] -public class WarningService : ApplicationService +public class WarningService : ApplicationServiceBase { private readonly IWarningRuleRepository _warningRuleRepository; private readonly ICompleteWarningHandler _completeWarningHandler; diff --git a/src/TrackCenter.Application/TrackCenter.Application.csproj b/src/TrackCenter.Application/TrackCenter.Application.csproj index 1a330223..5085a5a4 100644 --- a/src/TrackCenter.Application/TrackCenter.Application.csproj +++ b/src/TrackCenter.Application/TrackCenter.Application.csproj @@ -26,7 +26,6 @@ - diff --git a/src/TrackCenter.Application/Validations/TrackContents/EditTrackContentInputValidation.cs b/src/TrackCenter.Application/Validations/TrackContents/EditTrackContentInputValidation.cs index 3e614672..1d7d48fb 100644 --- a/src/TrackCenter.Application/Validations/TrackContents/EditTrackContentInputValidation.cs +++ b/src/TrackCenter.Application/Validations/TrackContents/EditTrackContentInputValidation.cs @@ -1,5 +1,5 @@ using FluentValidation; -using TrackCenter.Application.Contract.Dtos.TrackContents; +using TrackCenter.Application.Dtos.TrackContents; namespace TrackCenter.Application.Validations.TrackContents; diff --git a/src/TrackCenter.Application/Validations/TrackContents/EditTrackContentMapInputValidation.cs b/src/TrackCenter.Application/Validations/TrackContents/EditTrackContentMapInputValidation.cs index 606309c4..03b9aac0 100644 --- a/src/TrackCenter.Application/Validations/TrackContents/EditTrackContentMapInputValidation.cs +++ b/src/TrackCenter.Application/Validations/TrackContents/EditTrackContentMapInputValidation.cs @@ -1,7 +1,7 @@ using FluentValidation; using Microsoft.Extensions.Localization; using SJZY.Expand.ABP.Core.Localization; -using TrackCenter.Application.Contract.Dtos.TrackContents; +using TrackCenter.Application.Dtos.TrackContents; using TrackCenter.Application.Localization; namespace TrackCenter.Application.Validations.TrackContents; diff --git a/src/TrackCenter.Application/Validations/TrackFlags/EditTrackFlagInputValidation.cs b/src/TrackCenter.Application/Validations/TrackFlags/EditTrackFlagInputValidation.cs index 8d33bea8..c2fac89c 100644 --- a/src/TrackCenter.Application/Validations/TrackFlags/EditTrackFlagInputValidation.cs +++ b/src/TrackCenter.Application/Validations/TrackFlags/EditTrackFlagInputValidation.cs @@ -1,5 +1,5 @@ using FluentValidation; -using TrackCenter.Application.Contract.Dtos.TrackFlags; +using TrackCenter.Application.Dtos.TrackFlags; namespace TrackCenter.Application.Validations.TrackFlags; diff --git a/src/TrackCenter.Application/Validations/TrackPull/EditTrackPullConfigInputValidation.cs b/src/TrackCenter.Application/Validations/TrackPull/EditTrackPullConfigInputValidation.cs index 6c9cd0cc..2aae7ae8 100644 --- a/src/TrackCenter.Application/Validations/TrackPull/EditTrackPullConfigInputValidation.cs +++ b/src/TrackCenter.Application/Validations/TrackPull/EditTrackPullConfigInputValidation.cs @@ -1,7 +1,7 @@ using FluentValidation; using Microsoft.Extensions.Localization; using SJZY.Expand.ABP.Core.Localization; -using TrackCenter.Application.Contract.Dtos.TrackPull; +using TrackCenter.Application.Dtos.TrackPull; using TrackCenter.Application.Localization; namespace TrackCenter.Application.Validations.TrackPull; diff --git a/src/TrackCenter.Application/Validations/TrackPull/EditTrackPullContentInputValidation.cs b/src/TrackCenter.Application/Validations/TrackPull/EditTrackPullContentInputValidation.cs index f694e164..ee28f042 100644 --- a/src/TrackCenter.Application/Validations/TrackPull/EditTrackPullContentInputValidation.cs +++ b/src/TrackCenter.Application/Validations/TrackPull/EditTrackPullContentInputValidation.cs @@ -1,7 +1,7 @@ using FluentValidation; using Microsoft.Extensions.Localization; using SJZY.Expand.ABP.Core.Localization; -using TrackCenter.Application.Contract.Dtos.TrackPull; +using TrackCenter.Application.Dtos.TrackPull; using TrackCenter.Application.Localization; namespace TrackCenter.Application.Validations.TrackPull; diff --git a/src/TrackCenter.Application/Validations/TrackStatus/EditTrackStatusInputValidation.cs b/src/TrackCenter.Application/Validations/TrackStatus/EditTrackStatusInputValidation.cs index bffeeb0c..bdd04939 100644 --- a/src/TrackCenter.Application/Validations/TrackStatus/EditTrackStatusInputValidation.cs +++ b/src/TrackCenter.Application/Validations/TrackStatus/EditTrackStatusInputValidation.cs @@ -1,5 +1,5 @@ using FluentValidation; -using TrackCenter.Application.Contract.Dtos.TrackStatus; +using TrackCenter.Application.Dtos.TrackStatus; namespace TrackCenter.Application.Validations.TrackStatus; diff --git a/src/TrackCenter.Application/Validations/TrackTemplates/EditTrackTemplateContentInputValidation.cs b/src/TrackCenter.Application/Validations/TrackTemplates/EditTrackTemplateContentInputValidation.cs index f43d0aa8..651624ba 100644 --- a/src/TrackCenter.Application/Validations/TrackTemplates/EditTrackTemplateContentInputValidation.cs +++ b/src/TrackCenter.Application/Validations/TrackTemplates/EditTrackTemplateContentInputValidation.cs @@ -1,7 +1,7 @@ using FluentValidation; using Microsoft.Extensions.Localization; using SJZY.Expand.ABP.Core.Localization; -using TrackCenter.Application.Contract.Dtos.TrackTemplates; +using TrackCenter.Application.Dtos.TrackTemplates; using TrackCenter.Application.Localization; namespace TrackCenter.Application.Validations.TrackTemplates; diff --git a/src/TrackCenter.Application/Validations/TrackTemplates/EditTrackTemplateInputValidation.cs b/src/TrackCenter.Application/Validations/TrackTemplates/EditTrackTemplateInputValidation.cs index b90ca949..64ca3cdd 100644 --- a/src/TrackCenter.Application/Validations/TrackTemplates/EditTrackTemplateInputValidation.cs +++ b/src/TrackCenter.Application/Validations/TrackTemplates/EditTrackTemplateInputValidation.cs @@ -1,5 +1,5 @@ using FluentValidation; -using TrackCenter.Application.Contract.Dtos.TrackTemplates; +using TrackCenter.Application.Dtos.TrackTemplates; namespace TrackCenter.Application.Validations.TrackTemplates; diff --git a/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderOperationRecordIndex.cs b/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderOperationRecordIndex.cs index 8c315e43..66d55d1d 100644 --- a/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderOperationRecordIndex.cs +++ b/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderOperationRecordIndex.cs @@ -38,7 +38,7 @@ public class OrderOperationRecordIndex : IdBaseIndex /// /// 创建人 /// - public int CreateUserId { get; set; } + public Guid CreateUserId { get; set; } /// /// 创建人姓名 diff --git a/src/TrackCenter.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs b/src/TrackCenter.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs index 464abb88..9f09ac3c 100644 --- a/src/TrackCenter.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs @@ -122,12 +122,6 @@ public class TrackDetailsIndex : IdVersionIndex /// public DateTime? UpdateTime { get; set; } - /// - /// 客户是否可见 - /// - [Obsolete("废弃的，请使用IsExternal")] - public bool IsVisibility { get; set; } - /// /// 是否对外 /// diff --git a/src/TrackCenter.Domain/Dtos/Common/DropdownListDataDto.cs b/src/TrackCenter.Domain/Dtos/Common/DropdownListDataDto.cs new file mode 100644 index 00000000..dd13ef6f --- /dev/null +++ b/src/TrackCenter.Domain/Dtos/Common/DropdownListDataDto.cs @@ -0,0 +1,10 @@ +namespace TrackCenter.Domain.Dtos.Common; + +public class DropdownListDataDto +{ + /// 下拉列表显示文本 + public string Key { get; set; } + + /// 下拉列表值 + public int Value { get; set; } +} diff --git a/src/TrackCenter.Domain/Dtos/Common/IdBaseDto.cs b/src/TrackCenter.Domain/Dtos/Common/IdBaseDto.cs new file mode 100644 index 00000000..08aa7978 --- /dev/null +++ b/src/TrackCenter.Domain/Dtos/Common/IdBaseDto.cs @@ -0,0 +1,6 @@ +namespace TrackCenter.Domain.Dtos.Common; + +public class IdBaseDto +{ + public int Id { get; set; } +} diff --git a/src/TrackCenter.Domain/Dtos/Common/OptionTypeNoNull.cs b/src/TrackCenter.Domain/Dtos/Common/OptionTypeNoNull.cs new file mode 100644 index 00000000..11ee8d56 --- /dev/null +++ b/src/TrackCenter.Domain/Dtos/Common/OptionTypeNoNull.cs @@ -0,0 +1,10 @@ +using System.ComponentModel; + +namespace TrackCenter.Domain.Dtos.Common; + +public enum OptionTypeNoNull +{ + [Description("新增")] 新增 = 1, + [Description("删除")] 删除 = 2, + [Description("修改")] 修改 = 3, +} diff --git a/src/TrackCenter.Domain/Extensions/LogHelper.cs b/src/TrackCenter.Domain/Extensions/LogHelper.cs index 2c3d5df9..7190c140 100644 --- a/src/TrackCenter.Domain/Extensions/LogHelper.cs +++ b/src/TrackCenter.Domain/Extensions/LogHelper.cs @@ -36,6 +36,12 @@ public static class LogHelper SyncContext.Run(() => NoticeAsync(msg, isSend, "Error")); } + public static void Error(Exception error, bool isSendNotice = true) + { + Error(error.ToString(), isSendNotice); + } + + public static async Task NoticeAsync(string content, bool isSend, string subTitle = "") { #if DEBUG diff --git a/src/TrackCenter.Domain/IBasicRepository.cs b/src/TrackCenter.Domain/IBasicRepository.cs index 6f0bc64b..42f0e193 100644 --- a/src/TrackCenter.Domain/IBasicRepository.cs +++ b/src/TrackCenter.Domain/IBasicRepository.cs @@ -5,13 +5,47 @@ namespace TrackCenter.Domain; public interface IBasicRepository : IRepository where T : class, IAggregateRoot, new() { + public ISugarQueryable AsQueryable(); + + /// + /// top 1 + /// + /// + /// + Task GetFirstAsync(Expression> whereExpression); + + Task GetFirstAsync(Expression> whereExpression,Expression> resultExpression); + + /// + /// get list + /// + /// + /// + Task> GetListAsync(Expression> whereExpression); + + Task> GetListAsync(Expression> whereExpression,Expression> resultExpression); + + /// + /// count + /// + /// + /// + Task CountAsync(Expression> exp); + + /// + /// exists + /// + /// + /// + Task IsAnyAsync(Expression> exp); + /// /// update /// /// /// 要忽略更新的列 /// - Task UpdateAsync(T entity, Expression>? ignoreColumns); + Task UpdateAsync(T entity, Expression> ignoreColumns); /// /// update @@ -19,7 +53,7 @@ public interface IBasicRepository : IRepository where T : class, IAggregat /// /// 要更新的列 /// - Task UpdateColumnAsync(T entity, Expression>? updateColumns); + Task UpdateColumnAsync(T entity, Expression> updateColumns); /// /// update @@ -36,7 +70,7 @@ public interface IBasicRepository : IRepository where T : class, IAggregat /// /// 要更新的列 /// - Task UpdateRangeAsync(List entities, Expression>? updateColumns = null); + Task UpdateRangeAsync(List entities, Expression> updateColumns = null); /// /// 软删 diff --git a/src/TrackCenter.Repository/Repositories/BasicRepository.cs b/src/TrackCenter.Repository/Repositories/BasicRepository.cs index b4b22d8a..5f2eefcf 100644 --- a/src/TrackCenter.Repository/Repositories/BasicRepository.cs +++ b/src/TrackCenter.Repository/Repositories/BasicRepository.cs @@ -15,6 +15,44 @@ public class BasicRepository : SqlSugarRepository, I { protected ISqlSugarClient Context => GetDbContextAsync().Result; + public ISugarQueryable AsQueryable() + { + return Context.Queryable(); + } + + public async Task GetFirstAsync(Expression> whereExpression) + { + return await AsQueryable().FirstAsync(whereExpression); + } + + public async Task GetFirstAsync(Expression> whereExpression, + Expression> resultExpression) + { + return await Context.Queryable().Where(whereExpression).Select(resultExpression).FirstAsync(); + } + + public async Task> GetListAsync(Expression> whereExpression) + { + return await AsQueryable().Where(whereExpression).ToListAsync(); + } + + public async Task> GetListAsync(Expression> whereExpression, + Expression> resultExpression) + { + var ctx = await GetDbContextAsync(); + return await ctx.Queryable().Where(whereExpression).Select(resultExpression).ToListAsync(); + } + + public async Task CountAsync(Expression> exp) + { + return await AsQueryable().Where(exp).CountAsync(); + } + + public async Task IsAnyAsync(Expression> exp) + { + return await AsQueryable().Where(exp).AnyAsync(); + } + public async Task UpdateAsync(T entity, Expression>? ignoreColumns) { return await Context.Updateable(entity) @@ -43,13 +81,15 @@ public class BasicRepository : SqlSugarRepository, I .ExecuteCommandHasChangeAsync(); } - // tips: required where - public async Task SoftDeleteAsync(Expression> where) + public async Task SoftDeleteAsync(Expression>? where) { if (!typeof(T).IsAssignableTo()) throw new BusinessException( message: $"实体没有实现{nameof(ISoftDelete)}不能调用{nameof(SoftDeleteAsync)}"); + // tips: required where + if (where == default) return false; + return await Context.Updateable() .Where(where) .SetColumns(nameof(ISoftDelete.IsDeleted), 1) diff --git a/test/SJZY.Track.Test/TestModule.cs b/test/SJZY.Track.Test/TestModule.cs index 6e63ae62..cbc669b0 100644 --- a/test/SJZY.Track.Test/TestModule.cs +++ b/test/SJZY.Track.Test/TestModule.cs @@ -1,6 +1,5 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; -using TrackCenter.Application; using TrackCenter.Repository; using TrackCenter.Api; using Volo.Abp;