From 577f5aec956bb0cc5cc7c3b8f6b3d0f080e2b9ba Mon Sep 17 00:00:00 2001 From: xiaolipro <2357729423@qq.com> Date: Tue, 2 Sep 2025 15:32:49 +0800 Subject: [PATCH] fix sth --- .../Services/ProvideServices/TrackPushService.cs | 6 +++--- .../Services/ProvideServices/TrackService.cs | 4 ++-- .../Services/TrackPull/TrackPullCacheService.cs | 14 +++++++------- .../Aggregates/OrderAggregate/IOrderRepository.cs | 2 +- .../TrackContentAggregate/TrackContentMapEntity.cs | 2 +- .../ITrackPullConfigRepository.cs | 2 +- .../TrackPullContentConfigEntity.cs | 2 +- .../TrackPushContentConfigEntity.cs | 2 +- .../Complete/CompleteWarningRuleItemEntity.cs | 2 +- .../Return/ReturnWarningRetryPushTaskEntity.cs | 2 +- .../Return/ReturnWarningRuleItemEntity.cs | 2 +- .../TransportWarningDetailsGenerateTaskEntity.cs | 2 +- .../Transport/TransportWarningSceneEntity.cs | 2 +- .../TransportWarningSceneRuleItemEntity.cs | 2 +- .../WarningAggregate/WarningRuleEntity.cs | 12 ++++++------ .../VEntities/VServiceProviderEntity.cs | 2 +- .../Repositories/OrderRepository.cs | 6 +++--- .../Repositories/TrackPullConfigRepository.cs | 4 ++-- 18 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/TrackCenter.Application/Services/ProvideServices/TrackPushService.cs b/src/TrackCenter.Application/Services/ProvideServices/TrackPushService.cs index 08c0a14b..962f53b7 100644 --- a/src/TrackCenter.Application/Services/ProvideServices/TrackPushService.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/TrackPushService.cs @@ -146,13 +146,13 @@ public class TrackPushService : ApplicationServiceBase /// /// 获取轨迹推送内容 /// - /// + /// /// /// [HttpGet("Track/GetTrackPushContentList")] - public async Task> GetTrackPushContentListAsync(string AppKey, string customer) + public async Task> GetTrackPushContentListAsync(string appKey, string customer) { - var list = await _trackPushConfigRepository.GetTrackPushContentListAsync(AppKey, customer); + var list = await _trackPushConfigRepository.GetTrackPushContentListAsync(appKey, customer); var result = ObjectMapper.Map, List>(list); diff --git a/src/TrackCenter.Application/Services/ProvideServices/TrackService.cs b/src/TrackCenter.Application/Services/ProvideServices/TrackService.cs index 1759e4ac..992073ed 100644 --- a/src/TrackCenter.Application/Services/ProvideServices/TrackService.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/TrackService.cs @@ -371,7 +371,7 @@ public partial class TrackService : ApplicationServiceBase private async Task TrackUpsertValidation( bool isAdd, string? esId, - string AppKey, + string appKey, int orderId, string orderNo, string trackCode, @@ -424,7 +424,7 @@ public partial class TrackService : ApplicationServiceBase #region 轨迹内容中的配置规则检查 - var trackContent = await _trackContentRepository.GetByCodeAsync(AppKey, trackCode); + var trackContent = await _trackContentRepository.GetByCodeAsync(appKey, trackCode); if (trackContent == null) { throw new BusinessException(message: $"轨迹代码：{trackCode}轨迹内容不存在"); diff --git a/src/TrackCenter.Application/Services/TrackPull/TrackPullCacheService.cs b/src/TrackCenter.Application/Services/TrackPull/TrackPullCacheService.cs index 749fc12d..78dff813 100644 --- a/src/TrackCenter.Application/Services/TrackPull/TrackPullCacheService.cs +++ b/src/TrackCenter.Application/Services/TrackPull/TrackPullCacheService.cs @@ -16,16 +16,16 @@ public class TrackPullCacheService : ITransientDependency _objectMapper = objectMapper; } - public string TrackPullKey(string AppKey, string serviceProviderCode) => - $"{GlobalConst.TrackPullKeyPrefix}:{AppKey}:{serviceProviderCode}"; + public string TrackPullKey(string appKey, string serviceProviderCode) => + $"{GlobalConst.TrackPullKeyPrefix}:{appKey}:{serviceProviderCode}"; - public async Task GetPullParamsWithContentAsync(string AppKey, + public async Task GetPullParamsWithContentAsync(string appKey, string serviceProviderCode) { var data = await RedisHelper.Client.GetAsync(TrackPullContentKey( - AppKey, serviceProviderCode)); + appKey, serviceProviderCode)); - var pullId = await _trackPullConfigRepository.FindIdAsync(AppKey, serviceProviderCode); + var pullId = await _trackPullConfigRepository.FindIdAsync(appKey, serviceProviderCode); data ??= await SetPullConfigAsync(pullId); return data; @@ -59,6 +59,6 @@ public class TrackPullCacheService : ITransientDependency return data; } - public static string TrackPullContentKey(string AppKey, string serviceProviderCode) => - $"{GlobalConst.TrackPullContentKeyPrefix}:{AppKey}:{serviceProviderCode}"; + public static string TrackPullContentKey(string appKey, string serviceProviderCode) => + $"{GlobalConst.TrackPullContentKeyPrefix}:{appKey}:{serviceProviderCode}"; } diff --git a/src/TrackCenter.Domain/Aggregates/OrderAggregate/IOrderRepository.cs b/src/TrackCenter.Domain/Aggregates/OrderAggregate/IOrderRepository.cs index 718af3fb..caf47253 100644 --- a/src/TrackCenter.Domain/Aggregates/OrderAggregate/IOrderRepository.cs +++ b/src/TrackCenter.Domain/Aggregates/OrderAggregate/IOrderRepository.cs @@ -59,7 +59,7 @@ public interface IOrderRepository : IBasicRepository /// 更新推送预警单 /// /// - Task PushWarnOrdersAsync(string AppKey, int pageSize, int pageindex); + Task PushWarnOrdersAsync(string appKey, int pageSize, int pageindex); /// /// 更新缺失标记，时区缺失和发生地缺失标记，1表示时区，2表示发生地，3表示两种 diff --git a/src/TrackCenter.Domain/Aggregates/TrackContentAggregate/TrackContentMapEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackContentAggregate/TrackContentMapEntity.cs index e347a617..e79c148e 100644 --- a/src/TrackCenter.Domain/Aggregates/TrackContentAggregate/TrackContentMapEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackContentAggregate/TrackContentMapEntity.cs @@ -6,7 +6,7 @@ namespace TrackCenter.Domain.Aggregates.TrackContentAggregate; /// 轨迹内容映射表 /// [SugarTable("t_track_content_map")] -public class TrackContentMapEntity : FullAuditedEntity +public class TrackContentMapEntity : FullAuditedEntity { /// /// 自增主键 diff --git a/src/TrackCenter.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs b/src/TrackCenter.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs index d58c1b2f..d0512204 100644 --- a/src/TrackCenter.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs @@ -50,5 +50,5 @@ public interface ITrackPullConfigRepository : IBasicRepository UpdateContentAsync(TrackPullContentConfigEntity updateObj); Task IsContentAnyAsync(Expression> whereExpression); - Task FindIdAsync(string AppKey, string serviceProviderCode); + Task FindIdAsync(string appKey, string serviceProviderCode); } diff --git a/src/TrackCenter.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs index 6341923e..15cf081a 100644 --- a/src/TrackCenter.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs @@ -7,7 +7,7 @@ namespace TrackCenter.Domain.Aggregates.TrackPullAggregate; /// 轨迹拉取内容配置表 /// [SugarTable("t_track_pull_content_config")] -public class TrackPullContentConfigEntity : FullAuditedEntity +public class TrackPullContentConfigEntity : FullAuditedEntity { /// /// 自增主键 diff --git a/src/TrackCenter.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs index ddfccef5..462860e4 100644 --- a/src/TrackCenter.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs @@ -7,7 +7,7 @@ namespace TrackCenter.Domain.Aggregates.TrackPushAggregate; /// 轨迹推送内容配置表 /// [SugarTable("t_track_push_content_config")] -public class TrackPushContentConfigEntity : FullAuditedEntity +public class TrackPushContentConfigEntity : FullAuditedEntity { /// /// 自增主键 diff --git a/src/TrackCenter.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningRuleItemEntity.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningRuleItemEntity.cs index cecfeda3..da867c15 100644 --- a/src/TrackCenter.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningRuleItemEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningRuleItemEntity.cs @@ -3,7 +3,7 @@ using Fake.Domain.Entities.Auditing; namespace TrackCenter.Domain.Aggregates.WarningAggregate.Complete; [SugarTable("t_warning_complete_rule_item", TableDescription = "完整预警规则项")] -public sealed class CompleteWarningRuleItemEntity : FullAuditedEntity +public sealed class CompleteWarningRuleItemEntity : FullAuditedEntity { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } diff --git a/src/TrackCenter.Domain/Aggregates/WarningAggregate/Return/ReturnWarningRetryPushTaskEntity.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Return/ReturnWarningRetryPushTaskEntity.cs index 8860e6c2..3731437a 100644 --- a/src/TrackCenter.Domain/Aggregates/WarningAggregate/Return/ReturnWarningRetryPushTaskEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Return/ReturnWarningRetryPushTaskEntity.cs @@ -5,7 +5,7 @@ namespace TrackCenter.Domain.Aggregates.WarningAggregate.Return; // 预警重试推送任务 [SugarTable("t_warning_return_retry_task", TableDescription = "回传预警重试推送任务")] -public sealed class ReturnWarningRetryPushTaskEntity : FullAuditedEntity +public sealed class ReturnWarningRetryPushTaskEntity : FullAuditedEntity { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } diff --git a/src/TrackCenter.Domain/Aggregates/WarningAggregate/Return/ReturnWarningRuleItemEntity.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Return/ReturnWarningRuleItemEntity.cs index 5af4420b..2c93fe7c 100644 --- a/src/TrackCenter.Domain/Aggregates/WarningAggregate/Return/ReturnWarningRuleItemEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Return/ReturnWarningRuleItemEntity.cs @@ -4,7 +4,7 @@ namespace TrackCenter.Domain.Aggregates.WarningAggregate.Return; // 回传预警规则项 [SugarTable("t_warning_return_rule_item", TableDescription = "回传预警规则项")] -public sealed class ReturnWarningRuleItemEntity : FullAuditedEntity +public sealed class ReturnWarningRuleItemEntity : FullAuditedEntity { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } diff --git a/src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsGenerateTaskEntity.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsGenerateTaskEntity.cs index a76013c7..2fab38a4 100644 --- a/src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsGenerateTaskEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsGenerateTaskEntity.cs @@ -6,7 +6,7 @@ namespace TrackCenter.Domain.Aggregates.WarningAggregate.Transport; [SugarTable("t_warning_transport_generate_task", TableDescription = "运输时效预警明细生成任务")] [SugarIndex("IDX_PlanExecutionTime_IsClosed", nameof(PlanExecutionTime), OrderByType.Asc, nameof(IsClosed), OrderByType.Asc)] -public sealed class TransportWarningDetailsGenerateTaskEntity : FullAuditedEntity +public sealed class TransportWarningDetailsGenerateTaskEntity : FullAuditedEntity { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } diff --git a/src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningSceneEntity.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningSceneEntity.cs index da7bb0d0..a8c25568 100644 --- a/src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningSceneEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningSceneEntity.cs @@ -5,7 +5,7 @@ namespace TrackCenter.Domain.Aggregates.WarningAggregate.Transport; // 运输时效场景 [SugarTable("t_warning_transport_scene", TableDescription = "运输时效规则场景")] -public sealed class TransportWarningSceneEntity : FullAuditedEntity +public sealed class TransportWarningSceneEntity : FullAuditedEntity { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } diff --git a/src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningSceneRuleItemEntity.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningSceneRuleItemEntity.cs index 230058cc..896c59e4 100644 --- a/src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningSceneRuleItemEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningSceneRuleItemEntity.cs @@ -5,7 +5,7 @@ namespace TrackCenter.Domain.Aggregates.WarningAggregate.Transport; // 运输时效场景规则项 [SugarTable("t_warning_transport_scene_rule_item", TableDescription = "运输时效规则场景规则项")] -public sealed class TransportWarningSceneRuleItemEntity : FullAuditedEntity +public sealed class TransportWarningSceneRuleItemEntity : FullAuditedEntity { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } diff --git a/src/TrackCenter.Domain/Aggregates/WarningAggregate/WarningRuleEntity.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/WarningRuleEntity.cs index a2375b94..b01a9193 100644 --- a/src/TrackCenter.Domain/Aggregates/WarningAggregate/WarningRuleEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/WarningRuleEntity.cs @@ -36,22 +36,22 @@ public sealed class WarningRuleEntity : FullAuditedAggregateRoot { } - public WarningRuleEntity(int id, string name, string AppKey, string customer, bool isEnabled, int warningType, string version) + public WarningRuleEntity(int id, string name, string appKey, string customer, bool isEnabled, int warningType, string version) { Id = id; Name = name; - AppKey = AppKey; + AppKey = appKey; Customer = customer; IsEnabled = isEnabled; WarningType = warningType; Version = version; } - public WarningRuleEntity(int id, string name, string AppKey, string customer, bool isEnabled, int warningType) + public WarningRuleEntity(int id, string name, string appKey, string customer, bool isEnabled, int warningType) { Id = id; Name = name; - AppKey = AppKey; + AppKey = appKey; Customer = customer; IsEnabled = isEnabled; WarningType = warningType; @@ -59,8 +59,8 @@ public sealed class WarningRuleEntity : FullAuditedAggregateRoot } // 应用+客户id确定命中规则主体 - public bool CanHitRule(string AppKey, string customer) + public bool CanHitRule(string appKey, string customer) { - return AppKey == AppKey && Customer == customer; + return AppKey == appKey && Customer == customer; } } diff --git a/src/TrackCenter.Domain/VEntities/VServiceProviderEntity.cs b/src/TrackCenter.Domain/VEntities/VServiceProviderEntity.cs index dcd6a9e2..4fe1d4b8 100644 --- a/src/TrackCenter.Domain/VEntities/VServiceProviderEntity.cs +++ b/src/TrackCenter.Domain/VEntities/VServiceProviderEntity.cs @@ -6,7 +6,7 @@ namespace TrackCenter.Domain.VEntities; /// 服务商主表 /// [SugarTable("v_service_provider")] -public class VServiceProviderEntity : FullAuditedEntity +public class VServiceProviderEntity : FullAuditedEntity { /// /// 自增主键 diff --git a/src/TrackCenter.Repository/Repositories/OrderRepository.cs b/src/TrackCenter.Repository/Repositories/OrderRepository.cs index 42907565..fddfc33f 100644 --- a/src/TrackCenter.Repository/Repositories/OrderRepository.cs +++ b/src/TrackCenter.Repository/Repositories/OrderRepository.cs @@ -308,14 +308,14 @@ public class OrderRepository : BasicRepository, IOrderRepository, I /// /// 更新推送预警单 /// - /// + /// /// /// /// - public async Task PushWarnOrdersAsync(string AppKey, int pageSize, int pageindex) + public async Task PushWarnOrdersAsync(string appKey, int pageSize, int pageindex) { var ordersToUpdate = await Context.Queryable() - .Where(b => b.AppKey == AppKey && !b.IsCompleted && b.QuestionType != TrackProblemType.Error) + .Where(b => b.AppKey == appKey && !b.IsCompleted && b.QuestionType != TrackProblemType.Error) .Select(b => new { b.LatestPushTime, diff --git a/src/TrackCenter.Repository/Repositories/TrackPullConfigRepository.cs b/src/TrackCenter.Repository/Repositories/TrackPullConfigRepository.cs index 4c37c2ce..6ad60fa5 100644 --- a/src/TrackCenter.Repository/Repositories/TrackPullConfigRepository.cs +++ b/src/TrackCenter.Repository/Repositories/TrackPullConfigRepository.cs @@ -152,11 +152,11 @@ public class TrackPullConfigRepository : BasicRepository, return await Context.Queryable().Where(whereExpression).AnyAsync(); } - public async Task FindIdAsync(string AppKey, string serviceProviderCode) + public async Task FindIdAsync(string appKey, string serviceProviderCode) { return await AsQueryable() .LeftJoin((trackPull, service) => trackPull.ServiceProviderId == service.Id) - .Where((trackPull, service) => trackPull.AppKey == AppKey && service.Code == serviceProviderCode) + .Where((trackPull, service) => trackPull.AppKey == appKey && service.Code == serviceProviderCode) .Select(trackPull => trackPull.Id) .FirstAsync(); }