fmt&clear

.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
+# 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

src/SJZY.Track.Api/Program.cs

@@ -24,4 +24,4 @@ try
 catch (Exception ex)
 {
     Console.WriteLine($"项目启动失败，异常信息：{ex}");
-}
+}

src/SJZY.Track.Api/SjzyTrackApiModule.cs

@@ -97,4 +97,4 @@ public class SjzyTrackApiModule : AbpModule
 
         #endregion
     }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/Forewarning/CreateWarningInput.cs

@@ -39,4 +39,4 @@ public class CreateWarningInput
     /// 预警因素列表。
     /// </summary>
     public List<WarningFactorDto> WarningFactors { get; set; } = new();
-}
+}

src/SJZY.Track.Application.Contract/Dtos/Forewarning/EditWarningOutput.cs

@@ -55,4 +55,4 @@ public class WarningFactorWithIdDto : WarningFactorDto
     /// 因素id
     /// </summary>
     public int Id { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/Forewarning/ModifyTimeSpanInput.cs

@@ -11,4 +11,4 @@ public class ModifyTimeSpanInput
     /// 规则详情中的时效相关信息
     /// </summary>
     public List<WarningTimeSpanDto> Items { get; set; } = new();
-}
+}

src/SJZY.Track.Application.Contract/Dtos/Forewarning/UpdateWarningInput.cs

@@ -42,4 +42,4 @@ public class NotifyDto
     /// 通知人id
     /// </summary>
     public int NotifyUserId { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningDto.cs

@@ -12,4 +12,4 @@ public class WarningDto
     public int CustomerId { get; set; }
 
     public List<WarningOrderDto> Orders { get; set; } = new();
-}
+}

src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningFactorDto.cs

@@ -14,4 +14,4 @@ public class WarningFactorDto
     /// 因素值
     /// </summary>
     public JArray FactorValue { get; set; } = new();
-}
+}

src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningNitifyDto.cs

@@ -26,4 +26,4 @@ public class WarningNitifyDto
     /// 通知人id
     /// </summary>
     public int NotifyUserId { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningNotifyCacheEntry.cs

@@ -29,4 +29,4 @@ public class WarningNotifyCacheEntry
     {
         return $"{RuleId}:{OrderId}";
     }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningOrderDto.cs

@@ -44,4 +44,4 @@ public class WarningOrderDto
     /// 到达州省
     /// </summary>
     public string? ArrivalProvince { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/Forewarning/WarningTimeSpanDto.cs

@@ -24,4 +24,4 @@ public class WarningTimeSpanDto
     /// 提醒次数
     /// </summary>
     public int WarnCount { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackInput.cs

@@ -9,4 +9,4 @@ public class BatchDeleteTrackInput : OrderNosInfo
     /// </summary>
     [Required]
     public List<string> TrackCodes { get; set; } = new();
-}
+}

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; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/DeleteOrderInput.cs

@@ -13,4 +13,4 @@ public class DeleteTrackInput : OrderNoInfo
     /// </summary>
     [Required]
     public List<string> TrackCodes { get; set; } = new();
-}
+}

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs

@@ -104,4 +104,4 @@ public class TrackOrderDetailDto
     /// 创建人
     /// </summary>
     public string? CreateUser { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs

@@ -162,4 +162,4 @@ public class TrackOrderDto
     ///// 问题描述名称
     ///// </summary>
     //public string? ProblemDescriptionName { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackInput.cs

@@ -10,7 +10,8 @@ public class GetTrackInput : OrderNosInfo
     /// </summary>
     private float? _timeZone;
 
-    public float? TimeZone {
+    public float? TimeZone
+    {
         get => _timeZone ?? 8;
         set => _timeZone = value;
     }
@@ -38,4 +39,4 @@ public enum SortMethod
     /// 按订单模板排序
     /// </summary>
     ByTemplate
-}
+}

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; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/LinkOrderInput.cs

@@ -32,4 +32,4 @@ public class LinkOrderInput
     /// 关联的单号
     /// </summary>
     public List<string> LinkOrderNos { get; set; } = new();
-}
+}

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/OrderNoInfo.cs

@@ -33,4 +33,4 @@ public class OrderNosInfo
     /// </summary>
     [Required]
     public List<string> OrderNos { get; set; } = new();
-}
+}

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/PushTrackInput.cs

@@ -9,4 +9,4 @@ public class PushTrackInput : OrderNosInfo
     /// </summary>
     [Required]
     public string TrackCode { get; set; } = null!;
-}
+}

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs

@@ -50,4 +50,4 @@ public class QueryTrackPullMappingsInfo
     /// 服务商轨迹内容英文
     /// </summary>
     public string? ContentEn { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/RefreshTrackInput.cs

@@ -6,4 +6,4 @@ public class RefreshTrackInput
     /// 订单号
     /// </summary>
     public List<string> OrderNos { get; set; } = new();
-}
+}

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderInput.cs

@@ -66,4 +66,4 @@ public class UpdateOrderInput : OrderNoInfo
     /// 产品编码
     /// </summary>
     public string? ProductCode { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderStatusInput.cs

@@ -8,4 +8,4 @@ public class UpdateOrderStatusInput
     /// 订单是否完成
     /// </summary>
     public bool IsCompleted { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs

@@ -40,4 +40,4 @@ public class OrderFlightInfo
     /// </summary>
     [Required]
     public DateTime FlightDate { get; set; }
-}
+}

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; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs

@@ -94,4 +94,4 @@ public class GetTrackContentDetailDto
     /// 轨迹标记
     /// </summary>
     public string TrackFlag { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentMapInput.cs

@@ -38,4 +38,4 @@ public class EditTrackContentMapInput
     /// 源轨迹内容id
     /// </summary>
     public int? TrackContentId { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs

@@ -84,4 +84,4 @@ public class GetTrackContentListDto
     /// 修改人
     /// </summary>
     public string UpdateUser { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackFlags/EditTrackFlagInput.cs

@@ -64,4 +64,4 @@ public class GetTrackFlagDetailDto
     ///// 是否完结
     ///// </summary>
     //public bool IsFinish { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs

@@ -64,4 +64,4 @@ public class GetPageTrackFlagInput : PageInfoInput
     /// 关键字
     /// </summary>
     public string? Keywords { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackNode/TrackNodeInput.cs

@@ -26,4 +26,4 @@ public class EditTrackNodeInput
     /// 节点英文名称
     /// </summary>
     public string? NodeEnName { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackOrder/GetTrackCounterOutput.cs

@@ -16,4 +16,4 @@ public class GetTrackCounterOutput
     /// 预警数
     /// </summary>
     public int WarnCount { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs

@@ -2,4 +2,4 @@ namespace SJZY.Track.Application.Contract.Dtos.TrackOrder;
 
 public class TrackPushRecordItem
 {
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordOutput.cs

@@ -72,4 +72,4 @@ public class TrackPushRecordOutput
 
     /// <summary>创建时间</summary>
     public DateTime CreateTime { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs

@@ -77,4 +77,4 @@ public class EditTrackPullConfigInput
     /// 轨迹内容code
     /// </summary>
     public string? TrackContentCode { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs

@@ -64,4 +64,4 @@ public class EditTrackPullContentInput
     /// 是否完结
     /// </summary>
     public bool IsCompleted { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullConfigDto.cs

@@ -16,4 +16,4 @@ public class TrackPullConfigDto
     /// 子系统id
     /// </summary>
     public int SubSystemId { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullContentConfigDto.cs

@@ -46,4 +46,4 @@ public class TrackPullContentConfigDto
     /// 轨迹时区发生地参数值
     /// </summary>
     public int? TrackZonePlaceValue { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs

@@ -51,4 +51,4 @@ public class TrackPullParamConfigDto
     /// 轨迹内容代码
     /// </summary>
     public string? TrackContentCode { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamWithContentConfigDto.cs

@@ -5,4 +5,4 @@ public class TrackPullParamWithContentConfigDto
     public TrackPullParamConfigDto ParamConfig { get; set; } = new();
 
     public List<TrackPullContentConfigDto> ContentConfigs { get; set; } = new();
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullPayload.cs

@@ -6,4 +6,4 @@ public class TrackPullPayload
     /// 订单号
     /// </summary>
     public string OrderNo { get; set; } = null!;
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs

@@ -29,4 +29,4 @@ public class TrackRefreshAttach
     /// 子系统id
     /// </summary>
     public int SubSystemId { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshContext.cs

@@ -31,4 +31,4 @@ public class TrackRefreshContext
     /// 子系统id
     /// </summary>
     public int SubSystemId { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs

@@ -65,4 +65,4 @@ public class EditTrackPushConfigInput
     /// 时区格式格式模板
     /// </summary>
     public string? TimezoneFormat { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushContentInput.cs

@@ -63,4 +63,4 @@ public class EditTrackPushContentInput
     /// 轨迹时区GMT
     /// </summary>
     public double? TrackTimeZone { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackPush/SortTrackPushContentInput.cs

@@ -8,4 +8,4 @@ public class SortTrackPushContentInput
     /// 排序信息
     /// </summary>
     public List<DropdownListDataDto> SortInfo { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushAfterUpdateOrderDto.cs

@@ -26,4 +26,4 @@ public class TrackPushAfterUpdateOrderDto
     /// 问题描述
     /// </summary>
     public string? Message { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushContentConfigDto.cs

@@ -88,4 +88,4 @@ public class TrackPushContentConfigDto
     /// 时区格式格式模板
     /// </summary>
     public string? TimezoneFormat { get; set; }
-}
+}

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; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs

@@ -36,4 +36,4 @@ public class EditTrackStatusInput
     /// 轨迹状态英文
     /// </summary>
     public string? EntrackStatus { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs

@@ -41,4 +41,4 @@ public class GetTrackStatusDetailDto
     /// 节点名称
     /// </summary>
     public string? NodeName { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs

@@ -69,4 +69,4 @@ public class GetPageTrackStatusInput : PageInfoInput
     /// 选中的轨迹状态id
     /// </summary>
     public List<int>? SelectIds { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackStatus/QueryTrackNodeRequest.cs

@@ -11,4 +11,4 @@ public class QueryTrackNodeRequest : PageInfoInput
     /// 子系统id
     /// </summary>
     public long? SystemId { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs

@@ -30,4 +30,4 @@ public class EditTrackTemplateContentInput
     /// 轨迹模板id
     /// </summary>
     public int? TrackTemplateId { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs

@@ -24,4 +24,4 @@ public class GetPageTrackTemplateInput : PageInfoInput
     /// 选中的轨迹模版id
     /// </summary>
     public List<int>? SelectIds { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs

@@ -106,4 +106,4 @@ public class EditTrackTemplateInput
     /// 显示原轨迹
     /// </summary>
     public bool ShowOrigin { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs

@@ -8,4 +8,4 @@ public class SortTrackTemplateContentInput
     /// 排序信息
     /// </summary>
     public List<DropdownListDataDto> SortInfo { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Events/ModifyWarningEvent.cs

@@ -19,4 +19,4 @@ public class RedisEvent : IRedisEvent
 public interface IRedisEvent
 {
     string EventType { get; set; }
-}
+}

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; }
-}
+}

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; }
-}
+}

src/SJZY.Track.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs

@@ -61,4 +61,4 @@ public class TrackChangeAfterUpdateOrderEvent
     /// 时区缺失和发生地缺失标记，1表示时区，2表示发生地，3表示两种
     /// </summary>
     public int DeficiencyTagValue { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Events/TrackDeleteEvent.cs

@@ -26,4 +26,4 @@ public class TrackDeleteEvent
     /// 已经处理过的订单
     /// </summary>
     public List<int> Visited { get; set; } = new();
-}
+}

src/SJZY.Track.Application.Contract/Events/TrackInsertForNotMappedEvent.cs

@@ -46,4 +46,4 @@ public class TrackInsertForNotMappedEvent
     /// 轨迹发生时区
     /// </summary>
     public float TrackTimeZone { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs

@@ -64,4 +64,4 @@ public struct SystemPushStruct
     /// 轨迹发生时区
     /// </summary>
     public float TrackTimeZone { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Events/TrackRefreshStruct.cs

@@ -22,4 +22,4 @@ public struct TrackRefreshStruct
     /// todo：能够使得IsCompleted为true的点，全局只有一个：轨迹刷新？？
     /// </summary>
     public bool IsCompleted { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs

@@ -58,4 +58,4 @@ public class TrackUpsertEvent
     /// 时区缺失和发生地缺失标记，1表示时区，2表示发生地，3表示两种
     /// </summary>
     public int DeficiencyTagValue { get; set; }
-}
+}

src/SJZY.Track.Application.Contract/Events/TrackUpsertForRefreshEvent.cs

@@ -91,4 +91,4 @@ public class TrackHandledDto
     /// 轨迹发生时区
     /// </summary>
     public float? TrackTimeZone { get; set; }
-}
+}

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;
+global using SJZY.Expand.ABP.Core.Common.Dto;

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
     /// 发送通知。
     /// </summary>
     Task SendNotificationAsync();
-}
+}

src/SJZY.Track.Application.Contract/Services/IKpiAreaCacheService.cs

@@ -2,4 +2,4 @@ namespace SJZY.Track.Application.Contract.Services;
 
 public interface IKpiAreaCacheService
 {
-}
+}

src/SJZY.Track.Application.Contract/Services/IOrderService.cs

@@ -25,4 +25,4 @@ public interface IOrderService : IRemoteService
     /// <param name="input"></param>
     /// <returns></returns>
     Task<UnifyResultDto> LinkOrderAsync(LinkOrderInput input);
-}
+}

src/SJZY.Track.Application.Contract/Services/ITrackContentService.cs

@@ -2,4 +2,4 @@ namespace SJZY.Track.Application.Contract.Services;
 
 public interface ITrackContentService
 {
-}
+}

src/SJZY.Track.Application.Contract/Services/ITrackFlagService.cs

@@ -2,4 +2,4 @@ namespace SJZY.Track.Application.Contract.Services;
 
 public interface ITrackFlagService
 {
-}
+}

src/SJZY.Track.Application.Contract/Services/ITrackPullCacheService.cs

@@ -31,4 +31,4 @@ public interface ITrackPullCacheService
     /// <returns></returns>
     Task<TrackPullParamWithContentConfigDto?> SetPullConfigAsync(int? id = null, int? subSystemId = null,
         int? serviceProviderId = null);
-}
+}

src/SJZY.Track.Application.Contract/Services/ITrackPushCacheService.cs

@@ -19,4 +19,4 @@ public interface ITrackPushCacheService
     /// <param name="customId"></param>
     /// <returns></returns>
     Task<List<TrackPushContentConfigDto>?> SetPushContentConfigsAsync(int subSystemId, int customId);
-}
+}

src/SJZY.Track.Application.Contract/Services/ITrackPushConfigService.cs

@@ -12,4 +12,4 @@ public interface ITrackPushConfigService : IRemoteService
     /// <returns></returns>
     Task<UnifyResultDto<List<QueryTrackPullMappingsInfo>>> QueryTrackPullMappingsAsync(
         QueryTrackPullMappingsInput input);
-}
+}

src/SJZY.Track.Application.Contract/Services/ITrackService.cs

@@ -32,4 +32,4 @@ public interface ITrackService : IRemoteService
     /// <param name="input"></param>
     /// <returns></returns>
     Task<UnifyResultDto<List<GetTrackOutput>>> QueryAsync(GetTrackInput input);
-}
+}

src/SJZY.Track.Application.Contract/Services/ITrackStatusService.cs

@@ -2,4 +2,4 @@ namespace SJZY.Track.Application.Contract.Services;
 
 public interface ITrackStatusService
 {
-}
+}

src/SJZY.Track.Application.Contract/SjzyTrackApplicationContractModule.cs

@@ -7,4 +7,4 @@ public class SjzyTrackApplicationContractModule : AbpModule
     public override void PreConfigureServices(ServiceConfigurationContext context)
     {
     }
-}
+}

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));
     }
-}
+}

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;
     }
-}
+}

src/SJZY.Track.Application/AutoMapper/TrackAutoMapperProfile.cs

@@ -10,4 +10,4 @@ public class TrackAutoMapperProfile : Profile
     {
         CreateMap<UpsertTrackInput, TrackUpsertEvent>(MemberList.None);
     }
-}
+}

src/SJZY.Track.Application/AutoMapper/TrackContentAutoMapperProfile.cs

@@ -17,4 +17,4 @@ public class TrackContentAutoMapperProfile : Profile
             MemberList.None);
         CreateMap<EditTrackContentMapInput, TrackContentMapEntity>(MemberList.None);
     }
-}
+}

src/SJZY.Track.Application/AutoMapper/TrackFlagAutoMapperProfile.cs

@@ -17,4 +17,4 @@ public class TrackFlagAutoMapperProfile : Profile
         CreateMap<UnifyPageResultDto<GetTrackFlagListVO>, UnifyPageResultDto<GetTrackFlagListDto>>(MemberList.None);
         CreateMap<GetPageTrackFlagInput, GetPageTrackFlagVO>(MemberList.None);
     }
-}
+}

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));
     }
-}
+}

src/SJZY.Track.Application/AutoMapper/TrackPullAutoMapperProfile.cs

@@ -21,4 +21,4 @@ public class TrackPullAutoMapperProfile : Profile
         CreateMap<GetTrackPullConfigDetailOutputVO, TrackPullParamConfigDto>(MemberList.None);
         CreateMap<GetTrackPullContentListCacheVO, TrackPullContentConfigDto>(MemberList.None);
     }
-}
+}

src/SJZY.Track.Application/AutoMapper/TrackPushAutoMapperProfile.cs

@@ -21,4 +21,4 @@ public class TrackPushAutoMapperProfile : Profile
         CreateMap<EditTrackPushContentInput, TrackPushContentConfigEntity>(MemberList.None);
         CreateMap<TrackPushContentConfigVO, TrackPushContentConfigDto>(MemberList.None);
     }
-}
+}

src/SJZY.Track.Application/AutoMapper/TrackPushConfigAutoMapperProfile.cs

@@ -11,4 +11,4 @@ public class TrackPushConfigAutoMapperProfile : Profile
         CreateMap<QueryTrackPullMappingsInput, QueryTrackPullMappingsInputVO>(MemberList.None);
         CreateMap<QueryTrackPullMappingsInfoVO, QueryTrackPullMappingsInfo>(MemberList.None);
     }
-}
+}

src/SJZY.Track.Application/AutoMapper/TrackStatusAutoMapperProfile.cs

@@ -20,4 +20,4 @@ public class TrackStatusAutoMapperProfile : Profile
         CreateMap<UnifyPageResultDto<GetTrackStatusListVO>, UnifyPageResultDto<GetTrackStatusListDto>>(MemberList
             .None);
     }
-}
+}

src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs

@@ -20,4 +20,4 @@ public class TrackTemplateAutoMapperProfile : Profile
         CreateMap<UnifyPageResultDto<GetTrackTemplateListVO>, UnifyPageResultDto<GetTrackTemplateListDto>>(MemberList
             .None);
     }
-}
+}

src/SJZY.Track.Application/CAP/CAPFilter.cs

@@ -71,4 +71,4 @@ public class CapFilter : SubscribeFilter
 
         return Task.CompletedTask;
     }
-}
+}

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);
     }
-}
+}

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());
     }
-}
+}

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
             });
     }
-}
+}

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
+                });
         }
     }
-}
+}

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");
     }
-}
+}