From 4ddad722e174bb97b732e7b0cebfa1b69c4a7c6b Mon Sep 17 00:00:00 2001 From: xiaolipro <2357729423@qq.com> Date: Tue, 20 Aug 2024 09:07:19 +0800 Subject: [PATCH] fmt --- .editorconfig | 132 ++++++++++++++---- src/SJZY.Track.Api/SjzyTrackApiModule.cs | 2 +- src/SJZY.Track.Api/appsettings.json | 10 +- .../Dtos/Forewarning/ModifyTimeSpanInput.cs | 5 +- .../ProvideServices/BatchDeleteTrackInput.cs | 2 +- .../ProvideServices/BatchUpsertTrackInput.cs | 2 +- .../Dtos/ProvideServices/DeleteOrderInput.cs | 2 +- .../ProvideServices/GetOrderDetailsInput.cs | 2 +- .../ProvideServices/GetPageTrackOrderInput.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 +- .../Dtos/ProvideServices/UpdateOrderInput.cs | 2 +- .../ProvideServices/UpdateOrderStatusInput.cs | 2 +- .../Dtos/ProvideServices/UpsertOrderInput.cs | 2 +- .../Dtos/ProvideServices/UpsertTrackInput.cs | 2 +- .../TrackContents/EditTrackContentInput.cs | 2 +- .../TrackContents/EditTrackContentMapInput.cs | 2 +- .../TrackContents/GetPageTrackContentInput.cs | 2 +- .../Dtos/TrackFlags/EditTrackFlagInput.cs | 2 +- .../Dtos/TrackFlags/GetTrackFlagListDto.cs | 2 +- .../Dtos/TrackOrder/GetTrackCounterOutput.cs | 2 +- .../Dtos/TrackOrder/TrackPushRecordItem.cs | 2 +- .../Dtos/TrackOrder/TrackPushRecordOutput.cs | 2 +- .../TrackPull/EditTrackPullConfigInput.cs | 2 +- .../TrackPull/EditTrackPullContentInput.cs | 2 +- .../Dtos/TrackPull/TrackPullConfigDto.cs | 2 +- .../TrackPull/TrackPullContentConfigDto.cs | 2 +- .../Dtos/TrackPull/TrackPullParamConfigDto.cs | 2 +- .../Dtos/TrackPull/TrackRefreshAttach.cs | 2 +- .../TrackPush/EditTrackPushConfigInput.cs | 2 +- .../TrackPush/EditTrackPushContentInput.cs | 2 +- .../TrackPush/SortTrackPushContentInput.cs | 2 +- .../TrackPush/TrackPushAfterUpdateOrderDto.cs | 2 +- .../TrackPush/TrackPushContentConfigDto.cs | 2 +- .../Dtos/TrackPush/TrackPushInput.cs | 2 +- .../Dtos/TrackStatus/EditTrackStatusInput.cs | 2 +- .../TrackStatus/GetTrackStatusDetailDto.cs | 2 +- .../Dtos/TrackStatus/GetTrackStatusListDto.cs | 2 +- .../EditTrackTemplateContentInput.cs | 2 +- .../GetPageTrackTemplateInput.cs | 2 +- .../Dtos/TrackTemplates/GetTrackDetailDto.cs | 2 +- .../SortTrackTemplateContentInput.cs | 2 +- .../TrackChangeAfterUpdateOrderEvent.cs | 2 +- .../Events/TrackDeleteEvent.cs | 2 +- .../Events/TrackPushEvent.cs | 2 +- .../Events/TrackUpsertEvent.cs | 2 +- .../Events/TrackUpsertForRefreshEvent.cs | 2 +- .../GlobalUsings.cs | 2 +- .../Services/IOrderService.cs | 2 +- .../Services/ITrackContentService.cs | 2 +- .../Services/ITrackFlagService.cs | 2 +- .../Services/ITrackPullCacheService.cs | 2 +- .../Services/ITrackPushCacheService.cs | 2 +- .../Services/ITrackPushConfigService.cs | 2 +- .../Services/ITrackService.cs | 2 +- .../Services/ITrackStatusService.cs | 2 +- .../SjzyTrackApplicationContractModule.cs | 2 +- .../AutoMapper/OrderAutoMapperProfile.cs | 2 +- .../AutoMapper/TrackAutoMapperProfile.cs | 2 +- .../TrackContentAutoMapperProfile.cs | 2 +- .../AutoMapper/TrackFlagAutoMapperProfile.cs | 2 +- .../AutoMapper/TrackPullAutoMapperProfile.cs | 2 +- .../AutoMapper/TrackPushAutoMapperProfile.cs | 2 +- .../TrackPushConfigAutoMapperProfile.cs | 2 +- .../TrackStatusAutoMapperProfile.cs | 2 +- .../TrackTemplateAutoMapperProfile.cs | 2 +- src/SJZY.Track.Application/CAP/CAPFilter.cs | 8 +- ...TrackChangeAfterUpdateOrderEventHandler.cs | 2 +- .../TrackPushCompletedEventHandler.cs | 2 +- .../EventHandlers/TrackUpsertEventHandler.cs | 8 +- .../CAP/LoggerExtensions.cs | 2 +- .../CAP/MySubscribeExecutor.cs | 4 +- .../CAP/SubscriberExecutionFailedException.cs | 2 +- src/SJZY.Track.Application/GlobalUsing.cs | 2 +- .../Helpers/Base64Helper.cs | 2 +- .../Localization/TrackLocalizationResource.cs | 2 +- .../Options/CustomeOptions.cs | 2 +- .../Rabbit/TrackRefreshEventHandler.cs | 2 +- .../ProvideServices/OrderService.Link.cs | 2 +- .../Services/ProvideServices/OrderService.cs | 2 +- .../ProvideServices/TrackPullService.cs | 2 +- .../ProvideServices/TrackPushConfigService.cs | 2 +- .../ProvideServices/TrackPushService.cs | 2 +- .../Services/ProvideServices/TrackService.cs | 2 +- .../TrackContents/TrackContentService.cs | 2 +- .../Services/TrackFlags/TrackFlagService.cs | 2 +- .../Services/TrackOrders/TrackOrderService.cs | 2 +- .../TrackPull/TrackPullCacheService.cs | 21 ++- .../Services/TrackPush/TrackPushService.cs | 2 +- .../TrackStatus/TrackStatusService.cs | 2 +- .../TrackTemplates/TrackTemplateService.cs | 2 +- .../SjzyTrackApplicationModule.cs | 7 +- .../EditTrackContentInputValidation.cs | 2 +- .../EditTrackContentMapInputValidation.cs | 46 +++--- .../EditTrackFlagInputValidation.cs | 2 +- .../EditTrackPullConfigInputValidation.cs | 71 ++++++---- .../EditTrackPullContentInputValidation.cs | 28 ++-- .../EditTrackStatusInputValidation.cs | 2 +- ...EditTrackTemplateContentInputValidation.cs | 37 +++-- .../EditTrackTemplateInputValidation.cs | 2 +- .../OrderAggregate/IOrderRepository.cs | 2 +- .../Aggregates/OrderAggregate/OrderEntity.cs | 2 +- .../OrderAggregate/OrderFlightEntity.cs | 2 +- .../OrderAggregate/OrderLinkEntity.cs | 2 +- .../OrderAggregate/OrderTemplateEntity.cs | 2 +- .../ITrackContentRepository.cs | 8 +- .../TrackContentEntity.cs | 2 +- .../TrackContentMapEntity.cs | 2 +- .../ITrackFlagRepository.cs | 2 +- .../TrackFlagAggregate/TrackFlagEntity.cs | 2 +- .../ITrackPullConfigRepository.cs | 3 +- .../TrackPullConfigEntity.cs | 2 +- .../TrackPullContentConfigEntity.cs | 2 +- .../TrackPushPullParamsConfigEntity.cs | 2 +- .../ITrackPushConfigRepository.cs | 1 + .../ITrackPushRecordsRepository.cs | 2 +- .../TrackPushConfigEntity.cs | 2 +- .../TrackPushContentConfigEntity.cs | 2 +- .../TrackPushRecordIndex.cs | 2 +- .../TrackStatusAggregate/TrackStatusEntity.cs | 2 +- .../ITrackTemplateRepository.cs | 2 +- .../TrackTemplateContentEntity.cs | 2 +- .../TrackTemplateEntity.cs | 2 +- .../Consts/GlobalConst.MQ.cs | 2 +- src/SJZY.Track.Domain/Consts/GlobalConst.cs | 2 +- .../Dtos/Common/KeywordsInputVO.cs | 2 +- .../Dtos/Order/GetPageTrackOrderInputVO.cs | 2 +- .../Dtos/Order/GetTrackCounterVO.cs | 2 +- .../Dtos/Order/LinkedOrderVO.cs | 2 +- .../Dtos/Order/OrderIdentifier.cs | 2 +- .../Dtos/Order/OrderWithServiceProviderVO.cs | 2 +- .../TrackContents/GetPageTrackContentVO.cs | 2 +- .../TrackContents/GetTrackContentDetailVO.cs | 2 +- .../GetTrackContentMapDetailOutputVO.cs | 2 +- .../GetTrackContentMapPageInputVO.cs | 2 +- .../GetTrackContentMapPageOutputVO.cs | 2 +- .../Dtos/TrackContents/TrackContentVO.cs | 2 +- .../Dtos/TrackDetails/MatchTrackContentDto.cs | 2 +- .../TrackDetails/MatchTrackContentsDto.cs | 2 +- .../Dtos/TrackFlags/GetPageTrackFlagVO.cs | 2 +- .../Dtos/TrackFlags/GetTrackFlagDetailVO.cs | 2 +- .../GetTrackPullConfigDetailOutputVO.cs | 2 +- .../GetTrackPullConfigPageOutputVO.cs | 2 +- .../GetTrackPullContentDetailOutputVO.cs | 2 +- .../GetTrackPullContentListCacheVO.cs | 2 +- .../GetTrackPullContentPageInputVO.cs | 2 +- .../GetTrackPullContentPageOutputVO.cs | 2 +- .../GetTrackPushConfigDetailOutputVO.cs | 2 +- .../GetTrackPushConfigPageOutputVO.cs | 2 +- .../GetTrackPushContentDetailOutputVO.cs | 2 +- .../GetTrackPushContentPageInputVO.cs | 2 +- .../GetTrackPushContentPageOutputVO.cs | 2 +- .../TrackPush/QueryTrackPullMappingsInfoVO.cs | 2 +- .../TrackPush/TrackPushContentConfigVO.cs | 2 +- .../Dtos/TrackStatus/GetPageTrackStatusVO.cs | 2 +- .../TrackStatus/GetTrackStatusDetailVO.cs | 2 +- .../Dtos/TrackStatus/GetTrackStatusListVO.cs | 2 +- .../TrackTemplate/CanDeleteTrackCodeVO.cs | 2 +- .../TrackTemplate/GetPageTrackTemplateVO.cs | 2 +- ...GetTemplateContentAttributeValueInputVO.cs | 2 +- .../GetTrackTemplateContentDetailOutputVo.cs | 2 +- .../GetTrackTemplateContentPageInputVO.cs | 2 +- .../GetTrackTemplateContentPageOutputVO.cs | 2 +- .../TrackTemplate/GetTrackTemplateDetailVO.cs | 2 +- .../Enums/EnumPropertyEnums.cs | 2 +- src/SJZY.Track.Domain/Enums/OrderType.cs | 12 +- .../Enums/TrackLocationValue.cs | 2 +- .../Enums/TrackProblemType.cs | 9 +- src/SJZY.Track.Domain/IBasicRepository.cs | 2 +- .../Queries/ITrackOrderQueries.cs | 2 +- .../SJZYTrackDomainModule.cs | 2 +- .../SeedWork/IAggregateRoot.cs | 2 +- src/SJZY.Track.Domain/SeedWork/IEntity.cs | 2 +- src/SJZY.Track.Domain/TransactionHelper.cs | 2 +- .../VEntities/VEnumValueInfo.cs | 2 +- .../VEntities/VExternalSubjectEntity.cs | 2 +- .../VEntities/VServiceProviderEntity.cs | 2 +- .../VEntities/VSystemEntity.cs | 2 +- .../VEntities/VUserEntity.cs | 2 +- src/SJZY.Track.Repository/DataBaseContext.cs | 2 +- src/SJZY.Track.Repository/EsExtensions.cs | 2 +- src/SJZY.Track.Repository/GlobalUsing.cs | 2 +- .../Queries/BasicQuery.cs | 2 +- .../Queries/TrackOrderQueries.cs | 10 +- .../Repositories/BasicRepository.cs | 2 +- .../Repositories/OrderRepository.cs | 2 +- .../Repositories/TrackContentRepository.cs | 2 +- .../Repositories/TrackFlagRepository.cs | 6 +- .../Repositories/TrackPullConfigRepository.cs | 68 +++++---- .../Repositories/TrackPushConfigRepository.cs | 2 +- .../Repositories/TrackTemplateRepository.cs | 2 +- .../SjzyTrackRepositoryModule.cs | 4 +- test/SJZY.Track.Test/Startup.cs | 2 +- test/SJZY.Track.Test/TestModule.cs | 2 +- test/SJZY.Track.Test/TestModuleTestBase.cs | 2 +- 198 files changed, 494 insertions(+), 358 deletions(-) diff --git a/.editorconfig b/.editorconfig index 83e321b9..0663417e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,33 +1,34 @@ +root = true # EditorConfig is awesome: https://EditorConfig.org # Please feel free to update it (by considering the code style of ABP Team). # top-most EditorConfig file -root = true + +[*] +charset = utf-8 +end_of_line = crlf +trim_trailing_whitespace = false +insert_final_newline = false +indent_style = space +indent_size = 4 +tab_width = 4 + +[*.json] +indent_size = 2 [*.cs] +# diagnostic规则配置 各个项目自己定义 +# CS8618 表示在定义非空属性时，没有在构造函数、初始化器或默认值中对其进行初始化。 +dotnet_diagnostic.cs8618.severity = none +# CS8618 表示方法的返回类型的可空性与目标委托的不匹配。 +dotnet_diagnostic.cs8613.severity = none +# CS1591 表示缺少XML注释 +dotnet_diagnostic.cs1591.severity = none #Namespace设置 -# noinspection EditorConfigKeyCorrectness -csharp_style_namespace_declarations = file_scoped - -# diagnostic规则配置 各个项目自己定义 -# noinspection EditorConfigKeyCorrectness -# CS8618 表示在定义非空属性时，没有在构造函数、初始化器或默认值中对其进行初始化。 -dotnet_diagnostic.CS8618.severity = none -# noinspection EditorConfigKeyCorrectness -# CS8618 表示方法的返回类型的可空性与目标委托的不匹配。 -dotnet_diagnostic.CS8613.severity = none -# noinspection EditorConfigKeyCorrectness -# CS1591 表示缺少XML注释 -dotnet_diagnostic.CS1591.severity = none - -#Core editorconfig formatting - indentation - -#使用制表符进行缩进 -# noinspection EditorConfigValueCorrectness -indent_style = tabs - -#Formatting - indentation options +csharp_style_namespace_declarations = file_scoped:silent +# 设置每行的最大列数 +max_line_length = 120 #缩进switch case内容 csharp_indent_case_contents = true #缩进switch标签 @@ -132,7 +133,7 @@ dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggest #Style - Modifier preferences #当此规则设置为修饰符列表时，偏好指定的顺序。 -csharp_preferred_modifier_order = public, protected, private, virtual, async, readonly, static, override, abstract:suggestion +csharp_preferred_modifier_order = public, private, protected, internal, file, new, static, abstract, virtual, sealed, readonly, override, extern, unsafe, volatile, async, required:suggestion #Style - Pattern matching @@ -146,4 +147,87 @@ dotnet_style_qualification_for_field = false:suggestion #偏好方法前不加this. 或 Me.（在Visual Basic中） dotnet_style_qualification_for_method = false:suggestion #偏好属性前不加this. 或 Me.（在Visual Basic中） -dotnet_style_qualification_for_property = false:suggestion \ No newline at end of file +dotnet_style_qualification_for_property = false:suggestion + +# Microsoft .NET properties +csharp_style_prefer_utf8_string_literals = true:suggestion +dotnet_naming_rule.unity_serialized_field_rule.import_to_resharper = True +dotnet_naming_rule.unity_serialized_field_rule.resharper_description = Unity serialized field +dotnet_naming_rule.unity_serialized_field_rule.resharper_guid = 5f0fdb63-c892-4d2c-9324-15c80b22a7ef +dotnet_naming_rule.unity_serialized_field_rule.severity = warning +dotnet_naming_rule.unity_serialized_field_rule.style = lower_camel_case_style +dotnet_naming_rule.unity_serialized_field_rule.symbols = unity_serialized_field_symbols +dotnet_naming_style.lower_camel_case_style.capitalization = camel_case +dotnet_naming_symbols.unity_serialized_field_symbols.applicable_accessibilities = * +dotnet_naming_symbols.unity_serialized_field_symbols.applicable_kinds = +dotnet_naming_symbols.unity_serialized_field_symbols.resharper_applicable_kinds = unity_serialised_field +dotnet_naming_symbols.unity_serialized_field_symbols.resharper_required_modifiers = instance +dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:none +dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:none +dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:none +dotnet_style_qualification_for_event = false:suggestion + +# ReSharper properties +resharper_autodetect_indent_settings = true +resharper_braces_for_for = not_required +resharper_braces_for_foreach = not_required +resharper_braces_for_ifelse = not_required_for_both +resharper_braces_for_while = not_required +resharper_braces_redundant = true +resharper_csharp_keep_existing_enum_arrangement = false +resharper_formatter_off_tag = @formatter:off +resharper_formatter_on_tag = @formatter:on +resharper_formatter_tags_enabled = true +resharper_keep_existing_declaration_block_arrangement = false +resharper_keep_existing_embedded_block_arrangement = false +resharper_use_heuristics_for_body_style = true +resharper_use_indent_from_vs = false + +# ReSharper inspection severities +resharper_arrange_accessor_owner_body_highlighting = suggestion +resharper_arrange_constructor_or_destructor_body_highlighting = none +resharper_arrange_method_or_operator_body_highlighting = none +resharper_arrange_redundant_parentheses_highlighting = hint +resharper_arrange_this_qualifier_highlighting = hint +resharper_arrange_type_member_modifiers_highlighting = hint +resharper_arrange_type_modifiers_highlighting = hint +resharper_built_in_type_reference_style_for_member_access_highlighting = hint +resharper_built_in_type_reference_style_highlighting = hint +resharper_enforce_do_while_statement_braces_highlighting = none +resharper_enforce_fixed_statement_braces_highlighting = none +resharper_enforce_foreach_statement_braces_highlighting = none +resharper_enforce_for_statement_braces_highlighting = none +resharper_enforce_if_statement_braces_highlighting = none +resharper_enforce_lock_statement_braces_highlighting = none +resharper_enforce_using_statement_braces_highlighting = none +resharper_enforce_while_statement_braces_highlighting = none +resharper_mvc_action_not_resolved_highlighting = warning +resharper_mvc_area_not_resolved_highlighting = warning +resharper_mvc_controller_not_resolved_highlighting = warning +resharper_mvc_masterpage_not_resolved_highlighting = warning +resharper_mvc_partial_view_not_resolved_highlighting = warning +resharper_mvc_template_not_resolved_highlighting = warning +resharper_mvc_view_component_not_resolved_highlighting = warning +resharper_mvc_view_component_view_not_resolved_highlighting = warning +resharper_mvc_view_not_resolved_highlighting = warning +resharper_razor_assembly_not_resolved_highlighting = warning +resharper_redundant_base_qualifier_highlighting = warning +resharper_remove_redundant_braces_highlighting = none +resharper_suggest_var_or_type_built_in_types_highlighting = hint +resharper_suggest_var_or_type_elsewhere_highlighting = hint +resharper_suggest_var_or_type_simple_types_highlighting = hint +resharper_web_config_module_not_resolved_highlighting = warning +resharper_web_config_type_not_resolved_highlighting = warning +resharper_web_config_wrong_module_highlighting = warning +csharp_using_directive_placement = outside_namespace:silent +csharp_prefer_simple_using_statement = true:suggestion +csharp_style_prefer_method_group_conversion = true:silent +csharp_style_prefer_top_level_statements = true:silent +csharp_style_prefer_primary_constructors = true:suggestion +csharp_style_expression_bodied_operators = false:silent +csharp_style_expression_bodied_indexers = true:silent +csharp_style_expression_bodied_accessors = true:silent +csharp_style_expression_bodied_lambdas = true:silent +csharp_style_expression_bodied_local_functions = false:silent +csharp_indent_labels = one_less_than_current +csharp_space_around_binary_operators = before_and_after \ No newline at end of file diff --git a/src/SJZY.Track.Api/SjzyTrackApiModule.cs b/src/SJZY.Track.Api/SjzyTrackApiModule.cs index d40ad3af..850a225d 100644 --- a/src/SJZY.Track.Api/SjzyTrackApiModule.cs +++ b/src/SJZY.Track.Api/SjzyTrackApiModule.cs @@ -1,4 +1,4 @@ -using FluentValidation.AspNetCore; +using FluentValidation.AspNetCore; using Microsoft.AspNetCore.Mvc; using SJZY.Expand.ABP.Core; using SJZY.Expand.ABP.Core.Cors; diff --git a/src/SJZY.Track.Api/appsettings.json b/src/SJZY.Track.Api/appsettings.json index d69cb0c1..90870b4f 100644 --- a/src/SJZY.Track.Api/appsettings.json +++ b/src/SJZY.Track.Api/appsettings.json @@ -1,13 +1,17 @@ { "Configuration": { - "UseLocalConfiguration": false, //是否使用本地配置文件 - "ConfiguraFileName": "appsettings.Development.json", //指定配置文件名称，开启UseLocalConfiguration时生效 + "UseLocalConfiguration": false, + //是否使用本地配置文件 + "ConfiguraFileName": "appsettings.Development.json", + //指定配置文件名称，开启UseLocalConfiguration时生效 "Apollo": { "AppId": "SJZY.Track.Configuration", "Env": "DEV", "Namespace": "Test", "MetaServer": "http://apollo-service-test-apollo-configservice.apollo.svc.cluster.local:8080", - "ConfigServer": [ "http://apollo-service-test-apollo-configservice.apollo.svc.cluster.local:8080" ] + "ConfigServer": [ + "http://apollo-service-test-apollo-configservice.apollo.svc.cluster.local:8080" + ] } }, "Kestrel": { diff --git a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/ModifyTimeSpanInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/ModifyTimeSpanInput.cs index 016106ec..85cfd8e9 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/ModifyTimeSpanInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/ModifyTimeSpanInput.cs @@ -1,5 +1,3 @@ -using SJZY.Track.Domain.Dtos.Forewarning; - namespace SJZY.Track.Application.Contract.Dtos.Forewarning; public class ModifyTimeSpanInput @@ -13,5 +11,4 @@ public class ModifyTimeSpanInput /// 规则详情中的时效相关信息 /// public List Items { get; set; } = new(); -} - +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackInput.cs index 0a79e008..6c5b9c18 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackInput.cs @@ -1,4 +1,4 @@ -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs index 1c90e3a9..29d81fd1 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs @@ -1,4 +1,4 @@ -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/DeleteOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/DeleteOrderInput.cs index bff3df6e..2562224f 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/DeleteOrderInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/DeleteOrderInput.cs @@ -1,4 +1,4 @@ -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs index edba26df..7f4d8f5e 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; public class GetOrderDetailsInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs index d9c87ab0..46b81f28 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; public class GetPageTrackOrderInput : PageInfoInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/LinkOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/LinkOrderInput.cs index da8b3110..d7a90761 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/LinkOrderInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/LinkOrderInput.cs @@ -1,4 +1,4 @@ -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/OrderNoInfo.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/OrderNoInfo.cs index 3ec49a17..94a276f0 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/OrderNoInfo.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/OrderNoInfo.cs @@ -1,4 +1,4 @@ -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/PushTrackInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/PushTrackInput.cs index 5eaff31e..6f4757c6 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/PushTrackInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/PushTrackInput.cs @@ -1,4 +1,4 @@ -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs index 2515ac90..ac1a4589 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; /// /// 查询轨迹推送映射关系入参 diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/RefreshTrackInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/RefreshTrackInput.cs index 4e6e2955..42380265 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/RefreshTrackInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/RefreshTrackInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; public class RefreshTrackInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderInput.cs index b49d6995..9e4c9c20 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderInput.cs @@ -1,4 +1,4 @@ -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderStatusInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderStatusInput.cs index c05d79ee..aab48407 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderStatusInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderStatusInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; public class UpdateOrderStatusInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs index 4293ccc0..1521f649 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs @@ -1,4 +1,4 @@ -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs index ce97f715..811bc6f6 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs @@ -1,4 +1,4 @@ -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs index 7aa92f75..3dc89b93 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackContents; +namespace SJZY.Track.Application.Contract.Dtos.TrackContents; public class EditTrackContentInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentMapInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentMapInput.cs index e207654d..d3765c9e 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentMapInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentMapInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackContents; +namespace SJZY.Track.Application.Contract.Dtos.TrackContents; public class EditTrackContentMapInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs index cf96a21a..caea711c 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackContents; +namespace SJZY.Track.Application.Contract.Dtos.TrackContents; public class GetPageTrackContentInput : PageInfoInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/EditTrackFlagInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/EditTrackFlagInput.cs index 133a8897..549feb6f 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/EditTrackFlagInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/EditTrackFlagInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackFlags; +namespace SJZY.Track.Application.Contract.Dtos.TrackFlags; public class EditTrackFlagInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs index 601d2ca6..163c8491 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackFlags; +namespace SJZY.Track.Application.Contract.Dtos.TrackFlags; public class GetTrackFlagListDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/GetTrackCounterOutput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/GetTrackCounterOutput.cs index e330fabb..795daea2 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/GetTrackCounterOutput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/GetTrackCounterOutput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackOrder; +namespace SJZY.Track.Application.Contract.Dtos.TrackOrder; public class GetTrackCounterOutput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs index f01d9869..d99aa8b6 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackOrder; +namespace SJZY.Track.Application.Contract.Dtos.TrackOrder; public class TrackPushRecordItem { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordOutput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordOutput.cs index bc136ca0..38fb93f4 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordOutput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordOutput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackOrder; +namespace SJZY.Track.Application.Contract.Dtos.TrackOrder; public class TrackPushRecordOutput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs index 7d165fc5..bb4cc36e 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPull; +namespace SJZY.Track.Application.Contract.Dtos.TrackPull; public class EditTrackPullConfigInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs index 0163c3e2..763c50b0 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPull; +namespace SJZY.Track.Application.Contract.Dtos.TrackPull; public class EditTrackPullContentInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullConfigDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullConfigDto.cs index 10f78964..c2074c37 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullConfigDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullConfigDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPull; +namespace SJZY.Track.Application.Contract.Dtos.TrackPull; public class TrackPullConfigDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullContentConfigDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullContentConfigDto.cs index d1e279d7..2de31be9 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullContentConfigDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullContentConfigDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPull; +namespace SJZY.Track.Application.Contract.Dtos.TrackPull; public class TrackPullContentConfigDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs index afb97603..11197ff5 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPull; +namespace SJZY.Track.Application.Contract.Dtos.TrackPull; public class TrackPullParamConfigDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs index a527dd47..3bd011dd 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPull; +namespace SJZY.Track.Application.Contract.Dtos.TrackPull; public class TrackRefreshAttach { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs index 12186d8a..126da65f 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Share.Enums; +using SJZY.Track.Share.Enums; namespace SJZY.Track.Application.Contract.Dtos.TrackPush; diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushContentInput.cs index 62fa7cda..6de74c24 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushContentInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushContentInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPush; +namespace SJZY.Track.Application.Contract.Dtos.TrackPush; public class EditTrackPushContentInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/SortTrackPushContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/SortTrackPushContentInput.cs index ed095f3e..b0bc3f48 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/SortTrackPushContentInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/SortTrackPushContentInput.cs @@ -1,4 +1,4 @@ -using SJZY.Expand.ABP.Core.PublicMethords; +using SJZY.Expand.ABP.Core.PublicMethords; namespace SJZY.Track.Application.Contract.Dtos.TrackPush; diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushAfterUpdateOrderDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushAfterUpdateOrderDto.cs index 3e6ca93d..bb9584f4 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushAfterUpdateOrderDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushAfterUpdateOrderDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPush; +namespace SJZY.Track.Application.Contract.Dtos.TrackPush; public class TrackPushAfterUpdateOrderDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushContentConfigDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushContentConfigDto.cs index e6f04aa7..09851e29 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushContentConfigDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushContentConfigDto.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Share.Enums; +using SJZY.Track.Share.Enums; namespace SJZY.Track.Application.Contract.Dtos.TrackPush; diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushInput.cs index 28a18876..6a222e13 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPush; +namespace SJZY.Track.Application.Contract.Dtos.TrackPush; public class TrackPushInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs index e0d93cd5..94295183 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackStatus; +namespace SJZY.Track.Application.Contract.Dtos.TrackStatus; public class EditTrackStatusInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs index 0331c626..e40ae440 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackStatus; +namespace SJZY.Track.Application.Contract.Dtos.TrackStatus; public class GetTrackStatusDetailDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs index ea6c42e4..c94f7b94 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackStatus; +namespace SJZY.Track.Application.Contract.Dtos.TrackStatus; public class GetTrackStatusListDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs index 62ae5922..38581fec 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackTemplates; +namespace SJZY.Track.Application.Contract.Dtos.TrackTemplates; /// public class EditTrackTemplateContentInput diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs index 8a6a9c1a..32ec2fd6 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackTemplates; +namespace SJZY.Track.Application.Contract.Dtos.TrackTemplates; /// /// 获取轨迹模版分页输入 diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs index eb23739c..041bb08d 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackTemplates; +namespace SJZY.Track.Application.Contract.Dtos.TrackTemplates; /// /// 获取轨迹模版详情 diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs index 0dbd5155..55c3dee0 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs @@ -1,4 +1,4 @@ -using SJZY.Expand.ABP.Core.PublicMethords; +using SJZY.Expand.ABP.Core.PublicMethords; namespace SJZY.Track.Application.Contract.Dtos.TrackTemplates; diff --git a/src/SJZY.Track.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs index 736100c9..d07ae367 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Events; +namespace SJZY.Track.Application.Contract.Events; public class TrackChangeAfterUpdateOrderEvent { diff --git a/src/SJZY.Track.Application.Contract/Events/TrackDeleteEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackDeleteEvent.cs index 73b4d0ac..0b77dcc2 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackDeleteEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackDeleteEvent.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Events; +namespace SJZY.Track.Application.Contract.Events; public class TrackDeleteEvent { diff --git a/src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs index b2724e3d..dc1abe5f 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Events; +namespace SJZY.Track.Application.Contract.Events; public class TrackPushEvent { diff --git a/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs index 5b6ea02e..c173644a 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Events; +namespace SJZY.Track.Application.Contract.Events; public class TrackUpsertEvent { diff --git a/src/SJZY.Track.Application.Contract/Events/TrackUpsertForRefreshEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackUpsertForRefreshEvent.cs index 7069903a..50096c8b 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackUpsertForRefreshEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackUpsertForRefreshEvent.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Events; +namespace SJZY.Track.Application.Contract.Events; public class TrackUpsertForRefreshEvent { diff --git a/src/SJZY.Track.Application.Contract/GlobalUsings.cs b/src/SJZY.Track.Application.Contract/GlobalUsings.cs index 99b0e5e1..19811628 100644 --- a/src/SJZY.Track.Application.Contract/GlobalUsings.cs +++ b/src/SJZY.Track.Application.Contract/GlobalUsings.cs @@ -1,4 +1,4 @@ -// Global using directives +// Global using directives global using SJZY.Expand.ABP.Common.Enums; global using SJZY.Expand.ABP.Core.Common.Dto; \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Services/IOrderService.cs b/src/SJZY.Track.Application.Contract/Services/IOrderService.cs index adff3b24..c2a5584e 100644 --- a/src/SJZY.Track.Application.Contract/Services/IOrderService.cs +++ b/src/SJZY.Track.Application.Contract/Services/IOrderService.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using SJZY.Track.Application.Contract.Dtos.ProvideServices; using Volo.Abp; namespace SJZY.Track.Application.Contract.Services; diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackContentService.cs b/src/SJZY.Track.Application.Contract/Services/ITrackContentService.cs index 08ce5194..b663cc5a 100644 --- a/src/SJZY.Track.Application.Contract/Services/ITrackContentService.cs +++ b/src/SJZY.Track.Application.Contract/Services/ITrackContentService.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Services; +namespace SJZY.Track.Application.Contract.Services; public interface ITrackContentService { diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackFlagService.cs b/src/SJZY.Track.Application.Contract/Services/ITrackFlagService.cs index a7d780b9..4687cc9b 100644 --- a/src/SJZY.Track.Application.Contract/Services/ITrackFlagService.cs +++ b/src/SJZY.Track.Application.Contract/Services/ITrackFlagService.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Services; +namespace SJZY.Track.Application.Contract.Services; public interface ITrackFlagService { diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackPullCacheService.cs b/src/SJZY.Track.Application.Contract/Services/ITrackPullCacheService.cs index e98a6be8..3dae00ee 100644 --- a/src/SJZY.Track.Application.Contract/Services/ITrackPullCacheService.cs +++ b/src/SJZY.Track.Application.Contract/Services/ITrackPullCacheService.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Application.Contract.Dtos.TrackPull; +using SJZY.Track.Application.Contract.Dtos.TrackPull; namespace SJZY.Track.Application.Contract.Services; diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackPushCacheService.cs b/src/SJZY.Track.Application.Contract/Services/ITrackPushCacheService.cs index d243a7a0..a8ec1f53 100644 --- a/src/SJZY.Track.Application.Contract/Services/ITrackPushCacheService.cs +++ b/src/SJZY.Track.Application.Contract/Services/ITrackPushCacheService.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Application.Contract.Dtos.TrackPush; +using SJZY.Track.Application.Contract.Dtos.TrackPush; namespace SJZY.Track.Application.Contract.Services; diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackPushConfigService.cs b/src/SJZY.Track.Application.Contract/Services/ITrackPushConfigService.cs index fc8e1260..89311311 100644 --- a/src/SJZY.Track.Application.Contract/Services/ITrackPushConfigService.cs +++ b/src/SJZY.Track.Application.Contract/Services/ITrackPushConfigService.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using SJZY.Track.Application.Contract.Dtos.ProvideServices; using Volo.Abp; namespace SJZY.Track.Application.Contract.Services; diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackService.cs b/src/SJZY.Track.Application.Contract/Services/ITrackService.cs index a586f69d..10108bbb 100644 --- a/src/SJZY.Track.Application.Contract/Services/ITrackService.cs +++ b/src/SJZY.Track.Application.Contract/Services/ITrackService.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using SJZY.Track.Application.Contract.Dtos.ProvideServices; using Volo.Abp; namespace SJZY.Track.Application.Contract.Services; diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackStatusService.cs b/src/SJZY.Track.Application.Contract/Services/ITrackStatusService.cs index b350cb93..4f351f2c 100644 --- a/src/SJZY.Track.Application.Contract/Services/ITrackStatusService.cs +++ b/src/SJZY.Track.Application.Contract/Services/ITrackStatusService.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Services; +namespace SJZY.Track.Application.Contract.Services; public interface ITrackStatusService { diff --git a/src/SJZY.Track.Application.Contract/SjzyTrackApplicationContractModule.cs b/src/SJZY.Track.Application.Contract/SjzyTrackApplicationContractModule.cs index 0da04423..9224ccbb 100644 --- a/src/SJZY.Track.Application.Contract/SjzyTrackApplicationContractModule.cs +++ b/src/SJZY.Track.Application.Contract/SjzyTrackApplicationContractModule.cs @@ -1,4 +1,4 @@ -using Volo.Abp.Modularity; +using Volo.Abp.Modularity; namespace SJZY.Track.Application.Contract; diff --git a/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs index dbe6b8f6..01283cc9 100644 --- a/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs @@ -1,4 +1,4 @@ -using AutoMapper; +using AutoMapper; using SJZY.Expand.ABP.Core.PublicMethords; using SJZY.Track.Application.Contract.Dtos.ProvideServices; using SJZY.Track.Application.Contract.Dtos.TrackOrder; diff --git a/src/SJZY.Track.Application/AutoMapper/TrackAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackAutoMapperProfile.cs index 96dd01b3..7a0fe9ef 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackAutoMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/TrackAutoMapperProfile.cs @@ -1,4 +1,4 @@ -using AutoMapper; +using AutoMapper; using SJZY.Track.Application.Contract.Dtos.ProvideServices; using SJZY.Track.Application.Contract.Events; diff --git a/src/SJZY.Track.Application/AutoMapper/TrackContentAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackContentAutoMapperProfile.cs index 7a91ef2c..4a4838fd 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackContentAutoMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/TrackContentAutoMapperProfile.cs @@ -1,4 +1,4 @@ -using AutoMapper; +using AutoMapper; using SJZY.Track.Application.Contract.Dtos.TrackContents; using SJZY.Track.Domain.Aggregates.TrackContentAggregate; using SJZY.Track.Domain.Dtos.TrackContents; diff --git a/src/SJZY.Track.Application/AutoMapper/TrackFlagAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackFlagAutoMapperProfile.cs index fb13e498..86972346 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackFlagAutoMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/TrackFlagAutoMapperProfile.cs @@ -1,4 +1,4 @@ -using AutoMapper; +using AutoMapper; using SJZY.Track.Application.Contract.Dtos.TrackFlags; using SJZY.Track.Domain.Aggregates.TrackFlagAggregate; using SJZY.Track.Domain.Dtos.TrackFlags; diff --git a/src/SJZY.Track.Application/AutoMapper/TrackPullAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackPullAutoMapperProfile.cs index fbd0abc8..3a1243ff 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackPullAutoMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/TrackPullAutoMapperProfile.cs @@ -1,4 +1,4 @@ -using AutoMapper; +using AutoMapper; using SJZY.Track.Application.Contract.Dtos.TrackPull; using SJZY.Track.Domain.Aggregates.TrackPullAggregate; using SJZY.Track.Domain.Dtos.TrackPull; diff --git a/src/SJZY.Track.Application/AutoMapper/TrackPushAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackPushAutoMapperProfile.cs index 6e0739fc..4383bdde 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackPushAutoMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/TrackPushAutoMapperProfile.cs @@ -1,4 +1,4 @@ -using AutoMapper; +using AutoMapper; using SJZY.Track.Application.Contract.Dtos.TrackPush; using SJZY.Track.Domain.Aggregates.TrackPullAggregate; using SJZY.Track.Domain.Aggregates.TrackPushAggregate; diff --git a/src/SJZY.Track.Application/AutoMapper/TrackPushConfigAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackPushConfigAutoMapperProfile.cs index 0edb37af..a16f00ff 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackPushConfigAutoMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/TrackPushConfigAutoMapperProfile.cs @@ -1,4 +1,4 @@ -using AutoMapper; +using AutoMapper; using SJZY.Track.Application.Contract.Dtos.ProvideServices; using SJZY.Track.Domain.Dtos.TrackPush; diff --git a/src/SJZY.Track.Application/AutoMapper/TrackStatusAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackStatusAutoMapperProfile.cs index 55479c73..326e6f01 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackStatusAutoMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/TrackStatusAutoMapperProfile.cs @@ -1,4 +1,4 @@ -using AutoMapper; +using AutoMapper; using SJZY.Track.Application.Contract.Dtos.TrackStatus; using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; using SJZY.Track.Domain.Dtos.TrackStatus; diff --git a/src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs index 36f0e498..538241c8 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs @@ -1,4 +1,4 @@ -using AutoMapper; +using AutoMapper; using SJZY.Track.Application.Contract.Dtos.TrackTemplates; using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; using SJZY.Track.Domain.Dtos.TrackTemplate; diff --git a/src/SJZY.Track.Application/CAP/CAPFilter.cs b/src/SJZY.Track.Application/CAP/CAPFilter.cs index 4b36e128..3f742ca4 100644 --- a/src/SJZY.Track.Application/CAP/CAPFilter.cs +++ b/src/SJZY.Track.Application/CAP/CAPFilter.cs @@ -1,4 +1,4 @@ -using DotNetCore.CAP.Filter; +using DotNetCore.CAP.Filter; using SJZY.Expand.ABP.Core; using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ABP.Core.PublicMethords; @@ -20,11 +20,7 @@ public class CapFilter : SubscribeFilter { // 轨迹新增、更新要做幂等 if (!context.DeliverMessage.Headers["cap-msg-name"] - .IsIn(GlobalConst.TrackUpsertSubscribe, GlobalConst.TrackManualPushSubscribe)) - { - return; - } - + .IsIn(GlobalConst.TrackUpsertSubscribe, GlobalConst.TrackManualPushSubscribe)) return; var argumentJsonStr = context.Arguments.ToJson(); if (!string.IsNullOrEmpty(argumentJsonStr)) diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs index ad2be8e2..134fdbda 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs @@ -1,4 +1,4 @@ -using DotNetCore.CAP; +using DotNetCore.CAP; using SJZY.Track.Application.Contract.Dtos.Forewarning; using SJZY.Track.Application.Contract.Events; using SJZY.Track.Application.Contract.Services; diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushCompletedEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushCompletedEventHandler.cs index c576fcec..959ce7e1 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushCompletedEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushCompletedEventHandler.cs @@ -1,4 +1,4 @@ -using DotNetCore.CAP; +using DotNetCore.CAP; using Newtonsoft.Json; using SJZY.InterfaceRelay.Application.Contracts; using SJZY.Track.Application.Contract.Dtos.TrackPush; diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs index a3a791ff..0f997d2f 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs @@ -1,4 +1,4 @@ -using DotNetCore.CAP; +using DotNetCore.CAP; using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ABP.Core.PublicMethords; using SJZY.Track.Application.Contract.Events; @@ -13,10 +13,10 @@ namespace SJZY.Track.Application.CAP.EventHandlers; public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe { + private readonly ICapPublisher _capPublisher; private readonly IOrderRepository _orderRepository; private readonly IProvideQueries _provideQueries; private readonly ITrackDetailsRepository _trackDetailsRepository; - private readonly ICapPublisher _capPublisher; public TrackUpsertEventHandler(IOrderRepository orderRepository, ICapPublisher capPublisher, IProvideQueries provideQueries, ITrackDetailsRepository trackDetailsRepository) @@ -82,9 +82,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe var identifiers = group.Select(x => new OrderIdentifier { - OrderId = x.OrderId, - OrderNo = x.OrderNo, - OrderType = x.OrderType, + OrderId = x.OrderId, OrderNo = x.OrderNo, OrderType = x.OrderType, }).ToList(); var idx = 0; while (idx < identifiers.Count) diff --git a/src/SJZY.Track.Application/CAP/LoggerExtensions.cs b/src/SJZY.Track.Application/CAP/LoggerExtensions.cs index 8b430825..3f66443e 100644 --- a/src/SJZY.Track.Application/CAP/LoggerExtensions.cs +++ b/src/SJZY.Track.Application/CAP/LoggerExtensions.cs @@ -1,4 +1,4 @@ -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging; namespace SJZY.Track.Application.CAP; diff --git a/src/SJZY.Track.Application/CAP/MySubscribeExecutor.cs b/src/SJZY.Track.Application/CAP/MySubscribeExecutor.cs index c9ff478b..f4061a25 100644 --- a/src/SJZY.Track.Application/CAP/MySubscribeExecutor.cs +++ b/src/SJZY.Track.Application/CAP/MySubscribeExecutor.cs @@ -146,9 +146,7 @@ public class MySubscribeExecutor : ISubscribeExecutor { _options.FailedThresholdCallback?.Invoke(new FailedInfo { - ServiceProvider = _provider, - MessageType = MessageType.Subscribe, - Message = message.Origin + ServiceProvider = _provider, MessageType = MessageType.Subscribe, Message = message.Origin }); _logger.ConsumerExecutedAfterThreshold(message.DbId, _options.FailedRetryCount); diff --git a/src/SJZY.Track.Application/CAP/SubscriberExecutionFailedException.cs b/src/SJZY.Track.Application/CAP/SubscriberExecutionFailedException.cs index 31b183af..ce3a5ffa 100644 --- a/src/SJZY.Track.Application/CAP/SubscriberExecutionFailedException.cs +++ b/src/SJZY.Track.Application/CAP/SubscriberExecutionFailedException.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.CAP; +namespace SJZY.Track.Application.CAP; internal class SubscriberExecutionFailedException : Exception { diff --git a/src/SJZY.Track.Application/GlobalUsing.cs b/src/SJZY.Track.Application/GlobalUsing.cs index 047d98cb..91d65fe7 100644 --- a/src/SJZY.Track.Application/GlobalUsing.cs +++ b/src/SJZY.Track.Application/GlobalUsing.cs @@ -1,4 +1,4 @@ -global using Microsoft.AspNetCore.Mvc; +global using Microsoft.AspNetCore.Mvc; global using Microsoft.Extensions.DependencyInjection; global using SJZY.Expand.ABP.Common.Enums; global using SJZY.Expand.ABP.Core.Common.Dto; diff --git a/src/SJZY.Track.Application/Helpers/Base64Helper.cs b/src/SJZY.Track.Application/Helpers/Base64Helper.cs index 4cc20d25..8bb30190 100644 --- a/src/SJZY.Track.Application/Helpers/Base64Helper.cs +++ b/src/SJZY.Track.Application/Helpers/Base64Helper.cs @@ -1,4 +1,4 @@ -using System.Text; +using System.Text; using Newtonsoft.Json; namespace SJZY.Track.Application.Helpers; diff --git a/src/SJZY.Track.Application/Localization/TrackLocalizationResource.cs b/src/SJZY.Track.Application/Localization/TrackLocalizationResource.cs index b273faba..bb336e2c 100644 --- a/src/SJZY.Track.Application/Localization/TrackLocalizationResource.cs +++ b/src/SJZY.Track.Application/Localization/TrackLocalizationResource.cs @@ -1,4 +1,4 @@ -using SJZY.Expand.ABP.Core.Localization; +using SJZY.Expand.ABP.Core.Localization; using Volo.Abp.Localization; namespace SJZY.Track.Application.Localization; diff --git a/src/SJZY.Track.Application/Options/CustomeOptions.cs b/src/SJZY.Track.Application/Options/CustomeOptions.cs index 7dd169bb..16a2e29e 100644 --- a/src/SJZY.Track.Application/Options/CustomeOptions.cs +++ b/src/SJZY.Track.Application/Options/CustomeOptions.cs @@ -1,4 +1,4 @@ -using SJZY.Expand.ABP.Core; +using SJZY.Expand.ABP.Core; namespace SJZY.Track.Application.Options; diff --git a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs index cb610056..8a276756 100644 --- a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs +++ b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs @@ -1,4 +1,4 @@ -using System.Diagnostics; +using System.Diagnostics; using System.Linq.Expressions; using System.Text; using BSI.Stack.Rabbit; diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs index 10946081..64aeed63 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs @@ -1,4 +1,4 @@ -using DotNetCore.CAP; +using DotNetCore.CAP; using SJZY.Track.Application.Contract.Dtos.ProvideServices; using SJZY.Track.Application.Contract.Events; using SJZY.Track.Domain.Aggregates.OrderAggregate; diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs index 4a72f258..134e1e8c 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs @@ -1,4 +1,4 @@ -using DotNetCore.CAP; +using DotNetCore.CAP; using SJZY.Track.Application.Contract.Dtos.ProvideServices; using SJZY.Track.Application.Contract.Services; using SJZY.Track.Domain.Aggregates.OrderAggregate; diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs index 92c27a59..d8b1262e 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Authorization; using SJZY.Expand.ABP.Core; using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ABP.Core.PublicMethords; diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushConfigService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushConfigService.cs index ab1b5d23..7e7070ea 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushConfigService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushConfigService.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using SJZY.Track.Application.Contract.Dtos.ProvideServices; using SJZY.Track.Application.Contract.Services; using SJZY.Track.Domain.Aggregates.TrackPushAggregate; using SJZY.Track.Domain.Dtos.TrackPush; diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs index 014860bd..ed2a0337 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs @@ -1,4 +1,4 @@ -using DotNetCore.CAP; +using DotNetCore.CAP; using Microsoft.AspNetCore.Authorization; using SJZY.Track.Application.Contract.Dtos.ProvideServices; using SJZY.Track.Application.Contract.Events; diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs index 132097b9..d03591de 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs @@ -1,4 +1,4 @@ -using DotNetCore.CAP; +using DotNetCore.CAP; using SJZY.Track.Application.Contract.Dtos.ProvideServices; using SJZY.Track.Application.Contract.Events; using SJZY.Track.Application.Contract.Services; diff --git a/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs b/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs index 57f68f68..da81dac8 100644 --- a/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs +++ b/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs @@ -1,4 +1,4 @@ -using System.Linq.Expressions; +using System.Linq.Expressions; using Microsoft.Extensions.Localization; using SJZY.Expand.ABP.Core.Localization; using SJZY.Expand.ABP.Core.PublicMethords; diff --git a/src/SJZY.Track.Application/Services/TrackFlags/TrackFlagService.cs b/src/SJZY.Track.Application/Services/TrackFlags/TrackFlagService.cs index 9d38119f..ab791109 100644 --- a/src/SJZY.Track.Application/Services/TrackFlags/TrackFlagService.cs +++ b/src/SJZY.Track.Application/Services/TrackFlags/TrackFlagService.cs @@ -1,4 +1,4 @@ -using Microsoft.Extensions.Localization; +using Microsoft.Extensions.Localization; using SJZY.Track.Application.Contract.Dtos.TrackFlags; using SJZY.Track.Application.Localization; using SJZY.Track.Domain.Aggregates.TrackContentAggregate; diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs index d094f67c..09d9ca2e 100644 --- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs +++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs @@ -1,4 +1,4 @@ -using System.Diagnostics; +using System.Diagnostics; using SJZY.Track.Application.Contract.Dtos.ProvideServices; using SJZY.Track.Application.Contract.Dtos.TrackOrder; using SJZY.Track.Domain.Aggregates.OrderAggregate; diff --git a/src/SJZY.Track.Application/Services/TrackPull/TrackPullCacheService.cs b/src/SJZY.Track.Application/Services/TrackPull/TrackPullCacheService.cs index 76ae531c..642744e3 100644 --- a/src/SJZY.Track.Application/Services/TrackPull/TrackPullCacheService.cs +++ b/src/SJZY.Track.Application/Services/TrackPull/TrackPullCacheService.cs @@ -12,26 +12,25 @@ public class TrackPullCacheService : ApplicationService, ITrackPullCacheService { private readonly ITrackPullConfigRepository _trackPullConfigRepository; + public TrackPullCacheService(ITrackPullConfigRepository trackPullConfigRepository) + { + _trackPullConfigRepository = trackPullConfigRepository; + } + public string TrackPullKey(int subSystemId, int serviceProviderId) => $"{GlobalConst.TrackPullKeyPrefix}:{subSystemId}:{serviceProviderId}"; public string TrackPullContentKey(int subSystemId, int serviceProviderId) => $"{GlobalConst.TrackPullContentKeyPrefix}:{subSystemId}:{serviceProviderId}"; - public TrackPullCacheService(ITrackPullConfigRepository trackPullConfigRepository) - { - _trackPullConfigRepository = trackPullConfigRepository; - } - [NonAction] public async Task> GetAllPullConfigsAsync() { - return await _trackPullConfigRepository.GetListAsync(x => true, x => new TrackPullConfigDto - { - SubSystemId = x.SubSystemId, - ServiceProviderId = x.ServiceProviderId, - PullInterval = x.PullInterval - }); + return await _trackPullConfigRepository.GetListAsync(x => true, + x => new TrackPullConfigDto + { + SubSystemId = x.SubSystemId, ServiceProviderId = x.ServiceProviderId, PullInterval = x.PullInterval + }); } [NonAction] diff --git a/src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs b/src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs index b81363b1..63c20073 100644 --- a/src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs +++ b/src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs @@ -1,4 +1,4 @@ -using System.Linq.Expressions; +using System.Linq.Expressions; using Microsoft.Extensions.Localization; using SJZY.Expand.ABP.Core.Localization; using SJZY.Expand.ABP.Core.PublicMethords; diff --git a/src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs b/src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs index 47f85ec1..e87fcd11 100644 --- a/src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs +++ b/src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs @@ -1,4 +1,4 @@ -using Microsoft.Extensions.Localization; +using Microsoft.Extensions.Localization; using SJZY.Track.Application.Contract.Dtos.TrackStatus; using SJZY.Track.Application.Localization; using SJZY.Track.Domain.Aggregates.TrackContentAggregate; diff --git a/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs b/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs index a52f01b4..8ca614d4 100644 --- a/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs +++ b/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs @@ -1,4 +1,4 @@ -using System.Linq.Expressions; +using System.Linq.Expressions; using Microsoft.Extensions.Localization; using SJZY.Expand.ABP.Core.Localization; using SJZY.Expand.ABP.Core.PublicMethords; diff --git a/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs b/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs index 10a9c45d..db7dcab3 100644 --- a/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs +++ b/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs @@ -1,4 +1,4 @@ -using BSI.Stack.Rabbit; +using BSI.Stack.Rabbit; using DotNetCore.CAP; using DotNetCore.CAP.Internal; using Microsoft.Extensions.Configuration; @@ -65,10 +65,7 @@ public class SjzyTrackApplicationModule : AbpModule .AddVirtualJson("/Localization/Resources"); }); //授权拦截提示 - context.Services.Configure(options => - { - options.Filters.Add(new ApiAsyncAuthorizationFilter()); - }); + context.Services.Configure(options => { options.Filters.Add(new ApiAsyncAuthorizationFilter()); }); //用户中心 context.Services.AddHttpClientProxies(typeof(SjzyUserCenterHttpApiModule).Assembly, "UserCenter", false); diff --git a/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentInputValidation.cs b/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentInputValidation.cs index afe77322..36848552 100644 --- a/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentInputValidation.cs +++ b/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentInputValidation.cs @@ -1,4 +1,4 @@ -using FluentValidation; +using FluentValidation; using SJZY.Track.Application.Contract.Dtos.TrackContents; namespace SJZY.Track.Application.Validations.TrackContents; diff --git a/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentMapInputValidation.cs b/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentMapInputValidation.cs index b4cf3ed8..d8ef431c 100644 --- a/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentMapInputValidation.cs +++ b/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentMapInputValidation.cs @@ -10,36 +10,50 @@ public class EditTrackContentMapInputValidation : AbstractValidator stringLocalizer) { - RuleFor(x => x.Options).IsInEnum().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum, nameof(EditTrackContentMapInput.Options)]); + RuleFor(x => x.Options).IsInEnum().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum, + nameof(EditTrackContentMapInput.Options)]); - RuleFor(x => x.Id).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackContentMapInput.Id), 0]); + RuleFor(x => x.Id).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, + nameof(EditTrackContentMapInput.Id), 0]); - RuleFor(x => x.MapSubSystemId).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackContentMapInput.MapSubSystemId), 0]); + RuleFor(x => x.MapSubSystemId).GreaterThan(0).WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackContentMapInput.MapSubSystemId), 0]); - RuleFor(x => x.MapTrackContentId).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackContentMapInput.MapTrackContentId), 0]); + RuleFor(x => x.MapTrackContentId).GreaterThan(0).WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackContentMapInput.MapTrackContentId), 0]); - RuleFor(x => x.SubSystemId).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackContentMapInput.SubSystemId), 0]); + RuleFor(x => x.SubSystemId).GreaterThan(0).WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackContentMapInput.SubSystemId), 0]); - RuleFor(x => x.TrackContentId).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackContentMapInput.TrackContentId), 0]); + RuleFor(x => x.TrackContentId).GreaterThan(0).WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackContentMapInput.TrackContentId), 0]); - When(x => x.Options != OptionTypeNoNull.新增, () => - { - RuleFor(x => x.Id).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackContentMapInput.Id)]); - }); + When(x => x.Options != OptionTypeNoNull.新增, + () => + { + RuleFor(x => x.Id).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, + nameof(EditTrackContentMapInput.Id)]); + }); When(x => x.Options != OptionTypeNoNull.删除, () => { - RuleFor(x => x.MapSubSystemId).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackContentMapInput.MapSubSystemId)]); + RuleFor(x => x.MapSubSystemId).NotNull().WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackContentMapInput.MapSubSystemId)]); - RuleFor(x => x.MapTrackContentCode).NotEmpty().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackContentMapInput.MapTrackContentCode)]); + RuleFor(x => x.MapTrackContentCode).NotEmpty().WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackContentMapInput.MapTrackContentCode)]); - RuleFor(x => x.MapTrackContentId).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackContentMapInput.MapTrackContentId)]); + RuleFor(x => x.MapTrackContentId).NotNull().WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackContentMapInput.MapTrackContentId)]); - RuleFor(x => x.SubSystemId).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackContentMapInput.SubSystemId)]); + RuleFor(x => x.SubSystemId).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, + nameof(EditTrackContentMapInput.SubSystemId)]); - RuleFor(x => x.TrackContentCode).NotEmpty().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackContentMapInput.TrackContentCode)]); + RuleFor(x => x.TrackContentCode).NotEmpty().WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackContentMapInput.TrackContentCode)]); - RuleFor(x => x.TrackContentId).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackContentMapInput.TrackContentId)]); + RuleFor(x => x.TrackContentId).NotNull().WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackContentMapInput.TrackContentId)]); }); } } \ No newline at end of file diff --git a/src/SJZY.Track.Application/Validations/TrackFlags/EditTrackFlagInputValidation.cs b/src/SJZY.Track.Application/Validations/TrackFlags/EditTrackFlagInputValidation.cs index 815acc10..543d9ef2 100644 --- a/src/SJZY.Track.Application/Validations/TrackFlags/EditTrackFlagInputValidation.cs +++ b/src/SJZY.Track.Application/Validations/TrackFlags/EditTrackFlagInputValidation.cs @@ -1,4 +1,4 @@ -using FluentValidation; +using FluentValidation; using SJZY.Track.Application.Contract.Dtos.TrackFlags; namespace SJZY.Track.Application.Validations.TrackFlags; diff --git a/src/SJZY.Track.Application/Validations/TrackPull/EditTrackPullConfigInputValidation.cs b/src/SJZY.Track.Application/Validations/TrackPull/EditTrackPullConfigInputValidation.cs index 50beea14..6833a5a8 100644 --- a/src/SJZY.Track.Application/Validations/TrackPull/EditTrackPullConfigInputValidation.cs +++ b/src/SJZY.Track.Application/Validations/TrackPull/EditTrackPullConfigInputValidation.cs @@ -10,55 +10,78 @@ public class EditTrackPullConfigInputValidation : AbstractValidator stringLocalizer) { - RuleFor(x => x.Options).IsInEnum().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum, nameof(EditTrackPullConfigInput.Options)]); + RuleFor(x => x.Options).IsInEnum().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum, + nameof(EditTrackPullConfigInput.Options)]); - RuleFor(x => x.Id).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackPullConfigInput.Id), 0]); + RuleFor(x => x.Id).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, + nameof(EditTrackPullConfigInput.Id), 0]); - RuleFor(x => x.ParseMethod).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackPullConfigInput.ParseMethod), 0]); + RuleFor(x => x.ParseMethod).GreaterThan(0).WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackPullConfigInput.ParseMethod), 0]); RuleFor(x => x.PullInterval) - .GreaterThanOrEqualTo(30).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThanOrEqualTo, nameof(EditTrackPullConfigInput.PullInterval), 30]); + .GreaterThanOrEqualTo(30).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThanOrEqualTo, + nameof(EditTrackPullConfigInput.PullInterval), 30]); - RuleFor(x => x.SubSystemId).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackPullConfigInput.SubSystemId), 0]); + RuleFor(x => x.SubSystemId).GreaterThan(0).WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackPullConfigInput.SubSystemId), 0]); - RuleFor(x => x.ServiceProviderId).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackPullConfigInput.ServiceProviderId), 0]); + RuleFor(x => x.ServiceProviderId).GreaterThan(0).WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackPullConfigInput.ServiceProviderId), 0]); - RuleFor(x => x.SubSystemId).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackPullConfigInput.SubSystemId), 0]); + RuleFor(x => x.SubSystemId).GreaterThan(0).WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackPullConfigInput.SubSystemId), 0]); - When(x => x.Options != OptionTypeNoNull.新增, () => - { - RuleFor(x => x.Id).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackPullConfigInput.Id)]); - }); + When(x => x.Options != OptionTypeNoNull.新增, + () => + { + RuleFor(x => x.Id).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, + nameof(EditTrackPullConfigInput.Id)]); + }); When(x => x.Options != OptionTypeNoNull.删除, () => { - RuleFor(x => x.SubSystemId).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackPullConfigInput.SubSystemId)]); + RuleFor(x => x.SubSystemId).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, + nameof(EditTrackPullConfigInput.SubSystemId)]); - RuleFor(x => x.ServiceProviderId).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackPullConfigInput.ServiceProviderId)]); + RuleFor(x => x.ServiceProviderId).NotNull().WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackPullConfigInput.ServiceProviderId)]); - RuleFor(x => x.PullInterval).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackPullConfigInput.PullInterval)]); + RuleFor(x => x.PullInterval).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, + nameof(EditTrackPullConfigInput.PullInterval)]); - RuleFor(x => x.ParseMethod).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackPullConfigInput.ParseMethod)]); + RuleFor(x => x.ParseMethod).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, + nameof(EditTrackPullConfigInput.ParseMethod)]); - RuleFor(x => x.OrderNoName).NotEmpty().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.OrderNoName)]); + RuleFor(x => x.OrderNoName).NotEmpty().WithMessage( + stringLocalizer[SjzyBasicLocalization.Validation_NotEmpty, + nameof(EditTrackPullConfigInput.OrderNoName)]); - RuleFor(x => x.OrderPath).NotEmpty().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.OrderPath)]); + RuleFor(x => x.OrderPath).NotEmpty().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotEmpty, + nameof(EditTrackPullConfigInput.OrderPath)]); - RuleFor(x => x.TrackDetailsPath).NotEmpty().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.TrackDetailsPath)]); + RuleFor(x => x.TrackDetailsPath).NotEmpty().WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.TrackDetailsPath)]); When(x => x.ParseMethod == 1, () => { - RuleFor(x => x.TrackTimeZoneName).NotEmpty().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.TrackTimeZoneName)]); + RuleFor(x => x.TrackTimeZoneName).NotEmpty().WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.TrackTimeZoneName)]); - RuleFor(x => x.TrackContentCodeName).NotEmpty().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.TrackContentCodeName)]); + RuleFor(x => x.TrackContentCodeName).NotEmpty().WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.TrackContentCodeName)]); - RuleFor(x => x.TrackContentName).NotEmpty().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.TrackContentName)]); + RuleFor(x => x.TrackContentName).NotEmpty().WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.TrackContentName)]); - RuleFor(x => x.TrackPlaceName).NotEmpty().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.TrackPlaceName)]); + RuleFor(x => x.TrackPlaceName).NotEmpty().WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.TrackPlaceName)]); - RuleFor(x => x.TrackStatusName).NotEmpty().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.TrackStatusName)]); + RuleFor(x => x.TrackStatusName).NotEmpty().WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.TrackStatusName)]); - RuleFor(x => x.TrackTimeName).NotEmpty().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.TrackTimeName)]); + RuleFor(x => x.TrackTimeName).NotEmpty().WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.TrackTimeName)]); }); }); } diff --git a/src/SJZY.Track.Application/Validations/TrackPull/EditTrackPullContentInputValidation.cs b/src/SJZY.Track.Application/Validations/TrackPull/EditTrackPullContentInputValidation.cs index dcf6ff1c..1ab3b0f5 100644 --- a/src/SJZY.Track.Application/Validations/TrackPull/EditTrackPullContentInputValidation.cs +++ b/src/SJZY.Track.Application/Validations/TrackPull/EditTrackPullContentInputValidation.cs @@ -10,24 +10,32 @@ public class EditTrackPullContentInputValidation : AbstractValidator stringLocalizer) { - RuleFor(x => x.Options).IsInEnum().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum, nameof(EditTrackPullContentInput.Options)]); + RuleFor(x => x.Options).IsInEnum().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum, + nameof(EditTrackPullContentInput.Options)]); - RuleFor(x => x.Id).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackPullContentInput.Id), 0]); + RuleFor(x => x.Id).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, + nameof(EditTrackPullContentInput.Id), 0]); - RuleFor(x => x.TrackContentId).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackPullContentInput.TrackContentId), 0]); + RuleFor(x => x.TrackContentId).GreaterThan(0).WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackPullContentInput.TrackContentId), 0]); - RuleFor(x => x.TrackPullConfigId).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackPullContentInput.TrackPullConfigId), 0]); + RuleFor(x => x.TrackPullConfigId).GreaterThan(0).WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackPullContentInput.TrackPullConfigId), 0]); - When(x => x.Options != OptionTypeNoNull.新增, () => - { - RuleFor(x => x.Id).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackPullContentInput.Id)]); - }); + When(x => x.Options != OptionTypeNoNull.新增, + () => + { + RuleFor(x => x.Id).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, + nameof(EditTrackPullContentInput.Id)]); + }); When(x => x.Options != OptionTypeNoNull.删除, () => { - RuleFor(x => x.TrackContentId).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackPullContentInput.TrackContentId)]); + RuleFor(x => x.TrackContentId).NotNull().WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackPullContentInput.TrackContentId)]); - RuleFor(x => x.TrackPullConfigId).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackPullContentInput.TrackPullConfigId)]); + RuleFor(x => x.TrackPullConfigId).NotNull().WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackPullContentInput.TrackPullConfigId)]); }); } } \ No newline at end of file diff --git a/src/SJZY.Track.Application/Validations/TrackStatus/EditTrackStatusInputValidation.cs b/src/SJZY.Track.Application/Validations/TrackStatus/EditTrackStatusInputValidation.cs index 34efa895..9bfa8536 100644 --- a/src/SJZY.Track.Application/Validations/TrackStatus/EditTrackStatusInputValidation.cs +++ b/src/SJZY.Track.Application/Validations/TrackStatus/EditTrackStatusInputValidation.cs @@ -1,4 +1,4 @@ -using FluentValidation; +using FluentValidation; using SJZY.Track.Application.Contract.Dtos.TrackStatus; namespace SJZY.Track.Application.Validations.TrackStatus; diff --git a/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateContentInputValidation.cs b/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateContentInputValidation.cs index c23984d4..7abbdacd 100644 --- a/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateContentInputValidation.cs +++ b/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateContentInputValidation.cs @@ -6,32 +6,43 @@ using SJZY.Track.Application.Localization; namespace SJZY.Track.Application.Validations.TrackTemplates; -public class EditTrackTemplateContentInputValidation : AbstractValidator, IValidationEnabled +public class EditTrackTemplateContentInputValidation : AbstractValidator, + IValidationEnabled { public EditTrackTemplateContentInputValidation(IStringLocalizer stringLocalizer) { - RuleFor(x => x.Options).IsInEnum().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum, nameof(EditTrackTemplateContentInput.Options)]); + RuleFor(x => x.Options).IsInEnum().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum, + nameof(EditTrackTemplateContentInput.Options)]); - RuleFor(x => x.Id).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackTemplateContentInput.Id), 0]); + RuleFor(x => x.Id).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, + nameof(EditTrackTemplateContentInput.Id), 0]); - RuleFor(x => x.TrackContentId).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackTemplateContentInput.TrackContentId), 0]); + RuleFor(x => x.TrackContentId).GreaterThan(0).WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackTemplateContentInput.TrackContentId), 0]); - RuleFor(x => x.TrackTemplateId).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackTemplateContentInput.TrackTemplateId), 0]); + RuleFor(x => x.TrackTemplateId).GreaterThan(0).WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackTemplateContentInput.TrackTemplateId), 0]); - When(x => x.Options != OptionTypeNoNull.新增, () => - { - RuleFor(x => x.Id).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackTemplateContentInput.Id)]); - }); + When(x => x.Options != OptionTypeNoNull.新增, + () => + { + RuleFor(x => x.Id).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, + nameof(EditTrackTemplateContentInput.Id)]); + }); When(x => x.Options != OptionTypeNoNull.删除, () => { - RuleFor(x => x.IsCanDelete).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackTemplateContentInput.IsCanDelete)]); + RuleFor(x => x.IsCanDelete).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, + nameof(EditTrackTemplateContentInput.IsCanDelete)]); - RuleFor(x => x.IsExternal).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackTemplateContentInput.IsExternal)]); + RuleFor(x => x.IsExternal).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, + nameof(EditTrackTemplateContentInput.IsExternal)]); - RuleFor(x => x.TrackContentId).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackTemplateContentInput.TrackContentId)]); + RuleFor(x => x.TrackContentId).NotNull().WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackTemplateContentInput.TrackContentId)]); - RuleFor(x => x.TrackTemplateId).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackTemplateContentInput.TrackTemplateId)]); + RuleFor(x => x.TrackTemplateId).NotNull().WithMessage(stringLocalizer[ + SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackTemplateContentInput.TrackTemplateId)]); }); } } \ No newline at end of file diff --git a/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateInputValidation.cs b/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateInputValidation.cs index 7499d829..051a5820 100644 --- a/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateInputValidation.cs +++ b/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateInputValidation.cs @@ -1,4 +1,4 @@ -using FluentValidation; +using FluentValidation; using SJZY.Track.Application.Contract.Dtos.TrackTemplates; namespace SJZY.Track.Application.Validations.TrackTemplates; diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs index 773b2996..5557a7f0 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Domain.Dtos.Order; +using SJZY.Track.Domain.Dtos.Order; namespace SJZY.Track.Domain.Aggregates.OrderAggregate; diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs index ee95f536..11c072d9 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Aggregates.OrderAggregate; +namespace SJZY.Track.Domain.Aggregates.OrderAggregate; /// /// 轨迹订单主表 diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs index 1ba0393a..757cd982 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Aggregates.OrderAggregate; +namespace SJZY.Track.Domain.Aggregates.OrderAggregate; /// /// 订单航班表（1：N） diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs index 612cdae2..cbeafa56 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Aggregates.OrderAggregate; +namespace SJZY.Track.Domain.Aggregates.OrderAggregate; /// /// 轨迹订单关联表（1：N） diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderTemplateEntity.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderTemplateEntity.cs index 7dee5516..cb2ddc9a 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderTemplateEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderTemplateEntity.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Aggregates.OrderAggregate; +namespace SJZY.Track.Domain.Aggregates.OrderAggregate; /// /// 轨迹订单模板表（1：N） diff --git a/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/ITrackContentRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/ITrackContentRepository.cs index 400b7363..04d252e0 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/ITrackContentRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/ITrackContentRepository.cs @@ -23,7 +23,11 @@ public interface ITrackContentRepository : IBasicRepository Task SoftDeleteMapAsync(Expression> whereExpression); - Task UpdateMapAsync(Expression> columns, Expression> whereExpression); + Task UpdateMapAsync(Expression> columns, + Expression> whereExpression); + Task GetTemplateIsExist(int trackContentId); - Task> GetTrackContentAttributeValue(GetTemplateContentAttributeValueInputVO input); + + Task> GetTrackContentAttributeValue( + GetTemplateContentAttributeValueInputVO input); } \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs index 02fac985..20bd2249 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Aggregates.TrackContentAggregate; +namespace SJZY.Track.Domain.Aggregates.TrackContentAggregate; /// /// 轨迹内容 diff --git a/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentMapEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentMapEntity.cs index 1c20048f..8d51d253 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentMapEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentMapEntity.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Aggregates.TrackContentAggregate; +namespace SJZY.Track.Domain.Aggregates.TrackContentAggregate; /// /// 轨迹内容映射表 diff --git a/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/ITrackFlagRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/ITrackFlagRepository.cs index 12ba3bc6..f092659a 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/ITrackFlagRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/ITrackFlagRepository.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Domain.Dtos.TrackFlags; +using SJZY.Track.Domain.Dtos.TrackFlags; namespace SJZY.Track.Domain.Aggregates.TrackFlagAggregate; diff --git a/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs index 225c8f85..282b1f3b 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Aggregates.TrackFlagAggregate; +namespace SJZY.Track.Domain.Aggregates.TrackFlagAggregate; /// /// 轨迹标记表 diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs index c21eef77..a8358f71 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs @@ -44,7 +44,8 @@ public interface ITrackPullConfigRepository : IBasicRepository InsertContentAsync(TrackPullContentConfigEntity insertObj); - Task GetParamsSingleAsync(Expression> whereExpression); + Task GetParamsSingleAsync( + Expression> whereExpression); Task UpdateParamsAsync(TrackPushPullParamsConfigEntity updateObj); diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs index 4c6d7ed7..75c272e9 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Aggregates.TrackPullAggregate; +namespace SJZY.Track.Domain.Aggregates.TrackPullAggregate; /// /// 轨迹拉取配置表 diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs index a72833f1..6f23b849 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Aggregates.TrackPullAggregate; +namespace SJZY.Track.Domain.Aggregates.TrackPullAggregate; /// /// 轨迹拉取内容配置表 diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPushPullParamsConfigEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPushPullParamsConfigEntity.cs index 7dd20963..449ae96f 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPushPullParamsConfigEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPushPullParamsConfigEntity.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Aggregates.TrackPullAggregate; +namespace SJZY.Track.Domain.Aggregates.TrackPullAggregate; /// /// 轨迹拉取/推送参数配置 diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushConfigRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushConfigRepository.cs index 3983cd7c..a93e751f 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushConfigRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushConfigRepository.cs @@ -35,5 +35,6 @@ public interface ITrackPushConfigRepository : IBasicRepository UpdateContentAsync(Expression> columns, Expression> whereExpression); + Task> QueryTrackPullMappingsAsync(QueryTrackPullMappingsInputVO input); } \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushRecordsRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushRecordsRepository.cs index 99276b4b..59654523 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushRecordsRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushRecordsRepository.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Aggregates.TrackPushAggregate; +namespace SJZY.Track.Domain.Aggregates.TrackPushAggregate; public interface ITrackPushRecordsRepository { diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs index e2d46c98..063417a9 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Share.Enums; +using SJZY.Track.Share.Enums; namespace SJZY.Track.Domain.Aggregates.TrackPushAggregate; diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs index 163b5b34..66e8199a 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Aggregates.TrackPushAggregate; +namespace SJZY.Track.Domain.Aggregates.TrackPushAggregate; /// /// 轨迹推送内容配置表 diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs index 956e241d..7d1dd61a 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs @@ -1,4 +1,4 @@ -using Nest; +using Nest; using SJZY.Expand.ElasticSearch; using SJZY.Track.Domain.Consts; diff --git a/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs index 0b200c1c..9ac58fa2 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Aggregates.TrackStatusAggregate; +namespace SJZY.Track.Domain.Aggregates.TrackStatusAggregate; /// /// 轨迹状态表 diff --git a/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/ITrackTemplateRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/ITrackTemplateRepository.cs index e80b9ff8..fb8aecfa 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/ITrackTemplateRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/ITrackTemplateRepository.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Domain.Dtos.TrackTemplate; +using SJZY.Track.Domain.Dtos.TrackTemplate; namespace SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; diff --git a/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateContentEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateContentEntity.cs index 3d8ba38a..911433f3 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateContentEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateContentEntity.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; +namespace SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; /// /// 轨迹模板内容表（1：N） diff --git a/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateEntity.cs index f99eaec0..31745f2a 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateEntity.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; +namespace SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; /// /// 轨迹模板表 diff --git a/src/SJZY.Track.Domain/Consts/GlobalConst.MQ.cs b/src/SJZY.Track.Domain/Consts/GlobalConst.MQ.cs index 02aa0816..e01ac8be 100644 --- a/src/SJZY.Track.Domain/Consts/GlobalConst.MQ.cs +++ b/src/SJZY.Track.Domain/Consts/GlobalConst.MQ.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Consts; +namespace SJZY.Track.Domain.Consts; public partial class GlobalConst { diff --git a/src/SJZY.Track.Domain/Consts/GlobalConst.cs b/src/SJZY.Track.Domain/Consts/GlobalConst.cs index 1bba2863..b91bcaec 100644 --- a/src/SJZY.Track.Domain/Consts/GlobalConst.cs +++ b/src/SJZY.Track.Domain/Consts/GlobalConst.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Consts; +namespace SJZY.Track.Domain.Consts; public partial class GlobalConst { diff --git a/src/SJZY.Track.Domain/Dtos/Common/KeywordsInputVO.cs b/src/SJZY.Track.Domain/Dtos/Common/KeywordsInputVO.cs index 8cbe4413..8508c3b9 100644 --- a/src/SJZY.Track.Domain/Dtos/Common/KeywordsInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Common/KeywordsInputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Common; +namespace SJZY.Track.Domain.Dtos.Common; public class KeywordsInputVO : PageInfoInput { diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs index 5aabb897..a9a45a01 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Order; +namespace SJZY.Track.Domain.Dtos.Order; public class GetPageTrackOrderInputVO : PageInfoInput { diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetTrackCounterVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetTrackCounterVO.cs index 67cc8496..06fcbd65 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/GetTrackCounterVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/GetTrackCounterVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Order; +namespace SJZY.Track.Domain.Dtos.Order; public class GetTrackCounterVO { diff --git a/src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs b/src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs index 23299e30..a308a58b 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Order; +namespace SJZY.Track.Domain.Dtos.Order; public class LinkedOrderVO { diff --git a/src/SJZY.Track.Domain/Dtos/Order/OrderIdentifier.cs b/src/SJZY.Track.Domain/Dtos/Order/OrderIdentifier.cs index 248ec7e9..f572ec3a 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/OrderIdentifier.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/OrderIdentifier.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Order; +namespace SJZY.Track.Domain.Dtos.Order; /// /// 订单标识符 diff --git a/src/SJZY.Track.Domain/Dtos/Order/OrderWithServiceProviderVO.cs b/src/SJZY.Track.Domain/Dtos/Order/OrderWithServiceProviderVO.cs index a5c9ad32..b899d01b 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/OrderWithServiceProviderVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/OrderWithServiceProviderVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Order; +namespace SJZY.Track.Domain.Dtos.Order; public class OrderWithServiceProviderVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs b/src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs index 6011b91f..adc29bc8 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackContents; +namespace SJZY.Track.Domain.Dtos.TrackContents; public class GetPageTrackContentVO : PageInfoInput { diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs index 2c6c728a..8be7ba1f 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackContents; +namespace SJZY.Track.Domain.Dtos.TrackContents; public class GetTrackContentDetailVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapDetailOutputVO.cs index dce4eff9..812f1106 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapDetailOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapDetailOutputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackContents; +namespace SJZY.Track.Domain.Dtos.TrackContents; public class GetTrackContentMapDetailOutputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageInputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageInputVO.cs index e6cd19e6..70e59f25 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageInputVO.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Domain.Dtos.Common; +using SJZY.Track.Domain.Dtos.Common; namespace SJZY.Track.Domain.Dtos.TrackContents; diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageOutputVO.cs index e291b71f..cfd3a460 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageOutputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackContents; +namespace SJZY.Track.Domain.Dtos.TrackContents; public class GetTrackContentMapPageOutputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/TrackContentVO.cs b/src/SJZY.Track.Domain/Dtos/TrackContents/TrackContentVO.cs index 0c0f13d5..a249f6fd 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackContents/TrackContentVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackContents/TrackContentVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackContents; +namespace SJZY.Track.Domain.Dtos.TrackContents; public class TrackContentVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackDetails/MatchTrackContentDto.cs b/src/SJZY.Track.Domain/Dtos/TrackDetails/MatchTrackContentDto.cs index 23c27bfe..163f870a 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackDetails/MatchTrackContentDto.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackDetails/MatchTrackContentDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackDetails; +namespace SJZY.Track.Domain.Dtos.TrackDetails; public class MatchTrackContentDto { diff --git a/src/SJZY.Track.Domain/Dtos/TrackDetails/MatchTrackContentsDto.cs b/src/SJZY.Track.Domain/Dtos/TrackDetails/MatchTrackContentsDto.cs index 14441bc6..bc3eca59 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackDetails/MatchTrackContentsDto.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackDetails/MatchTrackContentsDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackDetails; +namespace SJZY.Track.Domain.Dtos.TrackDetails; public class MatchTrackContentsDto { diff --git a/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs b/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs index c7f2bb60..2e1ef57d 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackFlags; +namespace SJZY.Track.Domain.Dtos.TrackFlags; public class GetPageTrackFlagVO : PageInfoInput { diff --git a/src/SJZY.Track.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs b/src/SJZY.Track.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs index a3fe5b12..daba3b36 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackFlags; +namespace SJZY.Track.Domain.Dtos.TrackFlags; public class GetTrackFlagDetailVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs index e8c7f8ed..933e14a7 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPull; +namespace SJZY.Track.Domain.Dtos.TrackPull; public class GetTrackPullConfigDetailOutputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigPageOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigPageOutputVO.cs index bd73f920..c4ec4d8b 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigPageOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigPageOutputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPull; +namespace SJZY.Track.Domain.Dtos.TrackPull; public class GetTrackPullConfigPageOutputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs index 1cbe9460..9b06efb3 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPull; +namespace SJZY.Track.Domain.Dtos.TrackPull; public class GetTrackPullContentDetailOutputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentListCacheVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentListCacheVO.cs index c1f7de5b..083c6d64 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentListCacheVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentListCacheVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPull; +namespace SJZY.Track.Domain.Dtos.TrackPull; public class GetTrackPullContentListCacheVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageInputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageInputVO.cs index ca31153a..a3bd5b8f 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageInputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPull; +namespace SJZY.Track.Domain.Dtos.TrackPull; public class GetTrackPullContentPageInputVO : PageInfoInput { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageOutputVO.cs index a1c52026..3413c1ad 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageOutputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPull; +namespace SJZY.Track.Domain.Dtos.TrackPull; public class GetTrackPullContentPageOutputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs index 600bc2fb..e9f20a2a 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Share.Enums; +using SJZY.Track.Share.Enums; namespace SJZY.Track.Domain.Dtos.TrackPush; diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigPageOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigPageOutputVO.cs index 01550b7f..70cccb38 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigPageOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigPageOutputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPush; +namespace SJZY.Track.Domain.Dtos.TrackPush; public class GetTrackPushConfigPageOutputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs index 3656b6f6..d094c304 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPush; +namespace SJZY.Track.Domain.Dtos.TrackPush; public class GetTrackPushContentDetailOutputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageInputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageInputVO.cs index f0558e95..c69fc29e 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageInputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPush; +namespace SJZY.Track.Domain.Dtos.TrackPush; public class GetTrackPushContentPageInputVO : PageInfoInput { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs index b3ae2d3f..7d9fac0b 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPush; +namespace SJZY.Track.Domain.Dtos.TrackPush; public class GetTrackPushContentPageOutputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/QueryTrackPullMappingsInfoVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/QueryTrackPullMappingsInfoVO.cs index 4a950076..b2a7400b 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/QueryTrackPullMappingsInfoVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPush/QueryTrackPullMappingsInfoVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPush; +namespace SJZY.Track.Domain.Dtos.TrackPush; /// /// 查询轨迹推送关系入参 diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/TrackPushContentConfigVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/TrackPushContentConfigVO.cs index 6ec62e85..985883c4 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/TrackPushContentConfigVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPush/TrackPushContentConfigVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPush; +namespace SJZY.Track.Domain.Dtos.TrackPush; public class TrackPushContentConfigVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs index a6d05fec..a77c0108 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackStatus; +namespace SJZY.Track.Domain.Dtos.TrackStatus; public class GetPageTrackStatusVO : PageInfoInput { diff --git a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs index 61a74568..004a7169 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackStatus; +namespace SJZY.Track.Domain.Dtos.TrackStatus; public class GetTrackStatusDetailVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs index 8a5e2010..b4bac8d9 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackStatus; +namespace SJZY.Track.Domain.Dtos.TrackStatus; public class GetTrackStatusListVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/CanDeleteTrackCodeVO.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/CanDeleteTrackCodeVO.cs index b4376fe5..f9e2c39e 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/CanDeleteTrackCodeVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/CanDeleteTrackCodeVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackTemplate; +namespace SJZY.Track.Domain.Dtos.TrackTemplate; public class CanDeleteTrackCodeVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateVO.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateVO.cs index ae7e5898..3a919c9d 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackTemplate; +namespace SJZY.Track.Domain.Dtos.TrackTemplate; public class GetPageTrackTemplateVO : PageInfoInput { diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTemplateContentAttributeValueInputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTemplateContentAttributeValueInputVO.cs index 2a9551f8..56eff7e4 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTemplateContentAttributeValueInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTemplateContentAttributeValueInputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackTemplate; +namespace SJZY.Track.Domain.Dtos.TrackTemplate; public class GetTemplateContentAttributeValueInputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentDetailOutputVo.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentDetailOutputVo.cs index 27e54aa6..9ba829a9 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentDetailOutputVo.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentDetailOutputVo.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackTemplate; +namespace SJZY.Track.Domain.Dtos.TrackTemplate; public class GetTrackTemplateContentDetailOutputVo { diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageInputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageInputVO.cs index 09e8f51f..fb51e127 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageInputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackTemplate; +namespace SJZY.Track.Domain.Dtos.TrackTemplate; public class GetTrackTemplateContentPageInputVO : PageInfoInput { diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs index b6d43291..20b45e05 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackTemplate; +namespace SJZY.Track.Domain.Dtos.TrackTemplate; public class GetTrackTemplateContentPageOutputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs index c5230b7e..20513d16 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackTemplate; +namespace SJZY.Track.Domain.Dtos.TrackTemplate; /// /// 获取轨迹模版明细 diff --git a/src/SJZY.Track.Domain/Enums/EnumPropertyEnums.cs b/src/SJZY.Track.Domain/Enums/EnumPropertyEnums.cs index b26a4303..0ea8a8c8 100644 --- a/src/SJZY.Track.Domain/Enums/EnumPropertyEnums.cs +++ b/src/SJZY.Track.Domain/Enums/EnumPropertyEnums.cs @@ -1,4 +1,4 @@ -using System.ComponentModel; +using System.ComponentModel; namespace SJZY.Track.Domain.Enums; diff --git a/src/SJZY.Track.Domain/Enums/OrderType.cs b/src/SJZY.Track.Domain/Enums/OrderType.cs index 79a97c52..08d61426 100644 --- a/src/SJZY.Track.Domain/Enums/OrderType.cs +++ b/src/SJZY.Track.Domain/Enums/OrderType.cs @@ -4,15 +4,11 @@ namespace SJZY.Track.Domain.Enums; public enum OrderType { - [Description("干线提单")] - 干线提单 = 1, + [Description("干线提单")] 干线提单 = 1, - [Description("小包运单")] - 小包运单 = 2, + [Description("小包运单")] 小包运单 = 2, - [Description("箱/袋单")] - 箱袋单 = 3, + [Description("箱/袋单")] 箱袋单 = 3, - [Description("FBA订单")] - FBA订单 = 4, + [Description("FBA订单")] FBA订单 = 4, } \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Enums/TrackLocationValue.cs b/src/SJZY.Track.Domain/Enums/TrackLocationValue.cs index 2aae150e..1ebc5e0b 100644 --- a/src/SJZY.Track.Domain/Enums/TrackLocationValue.cs +++ b/src/SJZY.Track.Domain/Enums/TrackLocationValue.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Enums; +namespace SJZY.Track.Domain.Enums; public enum TrackLocationValue { diff --git a/src/SJZY.Track.Domain/Enums/TrackProblemType.cs b/src/SJZY.Track.Domain/Enums/TrackProblemType.cs index 92369b84..85487cdf 100644 --- a/src/SJZY.Track.Domain/Enums/TrackProblemType.cs +++ b/src/SJZY.Track.Domain/Enums/TrackProblemType.cs @@ -8,18 +8,15 @@ public enum TrackProblemType /// /// 没问题 /// - [Description("无")] - None = 0, + [Description("无")] None = 0, /// /// 异常 /// - [Description("异常")] - Error = 1, + [Description("异常")] Error = 1, /// /// 预警 /// - [Description("预警")] - Warn = 2, + [Description("预警")] Warn = 2, } \ No newline at end of file diff --git a/src/SJZY.Track.Domain/IBasicRepository.cs b/src/SJZY.Track.Domain/IBasicRepository.cs index 3824c2eb..055afb0e 100644 --- a/src/SJZY.Track.Domain/IBasicRepository.cs +++ b/src/SJZY.Track.Domain/IBasicRepository.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Domain.Queries; +using SJZY.Track.Domain.Queries; namespace SJZY.Track.Domain; diff --git a/src/SJZY.Track.Domain/Queries/ITrackOrderQueries.cs b/src/SJZY.Track.Domain/Queries/ITrackOrderQueries.cs index b521d97d..1f2ffb54 100644 --- a/src/SJZY.Track.Domain/Queries/ITrackOrderQueries.cs +++ b/src/SJZY.Track.Domain/Queries/ITrackOrderQueries.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Domain.Dtos.Order; +using SJZY.Track.Domain.Dtos.Order; namespace SJZY.Track.Domain.Queries; diff --git a/src/SJZY.Track.Domain/SJZYTrackDomainModule.cs b/src/SJZY.Track.Domain/SJZYTrackDomainModule.cs index 792e7844..49c22be8 100644 --- a/src/SJZY.Track.Domain/SJZYTrackDomainModule.cs +++ b/src/SJZY.Track.Domain/SJZYTrackDomainModule.cs @@ -1,4 +1,4 @@ -using Volo.Abp.Modularity; +using Volo.Abp.Modularity; namespace SJZY.Track.Domain; diff --git a/src/SJZY.Track.Domain/SeedWork/IAggregateRoot.cs b/src/SJZY.Track.Domain/SeedWork/IAggregateRoot.cs index 613c8055..3f454992 100644 --- a/src/SJZY.Track.Domain/SeedWork/IAggregateRoot.cs +++ b/src/SJZY.Track.Domain/SeedWork/IAggregateRoot.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.SeedWork; +namespace SJZY.Track.Domain.SeedWork; public interface IAggregateRoot : IEntity { diff --git a/src/SJZY.Track.Domain/SeedWork/IEntity.cs b/src/SJZY.Track.Domain/SeedWork/IEntity.cs index 06cf92fc..8f478119 100644 --- a/src/SJZY.Track.Domain/SeedWork/IEntity.cs +++ b/src/SJZY.Track.Domain/SeedWork/IEntity.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.SeedWork; +namespace SJZY.Track.Domain.SeedWork; public interface IEntity { diff --git a/src/SJZY.Track.Domain/TransactionHelper.cs b/src/SJZY.Track.Domain/TransactionHelper.cs index fa8baac4..f51b538e 100644 --- a/src/SJZY.Track.Domain/TransactionHelper.cs +++ b/src/SJZY.Track.Domain/TransactionHelper.cs @@ -1,4 +1,4 @@ -using System.Transactions; +using System.Transactions; namespace SJZY.Track.Domain; diff --git a/src/SJZY.Track.Domain/VEntities/VEnumValueInfo.cs b/src/SJZY.Track.Domain/VEntities/VEnumValueInfo.cs index cfefa5c6..d44088e6 100644 --- a/src/SJZY.Track.Domain/VEntities/VEnumValueInfo.cs +++ b/src/SJZY.Track.Domain/VEntities/VEnumValueInfo.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.VEntities; +namespace SJZY.Track.Domain.VEntities; /// /// 主数据枚举 diff --git a/src/SJZY.Track.Domain/VEntities/VExternalSubjectEntity.cs b/src/SJZY.Track.Domain/VEntities/VExternalSubjectEntity.cs index 1743a9fd..7e9a6fc7 100644 --- a/src/SJZY.Track.Domain/VEntities/VExternalSubjectEntity.cs +++ b/src/SJZY.Track.Domain/VEntities/VExternalSubjectEntity.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.VEntities; +namespace SJZY.Track.Domain.VEntities; /// /// 外部主体 diff --git a/src/SJZY.Track.Domain/VEntities/VServiceProviderEntity.cs b/src/SJZY.Track.Domain/VEntities/VServiceProviderEntity.cs index 737fbb0f..c871565a 100644 --- a/src/SJZY.Track.Domain/VEntities/VServiceProviderEntity.cs +++ b/src/SJZY.Track.Domain/VEntities/VServiceProviderEntity.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.VEntities; +namespace SJZY.Track.Domain.VEntities; /// /// 服务商主表 diff --git a/src/SJZY.Track.Domain/VEntities/VSystemEntity.cs b/src/SJZY.Track.Domain/VEntities/VSystemEntity.cs index eb0030be..d215f4af 100644 --- a/src/SJZY.Track.Domain/VEntities/VSystemEntity.cs +++ b/src/SJZY.Track.Domain/VEntities/VSystemEntity.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.VEntities; +namespace SJZY.Track.Domain.VEntities; /// /// diff --git a/src/SJZY.Track.Domain/VEntities/VUserEntity.cs b/src/SJZY.Track.Domain/VEntities/VUserEntity.cs index 71a52664..5049e64b 100644 --- a/src/SJZY.Track.Domain/VEntities/VUserEntity.cs +++ b/src/SJZY.Track.Domain/VEntities/VUserEntity.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.VEntities; +namespace SJZY.Track.Domain.VEntities; /// /// 用户信息表 diff --git a/src/SJZY.Track.Repository/DataBaseContext.cs b/src/SJZY.Track.Repository/DataBaseContext.cs index d3e32537..394b6edb 100644 --- a/src/SJZY.Track.Repository/DataBaseContext.cs +++ b/src/SJZY.Track.Repository/DataBaseContext.cs @@ -1,4 +1,4 @@ -using SJZY.UserCenter.HttpApi.Services; +using SJZY.UserCenter.HttpApi.Services; #pragma warning disable 1591 diff --git a/src/SJZY.Track.Repository/EsExtensions.cs b/src/SJZY.Track.Repository/EsExtensions.cs index 7bd26f40..a9db42fb 100644 --- a/src/SJZY.Track.Repository/EsExtensions.cs +++ b/src/SJZY.Track.Repository/EsExtensions.cs @@ -1,4 +1,4 @@ -using Nest; +using Nest; using SJZY.Expand.ElasticSearch; namespace SJZY.Track.Repository; diff --git a/src/SJZY.Track.Repository/GlobalUsing.cs b/src/SJZY.Track.Repository/GlobalUsing.cs index bb8c080a..c5c115f0 100644 --- a/src/SJZY.Track.Repository/GlobalUsing.cs +++ b/src/SJZY.Track.Repository/GlobalUsing.cs @@ -1,4 +1,4 @@ -global using SJZY.Expand.ABP.Core; +global using SJZY.Expand.ABP.Core; global using SJZY.Expand.ABP.Core.Common.Dto; global using SJZY.Expand.ABP.Core.SqlSugar; global using SJZY.Expand.ABP.Core.SqlSugar.Entitys; diff --git a/src/SJZY.Track.Repository/Queries/BasicQuery.cs b/src/SJZY.Track.Repository/Queries/BasicQuery.cs index d983d66a..03f920e2 100644 --- a/src/SJZY.Track.Repository/Queries/BasicQuery.cs +++ b/src/SJZY.Track.Repository/Queries/BasicQuery.cs @@ -1,4 +1,4 @@ -using System.Linq.Expressions; +using System.Linq.Expressions; using SJZY.Track.Domain.Queries; using SJZY.Track.Domain.SeedWork; diff --git a/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs b/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs index 669ed58c..cd7255e5 100644 --- a/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs +++ b/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs @@ -10,13 +10,13 @@ namespace SJZY.Track.Repository.Queries; public class TrackOrderQueries : ISugarRepository, ITrackOrderQueries, ITransientDependency { - public ISqlSugarClient Context { get; set; } - public TrackOrderQueries() { Context = SqlsugarScopeBasic.GetContextSafely("default"); } + public ISqlSugarClient Context { get; set; } + /// /// 获取分页的轨迹订单 /// @@ -86,11 +86,7 @@ public class TrackOrderQueries : ISugarRepository, ITrackOrderQueries, { return await Context.Queryable() .GroupBy(x => x.QuestionType) - .Select(x => new GetTrackCounterVO - { - ProblemType = x.QuestionType, - Count = SqlFunc.AggregateCount(1) - }) + .Select(x => new GetTrackCounterVO { ProblemType = x.QuestionType, Count = SqlFunc.AggregateCount(1) }) .ToListAsync(); } } \ No newline at end of file diff --git a/src/SJZY.Track.Repository/Repositories/BasicRepository.cs b/src/SJZY.Track.Repository/Repositories/BasicRepository.cs index 965bd5d7..c13d9c10 100644 --- a/src/SJZY.Track.Repository/Repositories/BasicRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/BasicRepository.cs @@ -1,4 +1,4 @@ -using System.Linq.Expressions; +using System.Linq.Expressions; using SJZY.Track.Domain; using SJZY.Track.Domain.SeedWork; using SJZY.Track.Repository.Queries; diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs index 0c3e8024..56129728 100644 --- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Domain; +using SJZY.Track.Domain; using SJZY.Track.Domain.Aggregates.OrderAggregate; using SJZY.Track.Domain.Dtos.Order; diff --git a/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs index 315ceda3..0037ab81 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs @@ -1,4 +1,4 @@ -using System.Linq.Expressions; +using System.Linq.Expressions; using SJZY.Track.Domain.Aggregates.TrackContentAggregate; using SJZY.Track.Domain.Aggregates.TrackFlagAggregate; using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; diff --git a/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs index ed92d283..1fefbeb3 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Domain.Aggregates.TrackFlagAggregate; +using SJZY.Track.Domain.Aggregates.TrackFlagAggregate; using SJZY.Track.Domain.Dtos.TrackFlags; using SJZY.Track.Domain.VEntities; @@ -48,7 +48,9 @@ public class TrackFlagRepository : BasicRepository, ITrackFlagR .WhereIF(input.SubSystemId > 0, (a, b, c, d) => a.SubSystemId == input.SubSystemId) .WhereIF(!input.Keywords.IsNullOrWhiteSpace(), (a, b, c, d) => SqlFunc.Contains(a.Code, input.Keywords)) .OrderByIF(input.SelectIds.IsNullOrEmpty(), (a, b, c, d) => a.CreateTime, OrderByType.Desc) - .OrderByIF(!input.SelectIds.IsNullOrEmpty(), (a, b, c, d) => SqlFunc.IIF(input.SelectIds!.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), a.CreateTime), OrderByType.Desc) + .OrderByIF(!input.SelectIds.IsNullOrEmpty(), + (a, b, c, d) => SqlFunc.IIF(input.SelectIds!.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), + a.CreateTime), OrderByType.Desc) .Select((a, b, c, d) => new GetTrackFlagListVO { Id = a.Id, diff --git a/src/SJZY.Track.Repository/Repositories/TrackPullConfigRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackPullConfigRepository.cs index 2c313138..047916ec 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackPullConfigRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackPullConfigRepository.cs @@ -16,11 +16,13 @@ public class TrackPullConfigRepository : BasicRepository, { return await AsQueryable() .LeftJoin((trackPull, system) => trackPull.SubSystemId == system.Id && !system.IsDeleted) - .LeftJoin((trackPull, system, service) => trackPull.ServiceProviderId == service.Id && !service.IsDeleted) + .LeftJoin((trackPull, system, service) => + trackPull.ServiceProviderId == service.Id && !service.IsDeleted) .Filter(null, true) .Where(trackPull => !trackPull.IsDeleted) .WhereIF(input.SubSystemId.HasValue, trackPull => trackPull.SubSystemId == input.SubSystemId) - .WhereIF(!input.Keywords.IsNullOrWhiteSpace(), (trackPull, system, service) => service.Name.Contains(input.Keywords!)) + .WhereIF(!input.Keywords.IsNullOrWhiteSpace(), + (trackPull, system, service) => service.Name.Contains(input.Keywords!)) .OrderByDescending(trackPull => trackPull.CreateTime) .Select((trackPull, system, service) => new GetTrackPullConfigPageOutputVO { @@ -33,18 +35,19 @@ public class TrackPullConfigRepository : BasicRepository, .ToPagedListAsync(input.PageIndex, input.PageSize); } - public async Task> GetContentPageAsync(GetTrackPullContentPageInputVO input) + public async Task> GetContentPageAsync( + GetTrackPullContentPageInputVO input) { return await Context.Queryable() .InnerJoin((pullContent, trackContent) => pullContent.TrackContentId == trackContent.Id) - .LeftJoin((pullContent, trackContent, enumValue) => enumValue.Property == EnumPropertyEnums.轨迹发生地.GetDescription() && pullContent.TrackPlaceValue == enumValue.Enumkey) + .LeftJoin((pullContent, trackContent, enumValue) => + enumValue.Property == EnumPropertyEnums.轨迹发生地.GetDescription() && + pullContent.TrackPlaceValue == enumValue.Enumkey) .Where(pullContent => pullContent.TrackPullConfigId == input.TrackPullConfigId) .OrderBy(pullContent => pullContent.CreateTime) - .Select((pullContent, trackContent, enumValue) => new GetTrackPullContentPageOutputVO - { - Id = pullContent.Id, - TrackPlaceValue = enumValue.Disp - }, true) + .Select( + (pullContent, trackContent, enumValue) => + new GetTrackPullContentPageOutputVO { Id = pullContent.Id, TrackPlaceValue = enumValue.Disp }, true) .ToPagedListAsync(input.PageIndex, input.PageSize); } @@ -53,10 +56,9 @@ public class TrackPullConfigRepository : BasicRepository, return await Context.Queryable() .InnerJoin((pullContent, trackContent) => pullContent.TrackContentId == trackContent.Id) .Where(pullContent => pullContent.TrackPullConfigId == trackPullConfigId) - .Select((pullContent, trackContent) => new GetTrackPullContentListCacheVO - { - TrackContentCode = trackContent.Code - }, true) + .Select( + (pullContent, trackContent) => + new GetTrackPullContentListCacheVO { TrackContentCode = trackContent.Code }, true) .ToListAsync(); } @@ -64,17 +66,20 @@ public class TrackPullConfigRepository : BasicRepository, { return await AsQueryable() .LeftJoin((trackPull, system) => trackPull.SubSystemId == system.Id && !system.IsDeleted) - .LeftJoin((trackPull, system, service) => trackPull.ServiceProviderId == service.Id && !service.IsDeleted) - .InnerJoin((trackPull, system, service, paramsConfig) => trackPull.Id == paramsConfig.PullOrPushConfigId && !paramsConfig.IsPush && !paramsConfig.IsDeleted) + .LeftJoin((trackPull, system, service) => + trackPull.ServiceProviderId == service.Id && !service.IsDeleted) + .InnerJoin((trackPull, system, service, paramsConfig) => + trackPull.Id == paramsConfig.PullOrPushConfigId && !paramsConfig.IsPush && !paramsConfig.IsDeleted) .Filter(null, true) .Where(trackPull => trackPull.Id == id && !trackPull.IsDeleted) - .Select((trackPull, system, service, paramsConfig) => new GetTrackPullConfigDetailOutputVO - { - Id = trackPull.Id, - SubSystem = system.CnName, - ServiceProvider = service.Name, - TrackContentCode = paramsConfig.TrackContentCode - }, true) + .Select( + (trackPull, system, service, paramsConfig) => new GetTrackPullConfigDetailOutputVO + { + Id = trackPull.Id, + SubSystem = system.CnName, + ServiceProvider = service.Name, + TrackContentCode = paramsConfig.TrackContentCode + }, true) .SingleAsync(); } @@ -83,12 +88,13 @@ public class TrackPullConfigRepository : BasicRepository, return await Context.Queryable() .InnerJoin((pullContent, trackContent) => pullContent.TrackContentId == trackContent.Id) .Where(pullContent => pullContent.Id == id) - .Select((pullContent, trackContent) => new GetTrackPullContentDetailOutputVO - { - Id = pullContent.Id, - Code = trackContent.Code + "-" + trackContent.Content, - TrackTimePlaceValue = pullContent.TrackZonePlaceValue, - }, true) + .Select( + (pullContent, trackContent) => new GetTrackPullContentDetailOutputVO + { + Id = pullContent.Id, + Code = trackContent.Code + "-" + trackContent.Content, + TrackTimePlaceValue = pullContent.TrackZonePlaceValue, + }, true) .Mapper(x => { x.TrackKeywords = x.TrackKeyword?.Split(',').ToList(); @@ -107,7 +113,8 @@ public class TrackPullConfigRepository : BasicRepository, return await Context.Insertable(insertObj).ExecuteCommandAsync() > 0; } - public async Task GetParamsSingleAsync(Expression> whereExpression) + public async Task GetParamsSingleAsync( + Expression> whereExpression) { return await Context.Queryable().SingleAsync(whereExpression); } @@ -125,7 +132,8 @@ public class TrackPullConfigRepository : BasicRepository, .ExecuteCommandHasChangeAsync(); } - public async Task SoftDeleteParamsAsync(Expression> whereExpression) + public async Task SoftDeleteParamsAsync( + Expression> whereExpression) { return await Context.Updateable() .Where(whereExpression) diff --git a/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs index 6ca00716..c90196a1 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs @@ -1,4 +1,4 @@ -using System.Linq.Expressions; +using System.Linq.Expressions; using SJZY.Expand.ABP.Core.PublicMethords; using SJZY.Track.Domain.Aggregates.TrackContentAggregate; using SJZY.Track.Domain.Aggregates.TrackPushAggregate; diff --git a/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs index 0f7edf84..25a7cc85 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs @@ -1,4 +1,4 @@ -using System.Linq.Expressions; +using System.Linq.Expressions; using SJZY.Expand.ABP.Core.PublicMethords; using SJZY.Track.Domain.Aggregates.TrackContentAggregate; using SJZY.Track.Domain.Aggregates.TrackFlagAggregate; diff --git a/src/SJZY.Track.Repository/SjzyTrackRepositoryModule.cs b/src/SJZY.Track.Repository/SjzyTrackRepositoryModule.cs index e7ca3b6b..bffb1dab 100644 --- a/src/SJZY.Track.Repository/SjzyTrackRepositoryModule.cs +++ b/src/SJZY.Track.Repository/SjzyTrackRepositoryModule.cs @@ -31,7 +31,8 @@ public class SjzyTrackRepositoryModule : AbpModule ConnectionString = configuration["ConnectionStrings:DefaultConnection"]!, DbType = DbType.MySql, IsAutoCloseConnection = true, - ConfigId = "default", OpenSqlLog = true + ConfigId = "default", + OpenSqlLog = true } } ); @@ -43,6 +44,7 @@ public class SjzyTrackRepositoryModule : AbpModule { options.ShowLogInfo = true; } + options.NodeUrls = configuration.GetSection("ElasticSearch:NodeUrls").Get>()!; options.LoginName = configuration["ElasticSearch:LoginName"]!; options.Password = configuration["ElasticSearch:Password"]!; diff --git a/test/SJZY.Track.Test/Startup.cs b/test/SJZY.Track.Test/Startup.cs index f9a82089..ca91b962 100644 --- a/test/SJZY.Track.Test/Startup.cs +++ b/test/SJZY.Track.Test/Startup.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; diff --git a/test/SJZY.Track.Test/TestModule.cs b/test/SJZY.Track.Test/TestModule.cs index aa5f8d90..a72ff428 100644 --- a/test/SJZY.Track.Test/TestModule.cs +++ b/test/SJZY.Track.Test/TestModule.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using SJZY.Track.Api; using SJZY.Track.Application; diff --git a/test/SJZY.Track.Test/TestModuleTestBase.cs b/test/SJZY.Track.Test/TestModuleTestBase.cs index f183cf8c..25b36e48 100644 --- a/test/SJZY.Track.Test/TestModuleTestBase.cs +++ b/test/SJZY.Track.Test/TestModuleTestBase.cs @@ -1,4 +1,4 @@ -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Volo.Abp.AspNetCore.TestBase;