Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台

SJZY.Track.Api.sln

@@ -10,7 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DAC93270-5A2
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0E2537C3-6EF3-4085-9BD2-CF923E53F82A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SJZY.Track.Repository", "src\SJZY.Track.Repository\SJZY.Track.Repository.csproj", "{D9CF5706-1972-414F-821E-AA32C13B8570}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SJZY.Track.Infrastructure", "src\SJZY.Track.Infrastructure\SJZY.Track.Infrastructure.csproj", "{D9CF5706-1972-414F-821E-AA32C13B8570}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SJZY.Track.HttpApi", "src\SJZY.Track.HttpApi\SJZY.Track.HttpApi.csproj", "{390A44FB-0DB5-4B66-86AB-7712DC3030F5}"
 EndProject

src/SJZY.Track.Api/SJZY.Track.Api.csproj

@@ -26,7 +26,7 @@
 
 	<ItemGroup>
 	  <ProjectReference Include="..\SJZY.Track.Application\SJZY.Track.Application.csproj" />
-	  <ProjectReference Include="..\SJZY.Track.Repository\SJZY.Track.Repository.csproj" />
+	  <ProjectReference Include="..\SJZY.Track.Infrastructure\SJZY.Track.Infrastructure.csproj"/>
 	</ItemGroup>
 
 	

src/SJZY.Track.Api/SJZYTrackApiModule.cs

@@ -9,7 +9,7 @@ using SJZY.Expand.ABP.Core.Prometheus;
 using SJZY.Expand.ABP.Core.Redis;
 using SJZY.Expand.ABP.Core.Swagger;
 using SJZY.Track.Application;
-using SJZY.Track.Repository;
+using SJZY.Track.Infrastructure;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Serilog;
@@ -28,7 +28,7 @@ namespace SJZY.Track.Api
         typeof(AbpAspNetCoreMvcModule),
         typeof(AbpAspNetCoreSerilogModule),
         typeof(ApplicationModule),
-        typeof(SJZYTrackRepositoryModule)
+        typeof(SJZYTrackInfrastructureModule)
     )]
     public class SJZYTrackApiModule : AbpModule
     {

src/SJZY.Track.Application/SJZY.Track.Application.csproj

@@ -26,5 +26,6 @@
 	<ItemGroup>
 	  <ProjectReference Include="..\SJZY.Track.Domain\SJZY.Track.Domain.csproj" />
 	  <ProjectReference Include="..\SJZY.Track.HttpApi\SJZY.Track.HttpApi.csproj" />
+	  <ProjectReference Include="..\SJZY.Track.Infrastructure\SJZY.Track.Infrastructure.csproj"/>
 	</ItemGroup>
 </Project>

src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs

@@ -1,4 +1,5 @@
-using SJZY.Track.Application.Dtos.ProvideServices;
+using DotNetCore.CAP;
+using SJZY.Track.Application.Dtos.ProvideServices;
 using SJZY.Track.Domain.Aggregates.OrderAggregate;
 using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate;
 using SJZY.Track.Domain.Queries;
@@ -15,13 +16,15 @@ public class TrackService : ApplicationService
     private readonly IOrderRepository _orderRepository;
     private readonly ITrackDetailsRepository _trackDetailsRepository;
     private readonly ITrackQueries _trackQueries;
+    private readonly ICapPublisher _capPublisher;
 
     public TrackService(ITrackQueries trackQueries, IOrderRepository orderRepository,
-        ITrackDetailsRepository trackDetailsRepository)
+        ITrackDetailsRepository trackDetailsRepository, ICapPublisher capPublisher)
     {
         _trackQueries = trackQueries;
         _orderRepository = orderRepository;
         _trackDetailsRepository = trackDetailsRepository;
+        _capPublisher = capPublisher;
     }
 
     /// <summary>

src/SJZY.Track.Domain/SJZY.Track.Domain.csproj

@@ -9,7 +9,6 @@
     <ItemGroup>
         <PackageReference Include="SJZY.Expand.ABP.Core" Version="7.7.1" />
         <PackageReference Include="SJZY.Expand.ElasticSearch" Version="7.0.17" />
-        <PackageReference Include="SJZY.UserCenter.HttpApi" Version="3.0.3-alpha8" />
     </ItemGroup>
     
     <ItemGroup>

src/SJZY.Track.Infrastructure/BasicQuery.cs

@@ -2,7 +2,7 @@
 using SJZY.Track.Domain.Queries;
 using SJZY.Track.Domain.SeedWork;
 
-namespace SJZY.Track.Repository;
+namespace SJZY.Track.Infrastructure;
 
 #pragma warning disable CS8613
 public class BasicQuery<T> : SimpleClient<T>, IBasicQuery<T> where T : class, IEntity, new()

src/SJZY.Track.Infrastructure/DataBaseContext.cs

@@ -2,7 +2,7 @@
 
 #pragma warning disable 1591
 
-namespace SJZY.Track.Repository;
+namespace SJZY.Track.Infrastructure;
 
 /// <summary>
 /// Sqlsugar 上下文对象

src/SJZY.Track.Infrastructure/Enum/Enums.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace SJZY.Track.Repository.Enum;
+namespace SJZY.Track.Infrastructure.Enum;
 
 /// <summary>
 /// 枚举属性
@@ -10,6 +10,5 @@ public enum EnumPropertyEnums
     /// <summary>
     /// 节点
     /// </summary>
-    [Description("ServiceNode")]
+    [Description("ServiceNode")] 节点,
-    节点,
 }

src/SJZY.Track.Infrastructure/Queries/TrackQueries.cs

@@ -7,7 +7,7 @@ using SJZY.Track.Domain.Dtos.TrackDetails;
 using SJZY.Track.Domain.Dtos.TrackTemplate;
 using SJZY.Track.Domain.Queries;
 
-namespace SJZY.Track.Repository.Queries;
+namespace SJZY.Track.Infrastructure.Queries;
 
 public class TrackQueries : ISugarRepository, ITrackQueries,
     ITransientDependency

src/SJZY.Track.Infrastructure/Repositories/BasicRepository.cs

@@ -3,7 +3,7 @@ using SJZY.Track.Domain;
 using SJZY.Track.Domain.SeedWork;
 using Volo.Abp;
 
-namespace SJZY.Track.Repository;
+namespace SJZY.Track.Infrastructure.Repositories;
 
 /// <summary>
 /// 仓储基类实现

src/SJZY.Track.Infrastructure/Repositories/DemoRepository.cs

@@ -2,7 +2,7 @@
 using SJZY.Track.Domain.Aggregates.DemoAggregate;
 using SJZY.Track.Domain.Dtos.Demo;
 
-namespace SJZY.Track.Repository;
+namespace SJZY.Track.Infrastructure.Repositories;
 
 public class DemoRepository : BasicRepository<DemoEntity>, IDemoRepository, IScopedDependency
 {

src/SJZY.Track.Infrastructure/Repositories/OrderRepository.cs

@@ -6,7 +6,7 @@ using SJZY.Track.Domain.Dtos.Order;
 using SJZY.Track.Domain.VEntities;
 using SJZY.Track.Repository.VData.Entitys;
 
-namespace SJZY.Track.Repository;
+namespace SJZY.Track.Infrastructure.Repositories;
 
 public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, ITransientDependency
 {

src/SJZY.Track.Infrastructure/Repositories/TrackContentRepository.cs

@@ -2,10 +2,9 @@
 using SJZY.Track.Domain.Aggregates.TrackFlagAggregate;
 using SJZY.Track.Domain.Aggregates.TrackStatusAggregate;
 using SJZY.Track.Domain.Dtos.TrackContents;
-using SJZY.Track.Domain.Dtos.TrackStatus;
 using SJZY.Track.Domain.VEntities;
 
-namespace SJZY.Track.Repository;
+namespace SJZY.Track.Infrastructure.Repositories;
 
 public class TrackContentRepository : BasicRepository<TrackContentEntity>, ITrackContentRepository, IScopedDependency
 {

src/SJZY.Track.Infrastructure/Repositories/TrackDetailsRepository.cs

@@ -3,7 +3,7 @@ using SJZY.Expand.ElasticSearch.Services;
 using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate;
 using SJZY.Track.Domain.Dtos.TrackDetails;
 
-namespace SJZY.Track.Repository;
+namespace SJZY.Track.Infrastructure.Repositories;
 
 internal class TrackDetailsRepository : ElasticSearchContextAbstract<TrackDetailsIndex>, ITrackDetailsRepository,
     ITransientDependency

src/SJZY.Track.Infrastructure/Repositories/TrackFlagRepository.cs

@@ -1,10 +1,8 @@
 using SJZY.Track.Domain.Aggregates.TrackFlagAggregate;
-using SJZY.Track.Domain.Aggregates.TrackStatusAggregate;
 using SJZY.Track.Domain.Dtos.TrackFlags;
-using SJZY.Track.Domain.Dtos.TrackStatus;
 using SJZY.Track.Domain.VEntities;
 
-namespace SJZY.Track.Repository;
+namespace SJZY.Track.Infrastructure.Repositories;
 
 public class TrackFlagRepository : BasicRepository<TrackFlagEntity>, ITrackFlagRepository, IScopedDependency
 {

src/SJZY.Track.Infrastructure/Repositories/TrackPullConfigRepository.cs

@@ -1,12 +1,12 @@
-using SJZY.Track.Domain.Aggregates.TrackContentAggregate;
+using System.Linq.Expressions;
+using SJZY.Track.Domain.Aggregates.TrackContentAggregate;
 using SJZY.Track.Domain.Aggregates.TrackPullAggregate;
 using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate;
 using SJZY.Track.Domain.Dtos.Common;
 using SJZY.Track.Domain.Dtos.TrackPull;
 using SJZY.Track.Domain.VEntities;
-using System.Linq.Expressions;
 
-namespace SJZY.Track.Repository;
+namespace SJZY.Track.Infrastructure.Repositories;
 
 public class TrackPullConfigRepository : BasicRepository<TrackPullConfigEntity>, ITrackPullConfigRepository,
     IScopedDependency

src/SJZY.Track.Infrastructure/Repositories/TrackPushConfigRepository.cs

@@ -6,7 +6,7 @@ using SJZY.Track.Domain.Dtos.TrackPush;
 using SJZY.Track.Domain.VEntities;
 using SJZY.Track.Repository.VData.Entitys;
 
-namespace SJZY.Track.Repository;
+namespace SJZY.Track.Infrastructure.Repositories;
 
 public class TrackPushConfigRepository : BasicRepository<TrackPushConfigEntity>, ITrackPushConfigRepository,
     IScopedDependency

src/SJZY.Track.Infrastructure/Repositories/TrackStatusRepository.cs

@@ -2,7 +2,7 @@ using SJZY.Track.Domain.Aggregates.TrackStatusAggregate;
 using SJZY.Track.Domain.Dtos.TrackStatus;
 using SJZY.Track.Domain.VEntities;
 
-namespace SJZY.Track.Repository;
+namespace SJZY.Track.Infrastructure.Repositories;
 
 public class TrackStatusRepository : BasicRepository<TrackStatusEntity>, ITrackStatusRepository, IScopedDependency
 {

src/SJZY.Track.Infrastructure/Repositories/TrackTemplateRepository.cs

@@ -6,9 +6,9 @@ using SJZY.Track.Domain.Aggregates.TrackStatusAggregate;
 using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate;
 using SJZY.Track.Domain.Dtos.TrackTemplate;
 using SJZY.Track.Domain.VEntities;
-using SJZY.Track.Repository.Enum;
+using SJZY.Track.Infrastructure.Enum;
 
-namespace SJZY.Track.Repository;
+namespace SJZY.Track.Infrastructure.Repositories;
 
 public class TrackTemplateRepository : BasicRepository<TrackTemplateEntity>, ITrackTemplateRepository, IScopedDependency
 {

src/SJZY.Track.Infrastructure/SJZY.Track.Infrastructure.csproj

@@ -17,8 +17,10 @@
 
 
 	<ItemGroup>
-		<PackageReference Include="SJZY.LoggerCenter.HttpApi" Version="7.0.5" />
+		<PackageReference Include="SJZY.LoggerCenter.HttpApi" Version="7.0.5"/>
-		<PackageReference Include="Volo.Abp.Autofac" Version="7.0.2" />
+		<PackageReference Include="Volo.Abp.Autofac" Version="7.0.2"/>
+		<PackageReference Include="SJZY.UserCenter.HttpApi" Version="3.0.3-alpha8"/>
+		<PackageReference Include="SJZY.Expand.CAP" Version="7.8.0"/>
 	</ItemGroup>
 
 

src/SJZY.Track.Infrastructure/SJZYTrackInfrastructureModule.cs

@@ -4,17 +4,18 @@ using SJZY.Expand.ABP.Core.SqlSugar.Options;
 using SJZY.Expand.ElasticSearch;
 using SJZY.Track.Domain;
 using SJZY.Track.Domain.Queries;
+using SJZY.Track.Infrastructure.Repositories;
 using Volo.Abp.Autofac;
 using Volo.Abp.Modularity;
 
-namespace SJZY.Track.Repository;
+namespace SJZY.Track.Infrastructure;
 
 /// <summary>
 /// 仓储模块
 /// </summary>
 [DependsOn(typeof(AbpAutofacModule))]
 [DependsOn(typeof(SJZYTrackDomainModule))]
-public class SJZYTrackRepositoryModule : AbpModule
+public class SJZYTrackInfrastructureModule : AbpModule
 {
     public override void PreConfigureServices(ServiceConfigurationContext context)
     {

src/SJZY.Track.Infrastructure/TrackPushRecord/Entitys/TrackPushRecordEntity.cs

@@ -1,6 +1,6 @@
 using SJZY.Track.Domain.SeedWork;
 
-namespace SJZY.Track.Repository.TrackPushRecord.Entitys
+namespace SJZY.Track.Infrastructure.TrackPushRecord.Entitys
 {
     /// <summary>
     /// 轨迹推送记录

src/SJZY.Track.Infrastructure/TrackPushRecord/Services/ITrackPushRecordRepository.cs

@@ -0,0 +1,8 @@
+using SJZY.Track.Infrastructure.TrackPushRecord.Entitys;
+
+namespace SJZY.Track.Infrastructure.TrackPushRecord.Services
+{
+    public interface ITrackPushRecordRepository : ISimpleClient<TrackPushRecordEntity>
+    {
+    }
+}

src/SJZY.Track.Infrastructure/TrackPushRecord/Services/TrackPushRecordRepository.cs

@@ -0,0 +1,10 @@
+using SJZY.Track.Infrastructure.Repositories;
+using SJZY.Track.Infrastructure.TrackPushRecord.Entitys;
+
+namespace SJZY.Track.Infrastructure.TrackPushRecord.Services
+{
+    public class TrackPushRecordRepository : BasicRepository<TrackPushRecordEntity>, ITrackPushRecordRepository, IScopedDependency
+    {
+
+    }
+}

src/SJZY.Track.Infrastructure/TrackPushRecordDetails/Entitys/TrackPushRecordDetailsEntity.cs

@@ -1,6 +1,6 @@
 using SJZY.Track.Domain.SeedWork;
 
-namespace SJZY.Track.Repository.TrackPushRecordDetails.Entitys
+namespace SJZY.Track.Infrastructure.TrackPushRecordDetails.Entitys
 {
     /// <summary>
     /// 轨迹推送明细表

src/SJZY.Track.Infrastructure/TrackPushRecordDetails/Services/ITrackPushRecordDetailsRepository.cs

@@ -0,0 +1,8 @@
+using SJZY.Track.Infrastructure.TrackPushRecordDetails.Entitys;
+
+namespace SJZY.Track.Infrastructure.TrackPushRecordDetails.Services
+{
+    public interface ITrackPushRecordDetailsRepository : ISimpleClient<TrackPushRecordDetailsEntity>
+    {
+    }
+}

src/SJZY.Track.Infrastructure/TrackPushRecordDetails/Services/TrackPushRecordDetailsRepository.cs

@@ -0,0 +1,10 @@
+using SJZY.Track.Infrastructure.Repositories;
+using SJZY.Track.Infrastructure.TrackPushRecordDetails.Entitys;
+
+namespace SJZY.Track.Infrastructure.TrackPushRecordDetails.Services
+{
+    public class TrackPushRecordDetailsRepository : BasicRepository<TrackPushRecordDetailsEntity>, ITrackPushRecordDetailsRepository, IScopedDependency
+    {
+
+    }
+}

src/SJZY.Track.Repository/TrackPushRecord/Services/ITrackPushRecordRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.TrackPushRecord.Entitys;
-
-namespace SJZY.Track.Repository.TrackPushRecord.Services
-{
-    public interface ITrackPushRecordRepository : ISimpleClient<TrackPushRecordEntity>
-    {
-
-    }
-}

src/SJZY.Track.Repository/TrackPushRecord/Services/TrackPushRecordRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.TrackPushRecord.Entitys;
-
-namespace SJZY.Track.Repository.TrackPushRecord.Services
-{
-    public class TrackPushRecordRepository : BasicRepository<TrackPushRecordEntity>, ITrackPushRecordRepository, IScopedDependency
-    {
-
-    }
-}

src/SJZY.Track.Repository/TrackPushRecordDetails/Services/ITrackPushRecordDetailsRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.TrackPushRecordDetails.Entitys;
-
-namespace SJZY.Track.Repository.TrackPushRecordDetails.Services
-{
-    public interface ITrackPushRecordDetailsRepository : ISimpleClient<TrackPushRecordDetailsEntity>
-    {
-
-    }
-}

src/SJZY.Track.Repository/TrackPushRecordDetails/Services/TrackPushRecordDetailsRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.TrackPushRecordDetails.Entitys;
-
-namespace SJZY.Track.Repository.TrackPushRecordDetails.Services
-{
-    public class TrackPushRecordDetailsRepository : BasicRepository<TrackPushRecordDetailsEntity>, ITrackPushRecordDetailsRepository, IScopedDependency
-    {
-
-    }
-}

test/SJZY.Track.Test/TestModule.cs

@@ -2,7 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using SJZY.Track.Api;
 using SJZY.Track.Application;
-using SJZY.Track.Repository;
+using SJZY.Track.Infrastructure;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.TestBase;
 using Volo.Abp.Authorization;
@@ -19,7 +19,7 @@ namespace SJZY.Track.Test;
     typeof(AbpAspNetCoreTestBaseModule),
     typeof(AbpAutofacModule),
     typeof(AbpAuthorizationModule),
-    typeof(SJZYTrackRepositoryModule),
+    typeof(SJZYTrackInfrastructureModule),
     typeof(ApplicationModule),
     typeof(SJZYTrackApiModule),
     typeof(AbpHttpClientModule) //添加abp的http代理模块