From 9870fb0ae730fe1bda2601434b07417a41ba049f Mon Sep 17 00:00:00 2001 From: xiaolipro <2357729423@qq.com> Date: Mon, 11 Aug 2025 18:19:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- global.json | 5 - src/TrackCenter.Api/TrackCenter.Api.csproj | 2 +- src/TrackCenter.Api/TrackCenterApiModule.cs | 15 +- .../EventHandlers/TrackUpsertEventHandler.cs | 1 - .../Dtos/ProvideServices/UpsertOrderInput.cs | 5 - .../Dtos/ProvideServices/UpsertTrackInput.cs | 5 - .../Events/TrackDeleteEvent.cs | 2 +- .../Events/TrackUpsertEvent.cs | 2 +- .../Services/ApplicationServiceBase.cs | 5 +- .../ProvideServices/OrderService.Link.cs | 2 +- .../Services/ProvideServices/OrderService.cs | 8 +- .../Services/ProvideServices/TrackService.cs | 4 +- .../TrackCenter.Application.csproj | 6 +- .../TrackCenterApplicationModule.cs | 4 +- .../KPIAreaAggregate/RuleAreaEntity.cs | 6 +- .../KPIAreaAggregate/RuleAreaInfoEntity.cs | 6 +- .../Aggregates/OrderAggregate/OrderEntity.cs | 2 +- .../OrderAggregate/OrderFlightEntity.cs | 14 +- .../OrderAggregate/OrderLinkEntity.cs | 14 +- .../OrderOperationRecordIndex.cs | 2 +- .../OrderTrackPullStatusEntity.cs | 4 +- .../TrackContentEntity.cs | 2 +- .../TrackFlagAggregate/TrackFlagEntity.cs | 2 +- .../TrackNodeAggregate/TrackNodeEntity.cs | 2 +- .../TrackPullConfigEntity.cs | 2 +- .../TrackPushConfigEntity.cs | 2 +- .../TrackStatusAggregate/TrackStatusEntity.cs | 2 +- .../WarningNotifyTaskEntity.cs | 2 +- .../WarningAggregate/WarningRuleEntity.cs | 2 +- .../TrackCenter.Domain.csproj | 4 +- .../VEntities/VAppEntity.cs | 2 +- .../VEntities/VUserEntity.cs | 391 ++++++++++++++++++ .../Repositories/KpiAreaRepository.cs | 6 +- .../Repositories/TrackContentRepository.cs | 4 +- .../Repositories/TrackFlagRepository.cs | 4 +- .../Repositories/TrackStatusRepository.cs | 5 +- .../Repositories/WarningTaskRepository.cs | 2 +- 37 files changed, 454 insertions(+), 94 deletions(-) delete mode 100644 global.json create mode 100644 src/TrackCenter.Domain/VEntities/VUserEntity.cs diff --git a/global.json b/global.json deleted file mode 100644 index fd07d882..00000000 --- a/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sdk": { - "version": "8.0.303" - } -} diff --git a/src/TrackCenter.Api/TrackCenter.Api.csproj b/src/TrackCenter.Api/TrackCenter.Api.csproj index 1c211d7d..0a941dd9 100644 --- a/src/TrackCenter.Api/TrackCenter.Api.csproj +++ b/src/TrackCenter.Api/TrackCenter.Api.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/TrackCenter.Api/TrackCenterApiModule.cs b/src/TrackCenter.Api/TrackCenterApiModule.cs index 977ec39c..6b38afbd 100644 --- a/src/TrackCenter.Api/TrackCenterApiModule.cs +++ b/src/TrackCenter.Api/TrackCenterApiModule.cs @@ -7,6 +7,7 @@ using FluentValidation.AspNetCore; using Hangfire; using TrackCenter.Application; using TrackCenter.Application.Hangfire; +using TrackCenter.Domain.Extensions; using TrackCenter.Repository; namespace TrackCenter.Api; @@ -28,6 +29,7 @@ public class TrackCenterApiModule : FakeModule options.ScanApplicationServices(); }); + services.AddMvc().AddNewtonsoftJson(); services.AddFakeExceptionFilter() .AddFakeValidationActionFilter() @@ -67,12 +69,17 @@ public class TrackCenterApiModule : FakeModule { DisplayStorageConnectionString = false, IgnoreAntiforgeryToken = true, - AppPath = configuration["Swagger:JsonUrlPrefix"]! + "/", - PrefixPath = System.Diagnostics.Debugger.IsAttached - ? "" - : configuration["Swagger:JsonUrlPrefix"]!, + AppPath = "", + PrefixPath = "", DashboardTitle = "轨迹预警任务", Authorization = [new AnonymousHangfireAuthorizationFilter()] }); + + LogHelper.Info("Application started", true); + } + + public override void Shutdown(ApplicationShutdownContext context) + { + LogHelper.Info("Application stoped", true); } } diff --git a/src/TrackCenter.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs b/src/TrackCenter.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs index b68d2333..4b5bce7e 100644 --- a/src/TrackCenter.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs +++ b/src/TrackCenter.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs @@ -1,6 +1,5 @@ using DotNetCore.CAP; using InterfaceForward.Domain.Shared.Helpers; -using Microsoft.Extensions.Logging; using TrackCenter.Application.Events; using TrackCenter.Application.Kafka; using TrackCenter.Application.Queries; diff --git a/src/TrackCenter.Application/Dtos/ProvideServices/UpsertOrderInput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/UpsertOrderInput.cs index fe3f551d..31b5ee6c 100644 --- a/src/TrackCenter.Application/Dtos/ProvideServices/UpsertOrderInput.cs +++ b/src/TrackCenter.Application/Dtos/ProvideServices/UpsertOrderInput.cs @@ -8,11 +8,6 @@ public class UpsertOrderInput : UpdateOrderInput /// 客户 /// public string Customer { get; set; } - - /// - /// 当前操作人 - /// - public int OptionUserId { get; set; } } public class BatchUpsertOrderInput diff --git a/src/TrackCenter.Application/Dtos/ProvideServices/UpsertTrackInput.cs b/src/TrackCenter.Application/Dtos/ProvideServices/UpsertTrackInput.cs index df49f863..2e999605 100644 --- a/src/TrackCenter.Application/Dtos/ProvideServices/UpsertTrackInput.cs +++ b/src/TrackCenter.Application/Dtos/ProvideServices/UpsertTrackInput.cs @@ -132,11 +132,6 @@ public class UpsertTrackInput : OrderNoInfo [Range(-12, 12)] public float? DestinationTimeZone { get; set; } - /// - /// 当前操作人 - /// - public int OptionUserId { get; set; } - /// /// 重复的情况下，用什么比较 /// diff --git a/src/TrackCenter.Application/Events/TrackDeleteEvent.cs b/src/TrackCenter.Application/Events/TrackDeleteEvent.cs index 729f8b0e..bb666875 100644 --- a/src/TrackCenter.Application/Events/TrackDeleteEvent.cs +++ b/src/TrackCenter.Application/Events/TrackDeleteEvent.cs @@ -47,7 +47,7 @@ public class TrackDeleteEvent /// /// 操作人id /// - public Guid OperationManId { get; set; } + public int OperationManId { get; set; } /// /// 已经处理过的订单 diff --git a/src/TrackCenter.Application/Events/TrackUpsertEvent.cs b/src/TrackCenter.Application/Events/TrackUpsertEvent.cs index 045b0fe1..2a6278b7 100644 --- a/src/TrackCenter.Application/Events/TrackUpsertEvent.cs +++ b/src/TrackCenter.Application/Events/TrackUpsertEvent.cs @@ -32,7 +32,7 @@ public class TrackUpsertEvent /// /// 操作人id /// - public Guid OperationManId { get; set; } + public int OperationManId { get; set; } /// /// true新增，false更新 diff --git a/src/TrackCenter.Application/Services/ApplicationServiceBase.cs b/src/TrackCenter.Application/Services/ApplicationServiceBase.cs index bd38b458..f396ac71 100644 --- a/src/TrackCenter.Application/Services/ApplicationServiceBase.cs +++ b/src/TrackCenter.Application/Services/ApplicationServiceBase.cs @@ -1,5 +1,8 @@ +using System.Security.Claims; + namespace TrackCenter.Application.Services; -public class ApplicationServiceBase: ApplicationService +public class ApplicationServiceBase : ApplicationService { + public int CurrentUserId => CurrentUser.GetId(); } diff --git a/src/TrackCenter.Application/Services/ProvideServices/OrderService.Link.cs b/src/TrackCenter.Application/Services/ProvideServices/OrderService.Link.cs index 4c1433bd..0dcd2e40 100644 --- a/src/TrackCenter.Application/Services/ProvideServices/OrderService.Link.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/OrderService.Link.cs @@ -74,7 +74,7 @@ public partial class OrderService x.Id, x.OrderNo, x.OrderType, - AppKey = x.AppKey, + x.AppKey, x.Customer }); diff --git a/src/TrackCenter.Application/Services/ProvideServices/OrderService.cs b/src/TrackCenter.Application/Services/ProvideServices/OrderService.cs index 31999b50..7e0cf29d 100644 --- a/src/TrackCenter.Application/Services/ProvideServices/OrderService.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/OrderService.cs @@ -64,7 +64,7 @@ public partial class OrderService : ApplicationServiceBase OrderNo = input.OrderNo, OptionType = OrderOperationType.修改订单.ToString(), Content = input.ToJson(), - CreateUserId = CurrentUser.Id ?? Guid.Empty, + CreateUserId = CurrentUserId, CreateUserName = CurrentUser.UserName ?? string.Empty, }; @@ -90,7 +90,7 @@ public partial class OrderService : ApplicationServiceBase OrderNo = input.OrderNo, OptionType = nameof(OrderOperationType.创建订单), Content = input.ToJson(), - CreateUserId = CurrentUser.Id ?? Guid.Empty, + CreateUserId = CurrentUserId, CreateUserName = CurrentUser.UserName ?? string.Empty, CreateTime = DateTime.Now }; @@ -142,7 +142,7 @@ public partial class OrderService : ApplicationServiceBase OrderNo = order.OrderNo, OptionType = nameof(OrderOperationType.修改订单), Content = input2.ToJson(), - CreateUserId = CurrentUser.Id ?? Guid.Empty, + CreateUserId = CurrentUserId, CreateUserName = CurrentUser.UserName ?? string.Empty, CreateTime = DateTime.Now }); @@ -176,7 +176,7 @@ public partial class OrderService : ApplicationServiceBase OrderNo = order.OrderNo, OptionType = OrderOperationType.创建订单.ToString(), Content = insertInput.ToJson(), - CreateUserId = CurrentUser.Id ?? Guid.Empty, + CreateUserId = CurrentUserId, CreateUserName = CurrentUser.UserName ?? string.Empty, CreateTime = DateTime.Now }); diff --git a/src/TrackCenter.Application/Services/ProvideServices/TrackService.cs b/src/TrackCenter.Application/Services/ProvideServices/TrackService.cs index 20d971b2..1759e4ac 100644 --- a/src/TrackCenter.Application/Services/ProvideServices/TrackService.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/TrackService.cs @@ -139,7 +139,7 @@ public partial class TrackService : ApplicationServiceBase AppKey = tracks.First().AppKey, Source = input.Source, OperationMan = CurrentUser.UserName, - OperationManId = CurrentUser.Id ?? Guid.Empty, + OperationManId = CurrentUserId, }; await _capPublisher.PublishAsync(GlobalConst.TrackDeleteSubscribe, @event); } @@ -341,7 +341,7 @@ public partial class TrackService : ApplicationServiceBase NewTrackTime = input.NewTrackTime, TrackTimeZone = input.TrackTimeZone ?? GlobalConst.NoneTrackTimeZone, //时区为空使用一个特殊值填充 OperationMan = CurrentUser.UserName, - OperationManId = CurrentUser.Id ?? Guid.Empty, + OperationManId = CurrentUserId, IsExternal = input.IsExternal, Source = input.Source, Remarks = input.Remarks, diff --git a/src/TrackCenter.Application/TrackCenter.Application.csproj b/src/TrackCenter.Application/TrackCenter.Application.csproj index ee341c98..51326549 100644 --- a/src/TrackCenter.Application/TrackCenter.Application.csproj +++ b/src/TrackCenter.Application/TrackCenter.Application.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/src/TrackCenter.Application/TrackCenterApplicationModule.cs b/src/TrackCenter.Application/TrackCenterApplicationModule.cs index 91a81e30..3c3b430d 100644 --- a/src/TrackCenter.Application/TrackCenterApplicationModule.cs +++ b/src/TrackCenter.Application/TrackCenterApplicationModule.cs @@ -59,9 +59,7 @@ public class TrackCenterApplicationModule : FakeModule options.UseDashboard(dashboardOptions => { - dashboardOptions.PathBase = System.Diagnostics.Debugger.IsAttached - ? "" - : configuration["Swagger:JsonUrlPrefix"]!; + dashboardOptions.PathBase = ""; }); options.FailedThresholdCallback = faileCalback => { diff --git a/src/TrackCenter.Domain/Aggregates/KPIAreaAggregate/RuleAreaEntity.cs b/src/TrackCenter.Domain/Aggregates/KPIAreaAggregate/RuleAreaEntity.cs index 4711a190..e1d520dd 100644 --- a/src/TrackCenter.Domain/Aggregates/KPIAreaAggregate/RuleAreaEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/KPIAreaAggregate/RuleAreaEntity.cs @@ -4,7 +4,7 @@ using Fake.Domain.Entities.Auditing; namespace TrackCenter.Domain.Aggregates.KPIAreaAggregate; [SugarTable("t_area", TableDescription = "KPI分区主表")] -public class RuleAreaEntity : AggregateRoot, IHasCreateUserId, IHasCreateTime, IHasUpdateUserId, IHasUpdateTime +public class RuleAreaEntity : AggregateRoot, IHasCreateUserId, IHasCreateTime, IHasUpdateUserId, IHasUpdateTime { /// /// 自增主键 @@ -28,7 +28,7 @@ public class RuleAreaEntity : AggregateRoot, IHasCreateUserId, IHasCreateTi /// 创建人 /// [SugarColumn(ColumnName = "CreateUserId", ColumnDescription = "创建人")] - public Guid CreateUserId { get; set; } + public int CreateUserId { get; set; } /// /// 创建时间 @@ -40,7 +40,7 @@ public class RuleAreaEntity : AggregateRoot, IHasCreateUserId, IHasCreateTi /// 更新人 /// [SugarColumn(ColumnName = "UpdateUserId", ColumnDescription = "更新人")] - public Guid UpdateUserId { get; set; } + public int UpdateUserId { get; set; } /// /// 更新时间 diff --git a/src/TrackCenter.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs b/src/TrackCenter.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs index 70e3d568..24798f45 100644 --- a/src/TrackCenter.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs @@ -4,7 +4,7 @@ using Fake.Domain.Entities.Auditing; namespace TrackCenter.Domain.Aggregates.KPIAreaAggregate; [SugarTable("t_area_details", TableDescription = "kpi 区域子表")] -public class RuleAreaInfoEntity : Entity, IHasCreateUserId, IHasCreateTime, IHasUpdateUserId, IHasUpdateTime +public class RuleAreaInfoEntity : Entity, IHasCreateUserId, IHasCreateTime, IHasUpdateUserId, IHasUpdateTime { /// /// 自增主键 @@ -58,7 +58,7 @@ public class RuleAreaInfoEntity : Entity, IHasCreateUserId, IHasCreateTime, /// 创建人 /// [SugarColumn(ColumnName = "CreateUserId", ColumnDescription = "创建人")] - public Guid CreateUserId { get; set; } + public int CreateUserId { get; set; } /// /// 创建时间 @@ -70,7 +70,7 @@ public class RuleAreaInfoEntity : Entity, IHasCreateUserId, IHasCreateTime, /// 更新人 /// [SugarColumn(ColumnName = "UpdateUserId", IsNullable = false, ColumnDescription = "更新人")] - public Guid UpdateUserId { get; set; } + public int UpdateUserId { get; set; } /// /// 更新时间 diff --git a/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderEntity.cs b/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderEntity.cs index 53b059e3..4583789a 100644 --- a/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderEntity.cs @@ -7,7 +7,7 @@ namespace TrackCenter.Domain.Aggregates.OrderAggregate; /// 轨迹订单主表 /// [SugarTable("t_order")] -public class OrderEntity : FullAuditedAggregateRoot +public class OrderEntity : FullAuditedAggregateRoot { /// /// 自增主键 diff --git a/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs b/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs index afbc2918..e918625e 100644 --- a/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs @@ -7,7 +7,7 @@ namespace TrackCenter.Domain.Aggregates.OrderAggregate; /// 订单航班表（1：N） /// [SugarTable("t_order_flight")] -public class OrderFlightEntity : CreateAuditedEntity, ISoftDelete +public class OrderFlightEntity : CreateAuditedEntity, ISoftDelete { /// /// 自增主键 @@ -33,18 +33,6 @@ public class OrderFlightEntity : CreateAuditedEntity, ISoftDelete [SugarColumn(ColumnName = "OrderId")] public int OrderId { get; set; } - /// - /// 创建人 - /// - [SugarColumn(ColumnName = "CreateUserId")] - public override Guid CreateUserId { get; set; } - - /// - /// 创建时间 - /// - [SugarColumn(ColumnName = "CreateTime")] - public override DateTime CreateTime { get; set; } - /// /// 是否删除 /// diff --git a/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs b/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs index 5eba16aa..ce5ababa 100644 --- a/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs @@ -6,7 +6,7 @@ namespace TrackCenter.Domain.Aggregates.OrderAggregate; /// 轨迹订单关联表（1：N） /// [SugarTable("t_order_link")] -public class OrderLinkEntity : CreateAuditedEntity, ISoftDelete +public class OrderLinkEntity : CreateAuditedEntity, ISoftDelete { /// /// 自增主键 @@ -26,18 +26,6 @@ public class OrderLinkEntity : CreateAuditedEntity, ISoftDelete [SugarColumn(ColumnName = "LinkOrderId")] public int LinkOrderId { get; set; } - /// - /// 创建人 - /// - [SugarColumn(ColumnName = "CreateUserId")] - public int CreateUserId { get; set; } - - /// - /// 创建时间 - /// - [SugarColumn(ColumnName = "CreateTime")] - public DateTime CreateTime { get; set; } - /// /// 是否删除 /// diff --git a/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderOperationRecordIndex.cs b/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderOperationRecordIndex.cs index 66d55d1d..8c315e43 100644 --- a/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderOperationRecordIndex.cs +++ b/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderOperationRecordIndex.cs @@ -38,7 +38,7 @@ public class OrderOperationRecordIndex : IdBaseIndex /// /// 创建人 /// - public Guid CreateUserId { get; set; } + public int CreateUserId { get; set; } /// /// 创建人姓名 diff --git a/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderTrackPullStatusEntity.cs b/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderTrackPullStatusEntity.cs index 640254af..467c10e8 100644 --- a/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderTrackPullStatusEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderTrackPullStatusEntity.cs @@ -79,7 +79,7 @@ public class OrderPullStatusEntity : FullAuditedEntity /// 创建人 /// [SugarColumn(ColumnName = "CreateUserId")] - public Guid CreateUserId { get; set; } + public int CreateUserId { get; set; } /// /// 创建时间 @@ -91,5 +91,5 @@ public class OrderPullStatusEntity : FullAuditedEntity public DateTime? UpdateTime { get; set; } [SugarColumn(ColumnName = "UpdateUserId")] - public Guid UpdateUserId { get; set; } + public int UpdateUserId { get; set; } } diff --git a/src/TrackCenter.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs index afd433e2..36cc297d 100644 --- a/src/TrackCenter.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs @@ -7,7 +7,7 @@ namespace TrackCenter.Domain.Aggregates.TrackContentAggregate; /// 轨迹内容 /// [SugarTable("t_track_content")] -public class TrackContentEntity : FullAuditedAggregateRoot +public class TrackContentEntity : FullAuditedAggregateRoot { /// /// 自增主键 diff --git a/src/TrackCenter.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs index 28746142..567e285a 100644 --- a/src/TrackCenter.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs @@ -7,7 +7,7 @@ namespace TrackCenter.Domain.Aggregates.TrackFlagAggregate; /// 轨迹标记表 /// [SugarTable("t_track_flag")] -public class TrackFlagEntity : FullAuditedAggregateRoot +public class TrackFlagEntity : FullAuditedAggregateRoot { /// /// 自增主键 diff --git a/src/TrackCenter.Domain/Aggregates/TrackNodeAggregate/TrackNodeEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackNodeAggregate/TrackNodeEntity.cs index a7485943..6ae80d1e 100644 --- a/src/TrackCenter.Domain/Aggregates/TrackNodeAggregate/TrackNodeEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackNodeAggregate/TrackNodeEntity.cs @@ -7,7 +7,7 @@ namespace TrackCenter.Domain.Aggregates.TrackNodeAggregate; /// 轨迹节点主表 /// [SugarTable("t_track_node", TableDescription = "轨迹节点主表")] -public class TrackNodeEntity : FullAuditedAggregateRoot +public class TrackNodeEntity : FullAuditedAggregateRoot { /// /// 自增主键 diff --git a/src/TrackCenter.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs index 628c7397..d3a59d5d 100644 --- a/src/TrackCenter.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs @@ -6,7 +6,7 @@ namespace TrackCenter.Domain.Aggregates.TrackPullAggregate; /// 轨迹拉取配置表 /// [SugarTable("t_track_pull_config")] -public class TrackPullConfigEntity : FullAuditedAggregateRoot +public class TrackPullConfigEntity : FullAuditedAggregateRoot { /// /// 自增主键 diff --git a/src/TrackCenter.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs index 610f653e..bb77e4ad 100644 --- a/src/TrackCenter.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs @@ -7,7 +7,7 @@ namespace TrackCenter.Domain.Aggregates.TrackPushAggregate; /// 轨迹推送配置表 /// [SugarTable("t_track_push_config")] -public class TrackPushConfigEntity : FullAuditedAggregateRoot +public class TrackPushConfigEntity : FullAuditedAggregateRoot { /// /// 自增主键 diff --git a/src/TrackCenter.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs index 177acf09..fa23f5f1 100644 --- a/src/TrackCenter.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs @@ -7,7 +7,7 @@ namespace TrackCenter.Domain.Aggregates.TrackStatusAggregate; /// 轨迹状态表 /// [SugarTable("t_track_status")] -public class TrackStatusEntity : FullAuditedAggregateRoot +public class TrackStatusEntity : FullAuditedAggregateRoot { /// /// 自增主键 diff --git a/src/TrackCenter.Domain/Aggregates/WarningAggregate/WarningNotifyTaskEntity.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/WarningNotifyTaskEntity.cs index ec79a90c..eb4efcde 100644 --- a/src/TrackCenter.Domain/Aggregates/WarningAggregate/WarningNotifyTaskEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/WarningNotifyTaskEntity.cs @@ -4,7 +4,7 @@ using TrackCenter.Domain.SeedWork; namespace TrackCenter.Domain.Aggregates.WarningAggregate; [SugarTable("t_warning_notify_task", TableDescription = "预警通知任务")] -public sealed class WarningNotifyTaskEntity : FullAuditedAggregateRoot +public sealed class WarningNotifyTaskEntity : FullAuditedAggregateRoot { [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 5225d533..a2375b94 100644 --- a/src/TrackCenter.Domain/Aggregates/WarningAggregate/WarningRuleEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/WarningRuleEntity.cs @@ -6,7 +6,7 @@ namespace TrackCenter.Domain.Aggregates.WarningAggregate; // 预警规则主体 [SugarTable("t_warning", TableDescription = "预警规则主体")] [SugarIndex("IDX_Customer_AppKey", nameof(Customer), OrderByType.Asc, nameof(AppKey), OrderByType.Asc)] -public sealed class WarningRuleEntity : FullAuditedAggregateRoot +public sealed class WarningRuleEntity : FullAuditedAggregateRoot { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } diff --git a/src/TrackCenter.Domain/TrackCenter.Domain.csproj b/src/TrackCenter.Domain/TrackCenter.Domain.csproj index 0e6e4ff8..e78ee9b4 100644 --- a/src/TrackCenter.Domain/TrackCenter.Domain.csproj +++ b/src/TrackCenter.Domain/TrackCenter.Domain.csproj @@ -9,11 +9,11 @@ - + - + diff --git a/src/TrackCenter.Domain/VEntities/VAppEntity.cs b/src/TrackCenter.Domain/VEntities/VAppEntity.cs index 05eef14b..d4a47022 100644 --- a/src/TrackCenter.Domain/VEntities/VAppEntity.cs +++ b/src/TrackCenter.Domain/VEntities/VAppEntity.cs @@ -6,7 +6,7 @@ namespace TrackCenter.Domain.VEntities; /// 应用表 /// [SugarTable("v_app")] -public class VAppEntity : FullAuditedAggregateRoot +public class VAppEntity : FullAuditedAggregateRoot { /// /// 自增主键 diff --git a/src/TrackCenter.Domain/VEntities/VUserEntity.cs b/src/TrackCenter.Domain/VEntities/VUserEntity.cs new file mode 100644 index 00000000..972bdd9f --- /dev/null +++ b/src/TrackCenter.Domain/VEntities/VUserEntity.cs @@ -0,0 +1,391 @@ +namespace TrackCenter.Domain.VEntities; + +public class VUserEntity +{ + /// + /// Desc:Id + /// Default: + /// Nullable:False + /// + [SugarColumn(IsPrimaryKey = true)] + public long Id { get; set; } + + /// + /// Desc:头像 + /// Default: + /// Nullable:True + /// + public string? Avatar { get; set; } + + /// + /// Desc:签名 + /// Default: + /// Nullable:True + /// + public string? Signature { get; set; } + + /// + /// Desc:账号 + /// Default: + /// Nullable:False + /// + public string Account { get; set; } = null!; + + /// + /// Desc:密码 + /// Default: + /// Nullable:False + /// + public string Password { get; set; } = null!; + + /// + /// Desc:姓名 + /// Default: + /// Nullable:True + /// + public string? Name { get; set; } + + /// + /// Desc:昵称 + /// Default: + /// Nullable:True + /// + public string? Nickname { get; set; } + + /// + /// Desc:性别 + /// Default: + /// Nullable:True + /// + public string? Gender { get; set; } + + /// + /// Desc:出生日期 + /// Default: + /// Nullable:True + /// + public string? Birthday { get; set; } + + /// + /// Desc:民族 + /// Default: + /// Nullable:True + /// + public string? Nation { get; set; } + + /// + /// Desc:籍贯 + /// Default: + /// Nullable:True + /// + public string? NativePlace { get; set; } + + /// + /// Desc:家庭住址 + /// Default: + /// Nullable:True + /// + public string? HomeAddress { get; set; } + + /// + /// Desc:通信地址 + /// Default: + /// Nullable:True + /// + public string? MailingAddress { get; set; } + + /// + /// Desc:证件类型 + /// Default: + /// Nullable:True + /// + public string? IdCardType { get; set; } + + /// + /// Desc:证件号码 + /// Default: + /// Nullable:True + /// + public string? IdCardNumber { get; set; } + + /// + /// Desc:文化程度 + /// Default: + /// Nullable:True + /// + public string? CultureLevel { get; set; } + + /// + /// Desc:政治面貌 + /// Default: + /// Nullable:True + /// + public string? PoliticalOutlook { get; set; } + + /// + /// Desc:毕业院校 + /// Default: + /// Nullable:True + /// + public string? College { get; set; } + + /// + /// Desc:学历 + /// Default: + /// Nullable:True + /// + public string? Education { get; set; } + + /// + /// Desc:学制 + /// Default: + /// Nullable:True + /// + public string? EduLength { get; set; } + + /// + /// Desc:学位 + /// Default: + /// Nullable:True + /// + public string? Degree { get; set; } + + /// + /// Desc:手机 + /// Default: + /// Nullable:True + /// + public string? Phone { get; set; } + + /// + /// Desc:邮箱 + /// Default: + /// Nullable:True + /// + public string? Email { get; set; } + + /// + /// Desc:家庭电话 + /// Default: + /// Nullable:True + /// + public string? HomeTel { get; set; } + + /// + /// Desc:办公电话 + /// Default: + /// Nullable:True + /// + public string? OfficeTel { get; set; } + + /// + /// Desc:紧急联系人 + /// Default: + /// Nullable:True + /// + public string? EmergencyContact { get; set; } + + /// + /// Desc:紧急联系人电话 + /// Default: + /// Nullable:True + /// + public string? EmergencyPhone { get; set; } + + /// + /// Desc:紧急联系人地址 + /// Default: + /// Nullable:True + /// + public string? EmergencyAddress { get; set; } + + /// + /// Desc:员工编号 + /// Default: + /// Nullable:True + /// + public string? EmpNo { get; set; } + + /// + /// Desc:入职日期 + /// Default: + /// Nullable:True + /// + public string? EntryDate { get; set; } + + /// + /// Desc:机构id + /// Default: + /// Nullable:False + /// + public long OrgId { get; set; } + + /// + /// Desc:职位id + /// Default: + /// Nullable:False + /// + public long PositionId { get; set; } + + /// + /// Desc:职级 + /// Default: + /// Nullable:True + /// + public string? PositionLevel { get; set; } + + /// + /// Desc:主管id + /// Default: + /// Nullable:True + /// + public long? DirectorId { get; set; } + + /// + /// Desc:密码提醒修改时间 + /// Default: + /// Nullable:True + /// + public DateTime? PwdRemindUpdateTime { get; set; } + + /// + /// Desc:上次登录ip + /// Default: + /// Nullable:True + /// + public string? LastLoginIp { get; set; } + + /// + /// Desc:上次登录地点 + /// Default: + /// Nullable:True + /// + public string? LastLoginAddress { get; set; } + + /// + /// Desc:上次登录时间 + /// Default: + /// Nullable:True + /// + public DateTime? LastLoginTime { get; set; } + + /// + /// Desc:上次登录设备 + /// Default: + /// Nullable:True + /// + public string? LastLoginDevice { get; set; } + + /// + /// Desc:最新登录ip + /// Default: + /// Nullable:True + /// + public string? LatestLoginIp { get; set; } + + /// + /// Desc:最新登录地点 + /// Default: + /// Nullable:True + /// + public string? LatestLoginAddress { get; set; } + + /// + /// Desc:最新登录时间 + /// Default: + /// Nullable:True + /// + public DateTime? LatestLoginTime { get; set; } + + /// + /// Desc:最新登录设备 + /// Default: + /// Nullable:True + /// + public string? LatestLoginDevice { get; set; } + + /// + /// Desc:排序码 + /// Default: + /// Nullable:True + /// + public int? SortCode { get; set; } + + /// + /// Desc:默认模块 + /// Default: + /// Nullable:True + /// + public long? DefaultModule { get; set; } + + /// + /// Desc:状态 + /// Default:ENABLE + /// Nullable:True + /// + public string? Status { get; set; } + + /// + /// Desc:创建时间 + /// Default: + /// Nullable:True + /// + public DateTime? CreateTime { get; set; } + + /// + /// Desc:更新时间 + /// Default: + /// Nullable:True + /// + public DateTime? UpdateTime { get; set; } + + /// + /// Desc:创建者Id + /// Default: + /// Nullable:True + /// + public long? CreateUserId { get; set; } + + /// + /// Desc:修改者Id + /// Default: + /// Nullable:True + /// + public long? UpdateUserId { get; set; } + + /// + /// Desc:创建人 + /// Default: + /// Nullable:True + /// + public string? CreateUser { get; set; } + + /// + /// Desc:更新人 + /// Default: + /// Nullable:True + /// + public string? UpdateUser { get; set; } + + /// + /// Desc:软删除 + /// Default:true + /// Nullable:True + /// + public bool? IsDelete { get; set; } + + /// + /// Desc:扩展信息 + /// Default: + /// Nullable:True + /// + public string? ExtJson { get; set; } + + /// + /// Desc:用户id（特意映射） + /// Default: + /// Nullable:False + /// + [SugarColumn(IsIdentity = true)] + public int UserId { get; set; } +} diff --git a/src/TrackCenter.Repository/Repositories/KpiAreaRepository.cs b/src/TrackCenter.Repository/Repositories/KpiAreaRepository.cs index d6e3c7ec..07206f46 100644 --- a/src/TrackCenter.Repository/Repositories/KpiAreaRepository.cs +++ b/src/TrackCenter.Repository/Repositories/KpiAreaRepository.cs @@ -63,15 +63,15 @@ public class KpiAreaRepository : BasicRepository, IKpiAreaReposi public async Task> GetAreaInfos(QueryAreaInfoRequest query) { return await Context.Queryable() - .InnerJoin((x, c) => x.CountryCode == c.Digit2Code) + //.InnerJoin((x, c) => x.CountryCode == c.Digit2Code) .Where(x => x.AreaId == query.AreaId) .OrderBy(x => x.UpdateTime, OrderByType.Desc) - .Select((x, c) => new RuleAreaInfoDto() + .Select((x) => new RuleAreaInfoDto() { Id = x.Id, AreaId = x.AreaId, City = x.City, - CountryId = c.Id, + //CountryId = c.Id, CountryCode = x.CountryCode, CountryName = x.CountryName, LeftPostcode = x.LeftPostcode, diff --git a/src/TrackCenter.Repository/Repositories/TrackContentRepository.cs b/src/TrackCenter.Repository/Repositories/TrackContentRepository.cs index 2476462d..1000f635 100644 --- a/src/TrackCenter.Repository/Repositories/TrackContentRepository.cs +++ b/src/TrackCenter.Repository/Repositories/TrackContentRepository.cs @@ -49,8 +49,8 @@ public class TrackContentRepository : BasicRepository, ITrac { var pagedList = await Context.Queryable() .LeftJoin((a, b) => a.TrackStatusId == b.Id && b.IsDeleted == false) - .LeftJoin((a, b, e) => a.CreateUserId == e.Id && e.IsDeleted == false) - .LeftJoin((a, b, e, f) => a.UpdateUserId == f.Id && f.IsDeleted == false) + .LeftJoin((a, b, e) => a.CreateUserId == e.UserId && e.IsDelete == false) + .LeftJoin((a, b, e, f) => a.UpdateUserId == f.UserId && f.IsDelete == false) .WhereIF(!input.AppKey.IsNullOrWhiteSpace(), (a, b, e, f) => a.AppKey == input.AppKey) .WhereIF(!input.Keywords.IsNullOrWhiteSpace(), (a, b, e, f) => a.Code.Contains(input.Keywords!) || a.Content.Contains(input.Keywords!) diff --git a/src/TrackCenter.Repository/Repositories/TrackFlagRepository.cs b/src/TrackCenter.Repository/Repositories/TrackFlagRepository.cs index 92cc25e8..a02b212a 100644 --- a/src/TrackCenter.Repository/Repositories/TrackFlagRepository.cs +++ b/src/TrackCenter.Repository/Repositories/TrackFlagRepository.cs @@ -39,8 +39,8 @@ public class TrackFlagRepository : BasicRepository, ITrackFlagR PagedResult pagedList = new PagedResult(); pagedList = await Context.Queryable() .LeftJoin((a, b) => a.AppKey == b.AppKey && b.IsDeleted == false) - .LeftJoin((a, b, c) => a.CreateUserId == c.Id && c.IsDeleted == false) - .LeftJoin((a, b, c, d) => a.UpdateUserId == d.Id && d.IsDeleted == false) + .LeftJoin((a, b, c) => a.CreateUserId == c.UserId && c.IsDelete == false) + .LeftJoin((a, b, c, d) => a.UpdateUserId == d.UserId && d.IsDelete == false) .WhereIF(!input.AppKey.IsNullOrWhiteSpace(), (a, b, c, d) => a.AppKey == input.AppKey) .WhereIF(!input.Keywords.IsNullOrWhiteSpace(), (a, b, c, d) => SqlFunc.Contains(a.Code, input.Keywords)) .OrderByIF(input.SelectIds.IsNullOrEmpty(), (a, b, c, d) => a.CreateTime, OrderByType.Desc) diff --git a/src/TrackCenter.Repository/Repositories/TrackStatusRepository.cs b/src/TrackCenter.Repository/Repositories/TrackStatusRepository.cs index e11b260a..afea278b 100644 --- a/src/TrackCenter.Repository/Repositories/TrackStatusRepository.cs +++ b/src/TrackCenter.Repository/Repositories/TrackStatusRepository.cs @@ -1,6 +1,7 @@ using TrackCenter.Domain.Aggregates.TrackNodeAggregate; using TrackCenter.Domain.Aggregates.TrackStatusAggregate; using TrackCenter.Domain.Dtos.TrackStatus; +using TrackCenter.Domain.VEntities; namespace TrackCenter.Repository.Repositories; @@ -40,8 +41,8 @@ public class TrackStatusRepository : BasicRepository, ITrackS public async Task> GetPageTrackStatus(GetPagedTrackStatusVO input) { var pagedList = await Context.Queryable() - .LeftJoin((a, b) => a.CreateUserId == b.Id && b.IsDeleted == false) - .LeftJoin((a, b, d) => a.UpdateUserId == d.Id && d.IsDeleted == false) + .LeftJoin((a, b) => a.CreateUserId == b.UserId && b.IsDelete == false) + .LeftJoin((a, b, d) => a.UpdateUserId == d.UserId && d.IsDelete == false) .InnerJoin((a, b, d, e) => a.Node == e.Id && a.AppKey == e.AppKey) .WhereIF(!input.AppKey.IsNullOrWhiteSpace(), (a, b, d) => a.AppKey == input.AppKey) .WhereIF(!input.Keywords.IsNullOrWhiteSpace(), diff --git a/src/TrackCenter.Repository/Repositories/WarningTaskRepository.cs b/src/TrackCenter.Repository/Repositories/WarningTaskRepository.cs index e81b231b..d2f61e70 100644 --- a/src/TrackCenter.Repository/Repositories/WarningTaskRepository.cs +++ b/src/TrackCenter.Repository/Repositories/WarningTaskRepository.cs @@ -5,7 +5,7 @@ using TrackCenter.Domain.Aggregates.WarningAggregate.Transport; namespace TrackCenter.Repository.Repositories; -public sealed class WarningTaskRepository : BasicRepository, IWarningTaskRepository, ITransientDependency +public class WarningTaskRepository : BasicRepository, IWarningTaskRepository, ITransientDependency { #region 预警通知任务