diff --git a/.editorconfig b/.editorconfig index 0663417e..22d62327 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,233 +1,69 @@ +# Top-most EditorConfig file 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 +# All files [*] charset = utf-8 end_of_line = crlf -trim_trailing_whitespace = false -insert_final_newline = false +insert_final_newline = true +trim_trailing_whitespace = true + +# C# files +[*.cs] 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设置 -csharp_style_namespace_declarations = file_scoped:silent - -# 设置每行的最大列数 -max_line_length = 120 -#缩进switch case内容 -csharp_indent_case_contents = true -#缩进switch标签 -csharp_indent_switch_labels = true - -#Formatting - new line options - -#在新行上放置catch语句 -csharp_new_line_before_catch = true -#在新行上放置else语句 -csharp_new_line_before_else = true -#要求对象初始化器的成员在单独的行上 +# 新行前的成员初始化 csharp_new_line_before_members_in_object_initializers = true -#要求在对象集合数组初始化器、方法、控制块、类型和lambda表达式的花括号前换行（也称为“Allman”风格） -csharp_new_line_before_open_brace = object_collection_array_initializers, methods, control_blocks, types, lambdas - -#Formatting - organize using options - -#按字母顺序排序System.*using指令，并将它们放在其他using指令之前 -dotnet_sort_system_directives_first = true - -#Formatting - spacing options - -#要求在类型转换和值之间不留空格 -csharp_space_after_cast = false -#在类型声明中要求在基类或接口的冒号前留空格 -csharp_space_after_colon_in_inheritance_clause = true -#在控制流语句（如for循环）中的关键字后要求留空格 -csharp_space_after_keywords_in_control_flow_statements = true -#在类型声明中要求在基类或接口的冒号前留空格 -csharp_space_before_colon_in_inheritance_clause = true -#删除空参数列表括号内的空格 -csharp_space_between_method_call_empty_parameter_list_parentheses = false -#删除方法调用名称和左括号之间的空格 -csharp_space_between_method_call_name_and_opening_parenthesis = false -#在方法调用的左括号后和右括号前不要留空格 -csharp_space_between_method_call_parameter_list_parentheses = false -#删除方法声明中空参数列表括号内的空格 -csharp_space_between_method_declaration_empty_parameter_list_parentheses = false -#在方法声明参数列表的左括号后和右括号前留空格 -csharp_space_between_method_declaration_parameter_list_parentheses = false - -#Formatting - wrapping options - -#将代码块留在单行上 -csharp_preserve_single_line_blocks = true - -#Style - Code block preferences - -#即使是单行代码也使用花括号 -csharp_prefer_braces = true:suggestion - -#Style - expression bodied member options - -#构造函数使用块体 -csharp_style_expression_bodied_constructors = false:suggestion -#方法使用块体 -csharp_style_expression_bodied_methods = false:suggestion -#属性使用表达式体 -csharp_style_expression_bodied_properties = true:suggestion - -#Style - expression level options - -#尽可能在方法调用的参数列表中内联声明out变量 -csharp_style_inlined_variable_declaration = true:suggestion -#对于有关键字表示的类型，成员访问表达式使用语言关键字而不是类型名 -dotnet_style_predefined_type_for_member_access = true:suggestion - -#Style - Expression-level preferences - -#使用default而不是default(T) -csharp_prefer_simple_default_expression = true:suggestion -#尽可能使用对象初始化器初始化对象 -dotnet_style_object_initializer = true:suggestion -#使用推断的元组元素名称 -dotnet_style_prefer_inferred_tuple_names = true:suggestion - -#Style - implicit and explicit types - -#在所有情况下都使用var代替显式类型，除非被其他代码样式规则覆盖 -csharp_style_var_elsewhere = true:suggestion -#使用var声明内置系统类型（如int）的变量 +# 使用 var 关键字 csharp_style_var_for_built_in_types = true:suggestion -#当类型已经在声明表达式的右侧提及时，使用var csharp_style_var_when_type_is_apparent = true:suggestion +csharp_style_var_elsewhere = true:suggestion +# 命名约定 +dotnet_naming_rule.private_members_should_be_camel_case.severity = suggestion +dotnet_naming_rule.private_members_should_be_camel_case.symbols = private_members +dotnet_naming_rule.private_members_should_be_camel_case.style = camel_case -#Style - language keyword and framework type options +dotnet_naming_symbols.private_members.applicable_accessibilities = private +dotnet_naming_symbols.private_members.applicable_kinds = field +dotnet_naming_symbols.private_members.required_modifiers = readonly -#对于有关键字表示的类型，局部变量、方法参数和类成员使用语言关键字而不是类型名 -dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion +dotnet_naming_style.camel_case.capitalization = camel_case +dotnet_naming_style.camel_case.required_prefix = _ +dotnet_naming_style.camel_case.required_suffix = -#Style - Miscellaneous preferences +# 空格和换行 +csharp_space_after_cast = true +csharp_space_after_colon_in_inheritance_clause = true +csharp_space_around_binary_operators = before_and_after +csharp_space_after_keywords_in_control_flow_statements = true +csharp_space_before_colon_in_inheritance_clause = true +csharp_space_before_comma = false +csharp_space_before_dot = false +csharp_space_before_semicolon_in_for_statement = false +csharp_space_before_open_square_bracket = false +csharp_space_between_empty_square_brackets = false +csharp_space_between_empty_method_call_parentheses = false +csharp_space_between_empty_method_declaration_parentheses = false -#使用局部函数而不是匿名函数 -csharp_style_pattern_local_over_anonymous_function = true:suggestion +# 花括号 +csharp_new_line_before_open_brace = all +csharp_new_line_before_else = true +csharp_new_line_before_catch = true +csharp_new_line_before_finally = true +csharp_new_line_before_members_in_anonymous_types = true -#Style - modifier options +# 缩进规则 +csharp_indent_case_contents = true +csharp_indent_block_contents = true +csharp_indent_braces = false -#除了公共接口成员外，偏好声明访问修饰符。这目前不会与“总是”不同，并且将在C#添加默认接口方法时作为未来的保护措施。 -dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion +# 其他设置 +dotnet_sort_system_directives_first = true +dotnet_separate_import_directive_groups = false -#Style - Modifier preferences - -#当此规则设置为修饰符列表时，偏好指定的顺序。 -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 - -#使用模式匹配而不是带有类型转换的is表达式 -csharp_style_pattern_matching_over_as_with_null_check = true:suggestion - -#Style - qualification options - -#偏好字段前不加this. 或 Me.（在Visual Basic中） -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 - -# 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 +# resharper兼容 +# 对象初始化收缩问题 https://youtrack.jetbrains.com/issue/RSRP-486359 +resharper_wrap_object_and_collection_initializer_style = chop_always +# 条件表达式花括号收缩问题 +resharper_csharp_case_block_braces = next_line_shifted_2 +resharper_indent_braces_inside_statement_conditions = false \ No newline at end of file diff --git a/src/SJZY.Track.Api/Program.cs b/src/SJZY.Track.Api/Program.cs index b1ac2cbf..8d7f64af 100644 --- a/src/SJZY.Track.Api/Program.cs +++ b/src/SJZY.Track.Api/Program.cs @@ -24,4 +24,4 @@ try catch (Exception ex) { Console.WriteLine($"项目启动失败，异常信息：{ex}"); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Api/SjzyTrackApiModule.cs b/src/SJZY.Track.Api/SjzyTrackApiModule.cs index 850a225d..6ec66034 100644 --- a/src/SJZY.Track.Api/SjzyTrackApiModule.cs +++ b/src/SJZY.Track.Api/SjzyTrackApiModule.cs @@ -97,4 +97,4 @@ public class SjzyTrackApiModule : AbpModule #endregion } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/CreateWarningInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/CreateWarningInput.cs index 19cd4f62..1e6bb896 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/CreateWarningInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/CreateWarningInput.cs @@ -39,4 +39,4 @@ public class CreateWarningInput /// 预警因素列表。 /// public List WarningFactors { get; set; } = new(); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/EditWarningOutput.cs b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/EditWarningOutput.cs index 897a87cf..e6dc14ec 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/EditWarningOutput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/EditWarningOutput.cs @@ -55,4 +55,4 @@ public class WarningFactorWithIdDto : WarningFactorDto /// 因素id /// public int Id { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/ModifyTimeSpanInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/ModifyTimeSpanInput.cs index 85cfd8e9..53df5f8b 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/ModifyTimeSpanInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/ModifyTimeSpanInput.cs @@ -11,4 +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/Forewarning/UpdateWarningInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/UpdateWarningInput.cs index fdf57b3f..cbc0a97e 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/UpdateWarningInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/UpdateWarningInput.cs @@ -42,4 +42,4 @@ public class NotifyDto /// 通知人id /// public int NotifyUserId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningDto.cs b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningDto.cs index 14c69977..9ef9894b 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningDto.cs @@ -12,4 +12,4 @@ public class WarningDto public int CustomerId { get; set; } public List Orders { get; set; } = new(); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningFactorDto.cs b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningFactorDto.cs index c889dd5e..ea3647de 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningFactorDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningFactorDto.cs @@ -14,4 +14,4 @@ public class WarningFactorDto /// 因素值 /// public JArray FactorValue { get; set; } = new(); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningNitifyDto.cs b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningNitifyDto.cs index f831cfeb..6c89f28f 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningNitifyDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningNitifyDto.cs @@ -26,4 +26,4 @@ public class WarningNitifyDto /// 通知人id /// public int NotifyUserId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningNotifyCacheEntry.cs b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningNotifyCacheEntry.cs index 8e733230..80cdbe7f 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningNotifyCacheEntry.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningNotifyCacheEntry.cs @@ -29,4 +29,4 @@ public class WarningNotifyCacheEntry { return $"{RuleId}:{OrderId}"; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningOrderDto.cs b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningOrderDto.cs index 8c00b851..198686e0 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningOrderDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningOrderDto.cs @@ -44,4 +44,4 @@ public class WarningOrderDto /// 到达州省 /// public string? ArrivalProvince { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningTimeSpanDto.cs b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningTimeSpanDto.cs index d58664a1..45795909 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningTimeSpanDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningTimeSpanDto.cs @@ -24,4 +24,4 @@ public class WarningTimeSpanDto /// 提醒次数 /// public int WarnCount { get; set; } -} \ 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 6c5b9c18..667bf0d3 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackInput.cs @@ -9,4 +9,4 @@ public class BatchDeleteTrackInput : OrderNosInfo /// [Required] public List TrackCodes { get; set; } = new(); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs index 29d81fd1..9bbf7dea 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs @@ -35,4 +35,4 @@ public class BatchUpsertTrackInput : OrderNosInfo [Required] [Range(-12, 12)] public float? TrackTimeZone { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/DeleteOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/DeleteOrderInput.cs index 2562224f..c70c9b42 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/DeleteOrderInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/DeleteOrderInput.cs @@ -13,4 +13,4 @@ public class DeleteTrackInput : OrderNoInfo /// [Required] public List TrackCodes { get; set; } = new(); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs index 7f4d8f5e..0060f442 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs @@ -104,4 +104,4 @@ public class TrackOrderDetailDto /// 创建人 /// public string? CreateUser { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs index 46b81f28..e7933e1b 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs @@ -162,4 +162,4 @@ public class TrackOrderDto ///// 问题描述名称 ///// //public string? ProblemDescriptionName { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackInput.cs index bf1498cc..f1eec9c9 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackInput.cs @@ -10,7 +10,8 @@ public class GetTrackInput : OrderNosInfo /// private float? _timeZone; - public float? TimeZone { + public float? TimeZone + { get => _timeZone ?? 8; set => _timeZone = value; } @@ -38,4 +39,4 @@ public enum SortMethod /// 按订单模板排序 /// ByTemplate -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs index fadb5727..feaf64f9 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs @@ -19,4 +19,4 @@ public class TrackDetail public string Location { get; set; } = null!; public DateTime Time { get; set; } public float? TimeZone { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/LinkOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/LinkOrderInput.cs index d7a90761..274b3358 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/LinkOrderInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/LinkOrderInput.cs @@ -32,4 +32,4 @@ public class LinkOrderInput /// 关联的单号 /// public List LinkOrderNos { get; set; } = new(); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/OrderNoInfo.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/OrderNoInfo.cs index 94a276f0..933239a4 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/OrderNoInfo.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/OrderNoInfo.cs @@ -33,4 +33,4 @@ public class OrderNosInfo /// [Required] public List OrderNos { get; set; } = new(); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/PushTrackInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/PushTrackInput.cs index 6f4757c6..d58bea41 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/PushTrackInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/PushTrackInput.cs @@ -9,4 +9,4 @@ public class PushTrackInput : OrderNosInfo /// [Required] public string TrackCode { get; set; } = null!; -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs index ac1a4589..7c29d75b 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs @@ -50,4 +50,4 @@ public class QueryTrackPullMappingsInfo /// 服务商轨迹内容英文 /// public string? ContentEn { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/RefreshTrackInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/RefreshTrackInput.cs index 42380265..7ac71ffb 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/RefreshTrackInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/RefreshTrackInput.cs @@ -6,4 +6,4 @@ public class RefreshTrackInput /// 订单号 /// public List OrderNos { get; set; } = new(); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderInput.cs index 9e4c9c20..edb94a8c 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderInput.cs @@ -66,4 +66,4 @@ public class UpdateOrderInput : OrderNoInfo /// 产品编码 /// public string? ProductCode { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderStatusInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderStatusInput.cs index aab48407..9d1e330b 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderStatusInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderStatusInput.cs @@ -8,4 +8,4 @@ public class UpdateOrderStatusInput /// 订单是否完成 /// public bool IsCompleted { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs index 1521f649..86e0c6fb 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs @@ -40,4 +40,4 @@ public class OrderFlightInfo /// [Required] public DateTime FlightDate { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs index 811bc6f6..945a973b 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs @@ -35,4 +35,4 @@ public class UpsertTrackInput : OrderNoInfo [Required] [Range(-12, 12)] public float? TrackTimeZone { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs index 3dc89b93..d8b4f995 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs @@ -94,4 +94,4 @@ public class GetTrackContentDetailDto /// 轨迹标记 /// public string TrackFlag { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentMapInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentMapInput.cs index d3765c9e..b556cb20 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentMapInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentMapInput.cs @@ -38,4 +38,4 @@ public class EditTrackContentMapInput /// 源轨迹内容id /// public int? TrackContentId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs index caea711c..513b56bb 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs @@ -84,4 +84,4 @@ public class GetTrackContentListDto /// 修改人 /// public string UpdateUser { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/EditTrackFlagInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/EditTrackFlagInput.cs index 549feb6f..0d3c631d 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/EditTrackFlagInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/EditTrackFlagInput.cs @@ -64,4 +64,4 @@ public class GetTrackFlagDetailDto ///// 是否完结 ///// //public bool IsFinish { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs index 163c8491..89c82a8e 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs @@ -64,4 +64,4 @@ public class GetPageTrackFlagInput : PageInfoInput /// 关键字 /// public string? Keywords { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackNode/TrackNodeInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackNode/TrackNodeInput.cs index 01049d17..557a7206 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackNode/TrackNodeInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackNode/TrackNodeInput.cs @@ -26,4 +26,4 @@ public class EditTrackNodeInput /// 节点英文名称 /// public string? NodeEnName { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/GetTrackCounterOutput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/GetTrackCounterOutput.cs index 795daea2..f52c7156 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/GetTrackCounterOutput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/GetTrackCounterOutput.cs @@ -16,4 +16,4 @@ public class GetTrackCounterOutput /// 预警数 /// public int WarnCount { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs index d99aa8b6..1050f2ea 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs @@ -2,4 +2,4 @@ namespace SJZY.Track.Application.Contract.Dtos.TrackOrder; public class TrackPushRecordItem { -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordOutput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordOutput.cs index 38fb93f4..0dbf4bc9 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordOutput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordOutput.cs @@ -72,4 +72,4 @@ public class TrackPushRecordOutput /// 创建时间 public DateTime CreateTime { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs index bb4cc36e..46f551d1 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs @@ -77,4 +77,4 @@ public class EditTrackPullConfigInput /// 轨迹内容code /// public string? TrackContentCode { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs index 763c50b0..f5a08ccc 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs @@ -64,4 +64,4 @@ public class EditTrackPullContentInput /// 是否完结 /// public bool IsCompleted { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullConfigDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullConfigDto.cs index c2074c37..d13b6f19 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullConfigDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullConfigDto.cs @@ -16,4 +16,4 @@ public class TrackPullConfigDto /// 子系统id /// public int SubSystemId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullContentConfigDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullContentConfigDto.cs index 2de31be9..63cad472 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullContentConfigDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullContentConfigDto.cs @@ -46,4 +46,4 @@ public class TrackPullContentConfigDto /// 轨迹时区发生地参数值 /// public int? TrackZonePlaceValue { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs index 11197ff5..f64cdead 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs @@ -51,4 +51,4 @@ public class TrackPullParamConfigDto /// 轨迹内容代码 /// public string? TrackContentCode { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamWithContentConfigDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamWithContentConfigDto.cs index fe807cb0..5d4b576d 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamWithContentConfigDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamWithContentConfigDto.cs @@ -5,4 +5,4 @@ public class TrackPullParamWithContentConfigDto public TrackPullParamConfigDto ParamConfig { get; set; } = new(); public List ContentConfigs { get; set; } = new(); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullPayload.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullPayload.cs index c20366d1..3165361a 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullPayload.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullPayload.cs @@ -6,4 +6,4 @@ public class TrackPullPayload /// 订单号 /// public string OrderNo { get; set; } = null!; -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs index 3bd011dd..651e5000 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs @@ -29,4 +29,4 @@ public class TrackRefreshAttach /// 子系统id /// public int SubSystemId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshContext.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshContext.cs index d7e67a39..83aa4b27 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshContext.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshContext.cs @@ -31,4 +31,4 @@ public class TrackRefreshContext /// 子系统id /// public int SubSystemId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs index 126da65f..e9dc1d9a 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs @@ -65,4 +65,4 @@ public class EditTrackPushConfigInput /// 时区格式格式模板 /// public string? TimezoneFormat { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushContentInput.cs index 6de74c24..d8d4621a 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushContentInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushContentInput.cs @@ -63,4 +63,4 @@ public class EditTrackPushContentInput /// 轨迹时区GMT /// public double? TrackTimeZone { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/SortTrackPushContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/SortTrackPushContentInput.cs index b0bc3f48..e7c21f14 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/SortTrackPushContentInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/SortTrackPushContentInput.cs @@ -8,4 +8,4 @@ public class SortTrackPushContentInput /// 排序信息 /// public List SortInfo { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushAfterUpdateOrderDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushAfterUpdateOrderDto.cs index bb9584f4..0fbbbbd6 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushAfterUpdateOrderDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushAfterUpdateOrderDto.cs @@ -26,4 +26,4 @@ public class TrackPushAfterUpdateOrderDto /// 问题描述 /// public string? Message { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushContentConfigDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushContentConfigDto.cs index 09851e29..a9aaaf64 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushContentConfigDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushContentConfigDto.cs @@ -88,4 +88,4 @@ public class TrackPushContentConfigDto /// 时区格式格式模板 /// public string? TimezoneFormat { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushInput.cs index 6a222e13..45047f0a 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushInput.cs @@ -28,4 +28,4 @@ public class TrackItem public string? Code { get; set; } public string? Status { get; set; } public string? Extra { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs index 94295183..d93aea6c 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs @@ -36,4 +36,4 @@ public class EditTrackStatusInput /// 轨迹状态英文 /// public string? EntrackStatus { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs index e40ae440..d5742701 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs @@ -41,4 +41,4 @@ public class GetTrackStatusDetailDto /// 节点名称 /// public string? NodeName { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs index c94f7b94..acfa23b5 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs @@ -69,4 +69,4 @@ public class GetPageTrackStatusInput : PageInfoInput /// 选中的轨迹状态id /// public List? SelectIds { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/QueryTrackNodeRequest.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/QueryTrackNodeRequest.cs index ff9e74ef..b22e14a1 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/QueryTrackNodeRequest.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/QueryTrackNodeRequest.cs @@ -11,4 +11,4 @@ public class QueryTrackNodeRequest : PageInfoInput /// 子系统id /// public long? SystemId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs index 38581fec..e354acf2 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs @@ -30,4 +30,4 @@ public class EditTrackTemplateContentInput /// 轨迹模板id /// public int? TrackTemplateId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs index 32ec2fd6..32c44f61 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs @@ -24,4 +24,4 @@ public class GetPageTrackTemplateInput : PageInfoInput /// 选中的轨迹模版id /// public List? SelectIds { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs index 041bb08d..04634cb5 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs @@ -106,4 +106,4 @@ public class EditTrackTemplateInput /// 显示原轨迹 /// public bool ShowOrigin { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs index 55c3dee0..06c52f37 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs @@ -8,4 +8,4 @@ public class SortTrackTemplateContentInput /// 排序信息 /// public List SortInfo { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Events/ModifyWarningEvent.cs b/src/SJZY.Track.Application.Contract/Events/ModifyWarningEvent.cs index c2312e47..d5ba00e7 100644 --- a/src/SJZY.Track.Application.Contract/Events/ModifyWarningEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/ModifyWarningEvent.cs @@ -19,4 +19,4 @@ public class RedisEvent : IRedisEvent public interface IRedisEvent { string EventType { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Events/OrderIdentifier.cs b/src/SJZY.Track.Application.Contract/Events/OrderIdentifier.cs index 49e79b04..96b412cf 100644 --- a/src/SJZY.Track.Application.Contract/Events/OrderIdentifier.cs +++ b/src/SJZY.Track.Application.Contract/Events/OrderIdentifier.cs @@ -5,4 +5,4 @@ public struct OrderIdentifier public int OrderId { get; set; } public string OrderNo { get; set; } public int OrderType { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Events/PushWarningEvent.cs b/src/SJZY.Track.Application.Contract/Events/PushWarningEvent.cs index c8fbdb20..a6601102 100644 --- a/src/SJZY.Track.Application.Contract/Events/PushWarningEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/PushWarningEvent.cs @@ -3,4 +3,4 @@ namespace SJZY.Track.Application.Contract.Events; public class PushWarningEvent { public int PageSize { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs index d07ae367..7c419440 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs @@ -61,4 +61,4 @@ public class TrackChangeAfterUpdateOrderEvent /// 时区缺失和发生地缺失标记，1表示时区，2表示发生地，3表示两种 /// public int DeficiencyTagValue { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Events/TrackDeleteEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackDeleteEvent.cs index 0b77dcc2..cbf0e16b 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackDeleteEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackDeleteEvent.cs @@ -26,4 +26,4 @@ public class TrackDeleteEvent /// 已经处理过的订单 /// public List Visited { get; set; } = new(); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Events/TrackInsertForNotMappedEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackInsertForNotMappedEvent.cs index 8ab3f2ae..f67be132 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackInsertForNotMappedEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackInsertForNotMappedEvent.cs @@ -46,4 +46,4 @@ public class TrackInsertForNotMappedEvent /// 轨迹发生时区 /// public float TrackTimeZone { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs index dc1abe5f..870e2274 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs @@ -64,4 +64,4 @@ public struct SystemPushStruct /// 轨迹发生时区 /// public float TrackTimeZone { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Events/TrackRefreshStruct.cs b/src/SJZY.Track.Application.Contract/Events/TrackRefreshStruct.cs index 56d33357..a03f117e 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackRefreshStruct.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackRefreshStruct.cs @@ -22,4 +22,4 @@ public struct TrackRefreshStruct /// todo：能够使得IsCompleted为true的点，全局只有一个：轨迹刷新？？ /// public bool IsCompleted { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs index c173644a..cb4fcdf4 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs @@ -58,4 +58,4 @@ public class TrackUpsertEvent /// 时区缺失和发生地缺失标记，1表示时区，2表示发生地，3表示两种 /// public int DeficiencyTagValue { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Events/TrackUpsertForRefreshEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackUpsertForRefreshEvent.cs index 50096c8b..4ae99f4f 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackUpsertForRefreshEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackUpsertForRefreshEvent.cs @@ -91,4 +91,4 @@ public class TrackHandledDto /// 轨迹发生时区 /// public float? TrackTimeZone { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/GlobalUsings.cs b/src/SJZY.Track.Application.Contract/GlobalUsings.cs index 19811628..5845e7a0 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 SJZY.Expand.ABP.Common.Enums; -global using SJZY.Expand.ABP.Core.Common.Dto; \ No newline at end of file +global using SJZY.Expand.ABP.Core.Common.Dto; diff --git a/src/SJZY.Track.Application.Contract/Services/IForewarningNotifyService.cs b/src/SJZY.Track.Application.Contract/Services/IForewarningNotifyService.cs index 914535ae..df0272c6 100644 --- a/src/SJZY.Track.Application.Contract/Services/IForewarningNotifyService.cs +++ b/src/SJZY.Track.Application.Contract/Services/IForewarningNotifyService.cs @@ -1,5 +1,4 @@ using SJZY.Track.Application.Contract.Dtos.Forewarning; -using SJZY.Track.Domain.Dtos.Forewarning; namespace SJZY.Track.Application.Contract.Services; @@ -20,4 +19,4 @@ public interface IForewarningNotifyService /// 发送通知。 /// Task SendNotificationAsync(); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Services/IKpiAreaCacheService.cs b/src/SJZY.Track.Application.Contract/Services/IKpiAreaCacheService.cs index 905fde9a..4e15278f 100644 --- a/src/SJZY.Track.Application.Contract/Services/IKpiAreaCacheService.cs +++ b/src/SJZY.Track.Application.Contract/Services/IKpiAreaCacheService.cs @@ -2,4 +2,4 @@ namespace SJZY.Track.Application.Contract.Services; public interface IKpiAreaCacheService { -} \ 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 c2a5584e..5a1b4067 100644 --- a/src/SJZY.Track.Application.Contract/Services/IOrderService.cs +++ b/src/SJZY.Track.Application.Contract/Services/IOrderService.cs @@ -25,4 +25,4 @@ public interface IOrderService : IRemoteService /// /// Task LinkOrderAsync(LinkOrderInput input); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackContentService.cs b/src/SJZY.Track.Application.Contract/Services/ITrackContentService.cs index b663cc5a..b24b807c 100644 --- a/src/SJZY.Track.Application.Contract/Services/ITrackContentService.cs +++ b/src/SJZY.Track.Application.Contract/Services/ITrackContentService.cs @@ -2,4 +2,4 @@ namespace SJZY.Track.Application.Contract.Services; public interface ITrackContentService { -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackFlagService.cs b/src/SJZY.Track.Application.Contract/Services/ITrackFlagService.cs index 4687cc9b..4527823d 100644 --- a/src/SJZY.Track.Application.Contract/Services/ITrackFlagService.cs +++ b/src/SJZY.Track.Application.Contract/Services/ITrackFlagService.cs @@ -2,4 +2,4 @@ namespace SJZY.Track.Application.Contract.Services; public interface ITrackFlagService { -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackPullCacheService.cs b/src/SJZY.Track.Application.Contract/Services/ITrackPullCacheService.cs index 3dae00ee..59b14a49 100644 --- a/src/SJZY.Track.Application.Contract/Services/ITrackPullCacheService.cs +++ b/src/SJZY.Track.Application.Contract/Services/ITrackPullCacheService.cs @@ -31,4 +31,4 @@ public interface ITrackPullCacheService /// Task SetPullConfigAsync(int? id = null, int? subSystemId = null, int? serviceProviderId = null); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackPushCacheService.cs b/src/SJZY.Track.Application.Contract/Services/ITrackPushCacheService.cs index a8ec1f53..a7fb056a 100644 --- a/src/SJZY.Track.Application.Contract/Services/ITrackPushCacheService.cs +++ b/src/SJZY.Track.Application.Contract/Services/ITrackPushCacheService.cs @@ -19,4 +19,4 @@ public interface ITrackPushCacheService /// /// Task?> SetPushContentConfigsAsync(int subSystemId, int customId); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackPushConfigService.cs b/src/SJZY.Track.Application.Contract/Services/ITrackPushConfigService.cs index 89311311..214ba4f1 100644 --- a/src/SJZY.Track.Application.Contract/Services/ITrackPushConfigService.cs +++ b/src/SJZY.Track.Application.Contract/Services/ITrackPushConfigService.cs @@ -12,4 +12,4 @@ public interface ITrackPushConfigService : IRemoteService /// Task>> QueryTrackPullMappingsAsync( QueryTrackPullMappingsInput input); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackService.cs b/src/SJZY.Track.Application.Contract/Services/ITrackService.cs index 10108bbb..4d2b26c9 100644 --- a/src/SJZY.Track.Application.Contract/Services/ITrackService.cs +++ b/src/SJZY.Track.Application.Contract/Services/ITrackService.cs @@ -32,4 +32,4 @@ public interface ITrackService : IRemoteService /// /// Task>> QueryAsync(GetTrackInput input); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackStatusService.cs b/src/SJZY.Track.Application.Contract/Services/ITrackStatusService.cs index 4f351f2c..fc85abb7 100644 --- a/src/SJZY.Track.Application.Contract/Services/ITrackStatusService.cs +++ b/src/SJZY.Track.Application.Contract/Services/ITrackStatusService.cs @@ -2,4 +2,4 @@ namespace SJZY.Track.Application.Contract.Services; public interface ITrackStatusService { -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/SjzyTrackApplicationContractModule.cs b/src/SJZY.Track.Application.Contract/SjzyTrackApplicationContractModule.cs index 9224ccbb..9a69109c 100644 --- a/src/SJZY.Track.Application.Contract/SjzyTrackApplicationContractModule.cs +++ b/src/SJZY.Track.Application.Contract/SjzyTrackApplicationContractModule.cs @@ -7,4 +7,4 @@ public class SjzyTrackApplicationContractModule : AbpModule public override void PreConfigureServices(ServiceConfigurationContext context) { } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/AutoMapper/ForewarningMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/ForewarningMapperProfile.cs index 889d33d5..2ac133b5 100644 --- a/src/SJZY.Track.Application/AutoMapper/ForewarningMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/ForewarningMapperProfile.cs @@ -36,4 +36,4 @@ public class ForewarningMapperProfile : Profile .ForMember(dest => dest.LeftPostcode, opt => opt.MapFrom(src => src.LeftPostCode)) .ForMember(dest => dest.RightPostcode, opt => opt.MapFrom(src => src.RightPostCode)); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs index 01283cc9..725c984a 100644 --- a/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs @@ -51,7 +51,7 @@ public class OrderAutoMapperProfile : Profile string enumDescription = string.Empty; if (type == 1) { - TrackProblemType trackProblem = (TrackProblemType)value; // 将int值转换为枚举 + TrackProblemType trackProblem = (TrackProblemType) value; // 将int值转换为枚举 if (trackProblem.GetDescription().IsNullOrWhiteSpace()) enumDescription = ""; else @@ -59,7 +59,7 @@ public class OrderAutoMapperProfile : Profile } else { - OrderType orderType = (OrderType)value; // 将int值转换为枚举 + OrderType orderType = (OrderType) value; // 将int值转换为枚举 if (orderType.GetDescription().IsNullOrWhiteSpace()) enumDescription = ""; else @@ -68,4 +68,4 @@ public class OrderAutoMapperProfile : Profile return enumDescription; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/AutoMapper/TrackAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackAutoMapperProfile.cs index 7a0fe9ef..cac245bd 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackAutoMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/TrackAutoMapperProfile.cs @@ -10,4 +10,4 @@ public class TrackAutoMapperProfile : Profile { CreateMap(MemberList.None); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/AutoMapper/TrackContentAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackContentAutoMapperProfile.cs index 4a4838fd..862447be 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackContentAutoMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/TrackContentAutoMapperProfile.cs @@ -17,4 +17,4 @@ public class TrackContentAutoMapperProfile : Profile MemberList.None); CreateMap(MemberList.None); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/AutoMapper/TrackFlagAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackFlagAutoMapperProfile.cs index 86972346..be324306 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackFlagAutoMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/TrackFlagAutoMapperProfile.cs @@ -17,4 +17,4 @@ public class TrackFlagAutoMapperProfile : Profile CreateMap, UnifyPageResultDto>(MemberList.None); CreateMap(MemberList.None); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/AutoMapper/TrackNodeMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackNodeMapperProfile.cs index bddecde1..5de329ac 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackNodeMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/TrackNodeMapperProfile.cs @@ -16,4 +16,4 @@ public class TrackNodeMapperProfile : Profile .ForMember(val => val.NodeEnName, opt => opt.MapFrom(src => src.NodeEnName)) .ForMember(val => val.SubSystemId, opt => opt.MapFrom(src => src.SubSystemId)); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/AutoMapper/TrackPullAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackPullAutoMapperProfile.cs index 3a1243ff..aa08d477 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackPullAutoMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/TrackPullAutoMapperProfile.cs @@ -21,4 +21,4 @@ public class TrackPullAutoMapperProfile : Profile CreateMap(MemberList.None); CreateMap(MemberList.None); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/AutoMapper/TrackPushAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackPushAutoMapperProfile.cs index 4383bdde..487e6b0d 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackPushAutoMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/TrackPushAutoMapperProfile.cs @@ -21,4 +21,4 @@ public class TrackPushAutoMapperProfile : Profile CreateMap(MemberList.None); CreateMap(MemberList.None); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/AutoMapper/TrackPushConfigAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackPushConfigAutoMapperProfile.cs index a16f00ff..e6f4ad15 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackPushConfigAutoMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/TrackPushConfigAutoMapperProfile.cs @@ -11,4 +11,4 @@ public class TrackPushConfigAutoMapperProfile : Profile CreateMap(MemberList.None); CreateMap(MemberList.None); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/AutoMapper/TrackStatusAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackStatusAutoMapperProfile.cs index 326e6f01..fb6c1b96 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackStatusAutoMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/TrackStatusAutoMapperProfile.cs @@ -20,4 +20,4 @@ public class TrackStatusAutoMapperProfile : Profile CreateMap, UnifyPageResultDto>(MemberList .None); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs index 538241c8..bb999c90 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs @@ -20,4 +20,4 @@ public class TrackTemplateAutoMapperProfile : Profile CreateMap, UnifyPageResultDto>(MemberList .None); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/CAP/CAPFilter.cs b/src/SJZY.Track.Application/CAP/CAPFilter.cs index 3f742ca4..693ead6e 100644 --- a/src/SJZY.Track.Application/CAP/CAPFilter.cs +++ b/src/SJZY.Track.Application/CAP/CAPFilter.cs @@ -71,4 +71,4 @@ public class CapFilter : SubscribeFilter return Task.CompletedTask; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/PushWarningEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/PushWarningEventHandler.cs index de99f575..883c9ecc 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/PushWarningEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/PushWarningEventHandler.cs @@ -46,4 +46,4 @@ public class PushWarningEventHandler : ITransientDependency, ICapSubscribe await RedisHelper.Client.DelAsync(GlobalConst.TrackPushTrackWaringLockKey); _logger.LogInformation(message: "本次预警扫描了：{total}个订单", total); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs index 134fdbda..d38897b3 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs @@ -161,4 +161,4 @@ public class TrackChangeAfterUpdateOrderEventHandler : ITransientDependency, ICa return providerList.GroupBy(val => val.OrderId) .ToDictionary(val => val.Key, val => val.First()); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs index 24c4a39a..0757ab91 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackDeleteEventHandler.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; @@ -136,4 +136,4 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe x.LatestTrackTimeZone }); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushCompletedEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushCompletedEventHandler.cs index 959ce7e1..5eac20d7 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushCompletedEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushCompletedEventHandler.cs @@ -68,26 +68,39 @@ public class TrackPushCompletedEventHandler : ITransientDependency, ICapSubscrib // tips：只有新增会影响推送进度？ if (log.OptionType != OptionType.新增.ToString()) return; - var order = new OrderEntity { Id = log.OrderId }; + var order = new OrderEntity + { + Id = log.OrderId + }; /* * 异常：最近一条推送是失败 */ if (!log.IsSuccess) { - order.QuestionType = (int)TrackProblemType.Error; + order.QuestionType = (int) TrackProblemType.Error; order.LatestPushError = log.Message; - await _orderRepository.UpdateColumnAsync(order, x => new { x.QuestionType, x.LatestPushError }); + await _orderRepository.UpdateColumnAsync(order, x => new + { + x.QuestionType, + x.LatestPushError + }); } else { // 还原成正常态 - order.QuestionType = (int)TrackProblemType.None; + order.QuestionType = (int) TrackProblemType.None; order.LatestPushError = null; order.LatestPushTrackCode = log.TrackCode; order.LatestPushTime = log.CreateTime; await _orderRepository.UpdateColumnAsync(order, - x => new { x.LatestPushTrackCode, x.LatestPushTime, x.QuestionType, x.LatestPushError }); + x => new + { + x.LatestPushTrackCode, + x.LatestPushTime, + x.QuestionType, + x.LatestPushError + }); } } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs index dd055335..fd9de055 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs @@ -1,4 +1,4 @@ -using DotNetCore.CAP; +using DotNetCore.CAP; using Newtonsoft.Json; using SJZY.Expand.ABP.Core.PublicMethords; using SJZY.InterfaceRelay.Application.Contracts; @@ -50,7 +50,10 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe @event.OrderIds.Contains(x.Id), x => new OrderEntity { - Id = x.Id, OrderNo = x.OrderNo, LatestPushTrackCode = x.LatestPushTrackCode, OrderType = x.OrderType + Id = x.Id, + OrderNo = x.OrderNo, + LatestPushTrackCode = x.LatestPushTrackCode, + OrderType = x.OrderType }); if (orders.Count == 0) return; _orders = orders; @@ -81,7 +84,7 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe { foreach (var order in _orders) { - if (order.QuestionType == (int)TrackProblemType.Error) continue; // 系统不推异常单，只能人工操作 + if (order.QuestionType == (int) TrackProblemType.Error) continue; // 系统不推异常单，只能人工操作 // 推送新增，需要根据上一次的推送 推断 本次推送 是否可行 config = GetValidPushConfigAsync(_pushConfigs, order.LatestPushTrackCode, @event.TrackCode); if (config == null) continue; @@ -218,7 +221,10 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe Extra = config.ExpandFieldsValue }; - var body = new TrackUpdateInput { OrderNo = log.OrderNo, }; + var body = new TrackUpdateInput + { + OrderNo = log.OrderNo, + }; body.Data.Add(track); log.PushContent = body.ToJson(); @@ -243,7 +249,10 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe Extra = config.ExpandFieldsValue }; - var body = new TrackPushInput { OrderNo = log.OrderNo, }; + var body = new TrackPushInput + { + OrderNo = log.OrderNo, + }; body.Data.Add(track); if (config.IsAllPush) @@ -309,4 +318,4 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe return dateTime.ToString("yyyy-MM-ddTHH:mm:ss.fffK"); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs index 0f997d2f..afe662ff 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs @@ -49,7 +49,11 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe { // 理论上小包在这不会分组 foreach (var group in linkedOrders.Where(x => x.OwnerOrderId == order.OrderId) - .GroupBy(x => new { x.SubSystemId, x.CustomId })) + .GroupBy(x => new + { + x.SubSystemId, + x.CustomId + })) { var nextEvent = @event.DeepCopy(); nextEvent.Visited.AddRange(orderIds); @@ -82,7 +86,9 @@ 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) @@ -222,4 +228,4 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe }; await _capPublisher.PublishAsync(GlobalConst.TrackPushSubscribe, trackPushEvent); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/CAP/LoggerExtensions.cs b/src/SJZY.Track.Application/CAP/LoggerExtensions.cs index 3f66443e..1cefe77b 100644 --- a/src/SJZY.Track.Application/CAP/LoggerExtensions.cs +++ b/src/SJZY.Track.Application/CAP/LoggerExtensions.cs @@ -86,4 +86,4 @@ internal static class LoggerExtensions { logger.LogWarning(ex, $"Expected an OperationCanceledException, but found '{ex.Message}'."); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/CAP/MySubscribeExecutor.cs b/src/SJZY.Track.Application/CAP/MySubscribeExecutor.cs index f4061a25..39412572 100644 --- a/src/SJZY.Track.Application/CAP/MySubscribeExecutor.cs +++ b/src/SJZY.Track.Application/CAP/MySubscribeExecutor.cs @@ -1,4 +1,4 @@ -using System.Diagnostics; +using System.Diagnostics; using System.Reflection; using DotNetCore.CAP; using DotNetCore.CAP.Diagnostics; @@ -146,7 +146,9 @@ 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); @@ -263,4 +265,4 @@ public class MySubscribeExecutor : ISubscribeExecutor } #endregion -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/CAP/SubscriberExecutionFailedException.cs b/src/SJZY.Track.Application/CAP/SubscriberExecutionFailedException.cs index ce3a5ffa..567f5a9e 100644 --- a/src/SJZY.Track.Application/CAP/SubscriberExecutionFailedException.cs +++ b/src/SJZY.Track.Application/CAP/SubscriberExecutionFailedException.cs @@ -12,4 +12,4 @@ internal class SubscriberExecutionFailedException : Exception public override string? StackTrace => _originException.StackTrace; public override string? Source => _originException.Source; -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/GlobalUsing.cs b/src/SJZY.Track.Application/GlobalUsing.cs index 91d65fe7..c222f2ec 100644 --- a/src/SJZY.Track.Application/GlobalUsing.cs +++ b/src/SJZY.Track.Application/GlobalUsing.cs @@ -5,4 +5,4 @@ global using SJZY.Expand.ABP.Core.Common.Dto; global using SJZY.Track.Domain; global using Volo.Abp; global using Volo.Abp.Application.Services; -global using Volo.Abp.Validation; \ No newline at end of file +global using Volo.Abp.Validation; diff --git a/src/SJZY.Track.Application/Helpers/Base64Helper.cs b/src/SJZY.Track.Application/Helpers/Base64Helper.cs index 8bb30190..1a94a5ac 100644 --- a/src/SJZY.Track.Application/Helpers/Base64Helper.cs +++ b/src/SJZY.Track.Application/Helpers/Base64Helper.cs @@ -30,4 +30,4 @@ public class Base64Helper return JsonConvert.DeserializeObject(Encoding.UTF8.GetString(bytes)); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Helpers/DateTimeHelper.cs b/src/SJZY.Track.Application/Helpers/DateTimeHelper.cs index f1b1b14e..dff48044 100644 --- a/src/SJZY.Track.Application/Helpers/DateTimeHelper.cs +++ b/src/SJZY.Track.Application/Helpers/DateTimeHelper.cs @@ -32,7 +32,7 @@ public static class DateTimeHelper public static string TimezoneFormat(double timezone, string format) { //时区是整数丢掉浮点数部分 - return format.Replace("hh", ((int)timezone).ToString()); + return format.Replace("hh", ((int) timezone).ToString()); } /// @@ -55,4 +55,4 @@ public static class DateTimeHelper return sign * (hours + minutes / 60f); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Helpers/ForewarningHelper.cs b/src/SJZY.Track.Application/Helpers/ForewarningHelper.cs index c4183489..792f0112 100644 --- a/src/SJZY.Track.Application/Helpers/ForewarningHelper.cs +++ b/src/SJZY.Track.Application/Helpers/ForewarningHelper.cs @@ -199,7 +199,7 @@ public class ForewarningHelper foreach (var rule in rules) { dynamic dynamicRule = new ExpandoObject(); - var dynamicRuleDict = (IDictionary)dynamicRule; + var dynamicRuleDict = (IDictionary) dynamicRule; dynamicRuleDict[nameof(Id)] = rule.Id; dynamicRuleDict[nameof(rule.StartTrackStatus)] = rule.StartTrackStatus; @@ -240,4 +240,4 @@ public class ForewarningHelper return dynamicList; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Helpers/StringHelper.cs b/src/SJZY.Track.Application/Helpers/StringHelper.cs index b3a5966b..32fca43e 100644 --- a/src/SJZY.Track.Application/Helpers/StringHelper.cs +++ b/src/SJZY.Track.Application/Helpers/StringHelper.cs @@ -46,4 +46,4 @@ public class StringHelper return sb.ToString(); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/HostServices/RedisHostService.cs b/src/SJZY.Track.Application/HostServices/RedisHostService.cs index 356e9f58..4fe8ecbd 100644 --- a/src/SJZY.Track.Application/HostServices/RedisHostService.cs +++ b/src/SJZY.Track.Application/HostServices/RedisHostService.cs @@ -46,4 +46,4 @@ public class RedisHostService : IHostedService { return $"{GlobalConst.PublishNotifyChannelKey}"; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Localization/TrackLocalizationResource.cs b/src/SJZY.Track.Application/Localization/TrackLocalizationResource.cs index bb336e2c..6be5b4e4 100644 --- a/src/SJZY.Track.Application/Localization/TrackLocalizationResource.cs +++ b/src/SJZY.Track.Application/Localization/TrackLocalizationResource.cs @@ -6,4 +6,4 @@ namespace SJZY.Track.Application.Localization; [InheritResource(typeof(SjzyBasicLocalization))] public class TrackLocalizationResource { -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Options/CustomeOptions.cs b/src/SJZY.Track.Application/Options/CustomeOptions.cs index 16a2e29e..bf63a828 100644 --- a/src/SJZY.Track.Application/Options/CustomeOptions.cs +++ b/src/SJZY.Track.Application/Options/CustomeOptions.cs @@ -6,4 +6,4 @@ public class CustomeOptions : IOptionAutoInjection { public int Setting1 { get; set; } public int Setting2 { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs index 8a276756..33fa7b39 100644 --- a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs +++ b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs @@ -116,7 +116,12 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler var order = await _orderRepository.GetFirstAsync(x => x.OrderType == attach.OrderType && x.OrderNo == orderNo, - x => new { x.Id, x.LatestPushTrackCode, x.CustomId }); + x => new + { + x.Id, + x.LatestPushTrackCode, + x.CustomId + }); if (order == default) return; var context = new TrackRefreshContext @@ -246,7 +251,9 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler { new OrderIdentifier { - OrderId = context.OrderId, OrderNo = context.OrderNo, OrderType = context.OrderType, + OrderId = context.OrderId, + OrderNo = context.OrderNo, + OrderType = context.OrderType, } }, TrackRefreshData = new TrackRefreshStruct @@ -398,7 +405,7 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler private Task GetPlaceByOrder(int trackValue, int orderId) { Expression> resultExpression = - (TrackLocationValue)trackValue switch + (TrackLocationValue) trackValue switch { TrackLocationValue.ArrivalPort => x => x.ArrivalPort, TrackLocationValue.ArriveCity => x => x.ArrivalCity, @@ -423,8 +430,8 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler string timezone = null; if (!string.IsNullOrEmpty(placeOrCode)) { - if (matchedContentConfig!.TrackZonePlaceValue.Value == (int)TrackLocationValue.ArrivalPort - || matchedContentConfig!.TrackZonePlaceValue.Value == (int)TrackLocationValue.LeavePort) + if (matchedContentConfig!.TrackZonePlaceValue.Value == (int) TrackLocationValue.ArrivalPort + || matchedContentConfig!.TrackZonePlaceValue.Value == (int) TrackLocationValue.LeavePort) { timezone = await _timezoneQueries.GetPortTimezone(placeOrCode); return DateTimeHelper.ConvertTimeZoneToFloat(timezone); @@ -436,4 +443,4 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler return null; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningCacheService.cs b/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningCacheService.cs index e5f9de39..b9f8c373 100644 --- a/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningCacheService.cs +++ b/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningCacheService.cs @@ -59,7 +59,10 @@ public class ForewarningCacheService : IForewarningCacheService, ISingletonDepen await RedisHelper.Client.DelAsync(WarningKey(subSystemId, customerId)); var eventModel = new ClearRulCacheEvent { - Items = new List() { new RuleAreaBaseInfo(subSystemId, customerId) } + Items = new List() + { + new RuleAreaBaseInfo(subSystemId, customerId) + } }; await PublishEvent(eventModel); @@ -74,7 +77,10 @@ public class ForewarningCacheService : IForewarningCacheService, ISingletonDepen var willDelKeys = baseInfos.Select(val => WarningKey(val.SystemId, val.CustomerId)).ToArray(); await RedisHelper.Client.DelAsync(willDelKeys); await RedisHelper.Client.DelAsync(AreaKey(areaId)); - var eventModel = new ClearRulCacheEvent { Items = baseInfos }; + var eventModel = new ClearRulCacheEvent + { + Items = baseInfos + }; await PublishEvent(eventModel); } @@ -214,4 +220,4 @@ public class ForewarningCacheService : IForewarningCacheService, ISingletonDepen { await RedisHelper.Client.PublishAsync(GlobalConst.PublishNotifyChannelKey, @event.ToJson()); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningNotifyService.cs b/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningNotifyService.cs index ec4ff81d..b1bacde4 100644 --- a/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningNotifyService.cs +++ b/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningNotifyService.cs @@ -102,7 +102,11 @@ public class ForewarningNotifyService : IForewarningNotifyService, ITransientDep {起飞-落地+普货+12345678+美国 时效9，预警时效7，次数3} 命中订单总数：124，详情点击https://middlebusiness.pet.shijizhongyun.com/trajectoryCenter/trajectoryOrder {清关-提货+普货+12345678+美国 时效4，预警时效3，次数1} 命中订单总数：3250，详情点击https://middlebusiness.pet.shijizhongyun.com/trajectoryCenter/trajectoryOrder */ - foreach (var group in notifyRules.GroupBy(x => new { x.NotifyMode, x.NotifyUserId })) + foreach (var group in notifyRules.GroupBy(x => new + { + x.NotifyMode, + x.NotifyUserId + })) { var notifyContent = new StringBuilder(); @@ -187,4 +191,4 @@ public class ForewarningNotifyService : IForewarningNotifyService, ITransientDep { return new DateTimeOffset(dateTime).ToUnixTimeSeconds(); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningService.cs b/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningService.cs index a0b99c1b..ba1842cf 100644 --- a/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningService.cs +++ b/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningService.cs @@ -77,7 +77,11 @@ public class ForewarningService : ApplicationService } var statusList = await statusQuery.GetListAsync(x => x.SubSystemId == warning.SubSystemId, x => - new IdWithNameDto { Id = x.Id, Name = x.Status }); + new IdWithNameDto + { + Id = x.Id, + Name = x.Status + }); return ForewarningHelper.MapWarningSummary(warning, statusList); } @@ -194,4 +198,4 @@ public class ForewarningService : ApplicationService await _forewarningCacheService.DeleteRulesAsync(warning.SubSystemId, warning.CustomerId); return true; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Services/ForewarningServices/KpiAreaCacheService.cs b/src/SJZY.Track.Application/Services/ForewarningServices/KpiAreaCacheService.cs index b479e7e9..38c8813f 100644 --- a/src/SJZY.Track.Application/Services/ForewarningServices/KpiAreaCacheService.cs +++ b/src/SJZY.Track.Application/Services/ForewarningServices/KpiAreaCacheService.cs @@ -24,4 +24,4 @@ public class KpiAreaCacheService : IKpiAreaCacheService, ITransientDependency { throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Services/ForewarningServices/KpiAreaService.cs b/src/SJZY.Track.Application/Services/ForewarningServices/KpiAreaService.cs index 5456bac3..7f6bd213 100644 --- a/src/SJZY.Track.Application/Services/ForewarningServices/KpiAreaService.cs +++ b/src/SJZY.Track.Application/Services/ForewarningServices/KpiAreaService.cs @@ -142,4 +142,4 @@ public class KpiAreaService : ApplicationService { return await _ruleAreaRepository.GetAreaInfos(query); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs index 64aeed63..4402fe6d 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs @@ -27,7 +27,12 @@ public partial class OrderService public async Task LinkOrderAsync(LinkOrderInput input) { var order = await _orderRepository.GetFirstAsync(x => - x.OrderType == input.OrderType && x.OrderNo == input.OrderNo, x => new { x.Id, x.SubSystemId }); + x.OrderType == input.OrderType && x.OrderNo == input.OrderNo, + x => new + { + x.Id, + x.SubSystemId + }); if (order == default) { throw new BusinessException(message: $"订单：{input.OrderNo}不存在"); @@ -97,7 +102,11 @@ public partial class OrderService var tracks = await _trackDetailsRepository.GetListAsync(orderId); // 补轨迹 - foreach (var group in existedOrders.GroupBy(x => new { x.SubSystemId, x.CustomId })) + foreach (var group in existedOrders.GroupBy(x => new + { + x.SubSystemId, + x.CustomId + })) { foreach (var track in tracks) { @@ -107,7 +116,12 @@ public partial class OrderService CustomId = group.Key.CustomId, OrderIdentifiers = group.Select(x => - new OrderIdentifier { OrderId = x.Id, OrderNo = x.OrderNo, OrderType = x.OrderType, }) + new OrderIdentifier + { + OrderId = x.Id, + OrderNo = x.OrderNo, + OrderType = x.OrderType, + }) .ToArray(), TrackCode = track.TrackCode, TrackPlace = track.TrackPlace, @@ -133,4 +147,4 @@ public partial class OrderService return new UnifyResultDto(true, true); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs index 134e1e8c..9e002b1c 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs @@ -42,7 +42,12 @@ public partial class OrderService : ApplicationService, IOrderService // 订单已存在则视为更新 await UpdateOrderAsync(input, order); - return new UnifyResultDto() { Code = "200", Msg = "操作成功", Data = "创建成功" }; + return new UnifyResultDto() + { + Code = "200", + Msg = "操作成功", + Data = "创建成功" + }; } order = ObjectMapper.Map(input); @@ -51,7 +56,12 @@ public partial class OrderService : ApplicationService, IOrderService order.OrderFlights = ObjectMapper.Map, List>(input.FlightInfos); await _orderRepository.CreateOrderAsync(order); - return new UnifyResultDto() { Code = "200", Msg = "操作成功", Data = "新增成功" }; + return new UnifyResultDto() + { + Code = "200", + Msg = "操作成功", + Data = "新增成功" + }; } /// @@ -82,4 +92,4 @@ public partial class OrderService : ApplicationService, IOrderService order.OrderFlights = ObjectMapper.Map, List>(input.FlightInfos); await _orderRepository.UpdateOrderAsync(order); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs index d8b1262e..9752cf7d 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs @@ -56,9 +56,18 @@ public class TrackPullService : ApplicationService foreach (var group in orders.GroupBy(x => - new { x.ServiceProviderId, x.ServiceProviderName, x.SubSystemId, x.OrderType })) + new + { + x.ServiceProviderId, + x.ServiceProviderName, + x.SubSystemId, + x.OrderType + })) { - var data = new List(group.Select(x => new TrackPullPayload { OrderNo = x.OrderNo })); + var data = new List(group.Select(x => new TrackPullPayload + { + OrderNo = x.OrderNo + })); var serviceProviderCode = group.FirstOrDefault()!.ServiceProviderCode; var attach = Base64Helper.SerializeObject(group.Key); @@ -123,9 +132,16 @@ public class TrackPullService : ApplicationService var serviceProviderCode = orders.FirstOrDefault()?.ServiceProviderCode; var serviceProviderName = orders.FirstOrDefault()?.ServiceProviderName; - foreach (var group in orders.GroupBy(x => new { x.SubSystemId, x.OrderType })) + foreach (var group in orders.GroupBy(x => new { - var data = new List(group.Select(x => new TrackPullPayload { OrderNo = x.OrderNo })); + x.SubSystemId, + x.OrderType + })) + { + var data = new List(group.Select(x => new TrackPullPayload + { + OrderNo = x.OrderNo + })); var attach = Base64Helper.SerializeObject(new TrackRefreshAttach(config.ServiceProviderId, serviceProviderName!, group.Key.SubSystemId, group.Key.OrderType)); var res = await _httpClientProxy.Service.BatchForwardThenPushToQueueAsync( @@ -143,4 +159,4 @@ public class TrackPullService : ApplicationService await RedisHelper.Client.SetExAsync(redisKey, config.PullInterval * 60, orders.Count); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushConfigService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushConfigService.cs index 7e7070ea..af0a2f16 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushConfigService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushConfigService.cs @@ -36,4 +36,4 @@ public class TrackPushConfigService : ApplicationService, ITrackPushConfigServic return new UnifyResultDto>(true, output, "操作成功"); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs index ed2a0337..5650b962 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs @@ -45,7 +45,12 @@ public class TrackPushService : ApplicationService var orders = await _orderRepository.GetArrayAsync(x => x.OrderType == input.OrderType && input.OrderNos.Contains(x.OrderNo), - x => new { x.Id, x.SubSystemId, x.CustomId }); + x => new + { + x.Id, + x.SubSystemId, + x.CustomId + }); if (!orders.Any()) { @@ -61,7 +66,11 @@ public class TrackPushService : ApplicationService var name = userInfo.Data.UserName; - foreach (var group in orders.GroupBy(x => new { x.SubSystemId, x.CustomId })) + foreach (var group in orders.GroupBy(x => new + { + x.SubSystemId, + x.CustomId + })) { var trackPushEvent = new TrackPushEvent { @@ -88,7 +97,10 @@ public class TrackPushService : ApplicationService [HttpPost("Track/PushWarnForTask")] public async Task PushWarnForTaskAsync() { - await _capPublisher.PublishAsync(GlobalConst.TrackPushWarning, new PushWarningEvent { PageSize = 1000 }); + await _capPublisher.PublishAsync(GlobalConst.TrackPushWarning, new PushWarningEvent + { + PageSize = 1000 + }); return "推送预警任务已启动"; } @@ -110,4 +122,4 @@ public class TrackPushService : ApplicationService return await _trackPushRecordsRepository.GetTrackPushRecordsAsync(orderId); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.Query.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.Query.cs index f2dee9a6..620c9af5 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.Query.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.Query.cs @@ -111,4 +111,4 @@ public partial class TrackService }); }); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs index d03591de..3b9183a0 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs @@ -74,7 +74,12 @@ public partial class TrackService : ApplicationService, ITrackService @event.CustomId = order.CustomId; @event.OrderIdentifiers = new[] { - new OrderIdentifier { OrderId = order.Id, OrderNo = order.OrderNo, OrderType = order.OrderType, } + new OrderIdentifier + { + OrderId = order.Id, + OrderNo = order.OrderNo, + OrderType = order.OrderType, + } }; @event.OperationMan = name; await _capPublisher.PublishAsync(GlobalConst.TrackUpsertSubscribe, @event); @@ -90,14 +95,22 @@ public partial class TrackService : ApplicationService, ITrackService [HttpPost("Track/Delete")] public async Task DeleteTrackAsync(DeleteTrackInput input) { - var order = await _orderRepository.GetFirstAsync(x => - x.OrderType == input.OrderType && x.OrderNo == input.OrderNo, x => new { x.Id, x.SubSystemId }); + var order = await _orderRepository.GetFirstAsync( + x => x.OrderType == input.OrderType && x.OrderNo == input.OrderNo, + x => new + { + x.Id, + x.SubSystemId + }); if (order == default) { throw new BusinessException(message: $"订单：{input.OrderNo}不存在"); } - var codes = await _provideQueries.GetCanDeleteTrackCodesAsync(new List { order.Id }, input.TrackCodes); + var codes = await _provideQueries.GetCanDeleteTrackCodesAsync(new List + { + order.Id + }, input.TrackCodes); if (codes.Count == 0) { @@ -137,7 +150,12 @@ public partial class TrackService : ApplicationService, ITrackService { var orders = await _orderRepository.GetListAsync(x => x.OrderType == input.OrderType && input.OrderNos.Contains(x.OrderNo) - , x => new { x.Id, x.SubSystemId }); + , x => new + { + x.Id, + x.SubSystemId + } + ); var codes = await _provideQueries.GetCanDeleteTrackCodesAsync( orders.Select(x => x.Id).ToList(), input.TrackCodes @@ -190,7 +208,13 @@ public partial class TrackService : ApplicationService, ITrackService var orders = await _orderRepository.GetListAsync(x => x.OrderType == input.OrderType && input.OrderNos.Contains(x.OrderNo), - x => new { x.Id, x.OrderNo, x.SubSystemId, x.CustomId }); + x => new + { + x.Id, + x.OrderNo, + x.SubSystemId, + x.CustomId + }); var userInfo = await _requestCurrentUserService.Service.GetCurrentUserBasicInfoAsync(); if (userInfo.Code != "200" || userInfo.Data is null) @@ -201,7 +225,11 @@ public partial class TrackService : ApplicationService, ITrackService var name = userInfo.Data.UserName; - foreach (var group in orders.GroupBy(x => new { x.SubSystemId, x.CustomId })) + foreach (var group in orders.GroupBy(x => new + { + x.SubSystemId, + x.CustomId + })) { // 新增/更新轨迹 var @event = new TrackUpsertEvent @@ -211,7 +239,9 @@ public partial class TrackService : ApplicationService, ITrackService OrderIdentifiers = group.Select(order => new OrderIdentifier { - OrderId = order.Id, OrderNo = order.OrderNo, OrderType = input.OrderType, + OrderId = order.Id, + OrderNo = order.OrderNo, + OrderType = input.OrderType, }).ToArray(), IsAdd = input.IsAdd, TrackCode = input.TrackCode, @@ -226,4 +256,4 @@ public partial class TrackService : ApplicationService, ITrackService return new UnifyResultDto(true, true); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs b/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs index da81dac8..b2b5905a 100644 --- a/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs +++ b/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs @@ -129,22 +129,18 @@ public class TrackContentService : ApplicationService switch (input.Options) { case OptionTypeNoNull.新增: - { var trackContentMapEntity = ObjectMapper.Map(input); await _trackContentRepository.InsertMapAsync(trackContentMapEntity); - } break; case OptionTypeNoNull.修改: - { var oldTrackContentMapEntity = await _trackContentRepository.GetMapByIdAsync(input.Id!.Value) ?? throw new BusinessException(message: _stringLocalizer["NotFindData"]); ObjectMapper.Map(input, oldTrackContentMapEntity); await _trackContentRepository.UpdateMapAsync(oldTrackContentMapEntity); - } break; case OptionTypeNoNull.删除: @@ -242,13 +238,18 @@ public class TrackContentService : ApplicationService if (templateEntity.SubSystemId != input.SubSystemId || templateEntity.Code != input.Code) { await _trackContentRepository.UpdateMapAsync( - x => new TrackContentMapEntity { SubSystemId = input.SubSystemId, TrackContentCode = input.Code }, + x => new TrackContentMapEntity + { + SubSystemId = input.SubSystemId, + TrackContentCode = input.Code + }, x => x.TrackContentId == input.Id); await _trackContentRepository.UpdateMapAsync( x => new TrackContentMapEntity { - MapSubSystemId = input.SubSystemId, MapTrackContentCode = input.Code + MapSubSystemId = input.SubSystemId, + MapTrackContentCode = input.Code }, x => x.MapTrackContentId == input.Id); } @@ -293,4 +294,4 @@ public class TrackContentService : ApplicationService } #endregion 私有方法 -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Services/TrackFlags/TrackFlagService.cs b/src/SJZY.Track.Application/Services/TrackFlags/TrackFlagService.cs index ab791109..e3074d7d 100644 --- a/src/SJZY.Track.Application/Services/TrackFlags/TrackFlagService.cs +++ b/src/SJZY.Track.Application/Services/TrackFlags/TrackFlagService.cs @@ -167,4 +167,4 @@ public class TrackFlagService : ApplicationService, ITransientDependency } #endregion -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Services/TrackNode/TrackNodeService.cs b/src/SJZY.Track.Application/Services/TrackNode/TrackNodeService.cs index 7ebcae34..513e675e 100644 --- a/src/SJZY.Track.Application/Services/TrackNode/TrackNodeService.cs +++ b/src/SJZY.Track.Application/Services/TrackNode/TrackNodeService.cs @@ -166,4 +166,4 @@ public class TrackNodeService : ApplicationService, ITransientDependency } #endregion -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs index 09d9ca2e..d3c42d60 100644 --- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs +++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs @@ -66,7 +66,10 @@ public class TrackOrderService : ApplicationService order.IsCompleted = input.IsCompleted; - return await _orderRepository.UpdateColumnAsync(order, x => new { x.IsCompleted }); + return await _orderRepository.UpdateColumnAsync(order, x => new + { + x.IsCompleted + }); } /// @@ -81,8 +84,8 @@ public class TrackOrderService : ApplicationService return new GetTrackCounterOutput { TotalCount = counts.Sum(x => x.Count), - ErrorCount = counts.FirstOrDefault(x => x.ProblemType == (int)TrackProblemType.Error)?.Count ?? 0, - WarnCount = counts.FirstOrDefault(x => x.ProblemType == (int)TrackProblemType.Warn)?.Count ?? 0, + ErrorCount = counts.FirstOrDefault(x => x.ProblemType == (int) TrackProblemType.Error)?.Count ?? 0, + WarnCount = counts.FirstOrDefault(x => x.ProblemType == (int) TrackProblemType.Warn)?.Count ?? 0, }; } @@ -100,8 +103,8 @@ public class TrackOrderService : ApplicationService res.ForEach(x => { - int hours = (int)x.TrackTimeZone; // 提取整数部分作为小时 - int minutes = (int)((x.TrackTimeZone - hours) * 60); // 将小数部分乘以 60 转换为分钟 + int hours = (int) x.TrackTimeZone; // 提取整数部分作为小时 + int minutes = (int) ((x.TrackTimeZone - hours) * 60); // 将小数部分乘以 60 转换为分钟 x.TrackGTMTimeZone = $"GTM {(x.TrackTimeZone >= 0 ? "+" : "-")}{new TimeSpan(hours, minutes, 0).ToString().RemovePostFix(":00")}"; }); @@ -166,8 +169,8 @@ public class TrackOrderService : ApplicationService else { // 将小数形式的小时转换为时区偏移量 - int hours = (int)a.TrackTimeZoneValue; // 提取整数部分作为小时 - int minutes = (int)((a.TrackTimeZoneValue - hours) * 60); // 将小数部分乘以 60 转换为分钟 + int hours = (int) a.TrackTimeZoneValue; // 提取整数部分作为小时 + int minutes = (int) ((a.TrackTimeZoneValue - hours) * 60); // 将小数部分乘以 60 转换为分钟 TimeSpan offset = new TimeSpan(hours, minutes, 0); string timeZoneStr = offset.ToString(); string flag = a.TrackTimeZoneValue > 0f ? "+" : ""; @@ -201,4 +204,4 @@ public class TrackOrderService : ApplicationService } #endregion -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Services/TrackPull/TrackPullCacheService.cs b/src/SJZY.Track.Application/Services/TrackPull/TrackPullCacheService.cs index 642744e3..48424e0b 100644 --- a/src/SJZY.Track.Application/Services/TrackPull/TrackPullCacheService.cs +++ b/src/SJZY.Track.Application/Services/TrackPull/TrackPullCacheService.cs @@ -1,4 +1,4 @@ -using System.Linq.Expressions; +using System.Linq.Expressions; using SJZY.Expand.ABP.Core; using SJZY.Track.Application.Contract.Dtos.TrackPull; using SJZY.Track.Application.Contract.Services; @@ -29,7 +29,9 @@ public class TrackPullCacheService : ApplicationService, ITrackPullCacheService return await _trackPullConfigRepository.GetListAsync(x => true, x => new TrackPullConfigDto { - SubSystemId = x.SubSystemId, ServiceProviderId = x.ServiceProviderId, PullInterval = x.PullInterval + SubSystemId = x.SubSystemId, + ServiceProviderId = x.ServiceProviderId, + PullInterval = x.PullInterval }); } @@ -75,4 +77,4 @@ public class TrackPullCacheService : ApplicationService, ITrackPullCacheService return data; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs b/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs index 0ef6331b..4aeaf469 100644 --- a/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs +++ b/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.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; @@ -101,49 +101,49 @@ public class TrackPullService : ApplicationService switch (input.Options) { case OptionTypeNoNull.新增: - { - var trackPullEntity = ObjectMapper.Map(input); - var trackPullParamsEntity = - ObjectMapper.Map(input); - - int id; - - using (var ts = TransactionScopeHelper.Create()) { - id = await _trackPullConfigRepository.InsertReturnIdentityAsync(trackPullEntity); + var trackPullEntity = ObjectMapper.Map(input); + var trackPullParamsEntity = + ObjectMapper.Map(input); - trackPullParamsEntity.PullOrPushConfigId = id; - await _trackPullConfigRepository.InsertParamsAsync(trackPullParamsEntity); + int id; - ts.Complete(); + using (var ts = TransactionScopeHelper.Create()) + { + id = await _trackPullConfigRepository.InsertReturnIdentityAsync(trackPullEntity); + + trackPullParamsEntity.PullOrPushConfigId = id; + await _trackPullConfigRepository.InsertParamsAsync(trackPullParamsEntity); + + ts.Complete(); + } + + await _trackPullCacheService.SetPullConfigAsync(id); } - - await _trackPullCacheService.SetPullConfigAsync(id); - } break; case OptionTypeNoNull.修改: - { - var oldTrackPullEntity = await _trackPullConfigRepository.GetFirstAsync(x => x.Id == input.Id) ?? - throw new BusinessException(message: _stringLocalizer["NotFindData"]); - - var oldTrackPullParamsEntity = - await _trackPullConfigRepository.GetParamsSingleAsync(x => - x.PullOrPushConfigId == input.Id && !x.IsPush); - - ObjectMapper.Map(input, oldTrackPullEntity); - ObjectMapper.Map(input, oldTrackPullParamsEntity); - - using (var ts = TransactionScopeHelper.Create()) { - await _trackPullConfigRepository.UpdateAsync(oldTrackPullEntity); - await _trackPullConfigRepository.UpdateParamsAsync(oldTrackPullParamsEntity); + var oldTrackPullEntity = await _trackPullConfigRepository.GetFirstAsync(x => x.Id == input.Id) ?? + throw new BusinessException(message: _stringLocalizer["NotFindData"]); - ts.Complete(); + var oldTrackPullParamsEntity = + await _trackPullConfigRepository.GetParamsSingleAsync(x => + x.PullOrPushConfigId == input.Id && !x.IsPush); + + ObjectMapper.Map(input, oldTrackPullEntity); + ObjectMapper.Map(input, oldTrackPullParamsEntity); + + using (var ts = TransactionScopeHelper.Create()) + { + await _trackPullConfigRepository.UpdateAsync(oldTrackPullEntity); + await _trackPullConfigRepository.UpdateParamsAsync(oldTrackPullParamsEntity); + + ts.Complete(); + } + + await _trackPullCacheService.SetPullConfigAsync(input.Id); } - - await _trackPullCacheService.SetPullConfigAsync(input.Id); - } break; case OptionTypeNoNull.删除: @@ -213,38 +213,40 @@ public class TrackPullService : ApplicationService switch (input.Options) { case OptionTypeNoNull.新增: - { - var entity = ObjectMapper.Map(input); + { + var entity = ObjectMapper.Map(input); - await _trackPullConfigRepository.InsertContentAsync(entity); - await _trackPullCacheService.SetPullConfigAsync(input.TrackPullConfigId); + await _trackPullConfigRepository.InsertContentAsync(entity); + await _trackPullCacheService.SetPullConfigAsync(input.TrackPullConfigId); - break; - } + break; + } case OptionTypeNoNull.修改: - { - var oldTrackPullContentEntity = await _trackPullConfigRepository.GetContentByIdAsync(input.Id!.Value) ?? - throw new BusinessException(message: _stringLocalizer["NotFindData"]); + { + var oldTrackPullContentEntity = + await _trackPullConfigRepository.GetContentByIdAsync(input.Id!.Value) ?? + throw new BusinessException(message: _stringLocalizer["NotFindData"]); - ObjectMapper.Map(input, oldTrackPullContentEntity); + ObjectMapper.Map(input, oldTrackPullContentEntity); - await _trackPullConfigRepository.UpdateContentAsync(oldTrackPullContentEntity); - await _trackPullCacheService.SetPullConfigAsync(oldTrackPullContentEntity.TrackPullConfigId); + await _trackPullConfigRepository.UpdateContentAsync(oldTrackPullContentEntity); + await _trackPullCacheService.SetPullConfigAsync(oldTrackPullContentEntity.TrackPullConfigId); - break; - } + break; + } case OptionTypeNoNull.删除: - { - var oldTrackPullContentEntity = await _trackPullConfigRepository.GetContentByIdAsync(input.Id!.Value) ?? - throw new BusinessException(message: _stringLocalizer["NotFindData"]); + { + var oldTrackPullContentEntity = + await _trackPullConfigRepository.GetContentByIdAsync(input.Id!.Value) ?? + throw new BusinessException(message: _stringLocalizer["NotFindData"]); - await _trackPullConfigRepository.SoftDeleteContentAsync(x => x.Id == input.Id); - await _trackPullCacheService.SetPullConfigAsync(oldTrackPullContentEntity.TrackPullConfigId); + await _trackPullConfigRepository.SoftDeleteContentAsync(x => x.Id == input.Id); + await _trackPullCacheService.SetPullConfigAsync(oldTrackPullContentEntity.TrackPullConfigId); - break; - } + break; + } default: throw new BusinessException(message: _stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum, @@ -253,4 +255,4 @@ public class TrackPullService : ApplicationService return true; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Services/TrackPush/TrackPushCacheService.cs b/src/SJZY.Track.Application/Services/TrackPush/TrackPushCacheService.cs index fd0a708f..626096a4 100644 --- a/src/SJZY.Track.Application/Services/TrackPush/TrackPushCacheService.cs +++ b/src/SJZY.Track.Application/Services/TrackPush/TrackPushCacheService.cs @@ -1,4 +1,4 @@ -using SJZY.Expand.ABP.Core; +using SJZY.Expand.ABP.Core; using SJZY.Track.Application.Contract.Dtos.TrackPush; using SJZY.Track.Application.Contract.Services; using SJZY.Track.Domain.Aggregates.TrackPushAggregate; @@ -95,4 +95,4 @@ public class TrackPushCacheService : ITrackPushCacheService, ITransientDependenc return res; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs b/src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs index 63c20073..a5be2639 100644 --- a/src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs +++ b/src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs @@ -100,17 +100,14 @@ public class TrackPushService : ApplicationService switch (input.Options) { case OptionTypeNoNull.新增: - { var trackPushEntity = ObjectMapper.Map(input); await _trackPushConfigRepository.InsertReturnIdentityAsync(trackPushEntity); await _trackPushCacheService.SetPushContentConfigsAsync(trackPushEntity.SubSystemId, trackPushEntity.CustomId); - } break; case OptionTypeNoNull.修改: - { var oldTrackPushEntity = await _trackPushConfigRepository.GetFirstAsync(x => x.Id == input.Id) ?? throw new BusinessException(message: _stringLocalizer["NotFindData"]); @@ -118,18 +115,15 @@ public class TrackPushService : ApplicationService await _trackPushConfigRepository.UpdateAsync(oldTrackPushEntity); await _trackPushCacheService.SetPushContentConfigsAsync(oldTrackPushEntity.SubSystemId, oldTrackPushEntity.CustomId); - } break; case OptionTypeNoNull.删除: - { var entity = await _trackPushConfigRepository.GetFirstAsync(x => x.Id == input.Id) ?? throw new BusinessException(message: _stringLocalizer["NotFindData"]); await _trackPushConfigRepository.SoftDeleteAsync(x => x.Id == input.Id); await _trackPushConfigRepository.SoftDeleteContentAsync(x => x.TrackPushConfigId == input.Id); await _trackPushCacheService.SetPushContentConfigsAsync(entity.SubSystemId, entity.CustomId); - } break; default: @@ -183,36 +177,36 @@ public class TrackPushService : ApplicationService switch (input.Options) { case OptionTypeNoNull.新增: - { - int maxSort = await _trackPushConfigRepository.ContentMaxAsync(x => x.Sort, - x => x.TrackPushConfigId == input.TrackPushConfigId); + { + int maxSort = await _trackPushConfigRepository.ContentMaxAsync(x => x.Sort, + x => x.TrackPushConfigId == input.TrackPushConfigId); - var entity = ObjectMapper.Map(input); - entity.Sort = maxSort + 1; - await _trackPushConfigRepository.InsertContentAsync(entity); - break; - } + var entity = ObjectMapper.Map(input); + entity.Sort = maxSort + 1; + await _trackPushConfigRepository.InsertContentAsync(entity); + break; + } case OptionTypeNoNull.修改: - { - var entity = await _trackPushConfigRepository.GetContentByIdAsync(input.Id!.Value) ?? - throw new BusinessException(message: _stringLocalizer["NotFindData"]); + { + var entity = await _trackPushConfigRepository.GetContentByIdAsync(input.Id!.Value) ?? + throw new BusinessException(message: _stringLocalizer["NotFindData"]); - ObjectMapper.Map(input, entity); - await _trackPushConfigRepository.UpdateContentAsync(entity); - break; - } + ObjectMapper.Map(input, entity); + await _trackPushConfigRepository.UpdateContentAsync(entity); + break; + } case OptionTypeNoNull.删除: - { - var entity = await _trackPushConfigRepository.GetContentByIdAsync(input.Id!.Value) ?? - throw new BusinessException(message: _stringLocalizer["NotFindData"]); - trackPushConfigId = entity.TrackPushConfigId; - await _trackPushConfigRepository.SoftDeleteContentAsync(x => x.Id == input.Id); - await _trackPushConfigRepository.UpdateContentAsync(x => x.Sort == x.Sort - 1, - x => x.TrackPushConfigId == entity.TrackPushConfigId && x.Sort > entity.Sort); - break; - } + { + var entity = await _trackPushConfigRepository.GetContentByIdAsync(input.Id!.Value) ?? + throw new BusinessException(message: _stringLocalizer["NotFindData"]); + trackPushConfigId = entity.TrackPushConfigId; + await _trackPushConfigRepository.SoftDeleteContentAsync(x => x.Id == input.Id); + await _trackPushConfigRepository.UpdateContentAsync(x => x.Sort == x.Sort - 1, + x => x.TrackPushConfigId == entity.TrackPushConfigId && x.Sort > entity.Sort); + break; + } default: throw new BusinessException(message: _stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum, @@ -266,4 +260,4 @@ public class TrackPushService : ApplicationService return true; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs b/src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs index e87fcd11..8bd539a6 100644 --- a/src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs +++ b/src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs @@ -179,4 +179,4 @@ public class TrackStatusService : ApplicationService, ITransientDependency } #endregion -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs b/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs index 8ca614d4..56b3ca02 100644 --- a/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs +++ b/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs @@ -124,47 +124,45 @@ public class TrackTemplateService : ApplicationService switch (input.Options) { case OptionTypeNoNull.新增: - { - int maxSort = await _trackTemplateRepository.ContentMaxAsync(x => x.Sort, - x => x.TrackTemplateId == input.TrackTemplateId); + { + int maxSort = await _trackTemplateRepository.ContentMaxAsync(x => x.Sort, + x => x.TrackTemplateId == input.TrackTemplateId); - var entity = ObjectMapper.Map(input); - entity.Sort = maxSort + 1; + var entity = ObjectMapper.Map(input); + entity.Sort = maxSort + 1; - await _trackTemplateRepository.InsertContentAsync(entity); + await _trackTemplateRepository.InsertContentAsync(entity); - break; - } + break; + } case OptionTypeNoNull.修改: - { - var entity = await _trackTemplateRepository.GetContentByIdAsync(input.Id!.Value) ?? - throw new BusinessException(message: _stringLocalizer["NotFindData"]); + { + var entity = await _trackTemplateRepository.GetContentByIdAsync(input.Id!.Value) ?? + throw new BusinessException(message: _stringLocalizer["NotFindData"]); - ObjectMapper.Map(input, entity); + ObjectMapper.Map(input, entity); - await _trackTemplateRepository.UpdateContentAsync(entity); + await _trackTemplateRepository.UpdateContentAsync(entity); - break; - } + break; + } case OptionTypeNoNull.删除: - { - var entity = await _trackTemplateRepository.GetContentByIdAsync(input.Id!.Value) ?? - throw new BusinessException(message: _stringLocalizer["NotFindData"]); - - using (var ts = TransactionScopeHelper.Create()) { + var entity = await _trackTemplateRepository.GetContentByIdAsync(input.Id!.Value) ?? + throw new BusinessException(message: _stringLocalizer["NotFindData"]); + + using var ts = TransactionScopeHelper.Create(); await _trackTemplateRepository.SoftDeleteContentAsync(input.Id!.Value); await _trackTemplateRepository.UpdateContentAsync(x => x.Sort == x.Sort - 1, x => x.TrackTemplateId == entity.TrackTemplateId && x.Sort > entity.Sort); ts.Complete(); - } - break; - } + break; + } default: throw new BusinessException(message: _stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum, @@ -272,4 +270,4 @@ public class TrackTemplateService : ApplicationService } #endregion 私有方法 -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs b/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs index db7dcab3..680114b7 100644 --- a/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs +++ b/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs @@ -159,4 +159,4 @@ public class SjzyTrackApplicationModule : AbpModule }); }); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Validations/Forewarning/CreateRuleFactorValidation.cs b/src/SJZY.Track.Application/Validations/Forewarning/CreateRuleFactorValidation.cs index 931ebbd4..5c7fa156 100644 --- a/src/SJZY.Track.Application/Validations/Forewarning/CreateRuleFactorValidation.cs +++ b/src/SJZY.Track.Application/Validations/Forewarning/CreateRuleFactorValidation.cs @@ -15,4 +15,4 @@ public class CreateRuleFactorValidation : AbstractValidator // todo: more validation } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Validations/Forewarning/RuleTrackStateDtoValidator.cs b/src/SJZY.Track.Application/Validations/Forewarning/RuleTrackStateDtoValidator.cs index cf61bc45..b90b4b37 100644 --- a/src/SJZY.Track.Application/Validations/Forewarning/RuleTrackStateDtoValidator.cs +++ b/src/SJZY.Track.Application/Validations/Forewarning/RuleTrackStateDtoValidator.cs @@ -11,4 +11,4 @@ public class RuleTrackStateDtoValidator : AbstractValidator RuleFor(x => x.EndTrackStatusId).GreaterThan(0).WithMessage("终止轨迹状态id必须大于0"); RuleFor(x => x.NotifyUserId).NotEmpty().WithMessage("通知对象不能为空"); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentInputValidation.cs b/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentInputValidation.cs index 36848552..600dec8c 100644 --- a/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentInputValidation.cs +++ b/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentInputValidation.cs @@ -22,4 +22,4 @@ public class EditTrackContentInputValidation : AbstractValidator x.EnContent).NotNull().WithMessage("轨迹内容英文必填！").NotEmpty().WithMessage("轨迹内容英文不能为空！"); }); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentMapInputValidation.cs b/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentMapInputValidation.cs index d8ef431c..33341e79 100644 --- a/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentMapInputValidation.cs +++ b/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentMapInputValidation.cs @@ -1,4 +1,4 @@ -using FluentValidation; +using FluentValidation; using Microsoft.Extensions.Localization; using SJZY.Expand.ABP.Core.Localization; using SJZY.Track.Application.Contract.Dtos.TrackContents; @@ -56,4 +56,4 @@ public class EditTrackContentMapInputValidation : AbstractValidator x.Flag).NotNull().WithMessage("轨迹标记必填！").NotEmpty().WithMessage("轨迹标记不能为空！"); }); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Validations/TrackPull/EditTrackPullConfigInputValidation.cs b/src/SJZY.Track.Application/Validations/TrackPull/EditTrackPullConfigInputValidation.cs index 6833a5a8..91090c6c 100644 --- a/src/SJZY.Track.Application/Validations/TrackPull/EditTrackPullConfigInputValidation.cs +++ b/src/SJZY.Track.Application/Validations/TrackPull/EditTrackPullConfigInputValidation.cs @@ -1,4 +1,4 @@ -using FluentValidation; +using FluentValidation; using Microsoft.Extensions.Localization; using SJZY.Expand.ABP.Core.Localization; using SJZY.Track.Application.Contract.Dtos.TrackPull; @@ -85,4 +85,4 @@ public class EditTrackPullConfigInputValidation : AbstractValidator x.EntrackStatus).NotNull().WithMessage("轨迹状态英文必填！").NotEmpty().WithMessage("轨迹状态英文不能为空！"); }); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateContentInputValidation.cs b/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateContentInputValidation.cs index 7abbdacd..273362fe 100644 --- a/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateContentInputValidation.cs +++ b/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateContentInputValidation.cs @@ -1,4 +1,4 @@ -using FluentValidation; +using FluentValidation; using Microsoft.Extensions.Localization; using SJZY.Expand.ABP.Core.Localization; using SJZY.Track.Application.Contract.Dtos.TrackTemplates; @@ -45,4 +45,4 @@ public class EditTrackTemplateContentInputValidation : AbstractValidator x.Code).NotNull().WithMessage("模版代码必填！").NotEmpty().WithMessage("模版代码不能为空！"); }); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/IForewarningCacheService.cs b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/IForewarningCacheService.cs index c330405d..c80b108f 100644 --- a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/IForewarningCacheService.cs +++ b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/IForewarningCacheService.cs @@ -39,4 +39,4 @@ public interface IForewarningCacheService /// 客户id /// Task ClearRedisBySystemIdAndCustomer(int subSystemId, int customerId); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/IWarningRepository.cs b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/IWarningRepository.cs index f85ad374..bf638ac2 100644 --- a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/IWarningRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/IWarningRepository.cs @@ -59,4 +59,4 @@ public interface IWarningRepository : IBasicRepository /// /// Task GetByIdAsync(int warningId); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningEntity.cs b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningEntity.cs index ad78a417..7f407fa2 100644 --- a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningEntity.cs @@ -73,4 +73,4 @@ public class WarningEntity : IFullAuditedBasicEntitys, IAggregateRoot IsEnable = isEnable; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningFactorEntity.cs b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningFactorEntity.cs index ef349335..b55eeca9 100644 --- a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningFactorEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningFactorEntity.cs @@ -28,4 +28,4 @@ public class WarningFactorEntity : IFullAuditedBasicEntitys, IEntity /// [SugarColumn(ColumnName = "Value")] public string Value { get; set; } = null!; -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningNotifyEntity.cs b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningNotifyEntity.cs index 916bc70c..ff84c0ac 100644 --- a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningNotifyEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningNotifyEntity.cs @@ -46,4 +46,4 @@ public class WarningNotifyEntity : IFullAuditedBasicEntitys, IEntity /// [SugarColumn(ColumnName = "NotifyUserId")] public int NotifyUserId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningRecordIndex.cs b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningRecordIndex.cs index c19715e0..cd40adb7 100644 --- a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningRecordIndex.cs +++ b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningRecordIndex.cs @@ -41,4 +41,4 @@ public class WarningRecordIndex : IdBaseIndex /// /// public int CustomId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningRuleEntity.cs b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningRuleEntity.cs index 92f519f2..0fa80f26 100644 --- a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningRuleEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningRuleEntity.cs @@ -106,4 +106,4 @@ public class WarningRuleEntity : IFullAuditedBasicEntitys, IEntity /// [SugarColumn(ColumnName = "NotifyUserId")] public int NotifyUserId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/IKpiAreaRepository.cs b/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/IKpiAreaRepository.cs index 3b3a00b0..e84baad6 100644 --- a/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/IKpiAreaRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/IKpiAreaRepository.cs @@ -65,4 +65,4 @@ public interface IKpiAreaRepository : IBasicRepository /// /// List? GetAreaInfosByAreaId(int areaId); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaEntity.cs b/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaEntity.cs index a79f991a..192119f6 100644 --- a/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaEntity.cs @@ -46,4 +46,4 @@ public class RuleAreaEntity : IAggregateRoot public DateTime UpdateTime { get; set; } [SugarColumn(IsIgnore = true)] public List AreaInfos { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs b/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs index 90208447..b2f14b30 100644 --- a/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs @@ -74,4 +74,4 @@ public class RuleAreaInfoEntity : IEntity /// [SugarColumn(ColumnName = "UpdateTime", IsNullable = false, ColumnDescription = "更新时间")] public DateTime UpdateTime { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs index 5557a7f0..87f5f7d3 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs @@ -69,4 +69,4 @@ public interface IOrderRepository : IBasicRepository Task UnLinkByIdsAsync(List linkIds); #endregion -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs index 11c072d9..f19af187 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs @@ -186,4 +186,4 @@ public class OrderEntity : IFullAuditedBasicEntitys, IAggregateRoot LatestTrackPlace = null; LatestTrackTimeZone = null; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs index 757cd982..766c0d27 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs @@ -47,4 +47,4 @@ public class OrderFlightEntity : ICreateBaicEntity, ISoftDeleteBasicEntity, IEnt /// [SugarColumn(ColumnName = "IsDeleted")] public bool IsDeleted { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs index cbeafa56..4527282a 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs @@ -66,4 +66,4 @@ public class OrderLinkEntity : ICreateBaicEntity, ISoftDeleteBasicEntity, IEntit /// [SugarColumn(ColumnName = "IsDeleted")] public bool IsDeleted { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderTemplateEntity.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderTemplateEntity.cs index cb2ddc9a..6a1d9a8f 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderTemplateEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderTemplateEntity.cs @@ -47,4 +47,4 @@ public class OrderTemplateEntity : ICreateBaicEntity, ISoftDeleteBasicEntity, IE /// [SugarColumn(ColumnName = "IsDeleted")] public bool IsDeleted { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/ITrackContentRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/ITrackContentRepository.cs index 04d252e0..7ebad5f1 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/ITrackContentRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/ITrackContentRepository.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Domain.Dtos.TrackContents; +using SJZY.Track.Domain.Dtos.TrackContents; using SJZY.Track.Domain.Dtos.TrackTemplate; namespace SJZY.Track.Domain.Aggregates.TrackContentAggregate; @@ -30,4 +30,4 @@ public interface ITrackContentRepository : IBasicRepository 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 20bd2249..324888ec 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs @@ -47,4 +47,4 @@ public class TrackContentEntity : IFullAuditedBasicEntitys, IAggregateRoot /// [SugarColumn(ColumnName = "TrackStatusId")] public int TrackStatusId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentMapEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentMapEntity.cs index 8d51d253..7bf52c06 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentMapEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentMapEntity.cs @@ -47,4 +47,4 @@ public class TrackContentMapEntity : IFullAuditedBasicEntitys, IEntity /// [SugarColumn(ColumnName = "MapTrackContentCode")] public string MapTrackContentCode { get; set; } = null!; -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsRepository.cs index 50f2328f..7025ac47 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsRepository.cs @@ -1,5 +1,4 @@ using SJZY.Expand.ElasticSearch.Services; -using SJZY.Track.Domain.Dtos.TrackDetails; namespace SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; @@ -24,4 +23,4 @@ public interface ITrackDetailsRepository : IElasticsearchClientService trackCodes); Task DeleteTrackByIdAsync(string id, string indexName); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs index 9af7f023..8db3675a 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs @@ -96,4 +96,4 @@ public class TrackDetailsIndex : IdBaseIndex /// 修改时间 public DateTime? UpdateTime { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/ITrackFlagRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/ITrackFlagRepository.cs index f092659a..3868a195 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/ITrackFlagRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/ITrackFlagRepository.cs @@ -6,4 +6,4 @@ public interface ITrackFlagRepository : IBasicRepository { Task GetDetailAsync(int id); Task> GetPageTrackFlag(GetPageTrackFlagVO input); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs index 282b1f3b..81d0da3e 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs @@ -35,4 +35,4 @@ public class TrackFlagEntity : IFullAuditedBasicEntitys, IAggregateRoot ///// //[SugarColumn(ColumnName = "IsCompleted")] //public bool IsCompleted { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackNodeAggregate/ITrackNodeRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackNodeAggregate/ITrackNodeRepository.cs index 181d6565..80c29962 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackNodeAggregate/ITrackNodeRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackNodeAggregate/ITrackNodeRepository.cs @@ -31,4 +31,4 @@ public interface ITrackNodeRepository : IBasicRepository /// /// Task GetDetail(long id); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackNodeAggregate/TrackNodeEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackNodeAggregate/TrackNodeEntity.cs index c17ef2c2..cde19582 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackNodeAggregate/TrackNodeEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackNodeAggregate/TrackNodeEntity.cs @@ -29,4 +29,4 @@ public class TrackNodeEntity : IFullAuditedBasicEntitys, IAggregateRoot /// [SugarColumn(ColumnName = "NodeEnName", Length = 32, ColumnDescription = "节点英文名称")] public string? NodeEnName { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs index a8358f71..8a9ff4c5 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Domain.Dtos.Common; +using SJZY.Track.Domain.Dtos.Common; using SJZY.Track.Domain.Dtos.TrackPull; namespace SJZY.Track.Domain.Aggregates.TrackPullAggregate; @@ -58,4 +58,4 @@ public interface ITrackPullConfigRepository : IBasicRepository UpdateContentAsync(TrackPullContentConfigEntity updateObj); Task IsContentAnyAsync(Expression> whereExpression); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs index 75c272e9..8d456fff 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs @@ -35,4 +35,4 @@ public class TrackPullConfigEntity : IFullAuditedBasicEntitys, IAggregateRoot /// [SugarColumn(ColumnName = "SubSystemId")] public int SubSystemId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs index 6f23b849..778f7e12 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs @@ -77,4 +77,4 @@ public class TrackPullContentConfigEntity : IFullAuditedBasicEntitys, IEntity /// [SugarColumn(ColumnName = "TrackZonePlaceValue")] public int? TrackZonePlaceValue { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPushPullParamsConfigEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPushPullParamsConfigEntity.cs index 449ae96f..c483b801 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPushPullParamsConfigEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPushPullParamsConfigEntity.cs @@ -95,4 +95,4 @@ public class TrackPushPullParamsConfigEntity : IFullAuditedBasicEntitys, IEntity /// [SugarColumn(ColumnName = "TrackContentCode")] public string? TrackContentCode { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushConfigRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushConfigRepository.cs index a93e751f..49c8434f 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushConfigRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushConfigRepository.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Domain.Dtos.Common; +using SJZY.Track.Domain.Dtos.Common; using SJZY.Track.Domain.Dtos.TrackPush; namespace SJZY.Track.Domain.Aggregates.TrackPushAggregate; @@ -37,4 +37,4 @@ public interface ITrackPushConfigRepository : IBasicRepository> 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 59654523..2345c265 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushRecordsRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushRecordsRepository.cs @@ -24,4 +24,4 @@ public interface ITrackPushRecordsRepository /// /// Task GetLatestTrackPushRecordAsync(int orderId); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs index 063417a9..cd6a9e1c 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs @@ -73,4 +73,4 @@ public class TrackPushConfigEntity : IFullAuditedBasicEntitys, IAggregateRoot /// [SugarColumn(ColumnName = "TimezoneFormat")] public string? TimezoneFormat { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs index 66e8199a..5d9b9c02 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs @@ -77,4 +77,4 @@ public class TrackPushContentConfigEntity : IFullAuditedBasicEntitys, IEntity /// [SugarColumn(ColumnName = "ExpandFieldsValue")] public string ExpandFieldsValue { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs index 7d1dd61a..41bba894 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs @@ -82,4 +82,4 @@ public class TrackPushRecordIndex : IdBaseIndex /// 创建时间 public DateTime CreateTime { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/ITrackStatusRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/ITrackStatusRepository.cs index 5123bd2b..d2d88a6e 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/ITrackStatusRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/ITrackStatusRepository.cs @@ -6,4 +6,4 @@ public interface ITrackStatusRepository : IBasicRepository { Task GetDetailAsync(int id); Task> GetPageTrackStatus(GetPageTrackStatusVO input); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs index 9ac58fa2..fee02514 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs @@ -41,4 +41,4 @@ public class TrackStatusEntity : IFullAuditedBasicEntitys, IAggregateRoot /// [SugarColumn(ColumnName = "SubSystemId")] public int SubSystemId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/ITrackTemplateRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/ITrackTemplateRepository.cs index fb8aecfa..20398c5f 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/ITrackTemplateRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/ITrackTemplateRepository.cs @@ -43,4 +43,4 @@ public interface ITrackTemplateRepository : IBasicRepository UpdateContentAsync(Expression> columns, Expression> whereExpression); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateContentEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateContentEntity.cs index 911433f3..46f8806b 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateContentEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateContentEntity.cs @@ -41,4 +41,4 @@ public class TrackTemplateContentEntity : IFullAuditedBasicEntitys, IEntity /// [SugarColumn(ColumnName = "TrackTemplateId")] public int TrackTemplateId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateEntity.cs index 31745f2a..93b68c16 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateEntity.cs @@ -35,4 +35,4 @@ public class TrackTemplateEntity : IFullAuditedBasicEntitys, IAggregateRoot /// [SugarColumn(ColumnName = "ShowOrigin")] public bool ShowOrigin { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Consts/GlobalConst.ES.cs b/src/SJZY.Track.Domain/Consts/GlobalConst.ES.cs index d63dc55a..24c454e0 100644 --- a/src/SJZY.Track.Domain/Consts/GlobalConst.ES.cs +++ b/src/SJZY.Track.Domain/Consts/GlobalConst.ES.cs @@ -16,4 +16,4 @@ public partial class GlobalConst /// 预警记录 es索引名称（模板） /// public const string TrackWarningRecordsIndex = "sjzy_track_warning_records"; -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Consts/GlobalConst.MQ.cs b/src/SJZY.Track.Domain/Consts/GlobalConst.MQ.cs index e01ac8be..e75305e1 100644 --- a/src/SJZY.Track.Domain/Consts/GlobalConst.MQ.cs +++ b/src/SJZY.Track.Domain/Consts/GlobalConst.MQ.cs @@ -51,4 +51,4 @@ public partial class GlobalConst /// 推送预警任务 /// public const string TrackPushWarning = "SJZY.Track.TrackPushWarning"; -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Consts/GlobalConst.Redis.cs b/src/SJZY.Track.Domain/Consts/GlobalConst.Redis.cs index 4dec0225..37e054a5 100644 --- a/src/SJZY.Track.Domain/Consts/GlobalConst.Redis.cs +++ b/src/SJZY.Track.Domain/Consts/GlobalConst.Redis.cs @@ -66,4 +66,4 @@ public partial class GlobalConst /// 12小时推送预警轨迹锁 /// public const string TrackPushTrackWaringLockKey = "TrackPushTrackWaringLock"; -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Consts/GlobalConst.cs b/src/SJZY.Track.Domain/Consts/GlobalConst.cs index b91bcaec..87f1c99a 100644 --- a/src/SJZY.Track.Domain/Consts/GlobalConst.cs +++ b/src/SJZY.Track.Domain/Consts/GlobalConst.cs @@ -8,4 +8,4 @@ public partial class GlobalConst public const int SafelyLimit = 10000; public const float NoneTrackTimeZone = 99999; -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Consts/InterfaceRelayConst.cs b/src/SJZY.Track.Domain/Consts/InterfaceRelayConst.cs index 1d66b92f..741cfb7a 100644 --- a/src/SJZY.Track.Domain/Consts/InterfaceRelayConst.cs +++ b/src/SJZY.Track.Domain/Consts/InterfaceRelayConst.cs @@ -24,4 +24,4 @@ public class InterfaceRelayConst /// 更新轨迹接口代码 /// public const string TrackUpdateInterfaceCode = "A040"; -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Common/CityTimezoneDto.cs b/src/SJZY.Track.Domain/Dtos/Common/CityTimezoneDto.cs index 65d6f531..998ad0c6 100644 --- a/src/SJZY.Track.Domain/Dtos/Common/CityTimezoneDto.cs +++ b/src/SJZY.Track.Domain/Dtos/Common/CityTimezoneDto.cs @@ -11,4 +11,4 @@ public class CityTimezoneDto /// 时区 /// public string Timezone { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Common/IdWithNameDto.cs b/src/SJZY.Track.Domain/Dtos/Common/IdWithNameDto.cs index cdcaf0ce..ad19228d 100644 --- a/src/SJZY.Track.Domain/Dtos/Common/IdWithNameDto.cs +++ b/src/SJZY.Track.Domain/Dtos/Common/IdWithNameDto.cs @@ -5,4 +5,4 @@ public class IdWithNameDto public int Id { get; set; } public string Name { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Common/KeywordsInputVO.cs b/src/SJZY.Track.Domain/Dtos/Common/KeywordsInputVO.cs index 8508c3b9..f509edbe 100644 --- a/src/SJZY.Track.Domain/Dtos/Common/KeywordsInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Common/KeywordsInputVO.cs @@ -16,4 +16,4 @@ public class KeywordsInputVO : PageInfoInput /// 选中项 /// public List? SelectedIds { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Common/PortTimezoneDto.cs b/src/SJZY.Track.Domain/Dtos/Common/PortTimezoneDto.cs index ba06bd5b..321b575f 100644 --- a/src/SJZY.Track.Domain/Dtos/Common/PortTimezoneDto.cs +++ b/src/SJZY.Track.Domain/Dtos/Common/PortTimezoneDto.cs @@ -11,4 +11,4 @@ public class PortTimezoneDto /// 时区 /// public string Timezone { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/AddRuleAreaInfoRequest.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/AddRuleAreaInfoRequest.cs index eba03f3f..4b914187 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/AddRuleAreaInfoRequest.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/AddRuleAreaInfoRequest.cs @@ -41,4 +41,4 @@ public class AddRuleAreaInfoRequest /// [Required] public int AreaId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/AreaCacheEntry.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/AreaCacheEntry.cs index b685513c..e29b82b8 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/AreaCacheEntry.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/AreaCacheEntry.cs @@ -26,4 +26,4 @@ public class AreaCacheEntry /// 截止邮编 /// public string? RightPostcode { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/AreaDto.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/AreaDto.cs index 6da59742..cfce4f93 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/AreaDto.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/AreaDto.cs @@ -26,4 +26,4 @@ public class AreaDto /// 更新时间 /// public DateTime UpdateTime { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/AreaInfoDto.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/AreaInfoDto.cs index 71a2601f..b52978de 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/AreaInfoDto.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/AreaInfoDto.cs @@ -43,4 +43,4 @@ public class RuleAreaInfoDto public string LeftPostcode { get; set; } public string RightPostcode { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/ClearRulCacheEvent.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/ClearRulCacheEvent.cs index 22bc98af..30606ba3 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/ClearRulCacheEvent.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/ClearRulCacheEvent.cs @@ -1,7 +1,6 @@ namespace SJZY.Track.Domain.Dtos.Forewarning; - public class ClearRulCacheEvent { public List Items { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/CreateRuleAreaRequest.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/CreateRuleAreaRequest.cs index 11003b66..2dc8bdf3 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/CreateRuleAreaRequest.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/CreateRuleAreaRequest.cs @@ -15,4 +15,4 @@ public class CreateRuleAreaRequest /// [Required] public string Name { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/ForewarningRuleCacheEntry.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/ForewarningRuleCacheEntry.cs index 8a5a3040..75c6b552 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/ForewarningRuleCacheEntry.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/ForewarningRuleCacheEntry.cs @@ -66,4 +66,4 @@ public class ForewarningRuleCacheEntry /// 产品编码 /// public string? ProductCode { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/GetWarningNotifiesVo.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/GetWarningNotifiesVo.cs index 2ab6b618..5e2494cd 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/GetWarningNotifiesVo.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/GetWarningNotifiesVo.cs @@ -128,4 +128,4 @@ public class GetWarningNotifiesVo return res.ToString(); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/GetWarningPageInputVo.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/GetWarningPageInputVo.cs index 490958fa..3939f83a 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/GetWarningPageInputVo.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/GetWarningPageInputVo.cs @@ -11,4 +11,4 @@ public class GetWarningPageInputVo : PageInfoInput /// 关键字（客户or名称） /// public string? KeyWord { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/GetWarningRuleListInput.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/GetWarningRuleListInput.cs index c398fb68..acc67261 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/GetWarningRuleListInput.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/GetWarningRuleListInput.cs @@ -16,4 +16,4 @@ public class GetWarningRuleListInput : PageInfoInput /// 排序方式 /// public bool IsAsc { get; set; } = false; -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/IForewarningFactorValue.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/IForewarningFactorValue.cs index 0480dc88..4d6272ec 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/IForewarningFactorValue.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/IForewarningFactorValue.cs @@ -13,4 +13,4 @@ public interface IForewarningFactorValue public string? LeavePort { get; set; } public string? ProductCode { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/KpiAreaInfo.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/KpiAreaInfo.cs index 905fed5c..7df79baf 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/KpiAreaInfo.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/KpiAreaInfo.cs @@ -28,4 +28,4 @@ public class KpiAreaInfo /// 截止邮编 /// public string? RightPostcode { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/QueryAreaInfoRequest.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/QueryAreaInfoRequest.cs index 72cd83ac..4f551d67 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/QueryAreaInfoRequest.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/QueryAreaInfoRequest.cs @@ -6,4 +6,4 @@ public class QueryAreaInfoRequest : PageInfoInput /// 区域id /// public int AreaId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/QueryAreaRequest.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/QueryAreaRequest.cs index 67aa72e7..7bd8524f 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/QueryAreaRequest.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/QueryAreaRequest.cs @@ -11,4 +11,4 @@ public class QueryAreaRequest : PageInfoInput /// 子系统id /// public int? SystemId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/RuleAreaBaseInfo.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/RuleAreaBaseInfo.cs index b7457ff5..cc6959eb 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/RuleAreaBaseInfo.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/RuleAreaBaseInfo.cs @@ -2,9 +2,6 @@ namespace SJZY.Track.Domain.Dtos.Forewarning; public class RuleAreaBaseInfo { - public int SystemId { get; set; } - public int CustomerId { get; set; } - public RuleAreaBaseInfo() { } @@ -14,4 +11,7 @@ public class RuleAreaBaseInfo SystemId = systemId; CustomerId = customerId; } -} \ No newline at end of file + + public int SystemId { get; set; } + public int CustomerId { get; set; } +} diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/RuleCollectRequest.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/RuleCollectRequest.cs index c6fc3148..efd86df6 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/RuleCollectRequest.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/RuleCollectRequest.cs @@ -3,4 +3,4 @@ namespace SJZY.Track.Domain.Dtos.Forewarning; public class RuleCollectRequest { public string Name { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaInfoRequest.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaInfoRequest.cs index 0a1240b0..30b23150 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaInfoRequest.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaInfoRequest.cs @@ -43,4 +43,4 @@ public class UpdateRuleAreaInfoRequest /// 右侧邮政编码，可为空。 /// public string? RightPostCode { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaRequest.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaRequest.cs index df92829e..89831ba3 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaRequest.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaRequest.cs @@ -14,4 +14,4 @@ public class UpdateRuleAreaRequest /// 区域id /// public int Id { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/WarningPageOutput.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/WarningPageOutput.cs index 58408422..6ca61ccc 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/WarningPageOutput.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/WarningPageOutput.cs @@ -26,4 +26,4 @@ public class WarningPageOutput /// 更新时间 /// public DateTime? UpdateTime { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/WarningRuleCacheDto.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/WarningRuleCacheDto.cs index 43b6b25c..e0218636 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/WarningRuleCacheDto.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/WarningRuleCacheDto.cs @@ -17,4 +17,4 @@ public class WarningRuleCacheDto public bool? IsTransit { get; set; } public string? LeavePort { get; set; } public string? ProductCode { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/WarningRuleVo.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/WarningRuleVo.cs index 7b96fdd9..bda6b4ba 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/WarningRuleVo.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/WarningRuleVo.cs @@ -61,4 +61,4 @@ public class WarningRuleVo /// 销售产品 /// public string? ProductCode { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs index a9a45a01..90327672 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs @@ -147,4 +147,4 @@ public class TrackOrderVO /// 问题类型名称 /// public string? QuestionTypeName { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetTrackCounterVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetTrackCounterVO.cs index 06fcbd65..64794434 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/GetTrackCounterVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/GetTrackCounterVO.cs @@ -11,4 +11,4 @@ public class GetTrackCounterVO /// 总条数 /// public int Count { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs b/src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs index a308a58b..2bc90ca0 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs @@ -31,4 +31,4 @@ public class LinkedOrderVO /// 客户id /// public int CustomId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Order/OrderIdentifier.cs b/src/SJZY.Track.Domain/Dtos/Order/OrderIdentifier.cs index f572ec3a..fc4a22c4 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/OrderIdentifier.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/OrderIdentifier.cs @@ -20,4 +20,4 @@ public readonly struct OrderIdentifier /// 订单号 /// public string OrderNo { get; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Order/OrderTemplateLinkDto.cs b/src/SJZY.Track.Domain/Dtos/Order/OrderTemplateLinkDto.cs index 6ca82ed3..6d6f4528 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/OrderTemplateLinkDto.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/OrderTemplateLinkDto.cs @@ -11,4 +11,4 @@ public class OrderTemplateLinkDto /// 模板id /// public int TemplateId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Order/OrderTransportDto.cs b/src/SJZY.Track.Domain/Dtos/Order/OrderTransportDto.cs index 7f445fe8..360e3bce 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/OrderTransportDto.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/OrderTransportDto.cs @@ -7,4 +7,4 @@ public class OrderTransportDto public int ServiceProviderId { get; set; } public int SubSystemId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Order/OrderWithServiceProviderVO.cs b/src/SJZY.Track.Domain/Dtos/Order/OrderWithServiceProviderVO.cs index b899d01b..9356a80d 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/OrderWithServiceProviderVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/OrderWithServiceProviderVO.cs @@ -25,4 +25,4 @@ public class OrderWithServiceProviderVO /// 子系统id /// public int SubSystemId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs b/src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs index adc29bc8..37dfc796 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs @@ -84,4 +84,4 @@ public class GetTrackContentListVO /// 修改人 /// public string UpdateUser { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs index 8be7ba1f..a8489f9b 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs @@ -51,4 +51,4 @@ public class GetTrackContentDetailVO /// 轨迹标记 /// public string TrackFlag { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapDetailOutputVO.cs index 812f1106..f7372508 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapDetailOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapDetailOutputVO.cs @@ -53,4 +53,4 @@ public class GetTrackContentMapDetailOutputVO /// 映射轨迹内容代码 /// public string MapTrackContentCode { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageInputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageInputVO.cs index 70e59f25..16a35377 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageInputVO.cs @@ -8,4 +8,4 @@ public class GetTrackContentMapPageInputVO : KeywordsInputVO /// 映射子系统id /// public int? MapSubSystemId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageOutputVO.cs index cfd3a460..c98f653e 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageOutputVO.cs @@ -53,4 +53,4 @@ public class GetTrackContentMapPageOutputVO /// 轨迹状态 /// public string TrackStatus { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/TrackContentVO.cs b/src/SJZY.Track.Domain/Dtos/TrackContents/TrackContentVO.cs index a249f6fd..f91e7e7f 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackContents/TrackContentVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackContents/TrackContentVO.cs @@ -21,4 +21,4 @@ public class TrackContentVO /// 轨迹内容英文 /// public string TrackEnContent { get; set; } = null!; -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackDetails/MatchTrackContentDto.cs b/src/SJZY.Track.Domain/Dtos/TrackDetails/MatchTrackContentDto.cs index 163f870a..f5fca327 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackDetails/MatchTrackContentDto.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackDetails/MatchTrackContentDto.cs @@ -31,4 +31,4 @@ public class MatchTrackContentDto /// 是否可删 /// public bool IsCanDelete { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackDetails/MatchTrackContentsDto.cs b/src/SJZY.Track.Domain/Dtos/TrackDetails/MatchTrackContentsDto.cs index bc3eca59..22aba6a0 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackDetails/MatchTrackContentsDto.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackDetails/MatchTrackContentsDto.cs @@ -11,4 +11,4 @@ public class MatchTrackContentsDto /// 是否支持删除 /// public bool IsCanDelete { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackDetails/TrackDetailsQueryInput.cs b/src/SJZY.Track.Domain/Dtos/TrackDetails/TrackDetailsQueryInput.cs index 3a7b4d0d..c78da560 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackDetails/TrackDetailsQueryInput.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackDetails/TrackDetailsQueryInput.cs @@ -6,4 +6,4 @@ public class TrackDetailsQueryInput : PageInfoInput /// 单号 /// public List OrderNos { get; set; } = new(); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs b/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs index 2e1ef57d..27a73dbd 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs @@ -64,4 +64,4 @@ public class GetTrackFlagListVO /// 修改人 /// public string UpdateUser { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs b/src/SJZY.Track.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs index daba3b36..832dedbc 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs @@ -31,4 +31,4 @@ public class GetTrackFlagDetailVO ///// 是否完结 ///// //public bool IsFinish { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackNode/TrackNodeDicDto.cs b/src/SJZY.Track.Domain/Dtos/TrackNode/TrackNodeDicDto.cs index 318db936..fd54eb6a 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackNode/TrackNodeDicDto.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackNode/TrackNodeDicDto.cs @@ -16,4 +16,4 @@ public class TrackNodeDicDto /// 名称 /// public string EnName { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackNode/TrackNodeDto.cs b/src/SJZY.Track.Domain/Dtos/TrackNode/TrackNodeDto.cs index edff0851..fbb8e783 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackNode/TrackNodeDto.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackNode/TrackNodeDto.cs @@ -58,4 +58,4 @@ public class TrackNodeDto public string? CreateUserName { get; set; } public string? UpdateUserName { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackNode/TrackNodePageDto.cs b/src/SJZY.Track.Domain/Dtos/TrackNode/TrackNodePageDto.cs index 3e5075df..9de6342e 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackNode/TrackNodePageDto.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackNode/TrackNodePageDto.cs @@ -11,4 +11,4 @@ public class TrackNodePageDto : PageInfoInput /// 子系统id /// public long? SystemId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs index 933e14a7..1b45271c 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs @@ -83,4 +83,4 @@ public class GetTrackPullConfigDetailOutputVO /// 轨迹内容代码 /// public string? TrackContentCode { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigPageOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigPageOutputVO.cs index c4ec4d8b..7090affb 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigPageOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigPageOutputVO.cs @@ -23,4 +23,4 @@ public class GetTrackPullConfigPageOutputVO /// 子系统id /// public int SubSystemId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs index 9b06efb3..f8de20f8 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs @@ -73,4 +73,4 @@ public class GetTrackPullContentDetailOutputVO /// 轨迹时区兜底地址值 /// public int? TrackTimePlaceValue { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentListCacheVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentListCacheVO.cs index 083c6d64..05182296 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentListCacheVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentListCacheVO.cs @@ -56,4 +56,4 @@ public class GetTrackPullContentListCacheVO /// 轨迹时区发生地参数值 /// public int? TrackZonePlaceValue { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageInputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageInputVO.cs index a3bd5b8f..6367be32 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageInputVO.cs @@ -6,4 +6,4 @@ public class GetTrackPullContentPageInputVO : PageInfoInput /// 轨迹拉取配置id /// public int TrackPullConfigId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageOutputVO.cs index 3413c1ad..2fac5ae1 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageOutputVO.cs @@ -48,4 +48,4 @@ public class GetTrackPullContentPageOutputVO /// 拉取轨迹状态 /// public string? TrackStatusValue { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs index e9f20a2a..431af295 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs @@ -70,4 +70,4 @@ public class GetTrackPushConfigDetailOutputVO /// 时区格式格式模板 /// public string? TimezoneFormat { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigPageOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigPageOutputVO.cs index 70cccb38..8ec22d34 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigPageOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigPageOutputVO.cs @@ -23,4 +23,4 @@ public class GetTrackPushConfigPageOutputVO /// 子系统id /// public int SubSystemId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs index d094c304..7ef7e9f8 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs @@ -61,4 +61,4 @@ public class GetTrackPushContentDetailOutputVO /// 推送扩展字段 /// public string ExpandFieldsValue { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageInputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageInputVO.cs index c69fc29e..57bf0626 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageInputVO.cs @@ -6,4 +6,4 @@ public class GetTrackPushContentPageInputVO : PageInfoInput /// 轨迹推送配置id /// public int TrackPushConfigId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs index 7d9fac0b..7752372b 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs @@ -53,4 +53,4 @@ public class GetTrackPushContentPageOutputVO /// 推送轨迹状态 /// public string TrackStatusValue { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/QueryTrackPullMappingsInfoVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/QueryTrackPullMappingsInfoVO.cs index b2a7400b..170e127c 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/QueryTrackPullMappingsInfoVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPush/QueryTrackPullMappingsInfoVO.cs @@ -50,4 +50,4 @@ public class QueryTrackPullMappingsInputVO /// 客户id /// public int CustomerId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/TrackPushContentConfigVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/TrackPushContentConfigVO.cs index 985883c4..66db8889 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/TrackPushContentConfigVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPush/TrackPushContentConfigVO.cs @@ -66,4 +66,4 @@ public class TrackPushContentConfigVO /// 扩展字段参数值 /// public string? ExpandFieldsValue { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs index a77c0108..6cf364f2 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs @@ -16,4 +16,4 @@ public class GetPageTrackStatusVO : PageInfoInput /// 选中的轨迹状态id /// public List? SelectIds { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs index 004a7169..68e4fd33 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs @@ -41,4 +41,4 @@ public class GetTrackStatusDetailVO /// 节点名称 /// public string? NodeName { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs index b4bac8d9..421611b5 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs @@ -56,4 +56,4 @@ public class GetTrackStatusListVO /// 修改时间 /// public DateTime? UpdateTime { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/CanDeleteTrackCodeVO.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/CanDeleteTrackCodeVO.cs index f9e2c39e..c2714285 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/CanDeleteTrackCodeVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/CanDeleteTrackCodeVO.cs @@ -4,4 +4,4 @@ public class CanDeleteTrackCodeVO { public int OrderId { get; set; } public string TrackCode { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateVO.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateVO.cs index 3a919c9d..d82741d0 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateVO.cs @@ -16,4 +16,4 @@ public class GetPageTrackTemplateVO : PageInfoInput /// 选中的轨迹模版id /// public List? SelectIds { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTemplateContentAttributeValueInputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTemplateContentAttributeValueInputVO.cs index 56eff7e4..b9d80fcb 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTemplateContentAttributeValueInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTemplateContentAttributeValueInputVO.cs @@ -54,4 +54,4 @@ public class GetTemplateContentAttributeValueVO /// 是否对外 /// public bool IsExternal { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentDetailOutputVo.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentDetailOutputVo.cs index 9ba829a9..f8c1d629 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentDetailOutputVo.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentDetailOutputVo.cs @@ -43,4 +43,4 @@ public class GetTrackTemplateContentDetailOutputVo /// 轨迹模板id /// public int TrackTemplateId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageInputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageInputVO.cs index fb51e127..4d5bc0db 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageInputVO.cs @@ -6,4 +6,4 @@ public class GetTrackTemplateContentPageInputVO : PageInfoInput /// 轨迹模板id /// public List TrackTemplateIds { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs index 20b45e05..64de62bb 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs @@ -73,4 +73,4 @@ public class GetTrackTemplateContentPageOutputVO /// 轨迹内容id /// public int TrackContentId { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs index 20513d16..a95c017a 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs @@ -70,4 +70,4 @@ public class GetTrackTemplateListVO /// 创建时间 /// public DateTime? CreateTime { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/OrderedTrackCodeDto.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/OrderedTrackCodeDto.cs index 43805324..0a5e25a2 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/OrderedTrackCodeDto.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/OrderedTrackCodeDto.cs @@ -21,4 +21,4 @@ public class OrderedTrackCodeDto /// 显示原轨迹 /// public bool ShowOrigin { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Enums/EnumPropertyEnums.cs b/src/SJZY.Track.Domain/Enums/EnumPropertyEnums.cs index 0ea8a8c8..35bcc3ae 100644 --- a/src/SJZY.Track.Domain/Enums/EnumPropertyEnums.cs +++ b/src/SJZY.Track.Domain/Enums/EnumPropertyEnums.cs @@ -21,4 +21,4 @@ public enum EnumPropertyEnums /// 轨迹发生地 /// [Description("TrackLocationValue")] 轨迹发生地 -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Enums/OrderType.cs b/src/SJZY.Track.Domain/Enums/OrderType.cs index 08d61426..25bf3c5a 100644 --- a/src/SJZY.Track.Domain/Enums/OrderType.cs +++ b/src/SJZY.Track.Domain/Enums/OrderType.cs @@ -1,4 +1,4 @@ -using System.ComponentModel; +using System.ComponentModel; namespace SJZY.Track.Domain.Enums; @@ -11,4 +11,4 @@ public enum OrderType [Description("箱/袋单")] 箱袋单 = 3, [Description("FBA订单")] FBA订单 = 4, -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Enums/TimezoneSourceEnum.cs b/src/SJZY.Track.Domain/Enums/TimezoneSourceEnum.cs index 70aca24a..17c55bb5 100644 --- a/src/SJZY.Track.Domain/Enums/TimezoneSourceEnum.cs +++ b/src/SJZY.Track.Domain/Enums/TimezoneSourceEnum.cs @@ -34,4 +34,4 @@ public enum TimezoneSourceEnum /// 接收国家 /// ReceiveCountry = 6 -} \ 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 1ebc5e0b..61259829 100644 --- a/src/SJZY.Track.Domain/Enums/TrackLocationValue.cs +++ b/src/SJZY.Track.Domain/Enums/TrackLocationValue.cs @@ -8,4 +8,4 @@ public enum TrackLocationValue LeaveCountry = 5, ArriveCity = 6, LeaveCity = 7 -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Enums/TrackProblemType.cs b/src/SJZY.Track.Domain/Enums/TrackProblemType.cs index 85487cdf..ef7ba7bf 100644 --- a/src/SJZY.Track.Domain/Enums/TrackProblemType.cs +++ b/src/SJZY.Track.Domain/Enums/TrackProblemType.cs @@ -1,4 +1,4 @@ -using System.ComponentModel; +using System.ComponentModel; namespace SJZY.Track.Domain.Enums; @@ -19,4 +19,4 @@ public enum TrackProblemType /// 预警 /// [Description("预警")] Warn = 2, -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/GlobalUsings.cs b/src/SJZY.Track.Domain/GlobalUsings.cs index 04dd7033..48225d4e 100644 --- a/src/SJZY.Track.Domain/GlobalUsings.cs +++ b/src/SJZY.Track.Domain/GlobalUsings.cs @@ -7,4 +7,4 @@ global using System.Threading.Tasks; global using SJZY.Expand.ABP.Core.Common.Dto; global using SJZY.Expand.ABP.Core.SqlSugar.Entitys; global using SJZY.Track.Domain.SeedWork; -global using SqlSugar; \ No newline at end of file +global using SqlSugar; diff --git a/src/SJZY.Track.Domain/IBasicRepository.cs b/src/SJZY.Track.Domain/IBasicRepository.cs index 055afb0e..9d6a4796 100644 --- a/src/SJZY.Track.Domain/IBasicRepository.cs +++ b/src/SJZY.Track.Domain/IBasicRepository.cs @@ -64,4 +64,4 @@ public interface IBasicRepository : IBasicQuery where T : IAggregateRoot /// /// Task InsertRangeAsync(List entities); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Queries/IBasicQuery.cs b/src/SJZY.Track.Domain/Queries/IBasicQuery.cs index cfb7cdb3..d34cd63a 100644 --- a/src/SJZY.Track.Domain/Queries/IBasicQuery.cs +++ b/src/SJZY.Track.Domain/Queries/IBasicQuery.cs @@ -59,4 +59,4 @@ public interface IBasicQuery where T : IEntity /// /// Task IsAnyAsync(Expression> exp); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Queries/IProvideQueries.cs b/src/SJZY.Track.Domain/Queries/IProvideQueries.cs index e8d45688..14c5b80c 100644 --- a/src/SJZY.Track.Domain/Queries/IProvideQueries.cs +++ b/src/SJZY.Track.Domain/Queries/IProvideQueries.cs @@ -75,4 +75,4 @@ public interface IProvideQueries /// 订单id /// 订单和服务商信息 Task> FindOrderWithServiceProviderAsync(int[] orderIds); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Queries/ITimezoneQueries.cs b/src/SJZY.Track.Domain/Queries/ITimezoneQueries.cs index 14e33748..400cf6eb 100644 --- a/src/SJZY.Track.Domain/Queries/ITimezoneQueries.cs +++ b/src/SJZY.Track.Domain/Queries/ITimezoneQueries.cs @@ -1,5 +1,3 @@ -using SJZY.Track.Domain.Dtos.Common; - namespace SJZY.Track.Domain.Queries; public interface ITimezoneQueries @@ -17,4 +15,4 @@ public interface ITimezoneQueries /// /// Task GetPortTimezone(string airCode); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Queries/ITrackOrderQueries.cs b/src/SJZY.Track.Domain/Queries/ITrackOrderQueries.cs index 1f2ffb54..ccfc2e7d 100644 --- a/src/SJZY.Track.Domain/Queries/ITrackOrderQueries.cs +++ b/src/SJZY.Track.Domain/Queries/ITrackOrderQueries.cs @@ -16,4 +16,4 @@ public interface ITrackOrderQueries /// /// Task> GetTrackProblemCountsAsync(); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Queries/IWarningQueries.cs b/src/SJZY.Track.Domain/Queries/IWarningQueries.cs index f2920cbf..3a6320e5 100644 --- a/src/SJZY.Track.Domain/Queries/IWarningQueries.cs +++ b/src/SJZY.Track.Domain/Queries/IWarningQueries.cs @@ -24,4 +24,4 @@ public interface IWarningQueries /// /// Task?> GetWarningRuleByAreaId(int areaId); -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/SJZYTrackDomainModule.cs b/src/SJZY.Track.Domain/SJZYTrackDomainModule.cs index 49c22be8..ad164017 100644 --- a/src/SJZY.Track.Domain/SJZYTrackDomainModule.cs +++ b/src/SJZY.Track.Domain/SJZYTrackDomainModule.cs @@ -4,4 +4,4 @@ namespace SJZY.Track.Domain; public class SjzyTrackDomainModule : AbpModule { -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/SeedWork/IAggregateRoot.cs b/src/SJZY.Track.Domain/SeedWork/IAggregateRoot.cs index 3f454992..57fb7b63 100644 --- a/src/SJZY.Track.Domain/SeedWork/IAggregateRoot.cs +++ b/src/SJZY.Track.Domain/SeedWork/IAggregateRoot.cs @@ -2,4 +2,4 @@ namespace SJZY.Track.Domain.SeedWork; public interface IAggregateRoot : IEntity { -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/SeedWork/IEntity.cs b/src/SJZY.Track.Domain/SeedWork/IEntity.cs index 8f478119..e0db5fea 100644 --- a/src/SJZY.Track.Domain/SeedWork/IEntity.cs +++ b/src/SJZY.Track.Domain/SeedWork/IEntity.cs @@ -2,4 +2,4 @@ namespace SJZY.Track.Domain.SeedWork; public interface IEntity { -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/TransactionHelper.cs b/src/SJZY.Track.Domain/TransactionHelper.cs index f51b538e..dfe40bcb 100644 --- a/src/SJZY.Track.Domain/TransactionHelper.cs +++ b/src/SJZY.Track.Domain/TransactionHelper.cs @@ -11,7 +11,10 @@ public class TransactionHelper public static TransactionScope GetReadCommitted() { return new TransactionScope(TransactionScopeOption.Required, - new TransactionOptions { IsolationLevel = IsolationLevel.ReadCommitted }, + new TransactionOptions + { + IsolationLevel = IsolationLevel.ReadCommitted + }, TransactionScopeAsyncFlowOption.Enabled); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/VEntities/VAirportEntity.cs b/src/SJZY.Track.Domain/VEntities/VAirportEntity.cs index 11d5d471..4120c0b4 100644 --- a/src/SJZY.Track.Domain/VEntities/VAirportEntity.cs +++ b/src/SJZY.Track.Domain/VEntities/VAirportEntity.cs @@ -86,4 +86,4 @@ public class VAirportEntity : IFullAuditedBasicEntitys /// [SugarColumn(ColumnName = "Remark", IsNullable = true)] public string Remark { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/VEntities/VCityEntity.cs b/src/SJZY.Track.Domain/VEntities/VCityEntity.cs index aa6a469e..040fdf19 100644 --- a/src/SJZY.Track.Domain/VEntities/VCityEntity.cs +++ b/src/SJZY.Track.Domain/VEntities/VCityEntity.cs @@ -104,4 +104,4 @@ public class VCityEntity : IFullAuditedBasicEntitys /// [SugarColumn(ColumnName = "TimezoneURL", IsNullable = true)] public string TimezoneURL { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/VEntities/VCountryEntity.cs b/src/SJZY.Track.Domain/VEntities/VCountryEntity.cs index fcc1b8f9..126cbd18 100644 --- a/src/SJZY.Track.Domain/VEntities/VCountryEntity.cs +++ b/src/SJZY.Track.Domain/VEntities/VCountryEntity.cs @@ -74,4 +74,4 @@ public class VCountryEntity : IFullAuditedBasicEntitys /// [SugarColumn(ColumnName = "IsUnusable", IsNullable = false)] public bool IsUnusable { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/VEntities/VEnumValueInfo.cs b/src/SJZY.Track.Domain/VEntities/VEnumValueInfo.cs index d44088e6..eca94a79 100644 --- a/src/SJZY.Track.Domain/VEntities/VEnumValueInfo.cs +++ b/src/SJZY.Track.Domain/VEntities/VEnumValueInfo.cs @@ -47,4 +47,4 @@ public class VEnumValueInfoEntity : IFullAuditedBasicEntitys /// [SugarColumn(ColumnName = "Remark")] public string Remark { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/VEntities/VExternalSubjectEntity.cs b/src/SJZY.Track.Domain/VEntities/VExternalSubjectEntity.cs index 7e9a6fc7..11bfd62d 100644 --- a/src/SJZY.Track.Domain/VEntities/VExternalSubjectEntity.cs +++ b/src/SJZY.Track.Domain/VEntities/VExternalSubjectEntity.cs @@ -125,4 +125,4 @@ public class VExternalSubjectEntity : IFullAuditedBasicEntitys /// [SugarColumn(ColumnName = "VerifiedName")] public string VerifiedName { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/VEntities/VServiceProviderEntity.cs b/src/SJZY.Track.Domain/VEntities/VServiceProviderEntity.cs index c871565a..3bf955c1 100644 --- a/src/SJZY.Track.Domain/VEntities/VServiceProviderEntity.cs +++ b/src/SJZY.Track.Domain/VEntities/VServiceProviderEntity.cs @@ -71,4 +71,4 @@ public class VServiceProviderEntity : IFullAuditedBasicEntitys /// [SugarColumn(ColumnName = "Types")] public string Types { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/VEntities/VSystemEntity.cs b/src/SJZY.Track.Domain/VEntities/VSystemEntity.cs index d215f4af..4639ca98 100644 --- a/src/SJZY.Track.Domain/VEntities/VSystemEntity.cs +++ b/src/SJZY.Track.Domain/VEntities/VSystemEntity.cs @@ -149,4 +149,4 @@ public class VSystemEntity : IFullAuditedBasicEntitys /// [SugarColumn(ColumnName = "Token")] public string Token { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/VEntities/VUserEntity.cs b/src/SJZY.Track.Domain/VEntities/VUserEntity.cs index 5049e64b..82daae59 100644 --- a/src/SJZY.Track.Domain/VEntities/VUserEntity.cs +++ b/src/SJZY.Track.Domain/VEntities/VUserEntity.cs @@ -101,4 +101,4 @@ public class VUserEntity : IFullAuditedBasicEntitys /// [SugarColumn(ColumnName = "UserOrigin")] public bool? UserOrigin { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Repository/DataBaseContext.cs b/src/SJZY.Track.Repository/DataBaseContext.cs index 394b6edb..00429345 100644 --- a/src/SJZY.Track.Repository/DataBaseContext.cs +++ b/src/SJZY.Track.Repository/DataBaseContext.cs @@ -63,4 +63,4 @@ public class DataBaseContext } #endregion 审计属性自动赋值 -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Repository/EsExtensions.cs b/src/SJZY.Track.Repository/EsExtensions.cs index a9db42fb..1a02be94 100644 --- a/src/SJZY.Track.Repository/EsExtensions.cs +++ b/src/SJZY.Track.Repository/EsExtensions.cs @@ -28,4 +28,4 @@ public static class EsExtensions return dtos; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Repository/GlobalUsing.cs b/src/SJZY.Track.Repository/GlobalUsing.cs index c5c115f0..b124f61f 100644 --- a/src/SJZY.Track.Repository/GlobalUsing.cs +++ b/src/SJZY.Track.Repository/GlobalUsing.cs @@ -4,4 +4,4 @@ global using SJZY.Expand.ABP.Core.SqlSugar; global using SJZY.Expand.ABP.Core.SqlSugar.Entitys; global using SJZY.Expand.ABP.Core.SqlSugar.Tools; global using SqlSugar; -global using Volo.Abp.DependencyInjection; \ No newline at end of file +global using Volo.Abp.DependencyInjection; diff --git a/src/SJZY.Track.Repository/Queries/BasicQuery.cs b/src/SJZY.Track.Repository/Queries/BasicQuery.cs index 03f920e2..7842754a 100644 --- a/src/SJZY.Track.Repository/Queries/BasicQuery.cs +++ b/src/SJZY.Track.Repository/Queries/BasicQuery.cs @@ -36,4 +36,4 @@ public class BasicQuery : SimpleClient, IBasicQuery where T : class, IE { return await Context.Queryable().Where(whereExpression).Select(resultExpression).ToArrayAsync(); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Repository/Queries/ProvideQueries.cs b/src/SJZY.Track.Repository/Queries/ProvideQueries.cs index 8abdd59a..dad52683 100644 --- a/src/SJZY.Track.Repository/Queries/ProvideQueries.cs +++ b/src/SJZY.Track.Repository/Queries/ProvideQueries.cs @@ -31,7 +31,11 @@ public class ProvideQueries : ISugarRepository, IProvideQueries, return await Context.Queryable() .LeftJoin((a, b) => a.Id == b.OrderId) .Where(a => a.OrderType == orderType && orderNumbers.Contains(a.OrderNo)) - .Select((a, b) => new OrderTemplateLinkDto { OrderNo = a.OrderNo, TemplateId = b.TrackTemplateId }) + .Select((a, b) => new OrderTemplateLinkDto + { + OrderNo = a.OrderNo, + TemplateId = b.TrackTemplateId + }) .ToListAsync(); } @@ -45,7 +49,10 @@ public class ProvideQueries : ISugarRepository, IProvideQueries, .OrderBy((a, b) => b.Sort) .Select((a, b, c) => new OrderedTrackCodeDto { - TemplateId = a.Id, ShowOrigin = a.ShowOrigin, Code = c.Code, IsExternal = b.IsExternal + TemplateId = a.Id, + ShowOrigin = a.ShowOrigin, + Code = c.Code, + IsExternal = b.IsExternal }) .ToListAsync(); } @@ -80,7 +87,11 @@ public class ProvideQueries : ISugarRepository, IProvideQueries, .LeftJoin((x, a, b) => a.TrackContentId == b.Id) .Where((x, a, b) => orderIds.Contains(x.OrderId) && trackCodes.Contains(b.Code) && a.IsCanDelete) - .Select((x, a, b) => new CanDeleteTrackCodeVO { OrderId = x.OrderId, TrackCode = b.Code }) + .Select((x, a, b) => new CanDeleteTrackCodeVO + { + OrderId = x.OrderId, + TrackCode = b.Code + }) .ToListAsync(); } @@ -144,7 +155,9 @@ public class ProvideQueries : ISugarRepository, IProvideQueries, .Where((a, b) => orderIds.Contains(a.Id) && !a.IsCompleted) .Select((a, b) => new OrderTransportDto { - OrderId = a.Id, ServiceProviderId = b.ServiceProviderId, SubSystemId = a.SubSystemId + OrderId = a.Id, + ServiceProviderId = b.ServiceProviderId, + SubSystemId = a.SubSystemId }) .ToListAsync(); } @@ -169,4 +182,4 @@ public class ProvideQueries : ISugarRepository, IProvideQueries, /// db context /// public ISqlSugarClient Context { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Repository/Queries/TimezoneQueries.cs b/src/SJZY.Track.Repository/Queries/TimezoneQueries.cs index a5d35316..a5942262 100644 --- a/src/SJZY.Track.Repository/Queries/TimezoneQueries.cs +++ b/src/SJZY.Track.Repository/Queries/TimezoneQueries.cs @@ -80,7 +80,11 @@ public class TimezoneQueries : ITimezoneQueries, ISugarRepository, ITransientDep private Task GetTimezoneByCityName(string cityEnName) { return Context.Queryable().Where(val => !val.IsDeleted && val.EnName == cityEnName) - .Select(val => new CityTimezoneDto() { CityEnName = val.EnName, Timezone = val.TimeZone }) + .Select(val => new CityTimezoneDto() + { + CityEnName = val.EnName, + Timezone = val.TimeZone + }) .FirstAsync(); } @@ -89,7 +93,11 @@ public class TimezoneQueries : ITimezoneQueries, ISugarRepository, ITransientDep return Context.Queryable() .InnerJoin((city, airport) => city.Id == airport.CityId) .Where((city, airport) => !airport.IsDeleted && !city.IsDeleted && airport.Code == airCode) - .Select((city, airport) => new PortTimezoneDto() { PortCode = airport.Code, Timezone = city.TimeZone }) + .Select((city, airport) => new PortTimezoneDto() + { + PortCode = airport.Code, + Timezone = city.TimeZone + }) .FirstAsync(); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs b/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs index cd7255e5..18eb21a0 100644 --- a/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs +++ b/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Domain.Aggregates.OrderAggregate; +using SJZY.Track.Domain.Aggregates.OrderAggregate; using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; using SJZY.Track.Domain.Dtos.Order; using SJZY.Track.Domain.Enums; @@ -38,7 +38,7 @@ public class TrackOrderQueries : ISugarRepository, ITrackOrderQueries, .WhereIF(input.CustomerId > 0, (a, b, c) => a.CustomId == input.CustomerId) .WhereIF(input.TrackOrderType > 0, (a, b, c) => a.OrderType == input.TrackOrderType) .WhereIF(input.TabType > 0, (a, b, c) => a.QuestionType == input.TabType) - .WhereIF(input.TabType == (int)TrackProblemType.Warn, (a, b, c) => !a.IsCompleted) + .WhereIF(input.TabType == (int) TrackProblemType.Warn, (a, b, c) => !a.IsCompleted) .OrderByDescending((a, b, c) => a.CreateTime) .Select((a, b, c) => new TrackOrderVO { @@ -68,7 +68,12 @@ public class TrackOrderQueries : ISugarRepository, ITrackOrderQueries, var trackTemplateList = await Context.Queryable() .LeftJoin((a, b) => a.TrackTemplateId == b.Id) .Where((a, b) => orderIds.Contains(a.OrderId)) - .Select((a, b) => new { a.OrderId, b.Name, TemplateId = b.Id }) + .Select((a, b) => new + { + a.OrderId, + b.Name, + TemplateId = b.Id + }) .ToListAsync(); pageList.List.ForEach(a => { @@ -86,7 +91,11 @@ 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/Queries/WarningQueries.cs b/src/SJZY.Track.Repository/Queries/WarningQueries.cs index 01ebac80..4a82cc6b 100644 --- a/src/SJZY.Track.Repository/Queries/WarningQueries.cs +++ b/src/SJZY.Track.Repository/Queries/WarningQueries.cs @@ -79,7 +79,11 @@ public class WarningQueries : ISugarRepository, IWarningQueries, return Context.Queryable() .InnerJoin((a, b) => a.WarningId == b.Id) .Where((a, b) => b.IsEnable && a.AreaId == areaId) - .Select((a, b) => new RuleAreaBaseInfo { CustomerId = b.CustomerId, SystemId = b.SubSystemId }) + .Select((a, b) => new RuleAreaBaseInfo + { + CustomerId = b.CustomerId, + SystemId = b.SubSystemId + }) .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 c13d9c10..83e2052d 100644 --- a/src/SJZY.Track.Repository/Repositories/BasicRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/BasicRepository.cs @@ -52,4 +52,4 @@ public class BasicRepository : BasicQuery, IBasicRepository where T : c .SetColumns(nameof(ISoftDeleteBasicEntity.IsDeleted), 1) .ExecuteCommandHasChangeAsync(); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Repository/Repositories/KpiAreaInfoRepository.cs b/src/SJZY.Track.Repository/Repositories/KpiAreaInfoRepository.cs index 07a07b46..864ae98b 100644 --- a/src/SJZY.Track.Repository/Repositories/KpiAreaInfoRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/KpiAreaInfoRepository.cs @@ -2,4 +2,4 @@ namespace SJZY.Track.Repository.Repositories; public class KpiAreaInfoRepository { -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Repository/Repositories/KpiAreaRepository.cs b/src/SJZY.Track.Repository/Repositories/KpiAreaRepository.cs index a14f617c..1563b770 100644 --- a/src/SJZY.Track.Repository/Repositories/KpiAreaRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/KpiAreaRepository.cs @@ -110,4 +110,4 @@ public class KpiAreaRepository : BasicRepository, IKpiAreaReposi }) .ToList(); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs index 56129728..0cd86b83 100644 --- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs @@ -24,7 +24,10 @@ public class OrderRepository : BasicRepository, IOrderRepository, I var idsString = string.Join(",", ids); return Context.Ado.ExecuteCommandAsync( $"UPDATE `t_order` SET `DeficiencyTag` = @newValue ,UpdateTime= current_timestamp WHERE `Id` IN ({idsString})", - new { newValue }); + new + { + newValue + }); } public async Task UpdateOrderAsync(OrderEntity order) @@ -32,7 +35,11 @@ public class OrderRepository : BasicRepository, IOrderRepository, I using var tran = TransactionHelper.GetReadCommitted(); // 更新订单主表 - await UpdateAsync(order, x => new { x.CustomId, x.SubSystemId }); + await UpdateAsync(order, x => new + { + x.CustomId, + x.SubSystemId + }); // 更新订单模板 await Context.Deleteable().Where(x => x.OrderId == order.Id).ExecuteCommandAsync(); @@ -70,7 +77,11 @@ SET `b`.`QuestionType` = CASE WHEN `b`.`LatestPushTime` < DATE_SUB(NOW(), INTERVAL 12 HOUR) THEN 2 ELSE 0 END WHERE `b`.`IsCompleted` = 0 AND `b`.`QuestionType` != 1 AND `b`.`CreateTime` < @createTime -AND `a`.`IsDeleted` = 0 AND `b`.`IsDeleted` = 0 limit @pageSize", new { pageSize, createTime }); +AND `a`.`IsDeleted` = 0 AND `b`.`IsDeleted` = 0 limit @pageSize", new + { + pageSize, + createTime + }); } /// @@ -85,7 +96,12 @@ AND `a`.`IsDeleted` = 0 AND `b`.`IsDeleted` = 0 limit @pageSize", new { pageSize .Where((b) => !b.IsCompleted && b.QuestionType != 1 && !b.IsDeleted) - .Select(b => new { b.LatestPushTime, b.Id, b.QuestionType }) + .Select(b => new + { + b.LatestPushTime, + b.Id, + b.QuestionType + }) .ToPageListAsync(pageindex, pageSize); var latestPushTimeIds = new List(); @@ -110,7 +126,10 @@ AND `a`.`IsDeleted` = 0 AND `b`.`IsDeleted` = 0 limit @pageSize", new { pageSize var idsString = string.Join(",", ids); return Context.Ado.ExecuteCommand( $"UPDATE `t_order` SET `QuestionType` = @questionType ,UpdateTime= current_timestamp WHERE `Id` IN ({idsString})", - new { questionType }); + new + { + questionType + }); } #region 订单关联 @@ -143,4 +162,4 @@ AND `a`.`IsDeleted` = 0 AND `b`.`IsDeleted` = 0 limit @pageSize", new { pageSize } #endregion -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs index 0037ab81..a0d8ca0d 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs @@ -131,7 +131,11 @@ public class TrackContentRepository : BasicRepository, ITrac .LeftJoin((a, b) => a.Id == b.TrackContentId && b.IsDeleted == false) .LeftJoin((a, b, c) => b.TrackTemplateId == c.Id && c.IsDeleted == false) .Where((a, b, c) => a.Id == trackContentId) - .Select((a, b, c) => new { TrackContentId = a.Id, TemplateId = c.Id }) + .Select((a, b, c) => new + { + TrackContentId = a.Id, + TemplateId = c.Id + }) .ToListAsync(); if (trackContentEntities.Any(a => a.TemplateId > 0)) @@ -249,4 +253,4 @@ public class TrackContentRepository : BasicRepository, ITrac return await Context.Updateable().SetColumns(columns).Where(whereExpression) .ExecuteCommandAsync() > 0; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs index 20a9fcea..b472bea7 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs @@ -274,4 +274,4 @@ internal class TrackDetailsRepository : ElasticSearchContextAbstract, ITrackFlagR return pagedList; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Repository/Repositories/TrackNodeRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackNodeRepository.cs index 48b05c13..fcee8c2e 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackNodeRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackNodeRepository.cs @@ -40,7 +40,12 @@ public class TrackNodeRepository : BasicRepository, ITrackNodeR .WhereIF(!string.IsNullOrEmpty(queryParam.KeyWord), (t) => t.NodeName!.Contains(queryParam.KeyWord) || t.NodeEnName!.Contains(queryParam.KeyWord)) .WhereIF(queryParam.SystemId.HasValue, (t) => t.SubSystemId == queryParam.SystemId.Value) - .Select(t => new TrackNodeDicDto() { Id = t.Id, NodeName = t.NodeName, EnName = t.NodeEnName, }) + .Select(t => new TrackNodeDicDto() + { + Id = t.Id, + NodeName = t.NodeName, + EnName = t.NodeEnName, + }) .ToPagedListAsync(queryParam.PageIndex, queryParam.PageSize); return result; @@ -73,4 +78,4 @@ public class TrackNodeRepository : BasicRepository, ITrackNodeR }).FirstAsync(); return result; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Repository/Repositories/TrackPullConfigRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackPullConfigRepository.cs index 047916ec..838c8761 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackPullConfigRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackPullConfigRepository.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.TrackPullAggregate; @@ -47,7 +47,11 @@ public class TrackPullConfigRepository : BasicRepository, .OrderBy(pullContent => pullContent.CreateTime) .Select( (pullContent, trackContent, enumValue) => - new GetTrackPullContentPageOutputVO { Id = pullContent.Id, TrackPlaceValue = enumValue.Disp }, true) + new GetTrackPullContentPageOutputVO + { + Id = pullContent.Id, + TrackPlaceValue = enumValue.Disp + }, true) .ToPagedListAsync(input.PageIndex, input.PageSize); } @@ -58,7 +62,10 @@ public class TrackPullConfigRepository : BasicRepository, .Where(pullContent => pullContent.TrackPullConfigId == trackPullConfigId) .Select( (pullContent, trackContent) => - new GetTrackPullContentListCacheVO { TrackContentCode = trackContent.Code }, true) + new GetTrackPullContentListCacheVO + { + TrackContentCode = trackContent.Code + }, true) .ToListAsync(); } @@ -155,4 +162,4 @@ public class TrackPullConfigRepository : BasicRepository, { return await Context.Queryable().Where(whereExpression).AnyAsync(); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs index c90196a1..75a3fe8b 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs @@ -50,7 +50,9 @@ public class TrackPushConfigRepository : BasicRepository, .Select( (pushContent, trackContent, enumValue) => new GetTrackPushContentPageOutputVO { - Id = pushContent.Id, Sort = pushContent.Sort, OrderNoType = enumValue.Disp + Id = pushContent.Id, + Sort = pushContent.Sort, + OrderNoType = enumValue.Disp }, true) .ToPagedListAsync(input.PageIndex, input.PageSize); } @@ -86,7 +88,10 @@ public class TrackPushConfigRepository : BasicRepository, { return await Context.Queryable() .Where(pushContent => pushContent.Id == id) - .Select(pushContent => new GetTrackPushContentDetailOutputVO { Id = pushContent.Id }, true) + .Select(pushContent => new GetTrackPushContentDetailOutputVO + { + Id = pushContent.Id + }, true) .SingleAsync(); } @@ -196,4 +201,4 @@ public class TrackPushConfigRepository : BasicRepository, return result; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Repository/Repositories/TrackPushRecordsRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackPushRecordsRepository.cs index 044f8753..71ed5faa 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackPushRecordsRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackPushRecordsRepository.cs @@ -1,4 +1,4 @@ -using Nest; +using Nest; using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ElasticSearch.Services; using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; @@ -21,7 +21,7 @@ public class TrackPushRecordsRepository : ElasticSearchContextAbstract request .Index(index.IndexName) - //.Refresh(Refresh.True) // 可选：立即刷新索引使更改立即可见 + // .Refresh(Refresh.True) // 可选：立即刷新索引使更改立即可见 ); if (!r.IsValid) @@ -71,4 +71,4 @@ public class TrackPushRecordsRepository : ElasticSearchContextAbstract, ITrackS return pagedList; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs index 25a7cc85..7250b1e2 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs @@ -22,16 +22,15 @@ public class TrackTemplateRepository : BasicRepository, ITr var detail = await Context.Queryable() .LeftJoin((a, b) => a.SubSystemId == b.Id && b.IsDeleted == false) .Where((a, b) => a.Id == id) - .Select((a, b) => new - GetTrackTemplateDetailVO - { - Id = a.Id, - Code = a.Code, - Name = a.Name, - SubSystemId = a.SubSystemId, - SubSystem = b.CnName, - ShowOrigin = a.ShowOrigin - }).FirstAsync(); + .Select((a, b) => new GetTrackTemplateDetailVO + { + Id = a.Id, + Code = a.Code, + Name = a.Name, + SubSystemId = a.SubSystemId, + SubSystem = b.CnName, + ShowOrigin = a.ShowOrigin + }).FirstAsync(); return detail; } @@ -192,4 +191,4 @@ public class TrackTemplateRepository : BasicRepository, ITr { return null; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Repository/Repositories/WarningRepository.cs b/src/SJZY.Track.Repository/Repositories/WarningRepository.cs index 02f8d281..fff0a754 100644 --- a/src/SJZY.Track.Repository/Repositories/WarningRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/WarningRepository.cs @@ -68,7 +68,12 @@ public class WarningRepository : BasicRepository, IWarningReposit .Where(a => a.WarningId == warningId) .Select( (a, b, c, d) => - new WarningRuleVo { StartTrackStatus = b.Status, EndTrackStatus = c.Status, Area = d.Name }, true) + new WarningRuleVo + { + StartTrackStatus = b.Status, + EndTrackStatus = c.Status, + Area = d.Name + }, true) .ToListAsync(); } @@ -111,7 +116,12 @@ public class WarningRepository : BasicRepository, IWarningReposit public async Task TurnWarningAsync(WarningEntity warning) { return await Context.Updateable(warning) - .UpdateColumns(x => new { x.IsEnable, x.UpdateTime, x.UpdateUserId }) + .UpdateColumns(x => new + { + x.IsEnable, + x.UpdateTime, + x.UpdateUserId + }) .ExecuteCommandAsync() > 0; } @@ -131,4 +141,4 @@ public class WarningRepository : BasicRepository, IWarningReposit return warning; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Repository/SjzyTrackRepositoryModule.cs b/src/SJZY.Track.Repository/SjzyTrackRepositoryModule.cs index bffb1dab..056d0690 100644 --- a/src/SJZY.Track.Repository/SjzyTrackRepositoryModule.cs +++ b/src/SJZY.Track.Repository/SjzyTrackRepositoryModule.cs @@ -1,4 +1,4 @@ -using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using SJZY.Expand.ABP.Core.SqlSugar.Options; using SJZY.Expand.ElasticSearch; @@ -58,4 +58,4 @@ public class SjzyTrackRepositoryModule : AbpModule context.Services.AddTransient(typeof(IBasicQuery<>), typeof(BasicQuery<>)); context.Services.AddTransient(typeof(IBasicRepository<>), typeof(BasicRepository<>)); } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Shared/Enums/DateTimeFormatEnum.cs b/src/SJZY.Track.Shared/Enums/DateTimeFormatEnum.cs index 677162dc..198e1008 100644 --- a/src/SJZY.Track.Shared/Enums/DateTimeFormatEnum.cs +++ b/src/SJZY.Track.Shared/Enums/DateTimeFormatEnum.cs @@ -19,4 +19,4 @@ public enum DateTimeFormatEnum /// 时间加时区 /// DateTimeAndTimezone = 2 -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Shared/Enums/NotifyMode.cs b/src/SJZY.Track.Shared/Enums/NotifyMode.cs index 2603ace5..8e6a7ccf 100644 --- a/src/SJZY.Track.Shared/Enums/NotifyMode.cs +++ b/src/SJZY.Track.Shared/Enums/NotifyMode.cs @@ -11,4 +11,4 @@ public enum NotifyMode /// 飞书 /// FeiShu = 2 -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Shared/Enums/RuleFactorType.cs b/src/SJZY.Track.Shared/Enums/RuleFactorType.cs index 0d38426f..383cc667 100644 --- a/src/SJZY.Track.Shared/Enums/RuleFactorType.cs +++ b/src/SJZY.Track.Shared/Enums/RuleFactorType.cs @@ -1,6 +1,5 @@ namespace SJZY.Track.Share.Enums; - /// /// 枚举表示不同类型的规则因素。 /// @@ -35,4 +34,4 @@ public enum RuleFactorType /// 表示销售产品。 /// ProductCode -} \ No newline at end of file +} diff --git a/test/SJZY.Track.Test/Startup.cs b/test/SJZY.Track.Test/Startup.cs index ca91b962..73fe7c3a 100644 --- a/test/SJZY.Track.Test/Startup.cs +++ b/test/SJZY.Track.Test/Startup.cs @@ -17,4 +17,4 @@ public class Startup { app.InitializeApplication(); } -} \ No newline at end of file +} diff --git a/test/SJZY.Track.Test/TestModule.cs b/test/SJZY.Track.Test/TestModule.cs index a72ff428..31af0048 100644 --- a/test/SJZY.Track.Test/TestModule.cs +++ b/test/SJZY.Track.Test/TestModule.cs @@ -61,4 +61,4 @@ public class TestModule : AbpModule } }); } -} \ No newline at end of file +} diff --git a/test/SJZY.Track.Test/TestModuleTestBase.cs b/test/SJZY.Track.Test/TestModuleTestBase.cs index 25b36e48..9c025b6e 100644 --- a/test/SJZY.Track.Test/TestModuleTestBase.cs +++ b/test/SJZY.Track.Test/TestModuleTestBase.cs @@ -10,4 +10,4 @@ public class TestModuleTestBase : AbpAspNetCoreIntegratedTestBase { base.ConfigureServices(context, services); } -} \ No newline at end of file +} diff --git a/test/SJZY.Track.Test/Usings.cs b/test/SJZY.Track.Test/Usings.cs index 8c927eb7..c802f448 100644 --- a/test/SJZY.Track.Test/Usings.cs +++ b/test/SJZY.Track.Test/Usings.cs @@ -1 +1 @@ -global using Xunit; \ No newline at end of file +global using Xunit;