diff --git a/.idea/.idea.SJZY.Track.Api/.idea/.gitignore b/.idea/.idea.SJZY.Track.Api/.idea/.gitignore deleted file mode 100644 index d6752705..00000000 --- a/.idea/.idea.SJZY.Track.Api/.idea/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Rider ignored files -/projectSettingsUpdater.xml -/.idea.SJZY.Track.Api.iml -/modules.xml -/contentModel.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/NuGet.Config b/NuGet.Config index 3f0e0034..69486f24 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -1,6 +1,7 @@  + - \ No newline at end of file + diff --git a/SJZY.Track.Api.sln b/TrackCenter.sln similarity index 81% rename from SJZY.Track.Api.sln rename to TrackCenter.sln index 598973c0..12fa82df 100644 --- a/SJZY.Track.Api.sln +++ b/TrackCenter.sln @@ -2,21 +2,21 @@ # Visual Studio Version 17 VisualStudioVersion = 17.2.32630.192 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SJZY.Track.Api", "src\SJZY.Track.Api\SJZY.Track.Api.csproj", "{5F1A9619-A5A3-4F5F-AEFF-880707A251E1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrackCenter.Api", "src\TrackCenter.Api\TrackCenter.Api.csproj", "{5F1A9619-A5A3-4F5F-AEFF-880707A251E1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SJZY.Track.Application", "src\SJZY.Track.Application\SJZY.Track.Application.csproj", "{E052AEB3-A86F-431E-A685-769D3E59CB8A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrackCenter.Application", "src\TrackCenter.Application\TrackCenter.Application.csproj", "{E052AEB3-A86F-431E-A685-769D3E59CB8A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DAC93270-5A25-40E5-B851-E7CA398DBC31}" 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}") = "TrackCenter.Repository", "src\TrackCenter.Repository\TrackCenter.Repository.csproj", "{D9CF5706-1972-414F-821E-AA32C13B8570}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SJZY.Track.Application.Contract", "src\SJZY.Track.Application.Contract\SJZY.Track.Application.Contract.csproj", "{390A44FB-0DB5-4B66-86AB-7712DC3030F5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrackCenter.Application.Contract", "src\TrackCenter.Application.Contract\TrackCenter.Application.Contract.csproj", "{390A44FB-0DB5-4B66-86AB-7712DC3030F5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SJZY.Track.Test", "test\SJZY.Track.Test\SJZY.Track.Test.csproj", "{3A53539C-4A85-4E5D-A071-7B4B193AB0E0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SJZY.Track.Domain", "src\SJZY.Track.Domain\SJZY.Track.Domain.csproj", "{073EB297-E752-49AC-BED8-B4AEBAB518F6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrackCenter.Domain", "src\TrackCenter.Domain\TrackCenter.Domain.csproj", "{073EB297-E752-49AC-BED8-B4AEBAB518F6}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "solution items", "solution items", "{086C7812-46F9-49FD-B490-A769E2C0729E}" ProjectSection(SolutionItems) = preProject @@ -24,6 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "solution items", "solution NuGet.Config = NuGet.Config .gitignore = .gitignore .editorconfig = .editorconfig + global.json = global.json EndProjectSection EndProject Global diff --git a/TrackCenter.sln.DotSettings b/TrackCenter.sln.DotSettings new file mode 100644 index 00000000..55bb2ed6 --- /dev/null +++ b/TrackCenter.sln.DotSettings @@ -0,0 +1,3 @@ + + True + True \ No newline at end of file diff --git a/global.json b/global.json new file mode 100644 index 00000000..fd07d882 --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "version": "8.0.303" + } +} diff --git a/src/SJZY.Track.Api/Program.cs b/src/SJZY.Track.Api/Program.cs deleted file mode 100644 index 8d7f64af..00000000 --- a/src/SJZY.Track.Api/Program.cs +++ /dev/null @@ -1,27 +0,0 @@ -using SJZY.Expand.ABP.Core.Configuration; -using SJZY.Expand.ABP.Core.Configuration.AutoRegistOptions; -using SJZY.Expand.ABP.Core.Logger; -using SJZY.Track.Api; - -try -{ - var builder = WebApplication.CreateBuilder(args); - builder - .AddConfigurationContainer() - .AddOptionsFromConfiguration() - .UseSerilogDefault() - .AddOTel() //注入OTel - .Host.AddAppSettingsSecretsJson() - .UseAutofac(); - - await builder.AddApplicationAsync(); - - var app = builder.Build(); - await app.InitializeApplicationAsync(); - app.UseOTel(); //启动WebApi的请求管道配置 - await app.RunAsync(); -} -catch (Exception ex) -{ - Console.WriteLine($"项目启动失败，异常信息：{ex}"); -} diff --git a/src/SJZY.Track.Api/SjzyTrackApiModule.cs b/src/SJZY.Track.Api/SjzyTrackApiModule.cs deleted file mode 100644 index 8c0ff673..00000000 --- a/src/SJZY.Track.Api/SjzyTrackApiModule.cs +++ /dev/null @@ -1,128 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; -using FluentValidation.AspNetCore; -using Hangfire; -using Microsoft.AspNetCore.Mvc; -using SJZY.Expand.ABP.Core; -using SJZY.Expand.ABP.Core.Cors; -using SJZY.Expand.ABP.Core.Filter; -using SJZY.Expand.ABP.Core.JsonSerialization; -using SJZY.Expand.ABP.Core.Localization; -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.Application.Hangfire; -using SJZY.Track.Application.HostServices; -using SJZY.Track.Repository; -using Volo.Abp; -using Volo.Abp.AspNetCore.Mvc; -using Volo.Abp.AspNetCore.Serilog; -using Volo.Abp.Auditing; -using Volo.Abp.Autofac; -using Volo.Abp.Json; -using Volo.Abp.Modularity; - -[assembly: HostingStartup(typeof(HostingStartup))] - -namespace SJZY.Track.Api; - -[DependsOn( - typeof(AbpAutofacModule), - typeof(SjzyAbpCodeModule), - typeof(AbpAspNetCoreMvcModule), - typeof(AbpAspNetCoreSerilogModule), - typeof(SjzyTrackApplicationModule), - typeof(SjzyTrackRepositoryModule) -)] -public class SjzyTrackApiModule : AbpModule -{ - public override void ConfigureServices(ServiceConfigurationContext context) - { - var environment = context.Services.GetHostingEnvironment(); - var configuration = context.Services.GetConfiguration(); - context.Services.AddSwagger(); - - //过滤器相关配置 - context.Services.AddMvc(options => - { - options.Filters.AddService(); - options.Filters.AddService(); - options.Filters.AddService(); - }).AddNewtonsoftJson(); - - context.Services.AddFluentValidationAutoValidation().AddFluentValidationClientsideAdapters(); - - //Json格式化全局处理 - context.Services.Configure(options => - { - options.SerializerSettings.ContractResolver = - new Newtonsoft.Json.Serialization. - CamelCasePropertyNamesContractResolver(); //.DefaultContractResolver(); - options.SerializerSettings.Converters.Add(new DateTimeJsonConverter("yyyy-MM-dd HH:mm:ss")); - options.SerializerSettings.Converters.Add(new LongJsonConverter()); - }); - - Configure(options => options.OutputDateTimeFormat = "yyyy-MM-dd HH:mm:ss"); - Configure(options => { options.IsEnabled = false; }); - - context.Services.AddRedis(); - context.Services.AddHostedService(); - } - - public override void OnApplicationInitialization(ApplicationInitializationContext context) - { - var app = context.GetApplicationBuilder(); - var env = context.GetEnvironment(); - var configuration = context.GetConfiguration(); - - if (env.IsDevelopment()) - app.UseDeveloperExceptionPage(); - - app.UseRequestCulture(); - app.UseRouting(); - app.UseCorsPolicy(); - app.UseConfiguredEndpoints(); - app.UseAbpSwaggerUI(env); - app.UseAbpSerilogEnrichers(); - app.UsePrometheus(); - app.UseHangfireDashboard("/hangfire", new DashboardOptions - { - DisplayStorageConnectionString = false, - IgnoreAntiforgeryToken = true, - AppPath = configuration["Swagger:JsonUrlPrefix"]! + "/", - PrefixPath = System.Diagnostics.Debugger.IsAttached - ? "" - : configuration["Swagger:JsonUrlPrefix"]!, - DashboardTitle = "轨迹预警任务", - Authorization = new[] { new AnonymousHangfireAuthorizationFilter() } - }); - - #region 启动提示 - - // var isLinux = RuntimeInformation.IsOSPlatform(OSPlatform.Linux); - // var arch = RuntimeInformation.ProcessArchitecture; - // var os = isLinux ? "linux-" : "win-"; - // var rid = os + arch; - // Console.WriteLine("\r\nrid:" + rid); - // // 获取当前程序集路径 - // var assemblyPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - // var path = Path.Combine(assemblyPath, "runtimes", rid, "native", isLinux ? "librdkafka.so" : "librdkafka.dll"); - // Console.WriteLine("libPath:"+path); - // var loadSuccess = Confluent.Kafka.Library.Load(path); - // Console.WriteLine($"KafkaLib 加载{loadSuccess}"); - // Console.WriteLine("Kafka.LibVersion:" + Confluent.Kafka.Library.VersionString); - Console.WriteLine($@" - +-------------------------------------------------------+ - | | - | | - | 轨迹中心启动成功 | - | {DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")} | - | | - | | - +-------------------------------------------------------+ - "); - - #endregion - } -} diff --git a/src/SJZY.Track.Api/appsettings.Development.json b/src/SJZY.Track.Api/appsettings.Development.json deleted file mode 100644 index c9efd594..00000000 --- a/src/SJZY.Track.Api/appsettings.Development.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "Environment": "Dev", - "Logging": { - "LogLevel": { - "Default": "Debug", - "Microsoft.AspNetCore": "Debug" - } - }, - "ConnectionStrings": { - "DefaultConnection": "server=mysql-dev.default.svc.cluster.local;Database=sjzy_track;Uid=sjzy_dev_user;Pwd=818f83e5;AllowLoadLocalInfile=true;SslMode=None;Charset=utf8mb4;" - }, - "CAP": { - "FailedRetryCount": 0, - "FailedRetryInterval": 60, - "PrefetchCount": 1, - "ConsumerThreadCount": 2, - "UseDispatchingPerGroup": true, - "SucceedMessageExpiredAfter": 21600 - }, - "Redis": { - "Host": "redis-dev.default.svc.cluster.local:6379", - "Password": "gaVEHR3V7qiY", - "MaxPoolSize": 1000, - "Database": 6, - "Prefix": "", - "IdleTimeout": 1000 - }, - "CorsPolicy": [ - "" - ], - "Swagger": { - "IsEnable": true, - "ServiceUrl": "/trackApi", - "JsonUrlPrefix": "/trackApi", - //转发目录前缀,部署服务器时需要配置 /kingmall - "ScanPrefix": [ - "SJZY" - ] - //全局扫描程序集或xml文件时只加载以 SJZY 开头的内容 - }, - "RabbitMQ": { - "UserName": "sjzy", - "Password": "jhUbkzDT7VVi", - "HostName": "rabbitmq-dev.default.svc.cluster.local", - "Port": 5672 - }, - "Notice": { - "Webhook": "https://open.feishu.cn/open-apis/bot/v2/hook/fbe92f24-7f9f-41ea-a93a-63d855a03bc0", - "Title": "😭 轨迹中台开发环境异常" - }, - "Serilog": { - "MinimumLevel": { - "Default": "Debug", - "Override": { - "System": "Debug", - "Microsoft": "Debug", - "Microsoft.Hosting.Lifetime": "Debug", - "Microsoft.EntityFrameworkCore": "Debug" - } - }, - "Enrich": [ "FromLogContext", "WithMachineName", "WithProcessId", "WithThreadId" ], - "WriteTo": [ - { - "Name": "Console", - "Args": { - //"theme": "Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme::Code, SystemConsoleTheme.Literate", - "outputTemplate": "{NewLine}[{Timestamp:yyyy-MM-dd HH:mm:ss fff} {Level:u3}] {Message:lj}" - } - } - ] - }, - "OSS": { - "AccessKeyId": "LTAI5t81UbwY8rkqLkURCEys", - "AccessKeySecret": "hFfNFTJSyVA1EqBSuXwBaSdm3RGoFL", - "Endpoint": "http://oss-cn-shenzhen.aliyuncs.com/", - "BucketName": "cams3", - "ReturnHttpsUrl": true - }, - "ElasticSearch": { - "NodeUrls": [ "http://elasticsearch-dev.default.svc.cluster.local:9200" ], - "LoginName": "elastic", - "Password": "afyTgmVb8jq6", - "Base64PassPassword": "Basic ZWxhc3RpYzphZnlUZ21WYjhqcTY=" - }, - "RemoteServices": { - "InterfaceForward": { - "BaseUrl": "http://interfaceapi-test.default.svc.cluster.local:5041/", - "AppKey": "BSI2302001", - "AppSecret": "ArJYL14XZneXpqvpq80wyi3h2hT918AX" - }, - "UserCenter": { - "BaseUrl": "http://userapi-dev.default.svc.cluster.local:5020/" - } - }, - "Language": { - "SystemName": "Track", - "Index": 6, - "KeyPrefix": "language" - } -} diff --git a/src/SJZY.Track.Api/appsettings.Local.json b/src/SJZY.Track.Api/appsettings.Local.json deleted file mode 100644 index 6745bedd..00000000 --- a/src/SJZY.Track.Api/appsettings.Local.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "Environment": "Dev", - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - }, - "ConnectionStrings": { - "DefaultConnection": "server=192.168.80.81;Database=sjzy_package_channel;Uid=root;Pwd=10c1fb814e7c1552;" - }, - "Redis": { - "ConnectionString": "192.168.80.57:6379,abortConnect=false", - "PassWord": "", - "DefaultDatabaseIndex": 6, - "Prefix": "" - }, - "Consul": { - "ServiceName": "PackageChannel", - "ServiceIP": "192.168.80.55", - "ServicePort": 5034, - "ServiceHealthCheck": "http://192.168.80.55:5034/HealthCheck", - "ConsulAddress": "http://192.168.80.56:8500" - }, - "CorsPolicy": [ - "http://172.16.216.101:18006" - ], - "Swagger": { - "IsEnable": true, - "ServiceUrl": "", - "JsonUrlPrefix": "", //转发目录前缀,部署服务器时需要配置 /kingmall - "ScanPrefix": [ "SJZY" ] //全局扫描程序集或xml文件时只加载以 SJZY 开头的内容 - }, - "OSS": { - "AccessKeyId": "LTAI5tJWyx1kgQfk221QFknu", - "AccessKeySecret": "0AvP3vyBdwT1pwvLXeqeJ448US8QL8", - "Endpoint": "http://oss-cn-shenzhen.aliyuncs.com/", - "BucketName": "cams3" - }, - "RabbitMQ": { - "UserName": "sjzy", - "Password": "sjzyadmin", - "HostName": "192.168.80.56", - "Port": 5672 - }, - "Custome": { - "Setting1": 12, - "Setting2": 22 - }, - "Serilog": { - "MinimumLevel": { - "Default": "Debug", - "Override": { - "System": "Warning", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information", - "Microsoft.EntityFrameworkCore": "Information" - } - }, - "Enrich": [ "FromLogContext", "WithMachineName", "WithProcessId", "WithThreadId" ], - "WriteTo": [ - { - "Name": "Console", - "Args": { - //"theme": "Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme::Code, SystemConsoleTheme.Literate", - "outputTemplate": "{NewLine}[{Timestamp:yyyy-MM-dd HH:mm:ss fff} {Level:u3}] {Message:lj}" - } - }, - { - "Name": "File", - "Args": { - "path": "logs/.log", - "rollingInterval": "Day", - "outputTemplate": "{NewLine}[{Timestamp:yyyy-MM-dd HH:mm:ss,fff} {Level:u3}] {Message:lj}" - } - }, - { - "Name": "Elasticsearch", - "Args": { - "nodeUris": "http://192.168.80.56:9200", - "indexFormat": "log_channel_{0:yyyy.MM.dd}", - "autoRegisterTemplate": true, - "autoRegisterTemplateVersion": "ESv7", - "connectionGlobalHeaders": "Authorization=Basic ZWxhc3RpYzpzanp5YWRtaW4=;" - } - } - ] - }, - "QiChaCha": { - "ApiUrl": "http://api.qichacha.com", - "Key": "3f07b46db1104426a7beec2a70b67334", - "SecretKey": "0DEDE94A0E14C5A060CF65F87A96FDDC", - "ValidDays": 180 - } - -} diff --git a/src/SJZY.Track.Api/appsettings.Test.json b/src/SJZY.Track.Api/appsettings.Test.json deleted file mode 100644 index c62fc382..00000000 --- a/src/SJZY.Track.Api/appsettings.Test.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "Environment": "Dev", - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - }, - "ConnectionStrings": { - "DefaultConnection": "server=mysql-test.default.svc.cluster.local;Database=sjzy_track;Uid=sjzy_test_user;Pwd=848c1c31;AllowLoadLocalInfile=true;SslMode=None;Charset=utf8mb4;", - "canalView": "server=mysql-test.default.svc.cluster.local;Database=sjzy_track;Uid=sjzy_test_user;Pwd=848c1c31;AllowLoadLocalInfile=true;SslMode=None;Charset=utf8mb4;" - }, - "Redis": { - "ConnectionString": "192.168.80.58:6379,abortConnect=false", - "PassWord": "", - "DefaultDatabaseIndex": 8, - "Prefix": "" - }, - "Consul": { - "ServiceName": "Package.Setting", - "ServiceIP": "192.168.80.57", - "ServicePort": 5047, - "ServiceHealthCheck": "http://192.168.80.57:5047/HealthCheck", - "ConsulAddress": "http://192.168.80.58:8500" - }, - "CorsPolicy": [ - "" - ], - "Swagger": { - "IsEnable": true, - "ServiceUrl": "", - "JsonUrlPrefix": "", //转发目录前缀,部署服务器时需要配置 /kingmall - "ScanPrefix": [ "SJZY" ] //全局扫描程序集或xml文件时只加载以 SJZY 开头的内容 - }, - "RabbitMQ": { - "UserName": "sjzy", - "Password": "sjzyadmin", - "HostName": "192.168.80.58", - "Port": 5672 - }, - "Custome": { - "Setting1": 12, - "Setting2": 22 - }, - "Serilog": { - "MinimumLevel": { - "Default": "Information", - "Override": { - "System": "Warning", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information", - "Microsoft.EntityFrameworkCore": "Information" - } - }, - "Enrich": [ "FromLogContext", "WithMachineName", "WithProcessId", "WithThreadId" ], - "WriteTo": [ - { - "Name": "Console", - "Args": { - //"theme": "Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme::Code, SystemConsoleTheme.Literate", - "outputTemplate": "{NewLine}[{Timestamp:yyyy-MM-dd HH:mm:ss fff} {Level:u3}] {Message:lj}" - } - }, - { - "Name": "File", - "Args": { - "path": "logs/.log", - "rollingInterval": "Day", - "outputTemplate": "{NewLine}[{Timestamp:yyyy-MM-dd HH:mm:ss,fff} {Level:u3}] {Message:lj}" - } - }, - { - "Name": "Elasticsearch", - "Args": { - "nodeUris": "http://192.168.80.97:9200", - "indexFormat": "log_package_setting_{0:yyyy.MM.dd}", - "autoRegisterTemplate": true, - "autoRegisterTemplateVersion": "ESv7", - "connectionGlobalHeaders": "Authorization=Basic ZWxhc3RpYzpzanp5YWRtaW4=;" - } - } - ] - }, - "OSS": { - "AccessKeyId": "LTAI5tJWyx1kgQfk221QFknu", - "AccessKeySecret": "0AvP3vyBdwT1pwvLXeqeJ448US8QL8", - "Endpoint": "http://oss-cn-shenzhen.aliyuncs.com/", - "BucketName": "cams3", - "ReturnHttpsUrl": true - } -} diff --git a/src/SJZY.Track.Api/appsettings.json b/src/SJZY.Track.Api/appsettings.json deleted file mode 100644 index 2af3f94c..00000000 --- a/src/SJZY.Track.Api/appsettings.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "Configuration": { - "UseLocalConfiguration": false, - "ConfiguraFileName": "appsettings.Development.json", - "Apollo": { - "AppId": "SJZY.Track.Configuration", - "Env": "DEV", - "Namespace": "test", - "MetaServer": "https://apollo.test.shijizhongyun.com", - "ConfigServer": [ - "https://apollo.test.shijizhongyun.com" - ] - } - }, - "Kestrel": { - "EndPoints": { - "Http": { - "Url": "http://*:5056" - } - } - } -} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs deleted file mode 100644 index 1050f2ea..00000000 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackOrder; - -public class TrackPushRecordItem -{ -} diff --git a/src/SJZY.Track.Application.Contract/Events/ClearRulCacheEvent.cs b/src/SJZY.Track.Application.Contract/Events/ClearRulCacheEvent.cs deleted file mode 100644 index 54ec00e9..00000000 --- a/src/SJZY.Track.Application.Contract/Events/ClearRulCacheEvent.cs +++ /dev/null @@ -1,8 +0,0 @@ -using SJZY.Track.Application.Contract.Dtos.Forewarning; - -namespace SJZY.Track.Application.Contract.Events; - -public class ClearRulCacheEvent -{ - public List Items { get; set; } -} diff --git a/src/SJZY.Track.Application.Contract/Services/IKpiAreaCacheService.cs b/src/SJZY.Track.Application.Contract/Services/IKpiAreaCacheService.cs deleted file mode 100644 index 4e15278f..00000000 --- a/src/SJZY.Track.Application.Contract/Services/IKpiAreaCacheService.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace SJZY.Track.Application.Contract.Services; - -public interface IKpiAreaCacheService -{ -} diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackFlagService.cs b/src/SJZY.Track.Application.Contract/Services/ITrackFlagService.cs deleted file mode 100644 index 4527823d..00000000 --- a/src/SJZY.Track.Application.Contract/Services/ITrackFlagService.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace SJZY.Track.Application.Contract.Services; - -public interface ITrackFlagService -{ -} diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackStatusService.cs b/src/SJZY.Track.Application.Contract/Services/ITrackStatusService.cs deleted file mode 100644 index fc85abb7..00000000 --- a/src/SJZY.Track.Application.Contract/Services/ITrackStatusService.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace SJZY.Track.Application.Contract.Services; - -public interface ITrackStatusService -{ -} diff --git a/src/SJZY.Track.Application/Caching/SystemCnNameDictCache.cs b/src/SJZY.Track.Application/Caching/SystemCnNameDictCache.cs deleted file mode 100644 index 3fedf83f..00000000 --- a/src/SJZY.Track.Application/Caching/SystemCnNameDictCache.cs +++ /dev/null @@ -1,46 +0,0 @@ -using SJZY.Expand.ABP.Core; -using SJZY.Track.Domain.Extensions; -using SJZY.Track.Domain.Queries; -using Volo.Abp.DependencyInjection; - -namespace SJZY.Track.Application.Caching; - -/// -/// 系统id中文名称字典缓存 -/// -public class SystemCnNameDictCache : BasicCacheForPeriodicRefresh, ISingletonDependency -{ - private readonly IVSystemQueries _vSystemQueries; - - public SystemCnNameDictCache(IVSystemQueries vSystemQueries) : base(RedisHelper.Client) - { - _vSystemQueries = vSystemQueries; - } - - protected override string BuildRedisKey(int key) => $"{GlobalConst.TrackDataDictKeyPrefix}:SystemCnName:{key}"; - - protected override TimeSpan RedisExpire => TimeSpan.FromSeconds(-1); // 设置缓存不过期，指定id系统被删除时仍能兜底提供系统中文名 - protected override TimeSpan LocalExpire => TimeSpan.FromMinutes(10); // 本地缓存10分钟过期后在次请求会刷新数据 - protected override TimeSpan MissingKeySetNullRedisExpire => TimeSpan.FromMinutes(1); // 缓存不存在时设置redisNull - - protected override async ValueTask LoadAsync(int key) - { - if (key == 0) return null; - return await _vSystemQueries.GetFirstAsync(x => x.Id == key, x => x.CnName); - } - - protected override async ValueTask> LoadAsync(HashSet keys) - { - if (keys.Count == 0) return Empty.Dict; - - var result = await _vSystemQueries.GetListAsync(x => keys.Contains(x.Id), x => new - { - x.Id, - x.CnName - }); - - return result.Count == 0 - ? Empty.Dict - : result.ToDictionary(x => x.Id, y => y.CnName); - } -} diff --git a/src/SJZY.Track.Application/Rabbit/RabbitClientBusExt.cs b/src/SJZY.Track.Application/Rabbit/RabbitClientBusExt.cs deleted file mode 100644 index 55ff1ae3..00000000 --- a/src/SJZY.Track.Application/Rabbit/RabbitClientBusExt.cs +++ /dev/null @@ -1,81 +0,0 @@ -using System.Diagnostics; -using BSI.Stack.Rabbit; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; -using RabbitMQ.Client; -using Volo.Abp.DependencyInjection; - -namespace SJZY.Track.Application.Rabbit; - -/// -/// 支持发布确认模式 -/// -public class RabbitClientBusExt : RabbitClientBus, ISingletonDependency -{ - public RabbitClientBusExt(IServiceProvider sp, ILogger logger) - : base(sp, logger, sp.GetRequiredService>().CurrentValue) - { - } - - public void PublishByConfirmSelect( - string exchange, - string routingKey, - byte[] data, - Action? options = null - ) - { - using var activity = RabbitInstrumentation.ActivitySource.StartActivity("/" + exchange + "/" + routingKey); - activity?.SetTag("kind", "publish"); - var key = exchange + ":" + routingKey; - Lazy orAdd = Channels.GetOrAdd(key, (Func>) (_ => new Lazy(CreateModel))); - var basicProperties1 = orAdd.Value.CreateBasicProperties(); - - // 配置属性 - if (options != null) - options(basicProperties1); - var model = orAdd.Value; - - // 启用发布确认 - model.ConfirmSelect(); - var readOnlyMemory = (ReadOnlyMemory) data; - model.BasicPublish(exchange, routingKey, basicProperties1, readOnlyMemory); - model.WaitForConfirmsOrDie(); - } - - public void PublishByConfirmSelect( - string exchange, - string routingKey, - IEnumerable datas, - Action? options = null - ) - { - using var activity = RabbitInstrumentation.ActivitySource.StartActivity("/" + exchange + "/" + routingKey); - activity?.SetTag("kind", "publish"); - var key = exchange + ":" + routingKey; - Lazy orAdd = Channels.GetOrAdd(key, (Func>) (_ => new Lazy(CreateModel))); - var basicProperties1 = orAdd.Value.CreateBasicProperties(); - - // 配置属性 - if (options != null) - options(basicProperties1); - var model = orAdd.Value; - - // 启用发布确认 - model.ConfirmSelect(); - foreach (var data in datas) - { - var readOnlyMemory = (ReadOnlyMemory) data; - model.BasicPublish(exchange, routingKey, basicProperties1, readOnlyMemory); - } - model.WaitForConfirmsOrDie(); - } - - private IConnection GetConnection() - { - var key = Connections.OrderBy((Func, int>) (q => q.Value)).Select((Func, IConnection>) (q => q.Key)).FirstOrDefault(); - Connections.AddOrUpdate(key, (Func) (_ => 1), (Func) ((_, v) => v + 1)); - return key; - } - - private IModel CreateModel() => GetConnection().CreateModel(); -} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/ITrackFlagRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/ITrackFlagRepository.cs deleted file mode 100644 index 3868a195..00000000 --- a/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/ITrackFlagRepository.cs +++ /dev/null @@ -1,9 +0,0 @@ -using SJZY.Track.Domain.Dtos.TrackFlags; - -namespace SJZY.Track.Domain.Aggregates.TrackFlagAggregate; - -public interface ITrackFlagRepository : IBasicRepository -{ - Task GetDetailAsync(int id); - Task> GetPageTrackFlag(GetPageTrackFlagVO input); -} diff --git a/src/SJZY.Track.Domain/GlobalUsings.cs b/src/SJZY.Track.Domain/GlobalUsings.cs deleted file mode 100644 index 48225d4e..00000000 --- a/src/SJZY.Track.Domain/GlobalUsings.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Global using directives - -global using System; -global using System.Collections.Generic; -global using System.Linq.Expressions; -global using System.Threading.Tasks; -global using SJZY.Expand.ABP.Core.Common.Dto; -global using SJZY.Expand.ABP.Core.SqlSugar.Entitys; -global using SJZY.Track.Domain.SeedWork; -global using SqlSugar; diff --git a/src/SJZY.Track.Domain/Queries/IBasicQuery.cs b/src/SJZY.Track.Domain/Queries/IBasicQuery.cs deleted file mode 100644 index d34cd63a..00000000 --- a/src/SJZY.Track.Domain/Queries/IBasicQuery.cs +++ /dev/null @@ -1,62 +0,0 @@ -namespace SJZY.Track.Domain.Queries; - -public interface IBasicQuery where T : IEntity -{ - /// - /// top 1 - /// - /// - /// - Task GetFirstAsync(Expression> whereExpression); - - /// - /// top 1 select fields - /// - /// - /// - /// - /// - Task GetFirstAsync(Expression> whereExpression, - Expression> resultExpression); - - /// - /// get list - /// - /// - /// - Task> GetListAsync(Expression> whereExpression); - - /// - /// get list select fields - /// - /// - /// - /// - /// - Task> GetListAsync(Expression> whereExpression, - Expression> resultExpression); - - /// - /// get list select fields, return arrary - /// - /// - /// - /// - /// - Task GetArrayAsync(Expression> whereExpression, - Expression> resultExpression); - - /// - /// count - /// - /// - /// - Task CountAsync(Expression> exp); - - /// - /// exists - /// - /// - /// - Task IsAnyAsync(Expression> exp); -} diff --git a/src/SJZY.Track.Domain/Queries/IProvideQueries.cs b/src/SJZY.Track.Domain/Queries/IProvideQueries.cs deleted file mode 100644 index d955ffda..00000000 --- a/src/SJZY.Track.Domain/Queries/IProvideQueries.cs +++ /dev/null @@ -1,75 +0,0 @@ -using SJZY.Track.Domain.Dtos.Order; -using SJZY.Track.Domain.Dtos.TrackContents; -using SJZY.Track.Domain.Dtos.TrackPull; - -namespace SJZY.Track.Domain.Queries; - -/// -/// 提供接口专用查询 -/// -public interface IProvideQueries -{ - /// - /// 根据子系统内容映射，得到映射后的轨迹code - /// - /// - /// - /// - /// - Task> MapTrackCodesAsync(int upSubSystemId, int subSystemId, params string[] trackCodes); - - /// - /// 获取子系统内容Code映射 - /// - /// - /// - /// - /// - Task> GetTrackCodeMapsAsync(int upSubSystemId, int subSystemId, params string[] trackCodes); - /// - /// 根据订单模板找对应服务商 - /// - /// - /// - /// - Task> FindOrderWithServiceProviderAsync(int subSystemId, List orderNos); - - /// - /// 获取服务商下所有单（未完成的） - /// - /// 服务商代码 - /// - /// - /// - Task> FindOrderWithServiceProviderAsync(string serviceProviderCode, int pageIndex, - int pageSize = 1000); - - /// - /// 获取轨迹内容 - /// - /// - /// - /// - Task GetTrackContentAsync(int subSystemId, string trackCode); - - /// - /// 获取轨迹内容 - /// - /// 子系统ids - /// 轨迹代码集合 - /// - Task> GetTrackContentsAsync(int[] subSystemIds, string[] trackCodes); - - /// - /// 获取所有拉取配置 - /// - /// - Task> GetAllPullConfigsAsync(); - - /// - /// 子系统id换code - /// - /// - /// - Task SubSystemId2CodeAsync(int subSystemId); -} diff --git a/src/SJZY.Track.Domain/Queries/ITimezoneQueries.cs b/src/SJZY.Track.Domain/Queries/ITimezoneQueries.cs deleted file mode 100644 index 400cf6eb..00000000 --- a/src/SJZY.Track.Domain/Queries/ITimezoneQueries.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace SJZY.Track.Domain.Queries; - -public interface ITimezoneQueries -{ - /// - /// 通过城市英文名称获取时区 - /// - /// - /// - Task GetCityTimezone(string cityEnName); - - /// - /// 通过港口三字码获取时区 - /// - /// - /// - Task GetPortTimezone(string airCode); -} diff --git a/src/SJZY.Track.Domain/Queries/IVExternalSubjectQueries.cs b/src/SJZY.Track.Domain/Queries/IVExternalSubjectQueries.cs deleted file mode 100644 index 81c8a988..00000000 --- a/src/SJZY.Track.Domain/Queries/IVExternalSubjectQueries.cs +++ /dev/null @@ -1,7 +0,0 @@ -using SJZY.Track.Domain.VEntities; - -namespace SJZY.Track.Domain.Queries; - -public interface IVExternalSubjectQueries : IBasicQuery -{ -} diff --git a/src/SJZY.Track.Domain/Queries/IVFsUserQueries.cs b/src/SJZY.Track.Domain/Queries/IVFsUserQueries.cs deleted file mode 100644 index debda110..00000000 --- a/src/SJZY.Track.Domain/Queries/IVFsUserQueries.cs +++ /dev/null @@ -1,7 +0,0 @@ -using SJZY.Track.Domain.VEntities; - -namespace SJZY.Track.Domain.Queries; - -public interface IVFsUserQueries : IBasicQuery -{ -} diff --git a/src/SJZY.Track.Domain/Queries/IVSystemQueries.cs b/src/SJZY.Track.Domain/Queries/IVSystemQueries.cs deleted file mode 100644 index 0f1b201a..00000000 --- a/src/SJZY.Track.Domain/Queries/IVSystemQueries.cs +++ /dev/null @@ -1,7 +0,0 @@ -using SJZY.Track.Domain.VEntities; - -namespace SJZY.Track.Domain.Queries; - -public interface IVSystemQueries : IBasicQuery -{ -} diff --git a/src/SJZY.Track.Domain/SJZY.Track.Domain.csproj b/src/SJZY.Track.Domain/SJZY.Track.Domain.csproj deleted file mode 100644 index d3ab704d..00000000 --- a/src/SJZY.Track.Domain/SJZY.Track.Domain.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - net7.0 - True - - - - - - - - diff --git a/src/SJZY.Track.Domain/SJZYTrackDomainModule.cs b/src/SJZY.Track.Domain/SJZYTrackDomainModule.cs deleted file mode 100644 index ad164017..00000000 --- a/src/SJZY.Track.Domain/SJZYTrackDomainModule.cs +++ /dev/null @@ -1,7 +0,0 @@ -using Volo.Abp.Modularity; - -namespace SJZY.Track.Domain; - -public class SjzyTrackDomainModule : AbpModule -{ -} diff --git a/src/SJZY.Track.Domain/SeedWork/IAggregateRoot.cs b/src/SJZY.Track.Domain/SeedWork/IAggregateRoot.cs deleted file mode 100644 index 57fb7b63..00000000 --- a/src/SJZY.Track.Domain/SeedWork/IAggregateRoot.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace SJZY.Track.Domain.SeedWork; - -public interface IAggregateRoot : IEntity -{ -} diff --git a/src/SJZY.Track.Domain/SeedWork/IEntity.cs b/src/SJZY.Track.Domain/SeedWork/IEntity.cs deleted file mode 100644 index e0db5fea..00000000 --- a/src/SJZY.Track.Domain/SeedWork/IEntity.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace SJZY.Track.Domain.SeedWork; - -public interface IEntity -{ -} diff --git a/src/SJZY.Track.Repository/DataBaseContext.cs b/src/SJZY.Track.Repository/DataBaseContext.cs deleted file mode 100644 index 00429345..00000000 --- a/src/SJZY.Track.Repository/DataBaseContext.cs +++ /dev/null @@ -1,66 +0,0 @@ -using SJZY.UserCenter.HttpApi.Services; - -#pragma warning disable 1591 - -namespace SJZY.Track.Repository; - -/// -/// Sqlsugar 上下文对象 -/// -public class DataBaseContext -{ - #region 审计属性自动赋值 - - public static void OnExcutingAction(object oldValue, DataFilterModel entityInfo) - { - //过滤掉 "v_" 开头的表 - if (entityInfo.EntityColumnInfo.DbTableName.StartsWith("v_", StringComparison.OrdinalIgnoreCase)) - throw new Exception("非法的操作，不允许编辑映射表"); - - //新增 - if (entityInfo.OperationType == DataFilterType.InsertByObject) - { - var time = DateTime.Now; - var userId = CurrentUserRequest.CurrentUser.UserId; - - if (entityInfo.PropertyName == nameof(ICreateBaicEntity.CreateTime)) - entityInfo.SetValue(time); - else if (entityInfo.PropertyName == nameof(IUpdateBasicEntity.UpdateTime)) - entityInfo.SetValue(time); - else if (entityInfo.PropertyName == nameof(ICreateBaicEntity.CreateUserId)) - { - entityInfo.SetValue(userId); - } - else if (entityInfo.PropertyName == nameof(IUpdateBasicEntity.UpdateUserId)) - { - entityInfo.SetValue(userId); - } - } - //修改 - else if (entityInfo.OperationType == DataFilterType.UpdateByObject) - { - if (entityInfo.PropertyName == nameof(IUpdateBasicEntity.UpdateTime)) - entityInfo.SetValue(DateTime.Now); - else if (entityInfo.PropertyName == nameof(IUpdateBasicEntity.UpdateUserId)) - { - entityInfo.SetValue(CurrentUserRequest.CurrentUser.UserId); - } - //删除 - else if (entityInfo.PropertyName == nameof(IDeleteBasicEntity.IsDeleted)) - { - var currentType = entityInfo.EntityValue.GetType(); - bool.TryParse( - currentType.GetProperty(entityInfo.PropertyName)?.GetValue(entityInfo.EntityValue)?.ToString(), - out bool isdelete); - if (isdelete) - { - //currentType.GetProperty(nameof(IDeleteBasicEntity.DeleteUserId))?.SetValue(entityInfo.EntityValue, 5); - currentType.GetProperty(nameof(IDeleteBasicEntity.DeleteTime)) - ?.SetValue(entityInfo.EntityValue, DateTime.Now); - } - } - } - } - - #endregion 审计属性自动赋值 -} diff --git a/src/SJZY.Track.Repository/GlobalUsing.cs b/src/SJZY.Track.Repository/GlobalUsing.cs deleted file mode 100644 index 30edf0ad..00000000 --- a/src/SJZY.Track.Repository/GlobalUsing.cs +++ /dev/null @@ -1,6 +0,0 @@ -global using SJZY.Expand.ABP.Core; -global using SJZY.Expand.ABP.Core.Common.Dto; -global using SJZY.Expand.ABP.Core.SqlSugar; -global using SJZY.Expand.ABP.Core.SqlSugar.Entitys; -global using SqlSugar; -global using Volo.Abp.DependencyInjection; diff --git a/src/SJZY.Track.Repository/Queries/BasicQuery.cs b/src/SJZY.Track.Repository/Queries/BasicQuery.cs deleted file mode 100644 index 7842754a..00000000 --- a/src/SJZY.Track.Repository/Queries/BasicQuery.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System.Linq.Expressions; -using SJZY.Track.Domain.Queries; -using SJZY.Track.Domain.SeedWork; - -namespace SJZY.Track.Repository.Queries; - -/// -/// basic queries -/// -/// -public class BasicQuery : SimpleClient, IBasicQuery where T : class, IEntity, new() -{ - /// - public BasicQuery() - { - Context = SqlsugarScopeBasic.GetContextSafely("default"); - } - - /// - public async Task GetFirstAsync(Expression> whereExpression, - Expression> resultExpression) - { - return await Context.Queryable().Where(whereExpression).Select(resultExpression).FirstAsync(); - } - - /// - public async Task> GetListAsync(Expression> whereExpression, - Expression> resultExpression) - { - return await Context.Queryable().Where(whereExpression).Select(resultExpression).ToListAsync(); - } - - /// - public async Task GetArrayAsync(Expression> whereExpression, - Expression> resultExpression) - { - return await Context.Queryable().Where(whereExpression).Select(resultExpression).ToArrayAsync(); - } -} diff --git a/src/SJZY.Track.Repository/Queries/VExternalSubjectQueries.cs b/src/SJZY.Track.Repository/Queries/VExternalSubjectQueries.cs deleted file mode 100644 index 163803e0..00000000 --- a/src/SJZY.Track.Repository/Queries/VExternalSubjectQueries.cs +++ /dev/null @@ -1,8 +0,0 @@ -using SJZY.Track.Domain.Queries; -using SJZY.Track.Domain.VEntities; - -namespace SJZY.Track.Repository.Queries; - -public class VExternalSubjectQueries : BasicQuery, IVExternalSubjectQueries, ITransientDependency -{ -} diff --git a/src/SJZY.Track.Repository/Queries/VFsUserQueries.cs b/src/SJZY.Track.Repository/Queries/VFsUserQueries.cs deleted file mode 100644 index fb047384..00000000 --- a/src/SJZY.Track.Repository/Queries/VFsUserQueries.cs +++ /dev/null @@ -1,9 +0,0 @@ -using SJZY.Track.Domain.Queries; -using SJZY.Track.Domain.VEntities; - -namespace SJZY.Track.Repository.Queries; - -public class VFsUserQueries: BasicQuery, IVFsUserQueries, ITransientDependency -{ - -} diff --git a/src/SJZY.Track.Repository/Queries/VSystemQueries.cs b/src/SJZY.Track.Repository/Queries/VSystemQueries.cs deleted file mode 100644 index 872f9ea2..00000000 --- a/src/SJZY.Track.Repository/Queries/VSystemQueries.cs +++ /dev/null @@ -1,8 +0,0 @@ -using SJZY.Track.Domain.Queries; -using SJZY.Track.Domain.VEntities; - -namespace SJZY.Track.Repository.Queries; - -public class VSystemQueries : BasicQuery, IVSystemQueries, ITransientDependency -{ -} diff --git a/src/SJZY.Track.Repository/Repositories/KpiAreaInfoRepository.cs b/src/SJZY.Track.Repository/Repositories/KpiAreaInfoRepository.cs deleted file mode 100644 index 864ae98b..00000000 --- a/src/SJZY.Track.Repository/Repositories/KpiAreaInfoRepository.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace SJZY.Track.Repository.Repositories; - -public class KpiAreaInfoRepository -{ -} diff --git a/src/SJZY.Track.Repository/SJZY.Track.Repository.csproj b/src/SJZY.Track.Repository/SJZY.Track.Repository.csproj deleted file mode 100644 index 4718739b..00000000 --- a/src/SJZY.Track.Repository/SJZY.Track.Repository.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - net7.0 - True - CS8613 - - - - - - - - - - - - - - diff --git a/src/SJZY.Track.Repository/SjzyTrackRepositoryModule.cs b/src/SJZY.Track.Repository/SjzyTrackRepositoryModule.cs deleted file mode 100644 index 056d0690..00000000 --- a/src/SJZY.Track.Repository/SjzyTrackRepositoryModule.cs +++ /dev/null @@ -1,61 +0,0 @@ -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using SJZY.Expand.ABP.Core.SqlSugar.Options; -using SJZY.Expand.ElasticSearch; -using SJZY.Track.Domain; -using SJZY.Track.Domain.Queries; -using SJZY.Track.Repository.Queries; -using SJZY.Track.Repository.Repositories; -using Volo.Abp.Autofac; -using Volo.Abp.Modularity; - -namespace SJZY.Track.Repository; - -/// -/// 仓储模块 -/// -[DependsOn(typeof(AbpAutofacModule))] -[DependsOn(typeof(SjzyTrackDomainModule))] -public class SjzyTrackRepositoryModule : AbpModule -{ - public override void PreConfigureServices(ServiceConfigurationContext context) - { - var configuration = context.Services.GetConfiguration(); - - context.Services.AddSqlsugar(options => - { - options.AddRange(new List - { - new() - { - ConnectionString = configuration["ConnectionStrings:DefaultConnection"]!, - DbType = DbType.MySql, - IsAutoCloseConnection = true, - ConfigId = "default", - OpenSqlLog = true - } - } - ); - }, DataBaseContext.OnExcutingAction, "SJZY.Track.Domain"); - - context.Services.AddElasticSearch(options => - { - if (System.Diagnostics.Debugger.IsAttached) - { - options.ShowLogInfo = true; - } - - options.NodeUrls = configuration.GetSection("ElasticSearch:NodeUrls").Get>()!; - options.LoginName = configuration["ElasticSearch:LoginName"]!; - options.Password = configuration["ElasticSearch:Password"]!; - options.Base64PassPassword = configuration["ElasticSearch:Base64PassPassword"]!; - }); - } - - - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.AddTransient(typeof(IBasicQuery<>), typeof(BasicQuery<>)); - context.Services.AddTransient(typeof(IBasicRepository<>), typeof(BasicRepository<>)); - } -} diff --git a/src/SJZY.Track.Api/Dockerfile b/src/TrackCenter.Api/Dockerfile similarity index 100% rename from src/SJZY.Track.Api/Dockerfile rename to src/TrackCenter.Api/Dockerfile diff --git a/src/TrackCenter.Api/Program.cs b/src/TrackCenter.Api/Program.cs new file mode 100644 index 00000000..5a7855e2 --- /dev/null +++ b/src/TrackCenter.Api/Program.cs @@ -0,0 +1,28 @@ +using Serilog; +using TrackCenter.Api; + +var builder = WebApplication.CreateSlimBuilder(args); +var configuration = builder.Configuration; +Log.Logger = new LoggerConfiguration() + .ReadFrom.Configuration(configuration) + .CreateLogger(); + +try +{ + builder.WebHost.UseUrls(builder.Configuration.GetSection("App:Urls").Get() ?? []); + builder.Host.UseAutofac().UseSerilog(); + builder.Services.AddApplication(); + + + var app = builder.Build(); + app.InitializeApplication(); + app.Run(); +} +catch (Exception ex) +{ + Log.Fatal(ex, "G"); +} +finally +{ + Log.CloseAndFlush(); +} diff --git a/src/SJZY.Track.Api/Properties/launchSettings.json b/src/TrackCenter.Api/Properties/launchSettings.json similarity index 100% rename from src/SJZY.Track.Api/Properties/launchSettings.json rename to src/TrackCenter.Api/Properties/launchSettings.json diff --git a/src/SJZY.Track.Api/SJZY.Track.Api.csproj b/src/TrackCenter.Api/TrackCenter.Api.csproj similarity index 64% rename from src/SJZY.Track.Api/SJZY.Track.Api.csproj rename to src/TrackCenter.Api/TrackCenter.Api.csproj index ccb41380..9cb80144 100644 --- a/src/SJZY.Track.Api/SJZY.Track.Api.csproj +++ b/src/TrackCenter.Api/TrackCenter.Api.csproj @@ -3,7 +3,7 @@ - net7.0 + net8 True Linux ..\.. @@ -14,12 +14,15 @@ - - - + + + + + + diff --git a/src/TrackCenter.Api/TrackCenterApiModule.cs b/src/TrackCenter.Api/TrackCenterApiModule.cs new file mode 100644 index 00000000..977ec39c --- /dev/null +++ b/src/TrackCenter.Api/TrackCenterApiModule.cs @@ -0,0 +1,78 @@ +using Fake.AspNetCore; +using Fake.AspNetCore.Auditing; +using Fake.AspNetCore.Mvc.Conventions; +using Fake.Autofac; +using Fake.Modularity; +using FluentValidation.AspNetCore; +using Hangfire; +using TrackCenter.Application; +using TrackCenter.Application.Hangfire; +using TrackCenter.Repository; + +namespace TrackCenter.Api; + +[DependsOn(typeof(FakeAutofacModule))] +[DependsOn(typeof(TrackCenterApplicationModule))] +[DependsOn(typeof(TrackCenterRepositoryModule))] +public class TrackCenterApiModule : FakeModule +{ + private const string DefaultCorsPolicyName = "default"; + + public override void ConfigureServices(ServiceConfigurationContext context) + { + var services = context.Services; + var configuration = context.Services.GetConfiguration(); + + services.Configure(options => + { + options.ScanApplicationServices(); + }); + + + services.AddFakeExceptionFilter() + .AddFakeValidationActionFilter() + .AddFakeAspNetCoreAuditing() + .AddFakeUnitOfWorkActionFilter(); + + services.AddFakeSwaggerGen(); + context.Services.AddFluentValidationAutoValidation().AddFluentValidationClientsideAdapters(); + + services.AddCors(options => + { + options.AddPolicy(DefaultCorsPolicyName, builder => + { + builder.WithOrigins(configuration.GetSection("App:CorsOrigins").Get() ?? []) + .AllowAnyHeader() + .AllowAnyMethod() + .AllowCredentials(); + }); + }); + } + + public override void ConfigureApplication(ApplicationConfigureContext context) + { + var app = context.GetWebApplication(); + var configuration = context.GetConfiguration(); + + app.MapControllers(); + // Configure the HTTP request pipeline. + app.UseFakeSwagger(); + + app.UseRouting(); + + app.UseCors(DefaultCorsPolicyName); + + // todo: 缺乏配置 + app.UseHangfireDashboard("/hangfire", new DashboardOptions + { + DisplayStorageConnectionString = false, + IgnoreAntiforgeryToken = true, + AppPath = configuration["Swagger:JsonUrlPrefix"]! + "/", + PrefixPath = System.Diagnostics.Debugger.IsAttached + ? "" + : configuration["Swagger:JsonUrlPrefix"]!, + DashboardTitle = "轨迹预警任务", + Authorization = [new AnonymousHangfireAuthorizationFilter()] + }); + } +} diff --git a/src/TrackCenter.Api/appsettings.Development.json b/src/TrackCenter.Api/appsettings.Development.json new file mode 100644 index 00000000..604980b5 --- /dev/null +++ b/src/TrackCenter.Api/appsettings.Development.json @@ -0,0 +1,21 @@ +{ + "Serilog": { + "MinimumLevel": { + "Default": "Information", + "Override": { + "Microsoft.AspNetCore": "Information" + } + }, + "Enrich": [ + "FromLogContext", + "WithMachineName", + "WithProcessId", + "WithThreadId" + ], + "WriteTo": [ + { + "Name": "Console" + } + ] + } +} diff --git a/src/SJZY.Track.Api/kafkalib/librdkafka++.so.1 b/src/TrackCenter.Api/kafkalib/librdkafka++.so.1 similarity index 100% rename from src/SJZY.Track.Api/kafkalib/librdkafka++.so.1 rename to src/TrackCenter.Api/kafkalib/librdkafka++.so.1 diff --git a/src/SJZY.Track.Api/kafkalib/librdkafka.so.1 b/src/TrackCenter.Api/kafkalib/librdkafka.so.1 similarity index 100% rename from src/SJZY.Track.Api/kafkalib/librdkafka.so.1 rename to src/TrackCenter.Api/kafkalib/librdkafka.so.1 diff --git a/src/SJZY.Track.Api/skyapm.json b/src/TrackCenter.Api/skyapm.json similarity index 100% rename from src/SJZY.Track.Api/skyapm.json rename to src/TrackCenter.Api/skyapm.json diff --git a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/AreaCacheEntry.cs b/src/TrackCenter.Application.Contract/Dtos/Forewarning/AreaCacheEntry.cs similarity index 89% rename from src/SJZY.Track.Application.Contract/Dtos/Forewarning/AreaCacheEntry.cs rename to src/TrackCenter.Application.Contract/Dtos/Forewarning/AreaCacheEntry.cs index 4c16c507..835929c2 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/AreaCacheEntry.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Forewarning/AreaCacheEntry.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.Forewarning; +namespace TrackCenter.Application.Contract.Dtos.Forewarning; public class AreaCacheEntry { diff --git a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/RuleAreaBaseInfo.cs b/src/TrackCenter.Application.Contract/Dtos/Forewarning/RuleAreaBaseInfo.cs similarity index 82% rename from src/SJZY.Track.Application.Contract/Dtos/Forewarning/RuleAreaBaseInfo.cs rename to src/TrackCenter.Application.Contract/Dtos/Forewarning/RuleAreaBaseInfo.cs index ee217da3..142e3b8a 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/RuleAreaBaseInfo.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Forewarning/RuleAreaBaseInfo.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.Forewarning; +namespace TrackCenter.Application.Contract.Dtos.Forewarning; public class RuleAreaBaseInfo { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackByEsIdInput.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackByEsIdInput.cs similarity index 86% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackByEsIdInput.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackByEsIdInput.cs index 7f54b601..2e97e08b 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackByEsIdInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackByEsIdInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; public class BatchDeleteTrackByEsIdInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackInput.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackInput.cs similarity index 91% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackInput.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackInput.cs index 426a1adb..cee9d063 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/BatchDeleteTrackInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; public class BatchDeleteTrackInput : OrderNosInfo { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs similarity index 98% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs index e0e1e796..7a1f1a5b 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; public class BatchUpsertTrackInput : OrderNosInfo { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/DeleteOrderInput.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/DeleteOrderInput.cs similarity index 93% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/DeleteOrderInput.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/DeleteOrderInput.cs index 4f1795c3..9c07f85a 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/DeleteOrderInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/DeleteOrderInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; public class DeleteOrderInput : OrderNoInfo { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/FileItemDto.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/FileItemDto.cs similarity index 83% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/FileItemDto.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/FileItemDto.cs index d39bf488..0fb48874 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/FileItemDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/FileItemDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; public class FileItemDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetDetailTimelineInput.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetDetailTimelineInput.cs similarity index 85% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetDetailTimelineInput.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetDetailTimelineInput.cs index 21ec867c..6ed36c39 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetDetailTimelineInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetDetailTimelineInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; public class GetDetailTimelineInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetDetailTimelineOutput.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetDetailTimelineOutput.cs similarity index 96% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetDetailTimelineOutput.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetDetailTimelineOutput.cs index 4441323c..73f10423 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetDetailTimelineOutput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetDetailTimelineOutput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; public class GetDetailTimelineOutput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs similarity index 98% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs index a6a3c4c7..4823af77 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; public class TrackOrderDetailDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs similarity index 98% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs index 2af82f3e..7124907e 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; public class GetPageTrackOrderInput : PageInfoInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackTemplateListInput.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetPageTrackTemplateListInput.cs similarity index 89% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackTemplateListInput.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetPageTrackTemplateListInput.cs index a591adf7..9ac87b8a 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackTemplateListInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetPageTrackTemplateListInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; public class GetPageTrackTemplateListInput : PageInfoInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackInput.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetTrackInput.cs similarity index 95% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackInput.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetTrackInput.cs index f14b3885..b267b5ee 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetTrackInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; /// /// 支持模板，传入时区补正，按轨迹发生时间升序降序 diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs similarity index 97% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs index 820ed535..5f30053b 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; public class GetTrackOutput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackTemplateListInput.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetTrackTemplateListInput.cs similarity index 87% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackTemplateListInput.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetTrackTemplateListInput.cs index e1c04282..3f04cecc 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackTemplateListInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/GetTrackTemplateListInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; public class GetTrackTemplateListInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/LinkOrderInput.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/LinkOrderInput.cs similarity index 93% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/LinkOrderInput.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/LinkOrderInput.cs index 28b17b97..7f94506b 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/LinkOrderInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/LinkOrderInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; public class LinkOrderInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/OrderNoInfo.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/OrderNoInfo.cs similarity index 94% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/OrderNoInfo.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/OrderNoInfo.cs index e62cb1b4..df32375d 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/OrderNoInfo.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/OrderNoInfo.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; /// /// 子系统id+订单类型+订单号 确定唯一订单 diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/PushTrackInput.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/PushTrackInput.cs similarity index 88% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/PushTrackInput.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/PushTrackInput.cs index bc5b6cae..5fab6cc3 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/PushTrackInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/PushTrackInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; public class PushTrackInput : OrderNosInfo { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs similarity index 94% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs index 7c29d75b..40b6d779 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/QueryTrackPullMappingsInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; /// /// 查询轨迹推送映射关系入参 diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/RefreshTrackInput.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/RefreshTrackInput.cs similarity index 79% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/RefreshTrackInput.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/RefreshTrackInput.cs index 6197fe26..24ff8e3c 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/RefreshTrackInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/RefreshTrackInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; public class RefreshTrackInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/TrackIdentifierDto.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/TrackIdentifierDto.cs similarity index 86% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/TrackIdentifierDto.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/TrackIdentifierDto.cs index 993de61c..c03d2b82 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/TrackIdentifierDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/TrackIdentifierDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; /// /// 轨迹标识符,用于唯一标识一个轨迹 diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/TrackTemplateContentDto.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/TrackTemplateContentDto.cs similarity index 96% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/TrackTemplateContentDto.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/TrackTemplateContentDto.cs index f05164ef..323fca0e 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/TrackTemplateContentDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/TrackTemplateContentDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; public class TrackTemplateOutput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderInput.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpdateOrderInput.cs similarity index 97% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderInput.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpdateOrderInput.cs index a37ab135..d31a8b77 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpdateOrderInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; public class UpdateOrderInput : OrderNoInfo { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderStatusInput.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpdateOrderStatusInput.cs similarity index 74% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderStatusInput.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpdateOrderStatusInput.cs index 9d1e330b..8681d59a 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderStatusInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpdateOrderStatusInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; public class UpdateOrderStatusInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateServiceProviderPullConfigsInput.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpdateServiceProviderPullConfigsInput.cs similarity index 62% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateServiceProviderPullConfigsInput.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpdateServiceProviderPullConfigsInput.cs index fd0dca43..b241b4b4 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateServiceProviderPullConfigsInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpdateServiceProviderPullConfigsInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; public class UpdateOrderPullConfigsInput : OrderNosInfo { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs similarity index 91% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs index a32b72d8..23c29693 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; public class UpsertOrderInput : UpdateOrderInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs similarity index 98% rename from src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs rename to src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs index f8fb030b..33fe947b 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; +namespace TrackCenter.Application.Contract.Dtos.ProvideServices; public class UpsertTrackInput : OrderNoInfo { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs similarity index 97% rename from src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs index 8b1aca31..e84e9d32 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackContents; +namespace TrackCenter.Application.Contract.Dtos.TrackContents; public class EditTrackContentInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentMapInput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackContents/EditTrackContentMapInput.cs similarity index 93% rename from src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentMapInput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackContents/EditTrackContentMapInput.cs index b556cb20..0ca19d92 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentMapInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackContents/EditTrackContentMapInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackContents; +namespace TrackCenter.Application.Contract.Dtos.TrackContents; public class EditTrackContentMapInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetAvailableContentInput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetAvailableContentInput.cs similarity index 88% rename from src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetAvailableContentInput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackContents/GetAvailableContentInput.cs index 39ae0073..21f1d716 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetAvailableContentInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetAvailableContentInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackContents; +namespace TrackCenter.Application.Contract.Dtos.TrackContents; public class GetAvailableContentInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetAvailableContentOutput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetAvailableContentOutput.cs similarity index 94% rename from src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetAvailableContentOutput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackContents/GetAvailableContentOutput.cs index 7af80b7c..6cb7c374 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetAvailableContentOutput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetAvailableContentOutput.cs @@ -1,6 +1,6 @@ -using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Dtos.ProvideServices; -namespace SJZY.Track.Application.Contract.Dtos.TrackContents; +namespace TrackCenter.Application.Contract.Dtos.TrackContents; public class GetAvailableContentOutput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetContentDetailInput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetContentDetailInput.cs similarity index 89% rename from src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetContentDetailInput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackContents/GetContentDetailInput.cs index d61d19bb..092ed824 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetContentDetailInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetContentDetailInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackContents; +namespace TrackCenter.Application.Contract.Dtos.TrackContents; public class GetContentDetailInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetContentDetailOutput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetContentDetailOutput.cs similarity index 98% rename from src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetContentDetailOutput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackContents/GetContentDetailOutput.cs index ea58971c..ff76fdf7 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetContentDetailOutput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetContentDetailOutput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackContents; +namespace TrackCenter.Application.Contract.Dtos.TrackContents; public class GetContentDetailOutput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs similarity index 97% rename from src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs index d71707d5..b6edb2a5 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackContents; +namespace TrackCenter.Application.Contract.Dtos.TrackContents; public class GetPageTrackContentInput : PageInfoInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetTrackContentByCodeInput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetTrackContentByCodeInput.cs similarity index 79% rename from src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetTrackContentByCodeInput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackContents/GetTrackContentByCodeInput.cs index 8f7b1c85..1f21299f 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetTrackContentByCodeInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetTrackContentByCodeInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackContents; +namespace TrackCenter.Application.Contract.Dtos.TrackContents; public class GetTrackContentByCodeInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetTrackContentByCodeOutput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetTrackContentByCodeOutput.cs similarity index 84% rename from src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetTrackContentByCodeOutput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackContents/GetTrackContentByCodeOutput.cs index e584522d..fd7ab1d1 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetTrackContentByCodeOutput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackContents/GetTrackContentByCodeOutput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackContents; +namespace TrackCenter.Application.Contract.Dtos.TrackContents; public class GetTrackContentByCodeOutput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/TrackContentOutput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackContents/TrackContentOutput.cs similarity index 96% rename from src/SJZY.Track.Application.Contract/Dtos/TrackContents/TrackContentOutput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackContents/TrackContentOutput.cs index c1b85a88..91935d9f 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/TrackContentOutput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackContents/TrackContentOutput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackContents; +namespace TrackCenter.Application.Contract.Dtos.TrackContents; public sealed class TrackContentOutput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/EditTrackFlagInput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackFlags/EditTrackFlagInput.cs similarity index 94% rename from src/SJZY.Track.Application.Contract/Dtos/TrackFlags/EditTrackFlagInput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackFlags/EditTrackFlagInput.cs index 5ec2434c..50ed1419 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/EditTrackFlagInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackFlags/EditTrackFlagInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackFlags; +namespace TrackCenter.Application.Contract.Dtos.TrackFlags; public class EditTrackFlagInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs b/src/TrackCenter.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs similarity index 95% rename from src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs index bc422fbb..2b4bcdab 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackFlags; +namespace TrackCenter.Application.Contract.Dtos.TrackFlags; public class GetTrackFlagListDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackNode/TrackNodeInput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackNode/TrackNodeInput.cs similarity index 90% rename from src/SJZY.Track.Application.Contract/Dtos/TrackNode/TrackNodeInput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackNode/TrackNodeInput.cs index 557a7206..da4e2e94 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackNode/TrackNodeInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackNode/TrackNodeInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackNode; +namespace TrackCenter.Application.Contract.Dtos.TrackNode; public class EditTrackNodeInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/GetTrackCounterOutput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackOrder/GetTrackCounterOutput.cs similarity index 84% rename from src/SJZY.Track.Application.Contract/Dtos/TrackOrder/GetTrackCounterOutput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackOrder/GetTrackCounterOutput.cs index f52c7156..08acddae 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/GetTrackCounterOutput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackOrder/GetTrackCounterOutput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackOrder; +namespace TrackCenter.Application.Contract.Dtos.TrackOrder; public class GetTrackCounterOutput { diff --git a/src/TrackCenter.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs b/src/TrackCenter.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs new file mode 100644 index 00000000..696aa541 --- /dev/null +++ b/src/TrackCenter.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs @@ -0,0 +1,5 @@ +namespace TrackCenter.Application.Contract.Dtos.TrackOrder; + +public class TrackPushRecordItem +{ +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordOutput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackOrder/TrackPushRecordOutput.cs similarity index 98% rename from src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordOutput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackOrder/TrackPushRecordOutput.cs index fc841591..03acfb6f 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordOutput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackOrder/TrackPushRecordOutput.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace SJZY.Track.Application.Contract.Dtos.TrackOrder; +namespace TrackCenter.Application.Contract.Dtos.TrackOrder; public class TrackPushRecordOutput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs similarity index 96% rename from src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs index b8512f4c..cd02f169 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPull; +namespace TrackCenter.Application.Contract.Dtos.TrackPull; public class EditTrackPullConfigInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs similarity index 94% rename from src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs index a4d9e0f8..80d6e4ee 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPull; +namespace TrackCenter.Application.Contract.Dtos.TrackPull; public class EditTrackPullContentInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullContentConfigDto.cs b/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullContentConfigDto.cs similarity index 93% rename from src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullContentConfigDto.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullContentConfigDto.cs index da3fecdc..2d2e1f7c 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullContentConfigDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullContentConfigDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPull; +namespace TrackCenter.Application.Contract.Dtos.TrackPull; public class TrackPullContentConfigDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs b/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs similarity index 95% rename from src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs index 014c80dc..d5cecaf9 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPull; +namespace TrackCenter.Application.Contract.Dtos.TrackPull; public class TrackPullParamConfigDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamWithContentConfigDto.cs b/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullParamWithContentConfigDto.cs similarity index 77% rename from src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamWithContentConfigDto.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullParamWithContentConfigDto.cs index e105248b..9fc3a8fc 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamWithContentConfigDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullParamWithContentConfigDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPull; +namespace TrackCenter.Application.Contract.Dtos.TrackPull; public class TrackPullParamsWithContentDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullPayload.cs b/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullPayload.cs similarity index 70% rename from src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullPayload.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullPayload.cs index 3165361a..ba6cd29d 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullPayload.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackPullPayload.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPull; +namespace TrackCenter.Application.Contract.Dtos.TrackPull; public class TrackPullPayload { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs b/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs similarity index 91% rename from src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs index 5f6894e1..d0971c9b 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPull; +namespace TrackCenter.Application.Contract.Dtos.TrackPull; public class TrackRefreshAttach { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshContext.cs b/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackRefreshContext.cs similarity index 91% rename from src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshContext.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackRefreshContext.cs index 89e55afe..d245b2ef 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshContext.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackPull/TrackRefreshContext.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPull; +namespace TrackCenter.Application.Contract.Dtos.TrackPull; public class TrackRefreshContext { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs similarity index 95% rename from src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs index 9d7c58d9..3b379d2d 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPush; +namespace TrackCenter.Application.Contract.Dtos.TrackPush; public class EditTrackPushConfigInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushContentInput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackPush/EditTrackPushContentInput.cs similarity index 96% rename from src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushContentInput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackPush/EditTrackPushContentInput.cs index d8d4621a..a2546e27 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushContentInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackPush/EditTrackPushContentInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPush; +namespace TrackCenter.Application.Contract.Dtos.TrackPush; public class EditTrackPushContentInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/QueryPushRecordInput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackPush/QueryPushRecordInput.cs similarity index 95% rename from src/SJZY.Track.Application.Contract/Dtos/TrackPush/QueryPushRecordInput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackPush/QueryPushRecordInput.cs index 3957baf0..69127bf2 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/QueryPushRecordInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackPush/QueryPushRecordInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.TrackPush; +namespace TrackCenter.Application.Contract.Dtos.TrackPush; public class QueryPushRecordInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/SortTrackPushContentInput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackPush/SortTrackPushContentInput.cs similarity index 77% rename from src/SJZY.Track.Application.Contract/Dtos/TrackPush/SortTrackPushContentInput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackPush/SortTrackPushContentInput.cs index e7c21f14..6fa38469 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/SortTrackPushContentInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackPush/SortTrackPushContentInput.cs @@ -1,6 +1,6 @@ using SJZY.Expand.ABP.Core.PublicMethords; -namespace SJZY.Track.Application.Contract.Dtos.TrackPush; +namespace TrackCenter.Application.Contract.Dtos.TrackPush; public class SortTrackPushContentInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushAfterUpdateOrderDto.cs b/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushAfterUpdateOrderDto.cs similarity index 90% rename from src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushAfterUpdateOrderDto.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushAfterUpdateOrderDto.cs index 0fbbbbd6..80f0e2c0 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushAfterUpdateOrderDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushAfterUpdateOrderDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPush; +namespace TrackCenter.Application.Contract.Dtos.TrackPush; public class TrackPushAfterUpdateOrderDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushConfigTagDto.cs b/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushConfigTagDto.cs similarity index 80% rename from src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushConfigTagDto.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushConfigTagDto.cs index 964a71bd..d5f3f205 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushConfigTagDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushConfigTagDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPush; +namespace TrackCenter.Application.Contract.Dtos.TrackPush; public class TrackPushConfigTagDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushContentConfigDto.cs b/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushContentConfigDto.cs similarity index 97% rename from src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushContentConfigDto.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushContentConfigDto.cs index b39d6a10..beb1054c 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushContentConfigDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushContentConfigDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPush; +namespace TrackCenter.Application.Contract.Dtos.TrackPush; public class TrackPushContentConfigDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushContentDto.cs b/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushContentDto.cs similarity index 92% rename from src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushContentDto.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushContentDto.cs index dab24a5e..e7af0074 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushContentDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushContentDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPush; +namespace TrackCenter.Application.Contract.Dtos.TrackPush; public class TrackPushContentDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushInput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushInput.cs similarity index 86% rename from src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushInput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushInput.cs index b9d5dfd2..e8d00217 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPush; +namespace TrackCenter.Application.Contract.Dtos.TrackPush; public class TrackPushInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushRecordDto.cs b/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushRecordDto.cs similarity index 97% rename from src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushRecordDto.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushRecordDto.cs index cee51033..8201eeba 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushRecordDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackPush/TrackPushRecordDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPush; +namespace TrackCenter.Application.Contract.Dtos.TrackPush; public class TrackPushRecordDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs similarity index 93% rename from src/SJZY.Track.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs index e5efd4c1..dab95a05 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackStatus; +namespace TrackCenter.Application.Contract.Dtos.TrackStatus; public class EditTrackStatusInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs b/src/TrackCenter.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs similarity index 94% rename from src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs index 228b013c..2c694177 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackStatus; +namespace TrackCenter.Application.Contract.Dtos.TrackStatus; public class GetTrackStatusDetailDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs b/src/TrackCenter.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs similarity index 96% rename from src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs index e0410ee0..78d54dd7 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackStatus; +namespace TrackCenter.Application.Contract.Dtos.TrackStatus; public class GetTrackStatusListDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/QueryTrackNodeRequest.cs b/src/TrackCenter.Application.Contract/Dtos/TrackStatus/QueryTrackNodeRequest.cs similarity index 81% rename from src/SJZY.Track.Application.Contract/Dtos/TrackStatus/QueryTrackNodeRequest.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackStatus/QueryTrackNodeRequest.cs index b22e14a1..f5810204 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/QueryTrackNodeRequest.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackStatus/QueryTrackNodeRequest.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackStatus; +namespace TrackCenter.Application.Contract.Dtos.TrackStatus; public class QueryTrackNodeRequest : PageInfoInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs similarity index 87% rename from src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs index e990ce39..6a142f62 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackTemplates; +namespace TrackCenter.Application.Contract.Dtos.TrackTemplates; /// public class EditTrackTemplateContentInput diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs similarity index 90% rename from src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs index 32c44f61..4f5cf413 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackTemplates; +namespace TrackCenter.Application.Contract.Dtos.TrackTemplates; /// /// 获取轨迹模版分页输入 diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs b/src/TrackCenter.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs similarity index 96% rename from src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs index ca3e1777..1e342059 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackTemplates; +namespace TrackCenter.Application.Contract.Dtos.TrackTemplates; /// /// 获取轨迹模版详情 diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs b/src/TrackCenter.Application.Contract/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs similarity index 76% rename from src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs rename to src/TrackCenter.Application.Contract/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs index 06c52f37..80d15c88 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs @@ -1,6 +1,6 @@ using SJZY.Expand.ABP.Core.PublicMethords; -namespace SJZY.Track.Application.Contract.Dtos.TrackTemplates; +namespace TrackCenter.Application.Contract.Dtos.TrackTemplates; public class SortTrackTemplateContentInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs similarity index 94% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs index ec2c9802..4512a39a 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs @@ -1,6 +1,6 @@ -using SJZY.Track.Application.Contract.Dtos.Warning.Return; +using TrackCenter.Application.Contract.Dtos.Warning.Return; -namespace SJZY.Track.Application.Contract.Dtos.Warning.Complete; +namespace TrackCenter.Application.Contract.Dtos.Warning.Complete; /// /// 完整预警明细 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningRuleItemDto.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/Complete/CompleteWarningRuleItemDto.cs similarity index 92% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningRuleItemDto.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/Complete/CompleteWarningRuleItemDto.cs index 7de3d710..c96f2566 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningRuleItemDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/Complete/CompleteWarningRuleItemDto.cs @@ -1,6 +1,6 @@ -using SJZY.Track.Application.Contract.Dtos.Warning.Return; +using TrackCenter.Application.Contract.Dtos.Warning.Return; -namespace SJZY.Track.Application.Contract.Dtos.Warning.Complete; +namespace TrackCenter.Application.Contract.Dtos.Warning.Complete; /// /// 完整预警规则配置条目 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/EditCompleteWarningRuleItemInput.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/Complete/EditCompleteWarningRuleItemInput.cs similarity index 91% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/EditCompleteWarningRuleItemInput.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/Complete/EditCompleteWarningRuleItemInput.cs index a53c5b19..cab9dfb0 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/EditCompleteWarningRuleItemInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/Complete/EditCompleteWarningRuleItemInput.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; -using SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.Warning.Complete; +namespace TrackCenter.Application.Contract.Dtos.Warning.Complete; /// /// 编辑完整预警配置 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/GetCompleteWarningRuleItemInput.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/Complete/GetCompleteWarningRuleItemInput.cs similarity index 63% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/GetCompleteWarningRuleItemInput.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/Complete/GetCompleteWarningRuleItemInput.cs index 4929c83d..e2966542 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/GetCompleteWarningRuleItemInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/Complete/GetCompleteWarningRuleItemInput.cs @@ -1,6 +1,6 @@ -using SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.Warning.Complete; +namespace TrackCenter.Application.Contract.Dtos.Warning.Complete; /// /// 获取完整预警规则条目列表 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs similarity index 95% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs index 8498b37d..5f33f57f 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.Warning.Complete; +namespace TrackCenter.Application.Contract.Dtos.Warning.Complete; /// /// 分页获取完成预警详情 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/DataAnnotations/IdRequiredAttribute.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/DataAnnotations/IdRequiredAttribute.cs similarity index 85% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/DataAnnotations/IdRequiredAttribute.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/DataAnnotations/IdRequiredAttribute.cs index cd4767f8..a2537004 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/DataAnnotations/IdRequiredAttribute.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/DataAnnotations/IdRequiredAttribute.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; +namespace TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; /// /// 要求id存在并且大于0 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/GetWarningRuleInput.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/GetWarningRuleInput.cs similarity index 92% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/GetWarningRuleInput.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/GetWarningRuleInput.cs index 22dd71a9..2b160f56 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/GetWarningRuleInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/GetWarningRuleInput.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.Warning; +namespace TrackCenter.Application.Contract.Dtos.Warning; /// /// 获取预警规则主体 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/NotifyUserDto.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/NotifyUserDto.cs similarity index 68% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/NotifyUserDto.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/NotifyUserDto.cs index ec7d43af..885defab 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/NotifyUserDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/NotifyUserDto.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; -using SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.Warning; +namespace TrackCenter.Application.Contract.Dtos.Warning; public sealed class NotifyUserDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/EditReturnWarningRuleItemInput.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/Return/EditReturnWarningRuleItemInput.cs similarity index 90% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/Return/EditReturnWarningRuleItemInput.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/Return/EditReturnWarningRuleItemInput.cs index 589e0d1b..d0027d03 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/EditReturnWarningRuleItemInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/Return/EditReturnWarningRuleItemInput.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; -using SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.Warning.Return; +namespace TrackCenter.Application.Contract.Dtos.Warning.Return; /// /// 编辑回传时效配置 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs similarity index 97% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs index 7ea8aa9c..4e952735 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.Warning.Return; +namespace TrackCenter.Application.Contract.Dtos.Warning.Return; /// /// 分页获取回传预警明细输入 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetReturnMessageRecordInput.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/Return/GetReturnMessageRecordInput.cs similarity index 81% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetReturnMessageRecordInput.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/Return/GetReturnMessageRecordInput.cs index 890c262c..c4ae0df7 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetReturnMessageRecordInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/Return/GetReturnMessageRecordInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.Warning.Return; +namespace TrackCenter.Application.Contract.Dtos.Warning.Return; /// /// 获取回传报文日志 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetReturnWarningRuleItemInput.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/Return/GetReturnWarningRuleItemInput.cs similarity index 63% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetReturnWarningRuleItemInput.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/Return/GetReturnWarningRuleItemInput.cs index 72258044..e89209f6 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetReturnWarningRuleItemInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/Return/GetReturnWarningRuleItemInput.cs @@ -1,6 +1,6 @@ -using SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.Warning.Return; +namespace TrackCenter.Application.Contract.Dtos.Warning.Return; /// /// 获取回传预警规则项目列表 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnMessageRecordDto.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnMessageRecordDto.cs similarity index 92% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnMessageRecordDto.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnMessageRecordDto.cs index f5070b9e..2e6a444b 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnMessageRecordDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnMessageRecordDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.Warning.Return; +namespace TrackCenter.Application.Contract.Dtos.Warning.Return; /// /// 回传报文日志 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnPushInput.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnPushInput.cs similarity index 79% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnPushInput.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnPushInput.cs index d6d637b7..429399ee 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnPushInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnPushInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.Warning.Return; +namespace TrackCenter.Application.Contract.Dtos.Warning.Return; public sealed class ReturnPushInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs similarity index 98% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs index b3030197..6c6c1b1d 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.Warning.Return; +namespace TrackCenter.Application.Contract.Dtos.Warning.Return; /// /// 回传预警明细 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningRuleItemDto.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnWarningRuleItemDto.cs similarity index 91% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningRuleItemDto.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnWarningRuleItemDto.cs index d223cb51..2d601f4b 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningRuleItemDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/Return/ReturnWarningRuleItemDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.Warning.Return; +namespace TrackCenter.Application.Contract.Dtos.Warning.Return; public class ReturnWarningRuleItemDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/DeleteTransportWarningSceneInput.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/DeleteTransportWarningSceneInput.cs similarity index 68% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/DeleteTransportWarningSceneInput.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/Transport/DeleteTransportWarningSceneInput.cs index e543dcaf..e2ce7fda 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/DeleteTransportWarningSceneInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/DeleteTransportWarningSceneInput.cs @@ -1,6 +1,6 @@ -using SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.Warning.Transport; +namespace TrackCenter.Application.Contract.Dtos.Warning.Transport; public sealed class DeleteTransportWarningSceneInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/EditTransportWarningSceneRuleItemInput.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/EditTransportWarningSceneRuleItemInput.cs similarity index 92% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/EditTransportWarningSceneRuleItemInput.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/Transport/EditTransportWarningSceneRuleItemInput.cs index 23e5bb6a..9f69e379 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/EditTransportWarningSceneRuleItemInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/EditTransportWarningSceneRuleItemInput.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; -using SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.Warning.Transport; +namespace TrackCenter.Application.Contract.Dtos.Warning.Transport; public class EditTransportWarningSceneRuleItemInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs similarity index 94% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs index d335700e..463cf931 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.Warning.Transport; +namespace TrackCenter.Application.Contract.Dtos.Warning.Transport; /// /// 分页获取运输预警明细 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneInput.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneInput.cs similarity index 61% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneInput.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneInput.cs index 13fde467..10eefd9a 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneInput.cs @@ -1,6 +1,6 @@ -using SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.Warning.Transport; +namespace TrackCenter.Application.Contract.Dtos.Warning.Transport; /// /// 获取运输时效预警规则场景 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneRuleItemInput.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneRuleItemInput.cs similarity index 71% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneRuleItemInput.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneRuleItemInput.cs index 6538d1e4..99e4f921 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneRuleItemInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneRuleItemInput.cs @@ -1,6 +1,6 @@ -using SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.Warning.Transport; +namespace TrackCenter.Application.Contract.Dtos.Warning.Transport; /// /// 获取运输时效预警场景规则条目列表 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningDetailsDto.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/TransportWarningDetailsDto.cs similarity index 98% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningDetailsDto.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/Transport/TransportWarningDetailsDto.cs index c5b88ae8..466a2efe 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningDetailsDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/TransportWarningDetailsDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.Warning.Transport; +namespace TrackCenter.Application.Contract.Dtos.Warning.Transport; /// /// 运输时效预警明细 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneDto.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneDto.cs similarity index 94% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneDto.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneDto.cs index 3b485485..f4c0859d 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.Warning.Transport; +namespace TrackCenter.Application.Contract.Dtos.Warning.Transport; /// /// 预警规则场景 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneRuleItemDto.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneRuleItemDto.cs similarity index 94% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneRuleItemDto.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneRuleItemDto.cs index d0c1a94b..75bf88ba 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneRuleItemDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneRuleItemDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.Warning.Transport; +namespace TrackCenter.Application.Contract.Dtos.Warning.Transport; /// /// 运输时效场景规则项目 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/UpsertTransportWarningSceneInput.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/UpsertTransportWarningSceneInput.cs similarity index 87% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/UpsertTransportWarningSceneInput.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/Transport/UpsertTransportWarningSceneInput.cs index 07d64f2f..ecf5ab67 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/UpsertTransportWarningSceneInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/Transport/UpsertTransportWarningSceneInput.cs @@ -1,6 +1,6 @@ -using SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.Warning.Transport; +namespace TrackCenter.Application.Contract.Dtos.Warning.Transport; public sealed class UpsertTransportWarningSceneInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/UpdateEnabledStatusInput.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/UpdateEnabledStatusInput.cs similarity index 82% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/UpdateEnabledStatusInput.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/UpdateEnabledStatusInput.cs index 71a63286..426952cb 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/UpdateEnabledStatusInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/UpdateEnabledStatusInput.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; -using SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.Warning; +namespace TrackCenter.Application.Contract.Dtos.Warning; public class UpdateEnabledStatusInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/UpsertWarningRuleInput.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/UpsertWarningRuleInput.cs similarity index 88% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/UpsertWarningRuleInput.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/UpsertWarningRuleInput.cs index 8d226d4a..cca63c16 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/UpsertWarningRuleInput.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/UpsertWarningRuleInput.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; -using SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; +using TrackCenter.Application.Contract.Dtos.Warning.DataAnnotations; -namespace SJZY.Track.Application.Contract.Dtos.Warning; +namespace TrackCenter.Application.Contract.Dtos.Warning; /// /// 更新或者新增预警规则主体 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/WarningRuleDto.cs b/src/TrackCenter.Application.Contract/Dtos/Warning/WarningRuleDto.cs similarity index 95% rename from src/SJZY.Track.Application.Contract/Dtos/Warning/WarningRuleDto.cs rename to src/TrackCenter.Application.Contract/Dtos/Warning/WarningRuleDto.cs index 8516366e..dda57f4f 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/WarningRuleDto.cs +++ b/src/TrackCenter.Application.Contract/Dtos/Warning/WarningRuleDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.Warning; +namespace TrackCenter.Application.Contract.Dtos.Warning; /// /// 预警规则主体 diff --git a/src/TrackCenter.Application.Contract/Events/ClearRulCacheEvent.cs b/src/TrackCenter.Application.Contract/Events/ClearRulCacheEvent.cs new file mode 100644 index 00000000..ac0295f4 --- /dev/null +++ b/src/TrackCenter.Application.Contract/Events/ClearRulCacheEvent.cs @@ -0,0 +1,8 @@ +using TrackCenter.Application.Contract.Dtos.Forewarning; + +namespace TrackCenter.Application.Contract.Events; + +public class ClearRulCacheEvent +{ + public List Items { get; set; } +} diff --git a/src/SJZY.Track.Application.Contract/Events/ModifyWarningEvent.cs b/src/TrackCenter.Application.Contract/Events/ModifyWarningEvent.cs similarity index 88% rename from src/SJZY.Track.Application.Contract/Events/ModifyWarningEvent.cs rename to src/TrackCenter.Application.Contract/Events/ModifyWarningEvent.cs index d5ba00e7..05ee0f1a 100644 --- a/src/SJZY.Track.Application.Contract/Events/ModifyWarningEvent.cs +++ b/src/TrackCenter.Application.Contract/Events/ModifyWarningEvent.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Events; +namespace TrackCenter.Application.Contract.Events; /// /// redis 的发布订阅事件 diff --git a/src/SJZY.Track.Application.Contract/Events/OrderIdentifier.cs b/src/TrackCenter.Application.Contract/Events/OrderIdentifier.cs similarity index 86% rename from src/SJZY.Track.Application.Contract/Events/OrderIdentifier.cs rename to src/TrackCenter.Application.Contract/Events/OrderIdentifier.cs index 09bccd14..24b77c10 100644 --- a/src/SJZY.Track.Application.Contract/Events/OrderIdentifier.cs +++ b/src/TrackCenter.Application.Contract/Events/OrderIdentifier.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Events; +namespace TrackCenter.Application.Contract.Events; public struct OrderIdentifier { diff --git a/src/SJZY.Track.Application.Contract/Events/PushWarningEvent.cs b/src/TrackCenter.Application.Contract/Events/PushWarningEvent.cs similarity index 58% rename from src/SJZY.Track.Application.Contract/Events/PushWarningEvent.cs rename to src/TrackCenter.Application.Contract/Events/PushWarningEvent.cs index a6601102..48f2259a 100644 --- a/src/SJZY.Track.Application.Contract/Events/PushWarningEvent.cs +++ b/src/TrackCenter.Application.Contract/Events/PushWarningEvent.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Events; +namespace TrackCenter.Application.Contract.Events; public class PushWarningEvent { diff --git a/src/SJZY.Track.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs b/src/TrackCenter.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs similarity index 96% rename from src/SJZY.Track.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs rename to src/TrackCenter.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs index 07242767..976e71e0 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs +++ b/src/TrackCenter.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Events; +namespace TrackCenter.Application.Contract.Events; public class TrackChangeAfterUpdateOrderEvent { diff --git a/src/SJZY.Track.Application.Contract/Events/TrackChangeEto.cs b/src/TrackCenter.Application.Contract/Events/TrackChangeEto.cs similarity index 96% rename from src/SJZY.Track.Application.Contract/Events/TrackChangeEto.cs rename to src/TrackCenter.Application.Contract/Events/TrackChangeEto.cs index 22e5fd37..b7f04897 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackChangeEto.cs +++ b/src/TrackCenter.Application.Contract/Events/TrackChangeEto.cs @@ -1,6 +1,6 @@ -using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Dtos.ProvideServices; -namespace SJZY.Track.Application.Contract.Events; +namespace TrackCenter.Application.Contract.Events; public class TrackChangeEto { diff --git a/src/SJZY.Track.Application.Contract/Events/TrackDeleteEvent.cs b/src/TrackCenter.Application.Contract/Events/TrackDeleteEvent.cs similarity index 93% rename from src/SJZY.Track.Application.Contract/Events/TrackDeleteEvent.cs rename to src/TrackCenter.Application.Contract/Events/TrackDeleteEvent.cs index 0b0ce375..7d6a47cb 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackDeleteEvent.cs +++ b/src/TrackCenter.Application.Contract/Events/TrackDeleteEvent.cs @@ -1,6 +1,6 @@ -using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Dtos.ProvideServices; -namespace SJZY.Track.Application.Contract.Events; +namespace TrackCenter.Application.Contract.Events; public class TrackDeleteEvent { diff --git a/src/SJZY.Track.Application.Contract/Events/TrackPushCompletedEvent.cs b/src/TrackCenter.Application.Contract/Events/TrackPushCompletedEvent.cs similarity index 97% rename from src/SJZY.Track.Application.Contract/Events/TrackPushCompletedEvent.cs rename to src/TrackCenter.Application.Contract/Events/TrackPushCompletedEvent.cs index 44eb1d52..e4972edb 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackPushCompletedEvent.cs +++ b/src/TrackCenter.Application.Contract/Events/TrackPushCompletedEvent.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Events; +namespace TrackCenter.Application.Contract.Events; /// /// 轨迹推送广播模型 diff --git a/src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs b/src/TrackCenter.Application.Contract/Events/TrackPushEvent.cs similarity index 97% rename from src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs rename to src/TrackCenter.Application.Contract/Events/TrackPushEvent.cs index bc2f58ac..2c7d631a 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs +++ b/src/TrackCenter.Application.Contract/Events/TrackPushEvent.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Events; +namespace TrackCenter.Application.Contract.Events; /// /// 轨迹推送事件 diff --git a/src/SJZY.Track.Application.Contract/Events/TrackRefreshStruct.cs b/src/TrackCenter.Application.Contract/Events/TrackRefreshStruct.cs similarity index 89% rename from src/SJZY.Track.Application.Contract/Events/TrackRefreshStruct.cs rename to src/TrackCenter.Application.Contract/Events/TrackRefreshStruct.cs index 4e73f046..ff4d2c06 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackRefreshStruct.cs +++ b/src/TrackCenter.Application.Contract/Events/TrackRefreshStruct.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Events; +namespace TrackCenter.Application.Contract.Events; public struct TrackRefreshStruct { diff --git a/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs b/src/TrackCenter.Application.Contract/Events/TrackUpsertEvent.cs similarity index 97% rename from src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs rename to src/TrackCenter.Application.Contract/Events/TrackUpsertEvent.cs index d6df40bb..767b5c37 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs +++ b/src/TrackCenter.Application.Contract/Events/TrackUpsertEvent.cs @@ -1,6 +1,6 @@ -using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Dtos.ProvideServices; -namespace SJZY.Track.Application.Contract.Events; +namespace TrackCenter.Application.Contract.Events; public class TrackUpsertEvent { diff --git a/src/SJZY.Track.Application.Contract/Events/TrackWarningCalcEvent.cs b/src/TrackCenter.Application.Contract/Events/TrackWarningCalcEvent.cs similarity index 91% rename from src/SJZY.Track.Application.Contract/Events/TrackWarningCalcEvent.cs rename to src/TrackCenter.Application.Contract/Events/TrackWarningCalcEvent.cs index f2031f12..769e40cd 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackWarningCalcEvent.cs +++ b/src/TrackCenter.Application.Contract/Events/TrackWarningCalcEvent.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Events; +namespace TrackCenter.Application.Contract.Events; public class TrackWarningCalcEvent { diff --git a/src/SJZY.Track.Application.Contract/GlobalUsings.cs b/src/TrackCenter.Application.Contract/GlobalUsings.cs similarity index 100% rename from src/SJZY.Track.Application.Contract/GlobalUsings.cs rename to src/TrackCenter.Application.Contract/GlobalUsings.cs diff --git a/src/SJZY.Track.Application.Contract/Services/IBroadcastingService.cs b/src/TrackCenter.Application.Contract/Services/IBroadcastingService.cs similarity index 89% rename from src/SJZY.Track.Application.Contract/Services/IBroadcastingService.cs rename to src/TrackCenter.Application.Contract/Services/IBroadcastingService.cs index 91d34dec..352e5d4f 100644 --- a/src/SJZY.Track.Application.Contract/Services/IBroadcastingService.cs +++ b/src/TrackCenter.Application.Contract/Services/IBroadcastingService.cs @@ -1,8 +1,8 @@ -using SJZY.Track.Application.Contract.Dtos.TrackPush; -using SJZY.Track.Application.Contract.Events; +using TrackCenter.Application.Contract.Dtos.TrackPush; +using TrackCenter.Application.Contract.Events; using Volo.Abp.DependencyInjection; -namespace SJZY.Track.Application.Contract.Services; +namespace TrackCenter.Application.Contract.Services; public interface IBroadcastingService : ITransientDependency { diff --git a/src/TrackCenter.Application.Contract/Services/IKpiAreaCacheService.cs b/src/TrackCenter.Application.Contract/Services/IKpiAreaCacheService.cs new file mode 100644 index 00000000..e4ce222e --- /dev/null +++ b/src/TrackCenter.Application.Contract/Services/IKpiAreaCacheService.cs @@ -0,0 +1,5 @@ +namespace TrackCenter.Application.Contract.Services; + +public interface IKpiAreaCacheService +{ +} diff --git a/src/TrackCenter.Application.Contract/Services/ITrackFlagService.cs b/src/TrackCenter.Application.Contract/Services/ITrackFlagService.cs new file mode 100644 index 00000000..666628a4 --- /dev/null +++ b/src/TrackCenter.Application.Contract/Services/ITrackFlagService.cs @@ -0,0 +1,5 @@ +namespace TrackCenter.Application.Contract.Services; + +public interface ITrackFlagService +{ +} diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackPullCacheService.cs b/src/TrackCenter.Application.Contract/Services/ITrackPullCacheService.cs similarity index 85% rename from src/SJZY.Track.Application.Contract/Services/ITrackPullCacheService.cs rename to src/TrackCenter.Application.Contract/Services/ITrackPullCacheService.cs index 308cd8ff..3dc5016c 100644 --- a/src/SJZY.Track.Application.Contract/Services/ITrackPullCacheService.cs +++ b/src/TrackCenter.Application.Contract/Services/ITrackPullCacheService.cs @@ -1,6 +1,6 @@ -using SJZY.Track.Application.Contract.Dtos.TrackPull; +using TrackCenter.Application.Contract.Dtos.TrackPull; -namespace SJZY.Track.Application.Contract.Services; +namespace TrackCenter.Application.Contract.Services; public interface ITrackPullCacheService { diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackPushCacheService.cs b/src/TrackCenter.Application.Contract/Services/ITrackPushCacheService.cs similarity index 85% rename from src/SJZY.Track.Application.Contract/Services/ITrackPushCacheService.cs rename to src/TrackCenter.Application.Contract/Services/ITrackPushCacheService.cs index a7fb056a..54c969d9 100644 --- a/src/SJZY.Track.Application.Contract/Services/ITrackPushCacheService.cs +++ b/src/TrackCenter.Application.Contract/Services/ITrackPushCacheService.cs @@ -1,6 +1,6 @@ -using SJZY.Track.Application.Contract.Dtos.TrackPush; +using TrackCenter.Application.Contract.Dtos.TrackPush; -namespace SJZY.Track.Application.Contract.Services; +namespace TrackCenter.Application.Contract.Services; public interface ITrackPushCacheService { diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackPushConfigService.cs b/src/TrackCenter.Application.Contract/Services/ITrackPushConfigService.cs similarity index 75% rename from src/SJZY.Track.Application.Contract/Services/ITrackPushConfigService.cs rename to src/TrackCenter.Application.Contract/Services/ITrackPushConfigService.cs index 214ba4f1..0b8a51ce 100644 --- a/src/SJZY.Track.Application.Contract/Services/ITrackPushConfigService.cs +++ b/src/TrackCenter.Application.Contract/Services/ITrackPushConfigService.cs @@ -1,7 +1,7 @@ -using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Dtos.ProvideServices; using Volo.Abp; -namespace SJZY.Track.Application.Contract.Services; +namespace TrackCenter.Application.Contract.Services; public interface ITrackPushConfigService : IRemoteService { diff --git a/src/TrackCenter.Application.Contract/Services/ITrackStatusService.cs b/src/TrackCenter.Application.Contract/Services/ITrackStatusService.cs new file mode 100644 index 00000000..abe0a480 --- /dev/null +++ b/src/TrackCenter.Application.Contract/Services/ITrackStatusService.cs @@ -0,0 +1,5 @@ +namespace TrackCenter.Application.Contract.Services; + +public interface ITrackStatusService +{ +} diff --git a/src/SJZY.Track.Application.Contract/Services/ProvideServices/IOrderService.cs b/src/TrackCenter.Application.Contract/Services/ProvideServices/IOrderService.cs similarity index 87% rename from src/SJZY.Track.Application.Contract/Services/ProvideServices/IOrderService.cs rename to src/TrackCenter.Application.Contract/Services/ProvideServices/IOrderService.cs index 8f469cde..fed69d70 100644 --- a/src/SJZY.Track.Application.Contract/Services/ProvideServices/IOrderService.cs +++ b/src/TrackCenter.Application.Contract/Services/ProvideServices/IOrderService.cs @@ -1,7 +1,7 @@ -using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Dtos.ProvideServices; using Volo.Abp; -namespace SJZY.Track.Application.Contract.Services.ProvideServices; +namespace TrackCenter.Application.Contract.Services.ProvideServices; public interface IOrderService : IRemoteService { diff --git a/src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackContentService.cs b/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackContentService.cs similarity index 71% rename from src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackContentService.cs rename to src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackContentService.cs index 95e8160c..98577708 100644 --- a/src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackContentService.cs +++ b/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackContentService.cs @@ -1,7 +1,7 @@ -using SJZY.Track.Application.Contract.Dtos.TrackContents; +using TrackCenter.Application.Contract.Dtos.TrackContents; using Volo.Abp; -namespace SJZY.Track.Application.Contract.Services.ProvideServices; +namespace TrackCenter.Application.Contract.Services.ProvideServices; public interface ITrackContentService : IRemoteService { diff --git a/src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackPullService.cs b/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackPullService.cs similarity index 66% rename from src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackPullService.cs rename to src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackPullService.cs index 744f195f..5edafed5 100644 --- a/src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackPullService.cs +++ b/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackPullService.cs @@ -1,7 +1,7 @@ -using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Dtos.ProvideServices; using Volo.Abp; -namespace SJZY.Track.Application.Contract.Services.ProvideServices; +namespace TrackCenter.Application.Contract.Services.ProvideServices; public interface ITrackPullService : IRemoteService { diff --git a/src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackPushService.cs b/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackPushService.cs similarity index 81% rename from src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackPushService.cs rename to src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackPushService.cs index 660dca49..13564c29 100644 --- a/src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackPushService.cs +++ b/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackPushService.cs @@ -1,9 +1,9 @@ -using SJZY.Track.Application.Contract.Dtos.ProvideServices; -using SJZY.Track.Application.Contract.Dtos.TrackOrder; -using SJZY.Track.Application.Contract.Dtos.TrackPush; +using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Dtos.TrackOrder; +using TrackCenter.Application.Contract.Dtos.TrackPush; using Volo.Abp; -namespace SJZY.Track.Application.Contract.Services.ProvideServices; +namespace TrackCenter.Application.Contract.Services.ProvideServices; public interface ITrackPushService : IRemoteService { diff --git a/src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackService.cs b/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackService.cs similarity index 92% rename from src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackService.cs rename to src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackService.cs index 0921c05d..b951694d 100644 --- a/src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackService.cs +++ b/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackService.cs @@ -1,7 +1,7 @@ -using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Dtos.ProvideServices; using Volo.Abp; -namespace SJZY.Track.Application.Contract.Services.ProvideServices; +namespace TrackCenter.Application.Contract.Services.ProvideServices; public interface ITrackService : IRemoteService { diff --git a/src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackTemplateService.cs b/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackTemplateService.cs similarity index 53% rename from src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackTemplateService.cs rename to src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackTemplateService.cs index d6e10e87..8be40a48 100644 --- a/src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackTemplateService.cs +++ b/src/TrackCenter.Application.Contract/Services/ProvideServices/ITrackTemplateService.cs @@ -1,6 +1,6 @@ using Volo.Abp; -namespace SJZY.Track.Application.Contract.Services.ProvideServices; +namespace TrackCenter.Application.Contract.Services.ProvideServices; public interface ITrackTemplateService : IRemoteService { diff --git a/src/SJZY.Track.Application.Contract/SjzyTrackApplicationContractModule.cs b/src/TrackCenter.Application.Contract/SjzyTrackApplicationContractModule.cs similarity index 54% rename from src/SJZY.Track.Application.Contract/SjzyTrackApplicationContractModule.cs rename to src/TrackCenter.Application.Contract/SjzyTrackApplicationContractModule.cs index 9a69109c..28e5ee2c 100644 --- a/src/SJZY.Track.Application.Contract/SjzyTrackApplicationContractModule.cs +++ b/src/TrackCenter.Application.Contract/SjzyTrackApplicationContractModule.cs @@ -1,8 +1,8 @@ using Volo.Abp.Modularity; -namespace SJZY.Track.Application.Contract; +namespace TrackCenter.Application.Contract; -public class SjzyTrackApplicationContractModule : AbpModule +public class SjzyTrackApplicationContractModule : FakeModule { public override void PreConfigureServices(ServiceConfigurationContext context) { diff --git a/src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj b/src/TrackCenter.Application.Contract/TrackCenter.Application.Contract.csproj similarity index 56% rename from src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj rename to src/TrackCenter.Application.Contract/TrackCenter.Application.Contract.csproj index fecf6b17..f450334d 100644 --- a/src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj +++ b/src/TrackCenter.Application.Contract/TrackCenter.Application.Contract.csproj @@ -3,14 +3,10 @@ - net7.0 + net8 True 7.0.24 True - - - - diff --git a/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/OrderAutoMapperProfile.cs similarity index 65% rename from src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs rename to src/TrackCenter.Application/AutoMapper/OrderAutoMapperProfile.cs index 6f71be50..6315fbf4 100644 --- a/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs +++ b/src/TrackCenter.Application/AutoMapper/OrderAutoMapperProfile.cs @@ -1,15 +1,13 @@ using AutoMapper; -using SJZY.Expand.ABP.Core.PublicMethords; -using SJZY.Track.Application.Contract.Dtos.ProvideServices; -using SJZY.Track.Application.Contract.Dtos.TrackOrder; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; -using SJZY.Track.Domain.Aggregates.TrackPushAggregate; -using SJZY.Track.Domain.Dtos.Order; -using SJZY.Track.Domain.Enums; -using Volo.Abp.AutoMapper; +using Fake.Application.Dtos; +using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Dtos.TrackOrder; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; +using TrackCenter.Domain.Aggregates.TrackPushAggregate; +using TrackCenter.Domain.Dtos.Order; -namespace SJZY.Track.Application.AutoMapper; +namespace TrackCenter.Application.AutoMapper; public class OrderAutoMapperProfile : Profile { @@ -23,7 +21,7 @@ public class OrderAutoMapperProfile : Profile CreateMap(MemberList.None); CreateMap(MemberList.None); - CreateMap, UnifyPageResultDto>(MemberList.None); + CreateMap, PagedResult>(MemberList.None); CreateMap(MemberList.None).Ignore(dest => dest.TrackTimeZone) .ForMember(dest => dest.Code, opt => opt.MapFrom(m => m.TrackCode)) .ForMember(dest => dest.Content, opt => opt.MapFrom(m => m.TrackContent)) diff --git a/src/SJZY.Track.Application/AutoMapper/TrackAutoMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/TrackAutoMapperProfile.cs similarity index 55% rename from src/SJZY.Track.Application/AutoMapper/TrackAutoMapperProfile.cs rename to src/TrackCenter.Application/AutoMapper/TrackAutoMapperProfile.cs index cac245bd..43998907 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackAutoMapperProfile.cs +++ b/src/TrackCenter.Application/AutoMapper/TrackAutoMapperProfile.cs @@ -1,8 +1,8 @@ using AutoMapper; -using SJZY.Track.Application.Contract.Dtos.ProvideServices; -using SJZY.Track.Application.Contract.Events; +using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Events; -namespace SJZY.Track.Application.AutoMapper; +namespace TrackCenter.Application.AutoMapper; public class TrackAutoMapperProfile : Profile { diff --git a/src/SJZY.Track.Application/AutoMapper/TrackContentAutoMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/TrackContentAutoMapperProfile.cs similarity index 57% rename from src/SJZY.Track.Application/AutoMapper/TrackContentAutoMapperProfile.cs rename to src/TrackCenter.Application/AutoMapper/TrackContentAutoMapperProfile.cs index 33f1965b..98fba2f5 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackContentAutoMapperProfile.cs +++ b/src/TrackCenter.Application/AutoMapper/TrackContentAutoMapperProfile.cs @@ -1,10 +1,11 @@ using AutoMapper; -using SJZY.Track.Application.Contract.Dtos.TrackContents; -using SJZY.Track.Domain.Aggregates.TrackContentAggregate; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; -using SJZY.Track.Domain.Dtos.TrackContents; +using Fake.Application.Dtos; +using TrackCenter.Application.Contract.Dtos.TrackContents; +using TrackCenter.Domain.Aggregates.TrackContentAggregate; +using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; +using TrackCenter.Domain.Dtos.TrackContents; -namespace SJZY.Track.Application.AutoMapper; +namespace TrackCenter.Application.AutoMapper; public class TrackContentAutoMapperProfile : Profile { @@ -14,12 +15,12 @@ public class TrackContentAutoMapperProfile : Profile CreateMap(MemberList.None); CreateMap(MemberList.None); CreateMap(MemberList.None); - CreateMap, UnifyPageResultDto>( + CreateMap, PagedResult>( MemberList.None); CreateMap(MemberList.None); CreateMap(MemberList.None); CreateMap(MemberList.None).ReverseMap(); - CreateMap(MemberList.None).ReverseMap(); + CreateMap(MemberList.None).ReverseMap(); } } diff --git a/src/SJZY.Track.Application/AutoMapper/TrackFlagAutoMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/TrackFlagAutoMapperProfile.cs similarity index 64% rename from src/SJZY.Track.Application/AutoMapper/TrackFlagAutoMapperProfile.cs rename to src/TrackCenter.Application/AutoMapper/TrackFlagAutoMapperProfile.cs index be324306..bb075d84 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackFlagAutoMapperProfile.cs +++ b/src/TrackCenter.Application/AutoMapper/TrackFlagAutoMapperProfile.cs @@ -1,9 +1,10 @@ using AutoMapper; -using SJZY.Track.Application.Contract.Dtos.TrackFlags; -using SJZY.Track.Domain.Aggregates.TrackFlagAggregate; -using SJZY.Track.Domain.Dtos.TrackFlags; +using Fake.Application.Dtos; +using TrackCenter.Application.Contract.Dtos.TrackFlags; +using TrackCenter.Domain.Aggregates.TrackFlagAggregate; +using TrackCenter.Domain.Dtos.TrackFlags; -namespace SJZY.Track.Application.AutoMapper; +namespace TrackCenter.Application.AutoMapper; public class TrackFlagAutoMapperProfile : Profile { @@ -14,7 +15,7 @@ public class TrackFlagAutoMapperProfile : Profile //.ForMember(dest => dest.IsCompleted, opt => opt.MapFrom(source => source.IsFinish)); CreateMap(MemberList.None); CreateMap(MemberList.None); - CreateMap, UnifyPageResultDto>(MemberList.None); + CreateMap, PagedResult>(MemberList.None); CreateMap(MemberList.None); } } diff --git a/src/SJZY.Track.Application/AutoMapper/TrackNodeMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/TrackNodeMapperProfile.cs similarity index 67% rename from src/SJZY.Track.Application/AutoMapper/TrackNodeMapperProfile.cs rename to src/TrackCenter.Application/AutoMapper/TrackNodeMapperProfile.cs index 5de329ac..60fa5851 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackNodeMapperProfile.cs +++ b/src/TrackCenter.Application/AutoMapper/TrackNodeMapperProfile.cs @@ -1,10 +1,10 @@ using AutoMapper; -using SJZY.Track.Application.Contract.Dtos.TrackNode; -using SJZY.Track.Application.Contract.Dtos.TrackStatus; -using SJZY.Track.Domain.Aggregates.TrackNodeAggregate; -using SJZY.Track.Domain.Dtos.TrackNode; +using TrackCenter.Application.Contract.Dtos.TrackNode; +using TrackCenter.Application.Contract.Dtos.TrackStatus; +using TrackCenter.Domain.Aggregates.TrackNodeAggregate; +using TrackCenter.Domain.Dtos.TrackNode; -namespace SJZY.Track.Application.AutoMapper; +namespace TrackCenter.Application.AutoMapper; public class TrackNodeMapperProfile : Profile { diff --git a/src/SJZY.Track.Application/AutoMapper/TrackPullAutoMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/TrackPullAutoMapperProfile.cs similarity index 80% rename from src/SJZY.Track.Application/AutoMapper/TrackPullAutoMapperProfile.cs rename to src/TrackCenter.Application/AutoMapper/TrackPullAutoMapperProfile.cs index ad6f1aff..326b9535 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackPullAutoMapperProfile.cs +++ b/src/TrackCenter.Application/AutoMapper/TrackPullAutoMapperProfile.cs @@ -1,11 +1,11 @@ using AutoMapper; -using SJZY.Track.Application.Contract.Dtos.ProvideServices; -using SJZY.Track.Application.Contract.Dtos.TrackPull; -using SJZY.Track.Domain.Aggregates.TrackPullAggregate; -using SJZY.Track.Domain.Dtos.Order; -using SJZY.Track.Domain.Dtos.TrackPull; +using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Dtos.TrackPull; +using TrackCenter.Domain.Aggregates.TrackPullAggregate; +using TrackCenter.Domain.Dtos.Order; +using TrackCenter.Domain.Dtos.TrackPull; -namespace SJZY.Track.Application.AutoMapper; +namespace TrackCenter.Application.AutoMapper; public class TrackPullAutoMapperProfile : Profile { diff --git a/src/SJZY.Track.Application/AutoMapper/TrackPushAutoMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/TrackPushAutoMapperProfile.cs similarity index 77% rename from src/SJZY.Track.Application/AutoMapper/TrackPushAutoMapperProfile.cs rename to src/TrackCenter.Application/AutoMapper/TrackPushAutoMapperProfile.cs index fe654d77..746026b0 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackPushAutoMapperProfile.cs +++ b/src/TrackCenter.Application/AutoMapper/TrackPushAutoMapperProfile.cs @@ -1,9 +1,9 @@ using AutoMapper; -using SJZY.Track.Application.Contract.Dtos.TrackPush; -using SJZY.Track.Domain.Aggregates.TrackPushAggregate; -using SJZY.Track.Domain.Dtos.TrackPush; +using TrackCenter.Application.Contract.Dtos.TrackPush; +using TrackCenter.Domain.Aggregates.TrackPushAggregate; +using TrackCenter.Domain.Dtos.TrackPush; -namespace SJZY.Track.Application.AutoMapper; +namespace TrackCenter.Application.AutoMapper; public class TrackPushAutoMapperProfile : Profile { diff --git a/src/SJZY.Track.Application/AutoMapper/TrackPushConfigAutoMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/TrackPushConfigAutoMapperProfile.cs similarity index 67% rename from src/SJZY.Track.Application/AutoMapper/TrackPushConfigAutoMapperProfile.cs rename to src/TrackCenter.Application/AutoMapper/TrackPushConfigAutoMapperProfile.cs index f6141b70..087dc02f 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackPushConfigAutoMapperProfile.cs +++ b/src/TrackCenter.Application/AutoMapper/TrackPushConfigAutoMapperProfile.cs @@ -1,9 +1,9 @@ using AutoMapper; -using SJZY.Track.Application.Contract.Dtos.ProvideServices; -using SJZY.Track.Application.Contract.Dtos.TrackPush; -using SJZY.Track.Domain.Dtos.TrackPush; +using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Dtos.TrackPush; +using TrackCenter.Domain.Dtos.TrackPush; -namespace SJZY.Track.Application.AutoMapper; +namespace TrackCenter.Application.AutoMapper; public class TrackPushConfigAutoMapperProfile : Profile { diff --git a/src/SJZY.Track.Application/AutoMapper/TrackStatusAutoMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/TrackStatusAutoMapperProfile.cs similarity index 70% rename from src/SJZY.Track.Application/AutoMapper/TrackStatusAutoMapperProfile.cs rename to src/TrackCenter.Application/AutoMapper/TrackStatusAutoMapperProfile.cs index f8bb4d05..cace9603 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackStatusAutoMapperProfile.cs +++ b/src/TrackCenter.Application/AutoMapper/TrackStatusAutoMapperProfile.cs @@ -1,9 +1,10 @@ using AutoMapper; -using SJZY.Track.Application.Contract.Dtos.TrackStatus; -using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; -using SJZY.Track.Domain.Dtos.TrackStatus; +using Fake.Application.Dtos; +using TrackCenter.Application.Contract.Dtos.TrackStatus; +using TrackCenter.Domain.Aggregates.TrackStatusAggregate; +using TrackCenter.Domain.Dtos.TrackStatus; -namespace SJZY.Track.Application.AutoMapper; +namespace TrackCenter.Application.AutoMapper; public class TrackStatusAutoMapperProfile : Profile { @@ -17,7 +18,7 @@ public class TrackStatusAutoMapperProfile : Profile CreateMap(MemberList.None); CreateMap(MemberList.None); CreateMap(MemberList.None); - CreateMap, UnifyPageResultDto>(MemberList + CreateMap, PagedResult>(MemberList .None); } } diff --git a/src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs similarity index 66% rename from src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs rename to src/TrackCenter.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs index f6e6b53b..adb36f7e 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs +++ b/src/TrackCenter.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs @@ -1,10 +1,11 @@ using AutoMapper; -using SJZY.Track.Application.Contract.Dtos.ProvideServices; -using SJZY.Track.Application.Contract.Dtos.TrackTemplates; -using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; -using SJZY.Track.Domain.Dtos.TrackTemplate; +using Fake.Application.Dtos; +using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Dtos.TrackTemplates; +using TrackCenter.Domain.Aggregates.TrackTemplateAggregate; +using TrackCenter.Domain.Dtos.TrackTemplate; -namespace SJZY.Track.Application.AutoMapper; +namespace TrackCenter.Application.AutoMapper; /// /// 轨迹模版自动映射 @@ -18,10 +19,10 @@ public class TrackTemplateAutoMapperProfile : Profile CreateMap(MemberList.None); CreateMap(MemberList.None); CreateMap(MemberList.None); - CreateMap, UnifyPageResultDto>(MemberList + CreateMap, PagedResult>(MemberList .None); CreateMap(MemberList.None); - CreateMap, UnifyPageResultDto>(MemberList.None); + CreateMap, PagedResult>(MemberList.None); CreateMap(MemberList.None); CreateMap(MemberList.None); diff --git a/src/SJZY.Track.Application/AutoMapper/WarningMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/WarningMapperProfile.cs similarity index 62% rename from src/SJZY.Track.Application/AutoMapper/WarningMapperProfile.cs rename to src/TrackCenter.Application/AutoMapper/WarningMapperProfile.cs index 4fef273f..7f7f0bc1 100644 --- a/src/SJZY.Track.Application/AutoMapper/WarningMapperProfile.cs +++ b/src/TrackCenter.Application/AutoMapper/WarningMapperProfile.cs @@ -1,10 +1,10 @@ using AutoMapper; -using SJZY.Track.Application.Contract.Dtos.Warning.Complete; -using SJZY.Track.Application.Contract.Dtos.Warning.Return; -using SJZY.Track.Application.Contract.Dtos.Warning.Transport; -using SJZY.Track.Domain.Dtos.Warning; +using TrackCenter.Application.Contract.Dtos.Warning.Complete; +using TrackCenter.Application.Contract.Dtos.Warning.Return; +using TrackCenter.Application.Contract.Dtos.Warning.Transport; +using TrackCenter.Domain.Dtos.Warning; -namespace SJZY.Track.Application.AutoMapper; +namespace TrackCenter.Application.AutoMapper; public class WarningMapperProfile : Profile { diff --git a/src/SJZY.Track.Application/CAP/CAPFilter.cs b/src/TrackCenter.Application/CAP/CAPFilter.cs similarity index 91% rename from src/SJZY.Track.Application/CAP/CAPFilter.cs rename to src/TrackCenter.Application/CAP/CAPFilter.cs index 0decb640..db51e15b 100644 --- a/src/SJZY.Track.Application/CAP/CAPFilter.cs +++ b/src/TrackCenter.Application/CAP/CAPFilter.cs @@ -1,10 +1,11 @@ using DotNetCore.CAP.Filter; -using SJZY.Expand.ABP.Core; -using SJZY.Expand.ABP.Core.Logger; -using SJZY.Expand.ABP.Core.PublicMethords; -using SJZY.Track.Application.Helpers; +using Fake.Application; +using InterfaceForward.Domain.Shared.Helpers; +using TrackCenter.Application.Helpers; +using TrackCenter.Domain.Extensions; +using TrackCenter.Repository.Redis; -namespace SJZY.Track.Application.CAP; +namespace TrackCenter.Application.CAP; public class CapFilter : SubscribeFilter { diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs b/src/TrackCenter.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs similarity index 95% rename from src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs rename to src/TrackCenter.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs index 050bc057..772c1bb5 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs +++ b/src/TrackCenter.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs @@ -1,11 +1,13 @@ using DotNetCore.CAP; +using Fake.DependencyInjection; using SJZY.Expand.ABP.Core.Logger; -using SJZY.Track.Application.Contract.Events; -using SJZY.Track.Application.Services.Warning.Handlers; -using SJZY.Track.Domain.Aggregates.OrderAggregate; +using TrackCenter.Application.Contract.Events; +using TrackCenter.Application.Services.Warning.Handlers; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Extensions; using Volo.Abp.DependencyInjection; -namespace SJZY.Track.Application.CAP.EventHandlers; +namespace TrackCenter.Application.CAP.EventHandlers; public class TrackChangeAfterUpdateOrderEventHandler : ITransientDependency, ICapSubscribe { diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs b/src/TrackCenter.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs similarity index 96% rename from src/SJZY.Track.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs rename to src/TrackCenter.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs index 5fe88be1..5fa4ebf7 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs +++ b/src/TrackCenter.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs @@ -2,19 +2,19 @@ using System.Collections.Immutable; using DotNetCore.CAP; using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ABP.Core.PublicMethords; -using SJZY.Track.Application.Contract.Dtos.ProvideServices; -using SJZY.Track.Application.Contract.Events; -using SJZY.Track.Application.Contract.Services; -using SJZY.Track.Application.Kafka; -using SJZY.Track.Application.Services.Warning.Signals; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; -using SJZY.Track.Domain.Enums; -using SJZY.Track.Domain.Extensions; -using SJZY.Track.Domain.Queries; +using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Events; +using TrackCenter.Application.Contract.Services; +using TrackCenter.Application.Kafka; +using TrackCenter.Application.Services.Warning.Signals; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; +using TrackCenter.Domain.Enums; +using TrackCenter.Domain.Extensions; +using TrackCenter.Domain.Queries; using Volo.Abp.DependencyInjection; -namespace SJZY.Track.Application.CAP.EventHandlers; +namespace TrackCenter.Application.CAP.EventHandlers; public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe { diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs b/src/TrackCenter.Application/CAP/EventHandlers/TrackPushEventHandler.cs similarity index 97% rename from src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs rename to src/TrackCenter.Application/CAP/EventHandlers/TrackPushEventHandler.cs index 7994fecc..f8bbb9fe 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs +++ b/src/TrackCenter.Application/CAP/EventHandlers/TrackPushEventHandler.cs @@ -6,21 +6,21 @@ using Newtonsoft.Json; using SJZY.Expand.ABP.Core.PublicMethords; using SJZY.InterfaceRelay.Application.Contracts; using SJZY.OTel; -using SJZY.Track.Application.Contract.Dtos.TrackPush; -using SJZY.Track.Application.Contract.Events; -using SJZY.Track.Application.Contract.Services; -using SJZY.Track.Application.Helpers; -using SJZY.Track.Application.Options; -using SJZY.Track.Application.Track2InterfaceRelay; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; -using SJZY.Track.Domain.Aggregates.TrackPushAggregate; -using SJZY.Track.Domain.Enums; -using SJZY.Track.Domain.Extensions; +using TrackCenter.Application.Contract.Dtos.TrackPush; +using TrackCenter.Application.Contract.Events; +using TrackCenter.Application.Contract.Services; +using TrackCenter.Application.Helpers; +using TrackCenter.Application.Options; +using TrackCenter.Application.Track2InterfaceRelay; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; +using TrackCenter.Domain.Aggregates.TrackPushAggregate; +using TrackCenter.Domain.Enums; +using TrackCenter.Domain.Extensions; using Volo.Abp.DependencyInjection; using Volo.Abp.Http.Client.DynamicProxying; -namespace SJZY.Track.Application.CAP.EventHandlers; +namespace TrackCenter.Application.CAP.EventHandlers; public class TrackPushEventHandler : ITransientDependency, ICapSubscribe { diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs b/src/TrackCenter.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs similarity index 97% rename from src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs rename to src/TrackCenter.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs index 76e87f99..d2b7c084 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs +++ b/src/TrackCenter.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs @@ -3,19 +3,19 @@ using Microsoft.Extensions.Logging; using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ABP.Core.PublicMethords; using SJZY.OTel; -using SJZY.Track.Application.Contract.Events; -using SJZY.Track.Application.Contract.Services; -using SJZY.Track.Application.Kafka; -using SJZY.Track.Application.Services.Warning.Signals; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; -using SJZY.Track.Domain.Dtos.TrackContents; -using SJZY.Track.Domain.Enums; -using SJZY.Track.Domain.Queries; +using TrackCenter.Application.Contract.Events; +using TrackCenter.Application.Contract.Services; +using TrackCenter.Application.Kafka; +using TrackCenter.Application.Services.Warning.Signals; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; +using TrackCenter.Domain.Dtos.TrackContents; +using TrackCenter.Domain.Enums; +using TrackCenter.Domain.Queries; using Volo.Abp.DependencyInjection; -using OrderIdentifier = SJZY.Track.Application.Contract.Events.OrderIdentifier; +using OrderIdentifier = TrackCenter.Application.Contract.Events.OrderIdentifier; -namespace SJZY.Track.Application.CAP.EventHandlers; +namespace TrackCenter.Application.CAP.EventHandlers; public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe { diff --git a/src/SJZY.Track.Application/CAP/LoggerExtensions.cs b/src/TrackCenter.Application/CAP/LoggerExtensions.cs similarity index 98% rename from src/SJZY.Track.Application/CAP/LoggerExtensions.cs rename to src/TrackCenter.Application/CAP/LoggerExtensions.cs index 1cefe77b..08662b76 100644 --- a/src/SJZY.Track.Application/CAP/LoggerExtensions.cs +++ b/src/TrackCenter.Application/CAP/LoggerExtensions.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.Logging; -namespace SJZY.Track.Application.CAP; +namespace TrackCenter.Application.CAP; internal static class LoggerExtensions { diff --git a/src/SJZY.Track.Application/CAP/MySubscribeExecutor.cs b/src/TrackCenter.Application/CAP/MySubscribeExecutor.cs similarity index 99% rename from src/SJZY.Track.Application/CAP/MySubscribeExecutor.cs rename to src/TrackCenter.Application/CAP/MySubscribeExecutor.cs index 6aed1398..b5b296f9 100644 --- a/src/SJZY.Track.Application/CAP/MySubscribeExecutor.cs +++ b/src/TrackCenter.Application/CAP/MySubscribeExecutor.cs @@ -8,7 +8,7 @@ using DotNetCore.CAP.Persistence; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -namespace SJZY.Track.Application.CAP; +namespace TrackCenter.Application.CAP; public class MySubscribeExecutor : ISubscribeExecutor { diff --git a/src/SJZY.Track.Application/CAP/SubscriberExecutionFailedException.cs b/src/TrackCenter.Application/CAP/SubscriberExecutionFailedException.cs similarity index 91% rename from src/SJZY.Track.Application/CAP/SubscriberExecutionFailedException.cs rename to src/TrackCenter.Application/CAP/SubscriberExecutionFailedException.cs index 2b780c56..a3616edc 100644 --- a/src/SJZY.Track.Application/CAP/SubscriberExecutionFailedException.cs +++ b/src/TrackCenter.Application/CAP/SubscriberExecutionFailedException.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.CAP; +namespace TrackCenter.Application.CAP; internal sealed class SubscriberExecutionFailedException : Exception { diff --git a/src/SJZY.Track.Application/Caching/BasicCacheForPeriodicRefresh.cs b/src/TrackCenter.Application/Caching/BasicCacheForPeriodicRefresh.cs similarity index 99% rename from src/SJZY.Track.Application/Caching/BasicCacheForPeriodicRefresh.cs rename to src/TrackCenter.Application/Caching/BasicCacheForPeriodicRefresh.cs index bc8325d6..e77b9a4d 100644 --- a/src/SJZY.Track.Application/Caching/BasicCacheForPeriodicRefresh.cs +++ b/src/TrackCenter.Application/Caching/BasicCacheForPeriodicRefresh.cs @@ -2,9 +2,9 @@ using FreeRedis; using Microsoft.Extensions.Caching.Memory; using Newtonsoft.Json; -using SJZY.Track.Domain.Extensions; +using TrackCenter.Domain.Extensions; -namespace SJZY.Track.Application.Caching; +namespace TrackCenter.Application.Caching; /// /// 容忍短暂的数据不一致，固定周期内强制刷新（本地缓存过期时强制刷新） diff --git a/src/SJZY.Track.Application/Caching/CustomAbbreviationDictCache.cs b/src/TrackCenter.Application/Caching/CustomAbbreviationDictCache.cs similarity index 90% rename from src/SJZY.Track.Application/Caching/CustomAbbreviationDictCache.cs rename to src/TrackCenter.Application/Caching/CustomAbbreviationDictCache.cs index fb4a9c06..37d3c478 100644 --- a/src/SJZY.Track.Application/Caching/CustomAbbreviationDictCache.cs +++ b/src/TrackCenter.Application/Caching/CustomAbbreviationDictCache.cs @@ -1,9 +1,11 @@ +using Fake.DependencyInjection; using SJZY.Expand.ABP.Core; -using SJZY.Track.Domain.Extensions; -using SJZY.Track.Domain.Queries; +using TrackCenter.Domain.Extensions; +using TrackCenter.Domain.Queries; +using TrackCenter.Repository.Redis; using Volo.Abp.DependencyInjection; -namespace SJZY.Track.Application.Caching; +namespace TrackCenter.Application.Caching; /// /// 客户id简称缓存 diff --git a/src/SJZY.Track.Application/Caching/TrackStatusNameDictCache.cs b/src/TrackCenter.Application/Caching/TrackStatusNameDictCache.cs similarity index 89% rename from src/SJZY.Track.Application/Caching/TrackStatusNameDictCache.cs rename to src/TrackCenter.Application/Caching/TrackStatusNameDictCache.cs index 9fae9972..35ed3de4 100644 --- a/src/SJZY.Track.Application/Caching/TrackStatusNameDictCache.cs +++ b/src/TrackCenter.Application/Caching/TrackStatusNameDictCache.cs @@ -1,9 +1,11 @@ +using Fake.DependencyInjection; using SJZY.Expand.ABP.Core; -using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; -using SJZY.Track.Domain.Extensions; +using TrackCenter.Domain.Aggregates.TrackStatusAggregate; +using TrackCenter.Domain.Extensions; +using TrackCenter.Repository.Redis; using Volo.Abp.DependencyInjection; -namespace SJZY.Track.Application.Caching; +namespace TrackCenter.Application.Caching; /// /// 轨迹状态id名称字典缓存 diff --git a/src/SJZY.Track.Application/FodyWeavers.xml b/src/TrackCenter.Application/FodyWeavers.xml similarity index 100% rename from src/SJZY.Track.Application/FodyWeavers.xml rename to src/TrackCenter.Application/FodyWeavers.xml diff --git a/src/SJZY.Track.Application/FodyWeavers.xsd b/src/TrackCenter.Application/FodyWeavers.xsd similarity index 100% rename from src/SJZY.Track.Application/FodyWeavers.xsd rename to src/TrackCenter.Application/FodyWeavers.xsd diff --git a/src/SJZY.Track.Application/GlobalUsings.cs b/src/TrackCenter.Application/GlobalUsings.cs similarity index 79% rename from src/SJZY.Track.Application/GlobalUsings.cs rename to src/TrackCenter.Application/GlobalUsings.cs index 5f9509fe..ab8d3553 100644 --- a/src/SJZY.Track.Application/GlobalUsings.cs +++ b/src/TrackCenter.Application/GlobalUsings.cs @@ -1,9 +1,9 @@ -global using SJZY.Track.Domain.Consts; +global using TrackCenter.Domain.Consts; global using Microsoft.AspNetCore.Mvc; global using Microsoft.Extensions.DependencyInjection; global using SJZY.Expand.ABP.Common.Enums; global using SJZY.Expand.ABP.Core.Common.Dto; -global using SJZY.Track.Domain; +global using TrackCenter.Domain; global using Volo.Abp; global using Volo.Abp.Application.Services; global using Volo.Abp.Validation; diff --git a/src/SJZY.Track.Application/Hangfire/AnonymousHangfireAuthorizationFilter.cs b/src/TrackCenter.Application/Hangfire/AnonymousHangfireAuthorizationFilter.cs similarity index 81% rename from src/SJZY.Track.Application/Hangfire/AnonymousHangfireAuthorizationFilter.cs rename to src/TrackCenter.Application/Hangfire/AnonymousHangfireAuthorizationFilter.cs index 49904d46..edc08515 100644 --- a/src/SJZY.Track.Application/Hangfire/AnonymousHangfireAuthorizationFilter.cs +++ b/src/TrackCenter.Application/Hangfire/AnonymousHangfireAuthorizationFilter.cs @@ -1,6 +1,6 @@ using Hangfire.Dashboard; -namespace SJZY.Track.Application.Hangfire; +namespace TrackCenter.Application.Hangfire; public class AnonymousHangfireAuthorizationFilter : IDashboardAuthorizationFilter { diff --git a/src/SJZY.Track.Application/Hangfire/WarningNotifyAggregator.cs b/src/TrackCenter.Application/Hangfire/WarningNotifyAggregator.cs similarity index 96% rename from src/SJZY.Track.Application/Hangfire/WarningNotifyAggregator.cs rename to src/TrackCenter.Application/Hangfire/WarningNotifyAggregator.cs index c49df4aa..99b53a97 100644 --- a/src/SJZY.Track.Application/Hangfire/WarningNotifyAggregator.cs +++ b/src/TrackCenter.Application/Hangfire/WarningNotifyAggregator.cs @@ -1,18 +1,18 @@ using Microsoft.Extensions.Options; -using SJZY.Track.Application.Contract.Dtos.Warning; -using SJZY.Track.Application.Options; -using SJZY.Track.Application.Services.Warning.Model; -using SJZY.Track.Domain.Aggregates.KPIAreaAggregate; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; -using SJZY.Track.Domain.Aggregates.WarningAggregate; -using SJZY.Track.Domain.Dtos.Forewarning; -using SJZY.Track.Domain.Dtos.Warning; -using SJZY.Track.Domain.Enums; -using SJZY.Track.Domain.Extensions; +using TrackCenter.Application.Contract.Dtos.Warning; +using TrackCenter.Application.Options; +using TrackCenter.Application.Services.Warning.Model; +using TrackCenter.Domain.Aggregates.KPIAreaAggregate; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; +using TrackCenter.Domain.Aggregates.WarningAggregate; +using TrackCenter.Domain.Dtos.Forewarning; +using TrackCenter.Domain.Dtos.Warning; +using TrackCenter.Domain.Enums; +using TrackCenter.Domain.Extensions; using Volo.Abp.DependencyInjection; -namespace SJZY.Track.Application.Hangfire; +namespace TrackCenter.Application.Hangfire; /// /// 预警通知聚合器 diff --git a/src/SJZY.Track.Application/Hangfire/WarningNotifyBuilder.cs b/src/TrackCenter.Application/Hangfire/WarningNotifyBuilder.cs similarity index 99% rename from src/SJZY.Track.Application/Hangfire/WarningNotifyBuilder.cs rename to src/TrackCenter.Application/Hangfire/WarningNotifyBuilder.cs index 997d3533..2969e4c0 100644 --- a/src/SJZY.Track.Application/Hangfire/WarningNotifyBuilder.cs +++ b/src/TrackCenter.Application/Hangfire/WarningNotifyBuilder.cs @@ -4,7 +4,7 @@ using FeishuNetSdk.Im.Dtos; using SJZY.UserCenter.SharedModel.Dtos.Message; using SJZY.UserCenter.SharedModel.Enums; -namespace SJZY.Track.Application.Hangfire; +namespace TrackCenter.Application.Hangfire; // 标题：预警通知 // 内容：尊敬的用户，截止到2024-12-13 10:00:01(UTC +8:00)，轨迹中心监测到与您相关的预警风险信息共计299 条，请及时处理，详情如下： diff --git a/src/SJZY.Track.Application/Hangfire/WarningNotifyParam.cs b/src/TrackCenter.Application/Hangfire/WarningNotifyParam.cs similarity index 91% rename from src/SJZY.Track.Application/Hangfire/WarningNotifyParam.cs rename to src/TrackCenter.Application/Hangfire/WarningNotifyParam.cs index c4b1de4b..433ce045 100644 --- a/src/SJZY.Track.Application/Hangfire/WarningNotifyParam.cs +++ b/src/TrackCenter.Application/Hangfire/WarningNotifyParam.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Hangfire; +namespace TrackCenter.Application.Hangfire; /// /// 构建轨迹预警通知消息所需的参数 diff --git a/src/SJZY.Track.Application/Hangfire/WarningTaskComponentBackgroundService.cs b/src/TrackCenter.Application/Hangfire/WarningTaskComponentBackgroundService.cs similarity index 96% rename from src/SJZY.Track.Application/Hangfire/WarningTaskComponentBackgroundService.cs rename to src/TrackCenter.Application/Hangfire/WarningTaskComponentBackgroundService.cs index 96016483..84e1b7f8 100644 --- a/src/SJZY.Track.Application/Hangfire/WarningTaskComponentBackgroundService.cs +++ b/src/TrackCenter.Application/Hangfire/WarningTaskComponentBackgroundService.cs @@ -2,10 +2,10 @@ using Hangfire; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using SJZY.Track.Application.Helpers; -using SJZY.Track.Application.Options; +using TrackCenter.Application.Helpers; +using TrackCenter.Application.Options; -namespace SJZY.Track.Application.Hangfire; +namespace TrackCenter.Application.Hangfire; /// /// 预警任务组件初始化 diff --git a/src/SJZY.Track.Application/Hangfire/WarningTaskScanner.cs b/src/TrackCenter.Application/Hangfire/WarningTaskScanner.cs similarity index 94% rename from src/SJZY.Track.Application/Hangfire/WarningTaskScanner.cs rename to src/TrackCenter.Application/Hangfire/WarningTaskScanner.cs index d7e796af..8fd25d03 100644 --- a/src/SJZY.Track.Application/Hangfire/WarningTaskScanner.cs +++ b/src/TrackCenter.Application/Hangfire/WarningTaskScanner.cs @@ -1,11 +1,11 @@ using Hangfire; using Microsoft.Extensions.Options; -using SJZY.Track.Application.Options; -using SJZY.Track.Application.Services.Warning.Handlers; -using SJZY.Track.Domain.Aggregates.WarningAggregate; +using TrackCenter.Application.Options; +using TrackCenter.Application.Services.Warning.Handlers; +using TrackCenter.Domain.Aggregates.WarningAggregate; using Volo.Abp.DependencyInjection; -namespace SJZY.Track.Application.Hangfire; +namespace TrackCenter.Application.Hangfire; public interface IWarningTaskScanner { diff --git a/src/SJZY.Track.Application/Hangfire/WarningTaskService.cs b/src/TrackCenter.Application/Hangfire/WarningTaskService.cs similarity index 94% rename from src/SJZY.Track.Application/Hangfire/WarningTaskService.cs rename to src/TrackCenter.Application/Hangfire/WarningTaskService.cs index 050d461d..b217e402 100644 --- a/src/SJZY.Track.Application/Hangfire/WarningTaskService.cs +++ b/src/TrackCenter.Application/Hangfire/WarningTaskService.cs @@ -3,21 +3,21 @@ using Hangfire; using Microsoft.Extensions.Options; using SJZY.Expand.ABP.Core.Logger; using SJZY.InterfaceRelay.Application.Contracts; -using SJZY.Track.Application.Contract.Dtos.TrackPush; -using SJZY.Track.Application.Helpers; -using SJZY.Track.Application.Options; -using SJZY.Track.Application.Track2InterfaceRelay; -using SJZY.Track.Domain.Aggregates.WarningAggregate; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Return; -using SJZY.Track.Domain.Dtos.Warning; -using SJZY.Track.Domain.Enums; -using SJZY.Track.Domain.Extensions; -using SJZY.Track.Domain.Queries; +using TrackCenter.Application.Contract.Dtos.TrackPush; +using TrackCenter.Domain.Aggregates.WarningAggregate; +using TrackCenter.Domain.Aggregates.WarningAggregate.Return; +using TrackCenter.Domain.Dtos.Warning; +using TrackCenter.Domain.Enums; +using TrackCenter.Domain.Extensions; +using TrackCenter.Domain.Queries; using SJZY.UserCenter.HttpApi.Services.Message; +using TrackCenter.Application.Helpers; +using TrackCenter.Application.Options; +using TrackCenter.Application.Track2InterfaceRelay; using Volo.Abp.DependencyInjection; using Volo.Abp.Http.Client.DynamicProxying; -namespace SJZY.Track.Application.Hangfire; +namespace TrackCenter.Application.Hangfire; public interface IWarningTaskService { diff --git a/src/SJZY.Track.Application/Helpers/Base64Helper.cs b/src/TrackCenter.Application/Helpers/Base64Helper.cs similarity index 94% rename from src/SJZY.Track.Application/Helpers/Base64Helper.cs rename to src/TrackCenter.Application/Helpers/Base64Helper.cs index 1a94a5ac..eb3a177c 100644 --- a/src/SJZY.Track.Application/Helpers/Base64Helper.cs +++ b/src/TrackCenter.Application/Helpers/Base64Helper.cs @@ -1,7 +1,7 @@ using System.Text; using Newtonsoft.Json; -namespace SJZY.Track.Application.Helpers; +namespace TrackCenter.Application.Helpers; public class Base64Helper { diff --git a/src/SJZY.Track.Application/Helpers/DateTimeHelper.cs b/src/TrackCenter.Application/Helpers/DateTimeHelper.cs similarity index 80% rename from src/SJZY.Track.Application/Helpers/DateTimeHelper.cs rename to src/TrackCenter.Application/Helpers/DateTimeHelper.cs index c58fe83d..fa3544ce 100644 --- a/src/SJZY.Track.Application/Helpers/DateTimeHelper.cs +++ b/src/TrackCenter.Application/Helpers/DateTimeHelper.cs @@ -1,4 +1,6 @@ -namespace SJZY.Track.Application.Helpers; +using Hangfire.Annotations; + +namespace TrackCenter.Application.Helpers; public static class DateTimeHelper { @@ -79,6 +81,36 @@ public static class DateTimeHelper return $"GMT {flag}{timeZoneStr.RemovePostFix(":00")}"; } + [ContractAnnotation("null <= str:null")] + public static string RemovePostFix(this string str, params string[] postFixes) + { + return str.RemovePostFix(StringComparison.Ordinal, postFixes); + } + + [ContractAnnotation("null <= str:null")] + public static string RemovePostFix(this string str, StringComparison comparisonType, params string[] postFixes) + { + if (str.IsNullOrEmpty()) + { + return str; + } + + if (postFixes.IsNullOrEmpty()) + { + return str; + } + + foreach (var postFix in postFixes) + { + if (str.EndsWith(postFix, comparisonType)) + { + return str.Left(str.Length - postFix.Length); + } + } + + return str; + } + /// /// 转换为utc0时区的时间转化进行Compare /// diff --git a/src/SJZY.Track.Application/Helpers/DebounceHelper.cs b/src/TrackCenter.Application/Helpers/DebounceHelper.cs similarity index 99% rename from src/SJZY.Track.Application/Helpers/DebounceHelper.cs rename to src/TrackCenter.Application/Helpers/DebounceHelper.cs index cba1e5e7..11f35ac0 100644 --- a/src/SJZY.Track.Application/Helpers/DebounceHelper.cs +++ b/src/TrackCenter.Application/Helpers/DebounceHelper.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Helpers; +namespace TrackCenter.Application.Helpers; /// /// 函数防抖 线程安全 diff --git a/src/SJZY.Track.Application/Helpers/StringHelper.cs b/src/TrackCenter.Application/Helpers/StringHelper.cs similarity index 97% rename from src/SJZY.Track.Application/Helpers/StringHelper.cs rename to src/TrackCenter.Application/Helpers/StringHelper.cs index ecb0bfae..9bcbf3e0 100644 --- a/src/SJZY.Track.Application/Helpers/StringHelper.cs +++ b/src/TrackCenter.Application/Helpers/StringHelper.cs @@ -2,7 +2,7 @@ using System.Security.Cryptography; using System.Text; using System.Text.RegularExpressions; -namespace SJZY.Track.Application.Helpers; +namespace TrackCenter.Application.Helpers; public class StringHelper { diff --git a/src/SJZY.Track.Application/HostServices/RedisHostService.cs b/src/TrackCenter.Application/HostServices/RedisHostService.cs similarity index 86% rename from src/SJZY.Track.Application/HostServices/RedisHostService.cs rename to src/TrackCenter.Application/HostServices/RedisHostService.cs index 598a86aa..76dd62da 100644 --- a/src/SJZY.Track.Application/HostServices/RedisHostService.cs +++ b/src/TrackCenter.Application/HostServices/RedisHostService.cs @@ -1,9 +1,9 @@ using Microsoft.Extensions.Hosting; -using SJZY.Expand.ABP.Core; -using SJZY.Track.Application.Contract.Events; -using SJZY.Track.Application.Contract.Services; +using TrackCenter.Application.Contract.Events; +using TrackCenter.Application.Helpers; +using TrackCenter.Repository.Redis; -namespace SJZY.Track.Application.HostServices; +namespace TrackCenter.Application.HostServices; public class RedisHostService : IHostedService { diff --git a/src/SJZY.Track.Application/Kafka/WarningCalcBackgroundService.cs b/src/TrackCenter.Application/Kafka/WarningCalcBackgroundService.cs similarity index 97% rename from src/SJZY.Track.Application/Kafka/WarningCalcBackgroundService.cs rename to src/TrackCenter.Application/Kafka/WarningCalcBackgroundService.cs index 32a75ddc..0b81a8e6 100644 --- a/src/SJZY.Track.Application/Kafka/WarningCalcBackgroundService.cs +++ b/src/TrackCenter.Application/Kafka/WarningCalcBackgroundService.cs @@ -2,14 +2,12 @@ using Confluent.Kafka; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; -using SJZY.Expand.ABP.Core.Logger; -using SJZY.OTel; -using SJZY.Track.Application.Options; -using SJZY.Track.Application.Services.Warning.Handlers; -using SJZY.Track.Application.Services.Warning.Signals; -using SJZY.Track.Domain.Extensions; +using TrackCenter.Application.Options; +using TrackCenter.Application.Services.Warning.Handlers; +using TrackCenter.Application.Services.Warning.Signals; +using TrackCenter.Domain.Extensions; -namespace SJZY.Track.Application.Kafka; +namespace TrackCenter.Application.Kafka; /// /// 预警计算后台任务 diff --git a/src/SJZY.Track.Application/Kafka/WarningCalcServiceExtension.cs b/src/TrackCenter.Application/Kafka/WarningCalcServiceExtension.cs similarity index 98% rename from src/SJZY.Track.Application/Kafka/WarningCalcServiceExtension.cs rename to src/TrackCenter.Application/Kafka/WarningCalcServiceExtension.cs index 34666d2b..2b8c428c 100644 --- a/src/SJZY.Track.Application/Kafka/WarningCalcServiceExtension.cs +++ b/src/TrackCenter.Application/Kafka/WarningCalcServiceExtension.cs @@ -5,11 +5,11 @@ using Confluent.Kafka; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection.Extensions; using SJZY.Expand.ABP.Core.Logger; -using SJZY.Track.Application.Helpers; -using SJZY.Track.Application.Services.Warning.Signals; +using TrackCenter.Application.Helpers; +using TrackCenter.Application.Services.Warning.Signals; using JsonSerializer = System.Text.Json.JsonSerializer; -namespace SJZY.Track.Application.Kafka; +namespace TrackCenter.Application.Kafka; public static class WarningCalcServiceExtension { diff --git a/src/SJZY.Track.Application/Kafka/WarningSignalPublisher.cs b/src/TrackCenter.Application/Kafka/WarningSignalPublisher.cs similarity index 91% rename from src/SJZY.Track.Application/Kafka/WarningSignalPublisher.cs rename to src/TrackCenter.Application/Kafka/WarningSignalPublisher.cs index 313705af..46ade8a1 100644 --- a/src/SJZY.Track.Application/Kafka/WarningSignalPublisher.cs +++ b/src/TrackCenter.Application/Kafka/WarningSignalPublisher.cs @@ -1,10 +1,10 @@ using Confluent.Kafka; using Microsoft.Extensions.Configuration; -using SJZY.Track.Application.Services.Warning.Signals; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; +using TrackCenter.Application.Services.Warning.Signals; +using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; using Volo.Abp.DependencyInjection; -namespace SJZY.Track.Application.Kafka; +namespace TrackCenter.Application.Kafka; /// /// 预警信号发布者 diff --git a/src/SJZY.Track.Application/Localization/Resources/en.json b/src/TrackCenter.Application/Localization/Resources/en.json similarity index 100% rename from src/SJZY.Track.Application/Localization/Resources/en.json rename to src/TrackCenter.Application/Localization/Resources/en.json diff --git a/src/SJZY.Track.Application/Localization/Resources/zh.json b/src/TrackCenter.Application/Localization/Resources/zh.json similarity index 100% rename from src/SJZY.Track.Application/Localization/Resources/zh.json rename to src/TrackCenter.Application/Localization/Resources/zh.json diff --git a/src/SJZY.Track.Application/Localization/TrackLocalizationResource.cs b/src/TrackCenter.Application/Localization/TrackLocalizationResource.cs similarity index 77% rename from src/SJZY.Track.Application/Localization/TrackLocalizationResource.cs rename to src/TrackCenter.Application/Localization/TrackLocalizationResource.cs index 6be5b4e4..f4a97b39 100644 --- a/src/SJZY.Track.Application/Localization/TrackLocalizationResource.cs +++ b/src/TrackCenter.Application/Localization/TrackLocalizationResource.cs @@ -1,7 +1,7 @@ using SJZY.Expand.ABP.Core.Localization; using Volo.Abp.Localization; -namespace SJZY.Track.Application.Localization; +namespace TrackCenter.Application.Localization; [InheritResource(typeof(SjzyBasicLocalization))] public class TrackLocalizationResource diff --git a/src/SJZY.Track.Application/Options/InterfaceRelayParamsConfigOptions.cs b/src/TrackCenter.Application/Options/InterfaceRelayParamsConfigOptions.cs similarity index 97% rename from src/SJZY.Track.Application/Options/InterfaceRelayParamsConfigOptions.cs rename to src/TrackCenter.Application/Options/InterfaceRelayParamsConfigOptions.cs index 2058b23a..a5a4f34e 100644 --- a/src/SJZY.Track.Application/Options/InterfaceRelayParamsConfigOptions.cs +++ b/src/TrackCenter.Application/Options/InterfaceRelayParamsConfigOptions.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Options; +namespace TrackCenter.Application.Options; public class InterfaceRelayParamsConfigOptions { diff --git a/src/SJZY.Track.Application/Options/TrackAppOptions.cs b/src/TrackCenter.Application/Options/TrackAppOptions.cs similarity index 92% rename from src/SJZY.Track.Application/Options/TrackAppOptions.cs rename to src/TrackCenter.Application/Options/TrackAppOptions.cs index 12b93bf8..a0d4184e 100644 --- a/src/SJZY.Track.Application/Options/TrackAppOptions.cs +++ b/src/TrackCenter.Application/Options/TrackAppOptions.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Options; +namespace TrackCenter.Application.Options; public class TrackAppOptions { diff --git a/src/SJZY.Track.Application/Options/TrackWarningTaskOptions.cs b/src/TrackCenter.Application/Options/TrackWarningTaskOptions.cs similarity index 97% rename from src/SJZY.Track.Application/Options/TrackWarningTaskOptions.cs rename to src/TrackCenter.Application/Options/TrackWarningTaskOptions.cs index 0c873b50..da2de913 100644 --- a/src/SJZY.Track.Application/Options/TrackWarningTaskOptions.cs +++ b/src/TrackCenter.Application/Options/TrackWarningTaskOptions.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Options; +namespace TrackCenter.Application.Options; public sealed class TrackWarningTaskOptions { diff --git a/src/SJZY.Track.Repository/Queries/ProvideQueries.cs b/src/TrackCenter.Application/Queries/ProvideQueries.cs similarity index 73% rename from src/SJZY.Track.Repository/Queries/ProvideQueries.cs rename to src/TrackCenter.Application/Queries/ProvideQueries.cs index 81d6703e..138912e0 100644 --- a/src/SJZY.Track.Repository/Queries/ProvideQueries.cs +++ b/src/TrackCenter.Application/Queries/ProvideQueries.cs @@ -1,29 +1,25 @@ -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.TrackContentAggregate; -using SJZY.Track.Domain.Aggregates.TrackFlagAggregate; -using SJZY.Track.Domain.Aggregates.TrackPullAggregate; -using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; -using SJZY.Track.Domain.Dtos.Order; -using SJZY.Track.Domain.Dtos.TrackContents; -using SJZY.Track.Domain.Dtos.TrackPull; -using SJZY.Track.Domain.Queries; -using SJZY.Track.Domain.VEntities; +using Fake.DependencyInjection; +using Fake.DomainDrivenDesign.Repositories.SqlSugarCore; +using SqlSugar; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.TrackContentAggregate; +using TrackCenter.Domain.Aggregates.TrackFlagAggregate; +using TrackCenter.Domain.Aggregates.TrackPullAggregate; +using TrackCenter.Domain.Aggregates.TrackStatusAggregate; +using TrackCenter.Domain.Dtos.Order; +using TrackCenter.Domain.Dtos.TrackContents; +using TrackCenter.Domain.Dtos.TrackPull; +using TrackCenter.Domain.VEntities; +using TrackCenter.Repository; -namespace SJZY.Track.Repository.Queries; +namespace TrackCenter.Application.Queries; /// /// 提供服务相关查询 /// -public class ProvideQueries : ISugarRepository, IProvideQueries, ITransientDependency +public class ProvideQueries : SqlSugarRootlessRepository, ITransientDependency { - /// - /// ctor - /// - public ProvideQueries() - { - Context = SqlsugarScopeBasic.GetContextSafely("default"); - } - + public ISqlSugarClient Context => GetDbContextAsync().Result; public async Task> MapTrackCodesAsync(int upSubSystemId, int subSystemId, params string[] trackCodes) { // 根据上游code得到下游code @@ -50,24 +46,21 @@ public class ProvideQueries : ISugarRepository, IProvideQueries, ITransientDepen .ToListAsync(); } - /// public async Task> FindOrderWithServiceProviderAsync(int subSystemId, List orderNos) { return await Context.Queryable() .InnerJoin((a, b) => a.Id == b.OrderId) - .LeftJoin((a, b, c) => a.SubSystemId == c.Id) .WhereIF(subSystemId > 0, a => a.SubSystemId == subSystemId) .Where((a, b) => !a.IsCompleted && orderNos.Contains(a.OrderNo) && b.StartTime <= DateTime.Now && b.EndTime >= DateTime.Now) - .Select((a, b, c) => new OrderWithServiceProviderVO + .Select((a, b) => new OrderWithServiceProviderVO { //优先使用第三方的订单号,为空时才使用主单号 OrderNo = b.OrderNo ?? a.OrderNo, OrderType = a.OrderType, SubSystemId = a.SubSystemId, ServiceProviderCode = b.ServiceProviderCode, - SubSystemCode = c.Key }) .ToListAsync(); } @@ -94,18 +87,15 @@ public class ProvideQueries : ISugarRepository, IProvideQueries, ITransientDepen .ToListAsync(); } - /// public async Task GetTrackContentAsync(int subSystemId, string trackCode) { return await Context.Queryable() .LeftJoin((x, y) => x.TrackStatusId == y.Id) - .LeftJoin((x, y, z) => x.SubSystemId == z.Id) - .LeftJoin((x, y, z, k) => x.SubSystemId == k.SubSystemId && k.Code == x.Code) + .LeftJoin((x, y, k) => x.SubSystemId == k.SubSystemId && k.Code == x.Code) .Where(x => x.SubSystemId == subSystemId && x.Code == trackCode) - .Select((x, y, z, k) => new TrackContentVO + .Select((x, y, k) => new TrackContentVO { SubSystemId = x.SubSystemId, - SubSystemCode = z.Key, TrackStatusId = x.TrackStatusId, TrackStatus = y.Status, TrackStatusCode = y.Code, @@ -127,13 +117,11 @@ public class ProvideQueries : ISugarRepository, IProvideQueries, ITransientDepen { return await Context.Queryable() .LeftJoin((x, y) => x.TrackStatusId == y.Id) - .LeftJoin((x, y, z) => x.SubSystemId == z.Id) - .LeftJoin((x, y, z, k) => x.SubSystemId == k.SubSystemId && k.Code == x.Code) + .LeftJoin((x, y, k) => x.SubSystemId == k.SubSystemId && k.Code == x.Code) .Where(x => subSystemIds.Contains(x.SubSystemId) && trackCodes.Contains(x.Code)) - .Select((x, y, z, k) => new TrackContentVO + .Select((x, y, k) => new TrackContentVO { SubSystemId = x.SubSystemId, - SubSystemCode = z.Key, TrackStatusId = x.TrackStatusId, TrackStatus = y.Status, TrackStatusCode = y.Code, @@ -155,28 +143,12 @@ public class ProvideQueries : ISugarRepository, IProvideQueries, ITransientDepen { return await Context.Queryable() .LeftJoin((a, b) => a.ServiceProviderId == b.Id) - .LeftJoin((a, b, c) => a.SubSystemId == c.Id) - .Select((a, b, c) => new TrackPullConfigVo + .Select((a, b) => new TrackPullConfigVo { PullInterval = a.PullInterval, ServiceProviderId = a.ServiceProviderId, ServiceProviderCode = b.Code, - SubSystemCode = c.Key, - SubSystemId = c.Id }) .ToListAsync(); } - - public async Task SubSystemId2CodeAsync(int subSystemId) - { - return await Context.Queryable() - .Where(x => x.Id == subSystemId) - .Select(x => x.Key) - .FirstAsync(); - } - - /// - /// db context - /// - public ISqlSugarClient Context { get; set; } } diff --git a/src/SJZY.Track.Repository/Queries/TimezoneQueries.cs b/src/TrackCenter.Application/Queries/TimezoneQueries.cs similarity index 86% rename from src/SJZY.Track.Repository/Queries/TimezoneQueries.cs rename to src/TrackCenter.Application/Queries/TimezoneQueries.cs index 3694fb10..bcad804b 100644 --- a/src/SJZY.Track.Repository/Queries/TimezoneQueries.cs +++ b/src/TrackCenter.Application/Queries/TimezoneQueries.cs @@ -1,21 +1,18 @@ -using SJZY.Track.Domain.Consts; -using SJZY.Track.Domain.Dtos.Common; -using SJZY.Track.Domain.Queries; -using SJZY.Track.Domain.VEntities; +using Fake.DependencyInjection; +using Fake.DomainDrivenDesign.Repositories.SqlSugarCore; +using SqlSugar; +using TrackCenter.Domain.Dtos.Common; +using TrackCenter.Domain.VEntities; +using TrackCenter.Repository.Redis; -namespace SJZY.Track.Repository.Queries; +namespace TrackCenter.Repository.Queries; /// /// 时区查询 /// -public class TimezoneQueries : ITimezoneQueries, ISugarRepository, ITransientDependency +public class TimezoneQueries : SqlSugarRootlessRepository, ITransientDependency { - public TimezoneQueries() - { - Context = SqlsugarScopeBasic.GetContextSafely("default"); - } - - public ISqlSugarClient Context { get; set; } + public ISqlSugarClient Context => GetDbContextAsync().Result; /// /// 获取城市时区 diff --git a/src/TrackCenter.Application/Rabbit/IRabbitHandler.cs b/src/TrackCenter.Application/Rabbit/IRabbitHandler.cs new file mode 100644 index 00000000..fb630619 --- /dev/null +++ b/src/TrackCenter.Application/Rabbit/IRabbitHandler.cs @@ -0,0 +1,12 @@ +using RabbitMQ.Client.Events; + +namespace TrackCenter.Application.Rabbit; + +public interface IRabbitHandler +{ + ConsumeOptions Options(); + + bool Enable(ConsumeOptions options) => options.Queue == Options().Queue; + + Task Handle(IServiceProvider sp, BasicDeliverEventArgs args, ConsumeOptions options); +} diff --git a/src/TrackCenter.Application/Rabbit/InterfaceRelayForwardReplayEvent.cs b/src/TrackCenter.Application/Rabbit/InterfaceRelayForwardReplayEvent.cs new file mode 100644 index 00000000..0f9144ba --- /dev/null +++ b/src/TrackCenter.Application/Rabbit/InterfaceRelayForwardReplayEvent.cs @@ -0,0 +1,39 @@ +namespace TrackCenter.Application.Rabbit; + +public class InterfaceRelayForwardReplayEvent +{ + /// + /// 请求Id + /// + public Guid RequestId { get; set; } + + /// + /// 是否成功 + /// + public bool IsSuccess { get; set; } + + /// + /// 异常消息 + /// + public string Message { get; set; } + + /// + /// 原始请求参数 + /// + public string RequestParams { get; set; } + + /// + /// 原报文 + /// + public string? OriginalMessage { get; set; } + + /// + /// 附加数据 + /// + public string Attach { get; set; } + + /// + /// 请求后的json字符串 + /// + public string Data { get; set; } +} diff --git a/src/TrackCenter.Application/Rabbit/RabbitClient.cs b/src/TrackCenter.Application/Rabbit/RabbitClient.cs new file mode 100644 index 00000000..97cb1469 --- /dev/null +++ b/src/TrackCenter.Application/Rabbit/RabbitClient.cs @@ -0,0 +1,85 @@ +using Fake.DependencyInjection; +using Fake.RabbitMQ; +using Microsoft.Extensions.Logging; +using RabbitMQ.Client; +using RabbitMQ.Client.Events; + +namespace TrackCenter.Application.Rabbit; + +public class RabbitClient( + IRabbitMqChannelPool channelPool, + IServiceScopeFactory serviceScopeFactory, + ILogger logger) : ISingletonDependency +{ + public void Subscribe(ConsumeOptions consumeOptions) + { + using var channelAccessor = channelPool.Acquire(consumeOptions.Queue); + + if (!channelAccessor.IsNew) return; + + var channel = channelAccessor.Channel; + + consumeOptions.Declaration.Invoke(channel); + + if (consumeOptions.FetchCount > 0) + { + channel.BasicQos(0, consumeOptions.FetchCount, false); + } + + var consumer = new AsyncEventingBasicConsumer(channel); + consumer.Received += async (model, ea) => + { + await using var scope = serviceScopeFactory.CreateAsyncScope(); + foreach (var handler in scope.ServiceProvider.GetServices()) + { + if (handler.Enable(consumeOptions)) + { + await handler.Handle(scope.ServiceProvider, ea, consumeOptions); + } + } + }; + + channel.CallbackException += (sender, args) => + { + logger.LogError(args.Exception, "RabbitMQ channel exception"); + }; + + channel.BasicConsume(queue: consumeOptions.Queue, + autoAck: false, + consumer: consumer); + } + + public void Publish(string exchange, string routingKey, byte[] data, Action? options = null) + { + using var channelAccessor = channelPool.Acquire(routingKey); + var props = channelAccessor.Channel.CreateBasicProperties(); + options?.Invoke(props); + channelAccessor.Channel.BasicPublish(exchange, routingKey, props, data); + } + + public void UnSubscribe(string queueName, string exchange, string routingKey, bool deleteQueue = false) + { + logger.LogInformation( + $"UnSubscribe queue: {queueName} exchange: {exchange} routingKey: {routingKey} deleteQueue: {deleteQueue}"); + using var channelAccessor = channelPool.Acquire(queueName); + if (deleteQueue) + { + var passive = channelAccessor.Channel.QueueDeclarePassive(queueName); + logger.LogInformation($"Queue {queueName} exists, deleting... {passive.MessageCount} messages in queue"); + channelAccessor.Channel.QueueDelete(queueName); + } + + channelPool.Release(queueName); + } +} + +public class ConsumeOptions +{ + public string Queue { get; set; } + + public ushort FetchCount { get; set; } + + public bool FailedRequeue { get; set; } + + public Action Declaration { get; set; } +} diff --git a/src/TrackCenter.Application/Rabbit/RabbitInstrumentation.cs b/src/TrackCenter.Application/Rabbit/RabbitInstrumentation.cs new file mode 100644 index 00000000..2afdc420 --- /dev/null +++ b/src/TrackCenter.Application/Rabbit/RabbitInstrumentation.cs @@ -0,0 +1,21 @@ +using System.Diagnostics; +using System.Diagnostics.Metrics; + +namespace TrackCenter.Application.Rabbit; + +public class RabbitInstrumentation +{ + public const string MeterName = "Fake.Rabbit.Meter"; + public const string ActivitySourceName = "Fake.Rabbit.ActivitySource"; + + static RabbitInstrumentation() + { + string version = typeof (RabbitInstrumentation).Assembly.GetName().Version?.ToString(); + Meter = new Meter(MeterName, version); + ActivitySource = new ActivitySource(ActivitySourceName, version); + } + + public static Meter Meter { get; } + + public static ActivitySource ActivitySource { get; } +} diff --git a/src/SJZY.Track.Application/Rabbit/TrackPushCompletedEventHandler.cs b/src/TrackCenter.Application/Rabbit/TrackPushCompletedEventHandler.cs similarity index 93% rename from src/SJZY.Track.Application/Rabbit/TrackPushCompletedEventHandler.cs rename to src/TrackCenter.Application/Rabbit/TrackPushCompletedEventHandler.cs index 322334e7..bf7a010b 100644 --- a/src/SJZY.Track.Application/Rabbit/TrackPushCompletedEventHandler.cs +++ b/src/TrackCenter.Application/Rabbit/TrackPushCompletedEventHandler.cs @@ -1,20 +1,19 @@ using System.Text; -using BSI.Stack.Rabbit; -using BSI.Stack.Rabbit.Handler; +using Fake.Application; +using Fake.DependencyInjection; using Newtonsoft.Json; using RabbitMQ.Client.Events; -using SJZY.Expand.ABP.Core.Logger; -using SJZY.InterfaceRelay.Application.Contracts; -using SJZY.Track.Application.Contract.Dtos.TrackPush; -using SJZY.Track.Application.Contract.Services; -using SJZY.Track.Application.Helpers; -using SJZY.Track.Application.Services.Warning.Handlers; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.TrackPushAggregate; -using SJZY.Track.Domain.Enums; -using Volo.Abp.DependencyInjection; +using TrackCenter.Application.Contract.Dtos.TrackPush; +using TrackCenter.Application.Contract.Services; +using TrackCenter.Application.Helpers; +using TrackCenter.Application.Services.Warning.Handlers; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.TrackPushAggregate; +using TrackCenter.Domain.Dtos.Common; +using TrackCenter.Domain.Enums; +using TrackCenter.Domain.Extensions; -namespace SJZY.Track.Application.Rabbit; +namespace TrackCenter.Application.Rabbit; public class TrackPushCompletedEventHandler : ITransientDependency, IRabbitHandler { diff --git a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs b/src/TrackCenter.Application/Rabbit/TrackRefreshEventHandler.cs similarity index 95% rename from src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs rename to src/TrackCenter.Application/Rabbit/TrackRefreshEventHandler.cs index 664846fe..553ca583 100644 --- a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs +++ b/src/TrackCenter.Application/Rabbit/TrackRefreshEventHandler.cs @@ -1,24 +1,21 @@ using System.Diagnostics; using System.Text; -using BSI.Stack.Rabbit; -using BSI.Stack.Rabbit.Handler; using DotNetCore.CAP; +using Fake.DependencyInjection; +using InterfaceForward.Domain.Shared.Helpers; using Microsoft.Extensions.Logging; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using RabbitMQ.Client.Events; -using SJZY.Expand.ABP.Core.PublicMethords; -using SJZY.InterfaceRelay.Application.Contracts; -using SJZY.Track.Application.Contract.Dtos.TrackPull; -using SJZY.Track.Application.Contract.Events; -using SJZY.Track.Application.Contract.Services; -using SJZY.Track.Application.Helpers; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; -using SJZY.Track.Domain.Enums; -using Volo.Abp.DependencyInjection; +using TrackCenter.Application.Contract.Dtos.TrackPull; +using TrackCenter.Application.Contract.Events; +using TrackCenter.Application.Contract.Services; +using TrackCenter.Application.Helpers; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; +using TrackCenter.Domain.Enums; -namespace SJZY.Track.Application.Rabbit; +namespace TrackCenter.Application.Rabbit; public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler { @@ -40,7 +37,7 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler _logger = logger; } - public ConsumeOptions Options() + public ConsumeOptions? Options() { return new ConsumeOptions() { diff --git a/src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs b/src/TrackCenter.Application/Services/Broadcasting/BroadcastingService.cs similarity index 95% rename from src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs rename to src/TrackCenter.Application/Services/Broadcasting/BroadcastingService.cs index 067b34c7..b9582f6e 100644 --- a/src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs +++ b/src/TrackCenter.Application/Services/Broadcasting/BroadcastingService.cs @@ -1,11 +1,11 @@ using System.Text; using SJZY.Expand.ABP.Core.PublicMethords; -using SJZY.Track.Application.Contract.Dtos.TrackPush; -using SJZY.Track.Application.Contract.Events; -using SJZY.Track.Application.Contract.Services; -using SJZY.Track.Application.Rabbit; +using TrackCenter.Application.Contract.Dtos.TrackPush; +using TrackCenter.Application.Contract.Events; +using TrackCenter.Application.Contract.Services; +using TrackCenter.Application.Rabbit; -namespace SJZY.Track.Application.Services.Broadcasting; +namespace TrackCenter.Application.Services.Broadcasting; /// /// 广播服务 diff --git a/src/SJZY.Track.Application/Services/DebugApis/NormalService.cs b/src/TrackCenter.Application/Services/DebugApis/NormalService.cs similarity index 85% rename from src/SJZY.Track.Application/Services/DebugApis/NormalService.cs rename to src/TrackCenter.Application/Services/DebugApis/NormalService.cs index 96eaee0f..501f3be2 100644 --- a/src/SJZY.Track.Application/Services/DebugApis/NormalService.cs +++ b/src/TrackCenter.Application/Services/DebugApis/NormalService.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Authorization; -using SJZY.Track.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.OrderAggregate; -namespace SJZY.Track.Application.Services.DebugApis; +namespace TrackCenter.Application.Services.DebugApis; [AllowAnonymous] [ApiExplorerSettings(GroupName = "调试专用")] diff --git a/src/SJZY.Track.Application/Services/DebugApis/OTelService.cs b/src/TrackCenter.Application/Services/DebugApis/OTelService.cs similarity index 90% rename from src/SJZY.Track.Application/Services/DebugApis/OTelService.cs rename to src/TrackCenter.Application/Services/DebugApis/OTelService.cs index 7770d26f..a1a96bca 100644 --- a/src/SJZY.Track.Application/Services/DebugApis/OTelService.cs +++ b/src/TrackCenter.Application/Services/DebugApis/OTelService.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Authorization; -using SJZY.Track.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.OrderAggregate; -namespace SJZY.Track.Application.Services.DebugApis; +namespace TrackCenter.Application.Services.DebugApis; [AllowAnonymous] [ApiExplorerSettings(GroupName = "调试专用")] diff --git a/src/SJZY.Track.Application/Services/DebugApis/TransportDetailsGenerate/_TransportDetailsGenerateService.cs b/src/TrackCenter.Application/Services/DebugApis/TransportDetailsGenerate/_TransportDetailsGenerateService.cs similarity index 87% rename from src/SJZY.Track.Application/Services/DebugApis/TransportDetailsGenerate/_TransportDetailsGenerateService.cs rename to src/TrackCenter.Application/Services/DebugApis/TransportDetailsGenerate/_TransportDetailsGenerateService.cs index 9dc69161..fdb8592e 100644 --- a/src/SJZY.Track.Application/Services/DebugApis/TransportDetailsGenerate/_TransportDetailsGenerateService.cs +++ b/src/TrackCenter.Application/Services/DebugApis/TransportDetailsGenerate/_TransportDetailsGenerateService.cs @@ -1,8 +1,8 @@ using Microsoft.AspNetCore.Authorization; -using SJZY.Track.Application.Services.Warning.Handlers; -using SJZY.Track.Domain.Aggregates.WarningAggregate; +using TrackCenter.Application.Services.Warning.Handlers; +using TrackCenter.Domain.Aggregates.WarningAggregate; -namespace SJZY.Track.Application.Services.DebugApis.TransportDetailsGenerate; +namespace TrackCenter.Application.Services.DebugApis.TransportDetailsGenerate; /// /// 运输预警明细生成任务 diff --git a/src/SJZY.Track.Application/Services/DebugApis/_MockReturnWarningService.cs b/src/TrackCenter.Application/Services/DebugApis/_MockReturnWarningService.cs similarity index 85% rename from src/SJZY.Track.Application/Services/DebugApis/_MockReturnWarningService.cs rename to src/TrackCenter.Application/Services/DebugApis/_MockReturnWarningService.cs index 19c80301..7b42d4f9 100644 --- a/src/SJZY.Track.Application/Services/DebugApis/_MockReturnWarningService.cs +++ b/src/TrackCenter.Application/Services/DebugApis/_MockReturnWarningService.cs @@ -1,10 +1,10 @@ using Microsoft.AspNetCore.Authorization; -using SJZY.Track.Application.Contract.Dtos.TrackPush; -using SJZY.Track.Application.Services.Warning.Handlers; -using SJZY.Track.Domain.Aggregates.TrackPushAggregate; -using SJZY.Track.Domain.Extensions; +using TrackCenter.Application.Contract.Dtos.TrackPush; +using TrackCenter.Application.Services.Warning.Handlers; +using TrackCenter.Domain.Aggregates.TrackPushAggregate; +using TrackCenter.Domain.Extensions; -namespace SJZY.Track.Application.Services.DebugApis; +namespace TrackCenter.Application.Services.DebugApis; [AllowAnonymous] [ApiExplorerSettings(GroupName = "调试专用")] diff --git a/src/SJZY.Track.Application/Services/ForewarningServices/KpiAreaCacheService.cs b/src/TrackCenter.Application/Services/ForewarningServices/KpiAreaCacheService.cs similarity index 78% rename from src/SJZY.Track.Application/Services/ForewarningServices/KpiAreaCacheService.cs rename to src/TrackCenter.Application/Services/ForewarningServices/KpiAreaCacheService.cs index 2a841b82..175d34b5 100644 --- a/src/SJZY.Track.Application/Services/ForewarningServices/KpiAreaCacheService.cs +++ b/src/TrackCenter.Application/Services/ForewarningServices/KpiAreaCacheService.cs @@ -1,8 +1,8 @@ -using SJZY.Track.Application.Contract.Services; -using SJZY.Track.Domain.Aggregates.KPIAreaAggregate; +using TrackCenter.Application.Contract.Services; +using TrackCenter.Domain.Aggregates.KPIAreaAggregate; using Volo.Abp.DependencyInjection; -namespace SJZY.Track.Application.Services.ForewarningServices; +namespace TrackCenter.Application.Services.ForewarningServices; public class KpiAreaCacheService : IKpiAreaCacheService, ITransientDependency { diff --git a/src/SJZY.Track.Application/Services/ForewarningServices/KpiAreaService.cs b/src/TrackCenter.Application/Services/ForewarningServices/KpiAreaService.cs similarity index 91% rename from src/SJZY.Track.Application/Services/ForewarningServices/KpiAreaService.cs rename to src/TrackCenter.Application/Services/ForewarningServices/KpiAreaService.cs index 03805f84..2492e48c 100644 --- a/src/SJZY.Track.Application/Services/ForewarningServices/KpiAreaService.cs +++ b/src/TrackCenter.Application/Services/ForewarningServices/KpiAreaService.cs @@ -1,8 +1,10 @@ -using SJZY.Track.Application.Contract.Services; -using SJZY.Track.Domain.Aggregates.KPIAreaAggregate; -using SJZY.Track.Domain.Dtos.Forewarning; +using Fake.Application; +using Fake.Application.Dtos; +using TrackCenter.Application.Contract.Services; +using TrackCenter.Domain.Aggregates.KPIAreaAggregate; +using TrackCenter.Domain.Dtos.Forewarning; -namespace SJZY.Track.Application.Services.ForewarningServices; +namespace TrackCenter.Application.Services.ForewarningServices; [ApiExplorerSettings(GroupName = "预警服务")] [Route("/ForewarningService")] @@ -127,7 +129,7 @@ public class KpiAreaService : ApplicationService /// /// [HttpPost("KpiArea/GetKpiAreas")] - public async Task> GetKpiAreas(QueryAreaRequest input) + public async Task> GetKpiAreas(QueryAreaRequest input) { return await _ruleAreaRepository.GetAreas(input); } @@ -138,7 +140,7 @@ public class KpiAreaService : ApplicationService /// /// [HttpPost("KpiArea/GetKpiAreaInfos")] - public async Task> GetKpiAreaInfos(QueryAreaInfoRequest query) + public async Task> GetKpiAreaInfos(QueryAreaInfoRequest query) { return await _ruleAreaRepository.GetAreaInfos(query); } diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs b/src/TrackCenter.Application/Services/ProvideServices/OrderService.Link.cs similarity index 94% rename from src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs rename to src/TrackCenter.Application/Services/ProvideServices/OrderService.Link.cs index 0d4b4cfe..c36771f1 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/OrderService.Link.cs @@ -1,10 +1,10 @@ using DotNetCore.CAP; -using SJZY.Track.Application.Contract.Dtos.ProvideServices; -using SJZY.Track.Application.Contract.Events; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; +using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Events; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; -namespace SJZY.Track.Application.Services.ProvideServices; +namespace TrackCenter.Application.Services.ProvideServices; /// /// 订单关联服务 diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.PullConfigs.cs b/src/TrackCenter.Application/Services/ProvideServices/OrderService.PullConfigs.cs similarity index 88% rename from src/SJZY.Track.Application/Services/ProvideServices/OrderService.PullConfigs.cs rename to src/TrackCenter.Application/Services/ProvideServices/OrderService.PullConfigs.cs index 332d0624..dc821436 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.PullConfigs.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/OrderService.PullConfigs.cs @@ -1,10 +1,10 @@ using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ABP.Core.PublicMethords; -using SJZY.Track.Application.Contract.Dtos.ProvideServices; -using SJZY.Track.Domain.Dtos.Order; +using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Domain.Dtos.Order; using SJZY.UserCenter.HttpApi.Services; -namespace SJZY.Track.Application.Services.ProvideServices; +namespace TrackCenter.Application.Services.ProvideServices; public partial class OrderService { diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs b/src/TrackCenter.Application/Services/ProvideServices/OrderService.cs similarity index 96% rename from src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs rename to src/TrackCenter.Application/Services/ProvideServices/OrderService.cs index 71c0c7ea..bb09fa4e 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/OrderService.cs @@ -1,16 +1,16 @@ using DotNetCore.CAP; using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ABP.Core.PublicMethords; -using SJZY.Track.Application.Contract.Dtos.ProvideServices; -using SJZY.Track.Application.Contract.Services.ProvideServices; -using SJZY.Track.Application.Services.Warning.Handlers; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; -using SJZY.Track.Domain.Extensions; +using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Services.ProvideServices; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; +using TrackCenter.Domain.Extensions; using SJZY.UserCenter.HttpApi.Services; using SqlSugar; +using TrackCenter.Application.Services.Warning.Handlers; -namespace SJZY.Track.Application.Services.ProvideServices; +namespace TrackCenter.Application.Services.ProvideServices; /// /// 订单服务 diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackContentService.cs b/src/TrackCenter.Application/Services/ProvideServices/TrackContentService.cs similarity index 77% rename from src/SJZY.Track.Application/Services/ProvideServices/TrackContentService.cs rename to src/TrackCenter.Application/Services/ProvideServices/TrackContentService.cs index 115bbd5f..5307fe01 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackContentService.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/TrackContentService.cs @@ -1,9 +1,9 @@ -using SJZY.Track.Application.Contract.Dtos.TrackContents; -using SJZY.Track.Application.Contract.Services.ProvideServices; -using SJZY.Track.Domain.Aggregates.TrackContentAggregate; -using SJZY.Track.Domain.Dtos.TrackContents; +using TrackCenter.Application.Contract.Dtos.TrackContents; +using TrackCenter.Application.Contract.Services.ProvideServices; +using TrackCenter.Domain.Aggregates.TrackContentAggregate; +using TrackCenter.Domain.Dtos.TrackContents; -namespace SJZY.Track.Application.Services.ProvideServices; +namespace TrackCenter.Application.Services.ProvideServices; /// /// 轨迹内容服务 diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs b/src/TrackCenter.Application/Services/ProvideServices/TrackPullService.cs similarity index 89% rename from src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs rename to src/TrackCenter.Application/Services/ProvideServices/TrackPullService.cs index f82db360..aa816ff5 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/TrackPullService.cs @@ -3,17 +3,17 @@ using Microsoft.Extensions.Options; using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ABP.Core.PublicMethords; using SJZY.InterfaceRelay.Application.Contracts; -using SJZY.Track.Application.Contract.Dtos.ProvideServices; -using SJZY.Track.Application.Contract.Dtos.TrackPull; -using SJZY.Track.Application.Contract.Services.ProvideServices; -using SJZY.Track.Application.Helpers; -using SJZY.Track.Application.Options; -using SJZY.Track.Application.Rabbit; -using SJZY.Track.Application.Track2InterfaceRelay; -using SJZY.Track.Domain.Queries; +using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Dtos.TrackPull; +using TrackCenter.Application.Contract.Services.ProvideServices; +using TrackCenter.Application.Helpers; +using TrackCenter.Application.Options; +using TrackCenter.Application.Rabbit; +using TrackCenter.Application.Track2InterfaceRelay; +using TrackCenter.Domain.Queries; using Volo.Abp.Http.Client.DynamicProxying; -namespace SJZY.Track.Application.Services.ProvideServices; +namespace TrackCenter.Application.Services.ProvideServices; /// /// 轨迹刷新服务 diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushConfigService.cs b/src/TrackCenter.Application/Services/ProvideServices/TrackPushConfigService.cs similarity index 81% rename from src/SJZY.Track.Application/Services/ProvideServices/TrackPushConfigService.cs rename to src/TrackCenter.Application/Services/ProvideServices/TrackPushConfigService.cs index 5da0abad..35deece0 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushConfigService.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/TrackPushConfigService.cs @@ -1,9 +1,9 @@ -using SJZY.Track.Application.Contract.Dtos.ProvideServices; -using SJZY.Track.Application.Contract.Services; -using SJZY.Track.Domain.Aggregates.TrackPushAggregate; -using SJZY.Track.Domain.Dtos.TrackPush; +using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Services; +using TrackCenter.Domain.Aggregates.TrackPushAggregate; +using TrackCenter.Domain.Dtos.TrackPush; -namespace SJZY.Track.Application.Services.ProvideServices; +namespace TrackCenter.Application.Services.ProvideServices; /// /// 轨迹推送配置服务 diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs b/src/TrackCenter.Application/Services/ProvideServices/TrackPushService.cs similarity index 93% rename from src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs rename to src/TrackCenter.Application/Services/ProvideServices/TrackPushService.cs index af36f1a7..6d27fac0 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/TrackPushService.cs @@ -1,21 +1,21 @@ using DotNetCore.CAP; using SJZY.Expand.ABP.Core.Common; -using SJZY.Track.Application.Contract.Dtos.ProvideServices; -using SJZY.Track.Application.Contract.Dtos.TrackOrder; -using SJZY.Track.Application.Contract.Dtos.TrackPush; -using SJZY.Track.Application.Contract.Events; -using SJZY.Track.Application.Contract.Services.ProvideServices; -using SJZY.Track.Application.Helpers; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; -using SJZY.Track.Domain.Aggregates.TrackPushAggregate; -using SJZY.Track.Domain.Dtos.TrackPush; -using SJZY.Track.Domain.Extensions; -using SJZY.Track.Domain.Queries; +using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Dtos.TrackOrder; +using TrackCenter.Application.Contract.Dtos.TrackPush; +using TrackCenter.Application.Contract.Events; +using TrackCenter.Application.Contract.Services.ProvideServices; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; +using TrackCenter.Domain.Aggregates.TrackPushAggregate; +using TrackCenter.Domain.Dtos.TrackPush; +using TrackCenter.Domain.Extensions; +using TrackCenter.Domain.Queries; using SJZY.UserCenter.HttpApi.Services.User; +using TrackCenter.Application.Helpers; using Volo.Abp.Http.Client.DynamicProxying; -namespace SJZY.Track.Application.Services.ProvideServices; +namespace TrackCenter.Application.Services.ProvideServices; /// /// 轨迹推送服务 diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.Query.cs b/src/TrackCenter.Application/Services/ProvideServices/TrackService.Query.cs similarity index 97% rename from src/SJZY.Track.Application/Services/ProvideServices/TrackService.Query.cs rename to src/TrackCenter.Application/Services/ProvideServices/TrackService.Query.cs index f872a99f..0ab0ea50 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.Query.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/TrackService.Query.cs @@ -1,13 +1,13 @@ using Microsoft.AspNetCore.Http; using SJZY.Expand.AliyunOSS; -using SJZY.Track.Application.Contract.Dtos.ProvideServices; -using SJZY.Track.Application.Helpers; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; -using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; -using SJZY.Track.Domain.Dtos.TrackTemplate; -using SJZY.Track.Domain.Queries; +using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Helpers; +using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; +using TrackCenter.Domain.Aggregates.TrackTemplateAggregate; +using TrackCenter.Domain.Dtos.TrackTemplate; +using TrackCenter.Domain.Queries; -namespace SJZY.Track.Application.Services.ProvideServices; +namespace TrackCenter.Application.Services.ProvideServices; /// /// 轨迹查询服务 diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs b/src/TrackCenter.Application/Services/ProvideServices/TrackService.cs similarity index 97% rename from src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs rename to src/TrackCenter.Application/Services/ProvideServices/TrackService.cs index fdbe5fd0..3ec4af4f 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/TrackService.cs @@ -1,23 +1,25 @@ using DotNetCore.CAP; +using Fake.Application; +using InterfaceForward.Domain.Shared.Helpers; using Microsoft.AspNetCore.Http; using SJZY.Expand.ABP.Core.PublicMethords; using SJZY.OTel; -using SJZY.Track.Application.Contract.Dtos.ProvideServices; -using SJZY.Track.Application.Contract.Events; -using SJZY.Track.Application.Contract.Services.ProvideServices; -using SJZY.Track.Application.Helpers; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.TrackContentAggregate; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; -using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; -using SJZY.Track.Domain.Enums; -using SJZY.Track.Domain.Extensions; -using SJZY.Track.Domain.Queries; +using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Events; +using TrackCenter.Application.Contract.Services.ProvideServices; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.TrackContentAggregate; +using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; +using TrackCenter.Domain.Aggregates.TrackTemplateAggregate; +using TrackCenter.Domain.Enums; +using TrackCenter.Domain.Extensions; +using TrackCenter.Domain.Queries; using SJZY.UserCenter.HttpApi.Services; using SJZY.UserCenter.HttpApi.Services.User; +using TrackCenter.Application.Helpers; using Volo.Abp.Http.Client.DynamicProxying; -namespace SJZY.Track.Application.Services.ProvideServices; +namespace TrackCenter.Application.Services.ProvideServices; /// /// 轨迹服务 diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackTemplateService.cs b/src/TrackCenter.Application/Services/ProvideServices/TrackTemplateService.cs similarity index 74% rename from src/SJZY.Track.Application/Services/ProvideServices/TrackTemplateService.cs rename to src/TrackCenter.Application/Services/ProvideServices/TrackTemplateService.cs index ae02e06e..34b6e357 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackTemplateService.cs +++ b/src/TrackCenter.Application/Services/ProvideServices/TrackTemplateService.cs @@ -1,9 +1,9 @@ -using SJZY.Track.Application.Contract.Dtos.ProvideServices; -using SJZY.Track.Application.Contract.Services.ProvideServices; -using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; -using SJZY.Track.Domain.Dtos.TrackTemplate; +using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Services.ProvideServices; +using TrackCenter.Domain.Aggregates.TrackTemplateAggregate; +using TrackCenter.Domain.Dtos.TrackTemplate; -namespace SJZY.Track.Application.Services.ProvideServices; +namespace TrackCenter.Application.Services.ProvideServices; /// /// 轨迹模版服务 @@ -40,11 +40,11 @@ public class TrackTemplateService : ApplicationService, ITrackTemplateService /// /// [HttpPost("Template/GetTrackTemplateListByPage")] - public async Task> GetTrackTemplateListByPageAsync(GetPageTrackTemplateListInput input) + public async Task> GetTrackTemplateListByPageAsync(GetPageTrackTemplateListInput input) { var inputVo = ObjectMapper.Map(input); var templates = await _trackTemplateRepository.GetPageTrackTemplateListAsync(inputVo); - var res = ObjectMapper.Map, UnifyPageResultDto>(templates); + var res = ObjectMapper.Map, PagedResult>(templates); return res; } } diff --git a/src/SJZY.Track.Application/Services/TimerTaskss/OrderPullStatusScanTask.cs b/src/TrackCenter.Application/Services/TimerTaskss/OrderPullStatusScanTask.cs similarity index 93% rename from src/SJZY.Track.Application/Services/TimerTaskss/OrderPullStatusScanTask.cs rename to src/TrackCenter.Application/Services/TimerTaskss/OrderPullStatusScanTask.cs index 07a52858..bd96c994 100644 --- a/src/SJZY.Track.Application/Services/TimerTaskss/OrderPullStatusScanTask.cs +++ b/src/TrackCenter.Application/Services/TimerTaskss/OrderPullStatusScanTask.cs @@ -3,10 +3,10 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Options; using SJZY.Expand.ABP.Core; using SJZY.Expand.ABP.Core.Logger; -using SJZY.Track.Application.Options; -using SJZY.Track.Domain.Aggregates.OrderAggregate; +using TrackCenter.Application.Options; +using TrackCenter.Domain.Aggregates.OrderAggregate; -namespace SJZY.Track.Application.Services.TimerTaskss; +namespace TrackCenter.Application.Services.TimerTaskss; /// /// 订单拉取状态扫描定时任务 diff --git a/src/SJZY.Track.Application/Services/TimerTaskss/TrackButtomUpScanTask.cs b/src/TrackCenter.Application/Services/TimerTaskss/TrackButtomUpScanTask.cs similarity index 94% rename from src/SJZY.Track.Application/Services/TimerTaskss/TrackButtomUpScanTask.cs rename to src/TrackCenter.Application/Services/TimerTaskss/TrackButtomUpScanTask.cs index bd1826d2..a78086a3 100644 --- a/src/SJZY.Track.Application/Services/TimerTaskss/TrackButtomUpScanTask.cs +++ b/src/TrackCenter.Application/Services/TimerTaskss/TrackButtomUpScanTask.cs @@ -1,17 +1,20 @@ using System.Linq.Expressions; +using Fake.Application; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Options; using Newtonsoft.Json.Linq; using SJZY.Expand.ABP.Core; using SJZY.Expand.ABP.Core.Logger; -using SJZY.Track.Application.Contract.Dtos.TrackPull; -using SJZY.Track.Application.Helpers; -using SJZY.Track.Application.Options; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Enums; -using SJZY.Track.Domain.Queries; +using TrackCenter.Application.Contract.Dtos.TrackPull; +using TrackCenter.Application.Helpers; +using TrackCenter.Application.Options; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Enums; +using TrackCenter.Domain.Extensions; +using TrackCenter.Domain.Queries; +using TrackCenter.Repository.Redis; -namespace SJZY.Track.Application.Services.TimerTaskss; +namespace TrackCenter.Application.Services.TimerTaskss; /// /// 轨迹兜底扫描定时任务 diff --git a/src/SJZY.Track.Application/Services/TimerTaskss/TrackPullTask.cs b/src/TrackCenter.Application/Services/TimerTaskss/TrackPullTask.cs similarity index 91% rename from src/SJZY.Track.Application/Services/TimerTaskss/TrackPullTask.cs rename to src/TrackCenter.Application/Services/TimerTaskss/TrackPullTask.cs index 6bd0edb1..f4b1d465 100644 --- a/src/SJZY.Track.Application/Services/TimerTaskss/TrackPullTask.cs +++ b/src/TrackCenter.Application/Services/TimerTaskss/TrackPullTask.cs @@ -4,17 +4,18 @@ using SJZY.Expand.ABP.Core; using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ABP.Core.PublicMethords; using SJZY.InterfaceRelay.Application.Contracts; -using SJZY.Track.Application.Contract.Dtos.TrackPull; -using SJZY.Track.Application.Contract.Services; -using SJZY.Track.Application.Helpers; -using SJZY.Track.Application.Options; -using SJZY.Track.Application.Track2InterfaceRelay; -using SJZY.Track.Domain.Dtos.TrackPull; -using SJZY.Track.Domain.Queries; +using TrackCenter.Application.Contract.Dtos.TrackPull; +using TrackCenter.Application.Contract.Services; +using TrackCenter.Application.Helpers; +using TrackCenter.Application.Options; +using TrackCenter.Application.Track2InterfaceRelay; +using TrackCenter.Domain.Dtos.TrackPull; +using TrackCenter.Domain.Queries; +using TrackCenter.Repository.Redis; using Volo.Abp.DependencyInjection; using Volo.Abp.Http.Client.DynamicProxying; -namespace SJZY.Track.Application.Services.TimerTaskss; +namespace TrackCenter.Application.Services.TimerTaskss; /// /// 轨迹拉取定时任务 diff --git a/src/SJZY.Track.Application/Services/TimerTaskss/TrackPushTask.cs b/src/TrackCenter.Application/Services/TimerTaskss/TrackPushTask.cs similarity index 94% rename from src/SJZY.Track.Application/Services/TimerTaskss/TrackPushTask.cs rename to src/TrackCenter.Application/Services/TimerTaskss/TrackPushTask.cs index 47f150de..43d77f03 100644 --- a/src/SJZY.Track.Application/Services/TimerTaskss/TrackPushTask.cs +++ b/src/TrackCenter.Application/Services/TimerTaskss/TrackPushTask.cs @@ -2,10 +2,10 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Options; using SJZY.Expand.ABP.Core; using SJZY.Expand.ABP.Core.Logger; -using SJZY.Track.Application.Track2InterfaceRelay; -using SJZY.Track.Domain.Aggregates.OrderAggregate; +using TrackCenter.Application.Track2InterfaceRelay; +using TrackCenter.Domain.Aggregates.OrderAggregate; -namespace SJZY.Track.Application.Services.TimerTaskss; +namespace TrackCenter.Application.Services.TimerTaskss; /// /// 轨迹推送定时任务 diff --git a/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs b/src/TrackCenter.Application/Services/TrackContents/TrackContentService.cs similarity index 95% rename from src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs rename to src/TrackCenter.Application/Services/TrackContents/TrackContentService.cs index 84f78a12..2da29ce1 100644 --- a/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs +++ b/src/TrackCenter.Application/Services/TrackContents/TrackContentService.cs @@ -3,21 +3,21 @@ using Microsoft.Extensions.Localization; using SJZY.Expand.ABP.Core.Localization; using SJZY.Expand.ABP.Core.PublicMethords; using SJZY.Expand.AliyunOSS; -using SJZY.Track.Application.Contract.Dtos.ProvideServices; -using SJZY.Track.Application.Contract.Dtos.TrackContents; -using SJZY.Track.Application.Contract.Services; -using SJZY.Track.Application.Localization; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.TrackContentAggregate; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; -using SJZY.Track.Domain.Aggregates.TrackFlagAggregate; -using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; -using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; -using SJZY.Track.Domain.Dtos.TrackContents; -using SJZY.Track.Domain.Enums; -using SJZY.Track.Domain.Queries; +using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Dtos.TrackContents; +using TrackCenter.Application.Contract.Services; +using TrackCenter.Application.Localization; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.TrackContentAggregate; +using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; +using TrackCenter.Domain.Aggregates.TrackFlagAggregate; +using TrackCenter.Domain.Aggregates.TrackStatusAggregate; +using TrackCenter.Domain.Aggregates.TrackTemplateAggregate; +using TrackCenter.Domain.Dtos.TrackContents; +using TrackCenter.Domain.Enums; +using TrackCenter.Domain.Queries; -namespace SJZY.Track.Application.Services.TrackContents; +namespace TrackCenter.Application.Services.TrackContents; /// /// 轨迹内容服务 @@ -114,12 +114,12 @@ public class TrackContentService : ApplicationService /// /// [HttpPost("GetList")] - public async Task> GetPageTrackContent(GetPageTrackContentInput input) + public async Task> GetPageTrackContent(GetPageTrackContentInput input) { var vo = ObjectMapper.Map(input); var resultDto = await _trackContentRepository.GetPageTrackContent(vo); var pageResultDto = - ObjectMapper.Map, UnifyPageResultDto>( + ObjectMapper.Map, PagedResult>( resultDto); return pageResultDto; @@ -131,7 +131,7 @@ public class TrackContentService : ApplicationService /// /// [HttpPost("GetMapPage")] - public async Task> GetMapPageAsync( + public async Task> GetMapPageAsync( [FromBody] GetTrackContentMapPageInputVO input) { return await _trackContentRepository.GetMapPageAsync(input); diff --git a/src/SJZY.Track.Application/Services/TrackFlags/TrackFlagService.cs b/src/TrackCenter.Application/Services/TrackFlags/TrackFlagService.cs similarity index 91% rename from src/SJZY.Track.Application/Services/TrackFlags/TrackFlagService.cs rename to src/TrackCenter.Application/Services/TrackFlags/TrackFlagService.cs index b42afce5..e3c6f36c 100644 --- a/src/SJZY.Track.Application/Services/TrackFlags/TrackFlagService.cs +++ b/src/TrackCenter.Application/Services/TrackFlags/TrackFlagService.cs @@ -1,13 +1,13 @@ using Microsoft.Extensions.Localization; -using SJZY.Track.Application.Contract.Dtos.TrackFlags; -using SJZY.Track.Application.Localization; -using SJZY.Track.Domain.Aggregates.TrackContentAggregate; -using SJZY.Track.Domain.Aggregates.TrackFlagAggregate; -using SJZY.Track.Domain.Dtos.TrackFlags; +using TrackCenter.Application.Contract.Dtos.TrackFlags; +using TrackCenter.Domain.Aggregates.TrackContentAggregate; +using TrackCenter.Domain.Aggregates.TrackFlagAggregate; +using TrackCenter.Domain.Dtos.TrackFlags; using SqlSugar; +using TrackCenter.Application.Localization; using Volo.Abp.DependencyInjection; -namespace SJZY.Track.Application.Services.TrackFlags; +namespace TrackCenter.Application.Services.TrackFlags; /// /// 轨迹标记服务 @@ -71,12 +71,12 @@ public class TrackFlagService : ApplicationService, ITransientDependency /// /// [HttpPost("GetList")] - public async Task> GetPageTrackFlag(GetPageTrackFlagInput input) + public async Task> GetPageTrackFlag(GetPageTrackFlagInput input) { var vo = ObjectMapper.Map(input); var resultDto = await _trackFlagRepository.GetPageTrackFlag(vo); var pageResultDto = - ObjectMapper.Map, UnifyPageResultDto>( + ObjectMapper.Map, PagedResult>( resultDto); return pageResultDto; diff --git a/src/SJZY.Track.Application/Services/TrackNode/TrackNodeService.cs b/src/TrackCenter.Application/Services/TrackNode/TrackNodeService.cs similarity index 90% rename from src/SJZY.Track.Application/Services/TrackNode/TrackNodeService.cs rename to src/TrackCenter.Application/Services/TrackNode/TrackNodeService.cs index d24eeaef..2422618c 100644 --- a/src/SJZY.Track.Application/Services/TrackNode/TrackNodeService.cs +++ b/src/TrackCenter.Application/Services/TrackNode/TrackNodeService.cs @@ -1,12 +1,12 @@ -using SJZY.Track.Application.Contract.Dtos.TrackNode; -using SJZY.Track.Application.Contract.Dtos.TrackStatus; -using SJZY.Track.Application.Helpers; -using SJZY.Track.Domain.Aggregates.TrackNodeAggregate; -using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; -using SJZY.Track.Domain.Dtos.TrackNode; +using TrackCenter.Application.Contract.Dtos.TrackNode; +using TrackCenter.Application.Contract.Dtos.TrackStatus; +using TrackCenter.Application.Helpers; +using TrackCenter.Domain.Aggregates.TrackNodeAggregate; +using TrackCenter.Domain.Aggregates.TrackStatusAggregate; +using TrackCenter.Domain.Dtos.TrackNode; using Volo.Abp.DependencyInjection; -namespace SJZY.Track.Application.Services.TrackNode; +namespace TrackCenter.Application.Services.TrackNode; /// /// 轨迹节点服务 @@ -47,7 +47,7 @@ public class TrackNodeService : ApplicationService, ITransientDependency /// /// [HttpPost("GetList")] - public async Task> GetPageTrackNode(QueryTrackNodeRequest input) + public async Task> GetPageTrackNode(QueryTrackNodeRequest input) { var queryParam = ObjectMapper.Map(input); var resultDto = await _trackNodeRepository.GetPageList(queryParam); @@ -72,7 +72,7 @@ public class TrackNodeService : ApplicationService, ITransientDependency /// /// [HttpPost("GetTrackNodeOption")] - public async Task> GetTrackNodeOption(QueryTrackNodeRequest input) + public async Task> GetTrackNodeOption(QueryTrackNodeRequest input) { var queryParam = ObjectMapper.Map(input); var resultDto = await _trackNodeRepository.GetPageDicList(queryParam); diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/TrackCenter.Application/Services/TrackOrders/TrackOrderService.cs similarity index 95% rename from src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs rename to src/TrackCenter.Application/Services/TrackOrders/TrackOrderService.cs index fdaba31d..a3a717e8 100644 --- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs +++ b/src/TrackCenter.Application/Services/TrackOrders/TrackOrderService.cs @@ -1,18 +1,18 @@ using System.Linq.Expressions; using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.AliyunOSS; -using SJZY.Track.Application.Contract.Dtos.ProvideServices; -using SJZY.Track.Application.Contract.Dtos.TrackOrder; -using SJZY.Track.Application.Helpers; -using SJZY.Track.Application.Services.Warning.Handlers; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.TrackContentAggregate; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; -using SJZY.Track.Domain.Aggregates.TrackPushAggregate; -using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; -using SJZY.Track.Domain.Dtos.Order; +using TrackCenter.Application.Contract.Dtos.ProvideServices; +using TrackCenter.Application.Contract.Dtos.TrackOrder; +using TrackCenter.Application.Helpers; +using TrackCenter.Application.Services.Warning.Handlers; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.TrackContentAggregate; +using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; +using TrackCenter.Domain.Aggregates.TrackPushAggregate; +using TrackCenter.Domain.Aggregates.TrackStatusAggregate; +using TrackCenter.Domain.Dtos.Order; -namespace SJZY.Track.Application.Services.TrackOrders; +namespace TrackCenter.Application.Services.TrackOrders; /// /// 轨迹订单服务 @@ -54,12 +54,12 @@ public class TrackOrderService : ApplicationService /// /// [HttpPost("GetTrackOrderList")] - public async Task> GetTrackOrderPagedList(GetPageTrackOrderInput input) + public async Task> GetTrackOrderPagedList(GetPageTrackOrderInput input) { var vo = ObjectMapper.Map(input); var pageList = await _orderRepository.GetTrackOrderPagedList(vo); var pageResultDto = - ObjectMapper.Map, UnifyPageResultDto>(pageList); + ObjectMapper.Map, PagedResult>(pageList); return pageResultDto; } diff --git a/src/SJZY.Track.Application/Services/TrackPull/TrackPullCacheService.cs b/src/TrackCenter.Application/Services/TrackPull/TrackPullCacheService.cs similarity index 90% rename from src/SJZY.Track.Application/Services/TrackPull/TrackPullCacheService.cs rename to src/TrackCenter.Application/Services/TrackPull/TrackPullCacheService.cs index dcd6177e..ee08ce54 100644 --- a/src/SJZY.Track.Application/Services/TrackPull/TrackPullCacheService.cs +++ b/src/TrackCenter.Application/Services/TrackPull/TrackPullCacheService.cs @@ -1,12 +1,12 @@ using SJZY.Expand.ABP.Core; -using SJZY.Track.Application.Contract.Dtos.TrackPull; -using SJZY.Track.Application.Contract.Services; -using SJZY.Track.Domain.Aggregates.TrackPullAggregate; -using SJZY.Track.Domain.Dtos.TrackPull; +using TrackCenter.Application.Contract.Dtos.TrackPull; +using TrackCenter.Application.Contract.Services; +using TrackCenter.Domain.Aggregates.TrackPullAggregate; +using TrackCenter.Domain.Dtos.TrackPull; using Volo.Abp.DependencyInjection; using Volo.Abp.ObjectMapping; -namespace SJZY.Track.Application.Services.TrackPull; +namespace TrackCenter.Application.Services.TrackPull; public class TrackPullCacheService : ITransientDependency, ITrackPullCacheService { diff --git a/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs b/src/TrackCenter.Application/Services/TrackPull/TrackPullService.cs similarity index 95% rename from src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs rename to src/TrackCenter.Application/Services/TrackPull/TrackPullService.cs index eff53648..6c085d1a 100644 --- a/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs +++ b/src/TrackCenter.Application/Services/TrackPull/TrackPullService.cs @@ -3,16 +3,16 @@ using Microsoft.Extensions.Localization; using Microsoft.Extensions.Options; using SJZY.Expand.ABP.Core.Localization; using SJZY.Expand.ABP.Core.PublicMethords; -using SJZY.Track.Application.Contract.Dtos.TrackPull; -using SJZY.Track.Application.Contract.Services; -using SJZY.Track.Application.Localization; -using SJZY.Track.Application.Options; -using SJZY.Track.Domain.Aggregates.TrackPullAggregate; -using SJZY.Track.Domain.Dtos.Common; -using SJZY.Track.Domain.Dtos.TrackPull; +using TrackCenter.Application.Contract.Dtos.TrackPull; +using TrackCenter.Application.Contract.Services; +using TrackCenter.Domain.Aggregates.TrackPullAggregate; +using TrackCenter.Domain.Dtos.Common; +using TrackCenter.Domain.Dtos.TrackPull; using SqlSugar; +using TrackCenter.Application.Localization; +using TrackCenter.Application.Options; -namespace SJZY.Track.Application.Services.TrackPull; +namespace TrackCenter.Application.Services.TrackPull; /// /// 轨迹拉取 @@ -43,7 +43,7 @@ public class TrackPullService : ApplicationService /// /// [HttpPost("GetPage")] - public async Task> GetPageAsync([FromBody] KeywordsInputVO input) + public async Task> GetPageAsync([FromBody] KeywordsInputVO input) { return await _trackPullConfigRepository.GetPageAsync(input); } @@ -54,7 +54,7 @@ public class TrackPullService : ApplicationService /// /// [HttpPost("GetContentPage")] - public async Task> GetContentPageAsync( + public async Task> GetContentPageAsync( [FromBody] GetTrackPullContentPageInputVO input) { return await _trackPullConfigRepository.GetContentPageAsync(input); diff --git a/src/SJZY.Track.Application/Services/TrackPush/TrackPushCacheService.cs b/src/TrackCenter.Application/Services/TrackPush/TrackPushCacheService.cs similarity index 94% rename from src/SJZY.Track.Application/Services/TrackPush/TrackPushCacheService.cs rename to src/TrackCenter.Application/Services/TrackPush/TrackPushCacheService.cs index a7098b8d..383ab42d 100644 --- a/src/SJZY.Track.Application/Services/TrackPush/TrackPushCacheService.cs +++ b/src/TrackCenter.Application/Services/TrackPush/TrackPushCacheService.cs @@ -1,10 +1,10 @@ using SJZY.Expand.ABP.Core; -using SJZY.Track.Application.Contract.Dtos.TrackPush; -using SJZY.Track.Application.Contract.Services; -using SJZY.Track.Domain.Aggregates.TrackPushAggregate; +using TrackCenter.Application.Contract.Dtos.TrackPush; +using TrackCenter.Application.Contract.Services; +using TrackCenter.Domain.Aggregates.TrackPushAggregate; using Volo.Abp.DependencyInjection; -namespace SJZY.Track.Application.Services.TrackPush; +namespace TrackCenter.Application.Services.TrackPush; public class TrackPushCacheService : ITrackPushCacheService, ITransientDependency { diff --git a/src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs b/src/TrackCenter.Application/Services/TrackPush/TrackPushService.cs similarity index 95% rename from src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs rename to src/TrackCenter.Application/Services/TrackPush/TrackPushService.cs index 8cd08d74..76878773 100644 --- a/src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs +++ b/src/TrackCenter.Application/Services/TrackPush/TrackPushService.cs @@ -3,19 +3,19 @@ using Microsoft.Extensions.Localization; using SJZY.Expand.ABP.Core.Localization; using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ABP.Core.PublicMethords; -using SJZY.Track.Application.Contract.Dtos.TrackPush; -using SJZY.Track.Application.Contract.Services; -using SJZY.Track.Application.Helpers; -using SJZY.Track.Application.Localization; -using SJZY.Track.Application.Services.Warning.Handlers; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.TrackPushAggregate; -using SJZY.Track.Domain.Dtos.Common; -using SJZY.Track.Domain.Dtos.TrackPush; -using SJZY.Track.Domain.Enums; +using TrackCenter.Application.Contract.Dtos.TrackPush; +using TrackCenter.Application.Contract.Services; +using TrackCenter.Application.Helpers; +using TrackCenter.Application.Localization; +using TrackCenter.Application.Services.Warning.Handlers; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.TrackPushAggregate; +using TrackCenter.Domain.Dtos.Common; +using TrackCenter.Domain.Dtos.TrackPush; +using TrackCenter.Domain.Enums; using Volo.Abp.DependencyInjection; -namespace SJZY.Track.Application.Services.TrackPush; +namespace TrackCenter.Application.Services.TrackPush; /// /// 轨迹推送 @@ -49,7 +49,7 @@ public class TrackPushService : ApplicationService, ISingletonDependency /// /// [HttpPost("GetPage")] - public async Task> GetPageAsync([FromBody] KeywordsInputVO input) + public async Task> GetPageAsync([FromBody] KeywordsInputVO input) { return await _trackPushConfigRepository.GetPageAsync(input); } @@ -80,7 +80,7 @@ public class TrackPushService : ApplicationService, ISingletonDependency /// /// [HttpPost("GetContentPage")] - public async Task> GetContentPageAsync( + public async Task> GetContentPageAsync( [FromBody] GetTrackPushContentPageInputVO input) { return await _trackPushConfigRepository.GetContentPageAsync(input); diff --git a/src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs b/src/TrackCenter.Application/Services/TrackStatus/TrackStatusService.cs similarity index 92% rename from src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs rename to src/TrackCenter.Application/Services/TrackStatus/TrackStatusService.cs index 0061c2c4..68a074ae 100644 --- a/src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs +++ b/src/TrackCenter.Application/Services/TrackStatus/TrackStatusService.cs @@ -1,9 +1,9 @@ -using SJZY.Track.Application.Contract.Dtos.TrackStatus; -using SJZY.Track.Domain.Aggregates.TrackContentAggregate; -using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; -using SJZY.Track.Domain.Dtos.TrackStatus; +using TrackCenter.Application.Contract.Dtos.TrackStatus; +using TrackCenter.Domain.Aggregates.TrackContentAggregate; +using TrackCenter.Domain.Aggregates.TrackStatusAggregate; +using TrackCenter.Domain.Dtos.TrackStatus; -namespace SJZY.Track.Application.Services.TrackStatus; +namespace TrackCenter.Application.Services.TrackStatus; /// /// 轨迹状态 @@ -64,12 +64,12 @@ public class TrackStatusService : ApplicationService /// /// [HttpPost("GetList")] - public async Task> GetPagedTrackStatus(GetPagedTrackStatusInput input) + public async Task> GetPagedTrackStatus(GetPagedTrackStatusInput input) { var vo = ObjectMapper.Map(input); var resultDto = await _trackStatusRepository.GetPageTrackStatus(vo); var pageResultDto = - ObjectMapper.Map, UnifyPageResultDto>( + ObjectMapper.Map, PagedResult>( resultDto); return pageResultDto; diff --git a/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs b/src/TrackCenter.Application/Services/TrackTemplates/TrackTemplateService.cs similarity index 94% rename from src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs rename to src/TrackCenter.Application/Services/TrackTemplates/TrackTemplateService.cs index 9dfc58bd..a0ac7350 100644 --- a/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs +++ b/src/TrackCenter.Application/Services/TrackTemplates/TrackTemplateService.cs @@ -2,12 +2,12 @@ using System.Linq.Expressions; using Microsoft.Extensions.Localization; using SJZY.Expand.ABP.Core.Localization; using SJZY.Expand.ABP.Core.PublicMethords; -using SJZY.Track.Application.Contract.Dtos.TrackTemplates; -using SJZY.Track.Application.Localization; -using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; -using SJZY.Track.Domain.Dtos.TrackTemplate; +using TrackCenter.Application.Contract.Dtos.TrackTemplates; +using TrackCenter.Application.Localization; +using TrackCenter.Domain.Aggregates.TrackTemplateAggregate; +using TrackCenter.Domain.Dtos.TrackTemplate; -namespace SJZY.Track.Application.Services.TrackTemplates; +namespace TrackCenter.Application.Services.TrackTemplates; /// /// 轨迹模版 @@ -62,12 +62,12 @@ public class TrackTemplateService : ApplicationService /// /// [HttpPost("GetList")] - public async Task> GetPageTrackTemplate(GetPageTrackTemplateInput input) + public async Task> GetPageTrackTemplate(GetPageTrackTemplateInput input) { var vo = ObjectMapper.Map(input); var resultDto = await _trackTemplateRepository.GetPageTrackTemplate(vo); var pageResultDto = - ObjectMapper.Map, UnifyPageResultDto>( + ObjectMapper.Map, PagedResult>( resultDto); return pageResultDto; @@ -79,7 +79,7 @@ public class TrackTemplateService : ApplicationService /// /// [HttpPost("GetContentPage")] - public async Task> GetContentPageAsync( + public async Task> GetContentPageAsync( [FromBody] GetTrackTemplateContentPageInputVO input) { return await _trackTemplateRepository.GetContentPageAsync(input); diff --git a/src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs b/src/TrackCenter.Application/Services/Warning/CompleteWarningService.cs similarity index 81% rename from src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs rename to src/TrackCenter.Application/Services/Warning/CompleteWarningService.cs index bb30224c..fa845ad0 100644 --- a/src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs +++ b/src/TrackCenter.Application/Services/Warning/CompleteWarningService.cs @@ -1,20 +1,23 @@ +using Fake.Application; +using Fake.Application.Dtos; +using InterfaceForward.Domain.Shared.Helpers; using SJZY.Expand.ABP.Core.PublicMethords; -using SJZY.Track.Application.Caching; -using SJZY.Track.Application.Contract.Dtos.Warning; -using SJZY.Track.Application.Contract.Dtos.Warning.Complete; -using SJZY.Track.Application.Contract.Dtos.Warning.Return; -using SJZY.Track.Application.Helpers; -using SJZY.Track.Application.Services.Warning.Handlers; -using SJZY.Track.Application.Services.Warning.Model; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; -using SJZY.Track.Domain.Aggregates.WarningAggregate; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Complete; -using SJZY.Track.Domain.Dtos.Warning; -using SJZY.Track.Domain.Enums; -using SJZY.Track.Domain.Extensions; +using TrackCenter.Application.Contract.Dtos.Warning; +using TrackCenter.Application.Contract.Dtos.Warning.Complete; +using TrackCenter.Application.Contract.Dtos.Warning.Return; +using TrackCenter.Application.Caching; +using TrackCenter.Application.Helpers; +using TrackCenter.Application.Services.Warning.Handlers; +using TrackCenter.Application.Services.Warning.Model; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; +using TrackCenter.Domain.Aggregates.WarningAggregate; +using TrackCenter.Domain.Aggregates.WarningAggregate.Complete; +using TrackCenter.Domain.Dtos.Warning; +using TrackCenter.Domain.Enums; +using TrackCenter.Domain.Extensions; -namespace SJZY.Track.Application.Services.Warning; +namespace TrackCenter.Application.Services.Warning; /// /// 完整预警服务 @@ -30,7 +33,6 @@ public class CompleteWarningService : ApplicationService private readonly ICompleteWarningHandler _completeWarningHandler; private readonly TrackStatusNameDictCache _trackStatusNameDictCache; private readonly CustomAbbreviationDictCache _customAbbreviationDictCache; - private readonly SystemCnNameDictCache _systemCnNameDictCache; public CompleteWarningService( IOrderRepository orderRepository, @@ -40,7 +42,6 @@ public class CompleteWarningService : ApplicationService ICompleteWarningHandler completeWarningHandler, TrackStatusNameDictCache trackStatusNameDictCache, CustomAbbreviationDictCache customAbbreviationDictCache, - SystemCnNameDictCache systemCnNameDictCache ) { _orderRepository = orderRepository; @@ -50,7 +51,6 @@ public class CompleteWarningService : ApplicationService _completeWarningHandler = completeWarningHandler; _trackStatusNameDictCache = trackStatusNameDictCache; _customAbbreviationDictCache = customAbbreviationDictCache; - _systemCnNameDictCache = systemCnNameDictCache; } @@ -60,11 +60,11 @@ public class CompleteWarningService : ApplicationService /// /// [HttpPost("GetCompleteWarningRuleItem")] - public async Task>> GetCompleteWarningRuleItem(GetCompleteWarningRuleItemInput input) + public async Task> GetCompleteWarningRuleItem(GetCompleteWarningRuleItemInput input) { var result = await _warningRuleRepository.GetCompleteRuleItemsAsync(input.WarningId); if (result.Count == 0) - return new UnifyResultDto>(true, new List()); + return new List(); var trackStatusIds = result .SelectMany(x => @@ -95,7 +95,7 @@ public class CompleteWarningService : ApplicationService NotifyUsers = TextJsonHelper.Deserialize>(x.NotifyUsers)! }); - return new UnifyResultDto>(true, map.ToList()); + return map.ToList(); List BuildRequireTrackStatus(CompleteWarningRuleItemEntity entity) { @@ -127,13 +127,13 @@ public class CompleteWarningService : ApplicationService /// /// [HttpPost("GetPageCompleteWarningDetails")] - public async Task> GetPageCompleteWarningDetails(GetPageCompleteWarningDetailsInput input) + public async Task> GetPageCompleteWarningDetails(GetPageCompleteWarningDetailsInput input) { var vo = ObjectMapper.Map(input); var result = await _warningDetailsEsRepository.GetPageCompleteWarningDetailsAsync(vo); - if (result.List.Count == 0) + if (result.Items.Count == 0) { - return new UnifyPageResultDto(new List(), + return new PagedResult(new List(), result.Pagination.PageIndex, result.Pagination.PageSize, result.Pagination.Total); @@ -152,9 +152,6 @@ public class CompleteWarningService : ApplicationService // 客户id简称字典 var customIds = result.List.Select(x => x.CustomId).ToHashSet(); var customDict = await _customAbbreviationDictCache.SafeGetBatchAsync(customIds); - // 子系统id中文名字典 - var subSystemIds = result.List.Select(x => x.SubSystemId).ToHashSet(); - var subSystemDict = await _systemCnNameDictCache.SafeGetBatchAsync(subSystemIds); // 查最新轨迹（创建时间） var orderIds = result.List.Select(x => x.OrderId).ToHashSet(); @@ -167,7 +164,6 @@ public class CompleteWarningService : ApplicationService { EsId = x.Id, SubSystemId = x.SubSystemId, - SubSystemName = subSystemDict.GetValueOrDefault(x.SubSystemId, GlobalConst.EmptyString), OrderType = x.OrderType, OrderTypeName = orderTypeDict.GetValueOrDefault(x.OrderType.ToString(), GlobalConst.EmptyString), OrderId = x.OrderId, @@ -193,7 +189,7 @@ public class CompleteWarningService : ApplicationService .OrderBy(x => x.Status == (int) CompleteWarningStatus.待处理 ? 1 : 2) .ThenByDescending(x => x.CreateTime); //同状态组按时间降序; - return new UnifyPageResultDto( + return new PagedResult( sorted.ToList(), result.Pagination.PageIndex, result.Pagination.PageSize, @@ -228,7 +224,7 @@ public class CompleteWarningService : ApplicationService /// /// [HttpPost("EditCompleteWarningRuleItem")] - public async Task EditCompleteWarningRuleItem(EditCompleteWarningRuleItemInput input) + public async Task EditCompleteWarningRuleItem(EditCompleteWarningRuleItemInput input) { var rule = await _warningRuleRepository.GetWarningRuleByIdAsync(input.WarningId, WarningRuleType.完整预警); if (rule == null) @@ -255,6 +251,5 @@ public class CompleteWarningService : ApplicationService } await _completeWarningHandler.HandleEditAsync(rule, bos); - return new UnifyResultDto(true); } } diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/CompleteWarningHandler.cs b/src/TrackCenter.Application/Services/Warning/Handlers/CompleteWarningHandler.cs similarity index 96% rename from src/SJZY.Track.Application/Services/Warning/Handlers/CompleteWarningHandler.cs rename to src/TrackCenter.Application/Services/Warning/Handlers/CompleteWarningHandler.cs index edc087ff..af7b9967 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/CompleteWarningHandler.cs +++ b/src/TrackCenter.Application/Services/Warning/Handlers/CompleteWarningHandler.cs @@ -1,16 +1,16 @@ -using SJZY.Track.Application.Services.Warning.Model; -using SJZY.Track.Application.Services.Warning.Signals; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; -using SJZY.Track.Domain.Aggregates.WarningAggregate; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Complete; -using SJZY.Track.Domain.Dtos.TrackDetails; -using SJZY.Track.Domain.Dtos.Warning; -using SJZY.Track.Domain.Enums; -using SJZY.Track.Domain.Extensions; -using Volo.Abp.DependencyInjection; +using Fake.DependencyInjection; +using TrackCenter.Application.Services.Warning.Model; +using TrackCenter.Application.Services.Warning.Signals; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; +using TrackCenter.Domain.Aggregates.WarningAggregate; +using TrackCenter.Domain.Aggregates.WarningAggregate.Complete; +using TrackCenter.Domain.Dtos.TrackDetails; +using TrackCenter.Domain.Dtos.Warning; +using TrackCenter.Domain.Enums; +using TrackCenter.Domain.Extensions; -namespace SJZY.Track.Application.Services.Warning.Handlers; +namespace TrackCenter.Application.Services.Warning.Handlers; public sealed class CompleteWarningHandler : ICompleteWarningHandler, ITransientDependency { @@ -131,8 +131,8 @@ public sealed class CompleteWarningHandler : ICompleteWarningHandler, ITransient var orderTrackStatusEarliestDictDict = await _trackDetailsEsRepository.GetTrackStatusEarliestDictAsync(orderIds); // 3.查规则主体 - var conditionDict = orders.GroupBy(x => (x.SubSystemId, x.CustomId)).ToDictionary(x => x.Key, y => y.ToList()); - var conditions = conditionDict.Keys.ToHashSet(); + var conditionDict = orders.GroupBy(x => x.CustomId).ToDictionary(x => x.Key, y => y.ToList()); + var conditions = conditionDict.Keys.ToList(); var ruleDict = await _warningRuleRepository.GetWarningRuleForEnabledAsync(conditions, WarningRuleType.完整预警); if (ruleDict.Count == 0) return; diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/ICompleteWarningHandler.cs b/src/TrackCenter.Application/Services/Warning/Handlers/ICompleteWarningHandler.cs similarity index 69% rename from src/SJZY.Track.Application/Services/Warning/Handlers/ICompleteWarningHandler.cs rename to src/TrackCenter.Application/Services/Warning/Handlers/ICompleteWarningHandler.cs index 3756c523..2e251032 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/ICompleteWarningHandler.cs +++ b/src/TrackCenter.Application/Services/Warning/Handlers/ICompleteWarningHandler.cs @@ -1,8 +1,8 @@ -using SJZY.Track.Application.Services.Warning.Model; -using SJZY.Track.Application.Services.Warning.Signals; -using SJZY.Track.Domain.Aggregates.WarningAggregate; +using TrackCenter.Application.Services.Warning.Model; +using TrackCenter.Application.Services.Warning.Signals; +using TrackCenter.Domain.Aggregates.WarningAggregate; -namespace SJZY.Track.Application.Services.Warning.Handlers; +namespace TrackCenter.Application.Services.Warning.Handlers; public interface ICompleteWarningHandler { diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/IOrderWarningHandler.cs b/src/TrackCenter.Application/Services/Warning/Handlers/IOrderWarningHandler.cs similarity index 70% rename from src/SJZY.Track.Application/Services/Warning/Handlers/IOrderWarningHandler.cs rename to src/TrackCenter.Application/Services/Warning/Handlers/IOrderWarningHandler.cs index 70f8e552..87028edb 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/IOrderWarningHandler.cs +++ b/src/TrackCenter.Application/Services/Warning/Handlers/IOrderWarningHandler.cs @@ -1,6 +1,6 @@ -using SJZY.Track.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.OrderAggregate; -namespace SJZY.Track.Application.Services.Warning.Handlers; +namespace TrackCenter.Application.Services.Warning.Handlers; /// /// 订单预警处理 diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/IReturnWarningHandler.cs b/src/TrackCenter.Application/Services/Warning/Handlers/IReturnWarningHandler.cs similarity index 75% rename from src/SJZY.Track.Application/Services/Warning/Handlers/IReturnWarningHandler.cs rename to src/TrackCenter.Application/Services/Warning/Handlers/IReturnWarningHandler.cs index 69843a6e..3b1dceec 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/IReturnWarningHandler.cs +++ b/src/TrackCenter.Application/Services/Warning/Handlers/IReturnWarningHandler.cs @@ -1,10 +1,10 @@ -using SJZY.Track.Application.Contract.Dtos.TrackPush; -using SJZY.Track.Application.Services.Warning.Model; -using SJZY.Track.Application.Services.Warning.Signals; -using SJZY.Track.Domain.Aggregates.TrackPushAggregate; -using SJZY.Track.Domain.Aggregates.WarningAggregate; +using TrackCenter.Application.Contract.Dtos.TrackPush; +using TrackCenter.Application.Services.Warning.Model; +using TrackCenter.Application.Services.Warning.Signals; +using TrackCenter.Domain.Aggregates.TrackPushAggregate; +using TrackCenter.Domain.Aggregates.WarningAggregate; -namespace SJZY.Track.Application.Services.Warning.Handlers; +namespace TrackCenter.Application.Services.Warning.Handlers; public interface IReturnWarningHandler { diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/ITransportWarningHandler.cs b/src/TrackCenter.Application/Services/Warning/Handlers/ITransportWarningHandler.cs similarity index 79% rename from src/SJZY.Track.Application/Services/Warning/Handlers/ITransportWarningHandler.cs rename to src/TrackCenter.Application/Services/Warning/Handlers/ITransportWarningHandler.cs index 16a035a7..ebe67e3f 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/ITransportWarningHandler.cs +++ b/src/TrackCenter.Application/Services/Warning/Handlers/ITransportWarningHandler.cs @@ -1,9 +1,9 @@ -using SJZY.Track.Application.Services.Warning.Model; -using SJZY.Track.Application.Services.Warning.Signals; -using SJZY.Track.Domain.Aggregates.WarningAggregate; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Transport; +using TrackCenter.Application.Services.Warning.Model; +using TrackCenter.Application.Services.Warning.Signals; +using TrackCenter.Domain.Aggregates.WarningAggregate; +using TrackCenter.Domain.Aggregates.WarningAggregate.Transport; -namespace SJZY.Track.Application.Services.Warning.Handlers; +namespace TrackCenter.Application.Services.Warning.Handlers; /// /// 运输预警处理器 diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/OrderWarningHandler.cs b/src/TrackCenter.Application/Services/Warning/Handlers/OrderWarningHandler.cs similarity index 91% rename from src/SJZY.Track.Application/Services/Warning/Handlers/OrderWarningHandler.cs rename to src/TrackCenter.Application/Services/Warning/Handlers/OrderWarningHandler.cs index b3f12c31..bf8c5edc 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/OrderWarningHandler.cs +++ b/src/TrackCenter.Application/Services/Warning/Handlers/OrderWarningHandler.cs @@ -1,10 +1,10 @@ -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.WarningAggregate; -using SJZY.Track.Domain.Dtos.Warning; -using SJZY.Track.Domain.Enums; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.WarningAggregate; +using TrackCenter.Domain.Dtos.Warning; +using TrackCenter.Domain.Enums; using Volo.Abp.DependencyInjection; -namespace SJZY.Track.Application.Services.Warning.Handlers; +namespace TrackCenter.Application.Services.Warning.Handlers; public class OrderWarningHandler : IOrderWarningHandler, ITransientDependency { diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/ReturnWarningHandler.cs b/src/TrackCenter.Application/Services/Warning/Handlers/ReturnWarningHandler.cs similarity index 97% rename from src/SJZY.Track.Application/Services/Warning/Handlers/ReturnWarningHandler.cs rename to src/TrackCenter.Application/Services/Warning/Handlers/ReturnWarningHandler.cs index e8f2db19..d4f94e63 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/ReturnWarningHandler.cs +++ b/src/TrackCenter.Application/Services/Warning/Handlers/ReturnWarningHandler.cs @@ -1,18 +1,18 @@ using Microsoft.Extensions.Options; -using SJZY.Track.Application.Contract.Dtos.TrackPush; -using SJZY.Track.Application.Contract.Services; -using SJZY.Track.Application.Options; -using SJZY.Track.Application.Services.Warning.Model; -using SJZY.Track.Application.Services.Warning.Signals; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.TrackPushAggregate; -using SJZY.Track.Domain.Aggregates.WarningAggregate; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Return; -using SJZY.Track.Domain.Dtos.Warning; -using SJZY.Track.Domain.Enums; +using TrackCenter.Application.Contract.Dtos.TrackPush; +using TrackCenter.Application.Contract.Services; +using TrackCenter.Application.Options; +using TrackCenter.Application.Services.Warning.Model; +using TrackCenter.Application.Services.Warning.Signals; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.TrackPushAggregate; +using TrackCenter.Domain.Aggregates.WarningAggregate; +using TrackCenter.Domain.Aggregates.WarningAggregate.Return; +using TrackCenter.Domain.Dtos.Warning; +using TrackCenter.Domain.Enums; using Volo.Abp.DependencyInjection; -namespace SJZY.Track.Application.Services.Warning.Handlers; +namespace TrackCenter.Application.Services.Warning.Handlers; public sealed class ReturnWarningHandler : IReturnWarningHandler, ITransientDependency { diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs b/src/TrackCenter.Application/Services/Warning/Handlers/TransportWarningHandler.cs similarity index 98% rename from src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs rename to src/TrackCenter.Application/Services/Warning/Handlers/TransportWarningHandler.cs index a472f129..07e2c3e7 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs +++ b/src/TrackCenter.Application/Services/Warning/Handlers/TransportWarningHandler.cs @@ -1,21 +1,21 @@ using System.Linq.Expressions; -using SJZY.Track.Application.Services.Warning.Model; -using SJZY.Track.Application.Services.Warning.Signals; -using SJZY.Track.Domain.Aggregates.KPIAreaAggregate; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; -using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; -using SJZY.Track.Domain.Aggregates.WarningAggregate; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Transport; -using SJZY.Track.Domain.Dtos.Forewarning; -using SJZY.Track.Domain.Dtos.TrackDetails; -using SJZY.Track.Domain.Dtos.Warning; -using SJZY.Track.Domain.Enums; -using SJZY.Track.Domain.Extensions; +using TrackCenter.Domain.Aggregates.KPIAreaAggregate; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; +using TrackCenter.Domain.Aggregates.TrackStatusAggregate; +using TrackCenter.Domain.Aggregates.WarningAggregate; +using TrackCenter.Domain.Aggregates.WarningAggregate.Transport; +using TrackCenter.Domain.Dtos.Forewarning; +using TrackCenter.Domain.Dtos.TrackDetails; +using TrackCenter.Domain.Dtos.Warning; +using TrackCenter.Domain.Enums; +using TrackCenter.Domain.Extensions; using SqlSugar; +using TrackCenter.Application.Services.Warning.Model; +using TrackCenter.Application.Services.Warning.Signals; using Volo.Abp.DependencyInjection; -namespace SJZY.Track.Application.Services.Warning.Handlers; +namespace TrackCenter.Application.Services.Warning.Handlers; public class TransportWarningHandler : ITransportWarningHandler, ITransientDependency { diff --git a/src/SJZY.Track.Application/Services/Warning/Model/CompleteWarningRuleItemBO.cs b/src/TrackCenter.Application/Services/Warning/Model/CompleteWarningRuleItemBO.cs similarity index 91% rename from src/SJZY.Track.Application/Services/Warning/Model/CompleteWarningRuleItemBO.cs rename to src/TrackCenter.Application/Services/Warning/Model/CompleteWarningRuleItemBO.cs index a6621497..6064368c 100644 --- a/src/SJZY.Track.Application/Services/Warning/Model/CompleteWarningRuleItemBO.cs +++ b/src/TrackCenter.Application/Services/Warning/Model/CompleteWarningRuleItemBO.cs @@ -1,9 +1,9 @@ -using SJZY.Track.Application.Contract.Dtos.Warning; -using SJZY.Track.Application.Contract.Dtos.Warning.Complete; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Complete; -using SJZY.Track.Domain.Extensions; +using TrackCenter.Application.Contract.Dtos.Warning; +using TrackCenter.Application.Contract.Dtos.Warning.Complete; +using TrackCenter.Domain.Aggregates.WarningAggregate.Complete; +using TrackCenter.Domain.Extensions; -namespace SJZY.Track.Application.Services.Warning.Model; +namespace TrackCenter.Application.Services.Warning.Model; public sealed class CompleteWarningRuleItemBO { diff --git a/src/SJZY.Track.Application/Services/Warning/Model/ReturnWarningRuleItemBO.cs b/src/TrackCenter.Application/Services/Warning/Model/ReturnWarningRuleItemBO.cs similarity index 89% rename from src/SJZY.Track.Application/Services/Warning/Model/ReturnWarningRuleItemBO.cs rename to src/TrackCenter.Application/Services/Warning/Model/ReturnWarningRuleItemBO.cs index 4caa03b1..8f4acf1c 100644 --- a/src/SJZY.Track.Application/Services/Warning/Model/ReturnWarningRuleItemBO.cs +++ b/src/TrackCenter.Application/Services/Warning/Model/ReturnWarningRuleItemBO.cs @@ -1,9 +1,9 @@ -using SJZY.Track.Application.Contract.Dtos.Warning; -using SJZY.Track.Application.Contract.Dtos.Warning.Return; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Return; -using SJZY.Track.Domain.Extensions; +using TrackCenter.Application.Contract.Dtos.Warning; +using TrackCenter.Application.Contract.Dtos.Warning.Return; +using TrackCenter.Domain.Aggregates.WarningAggregate.Return; +using TrackCenter.Domain.Extensions; -namespace SJZY.Track.Application.Services.Warning.Model; +namespace TrackCenter.Application.Services.Warning.Model; public sealed class ReturnWarningRuleItemBO { diff --git a/src/SJZY.Track.Application/Services/Warning/Model/TransportWarningSceneBO.cs b/src/TrackCenter.Application/Services/Warning/Model/TransportWarningSceneBO.cs similarity index 95% rename from src/SJZY.Track.Application/Services/Warning/Model/TransportWarningSceneBO.cs rename to src/TrackCenter.Application/Services/Warning/Model/TransportWarningSceneBO.cs index cf7f2263..8c770397 100644 --- a/src/SJZY.Track.Application/Services/Warning/Model/TransportWarningSceneBO.cs +++ b/src/TrackCenter.Application/Services/Warning/Model/TransportWarningSceneBO.cs @@ -1,9 +1,9 @@ -using SJZY.Track.Application.Contract.Dtos.Warning.Transport; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Transport; -using SJZY.Track.Domain.Dtos.Forewarning; +using TrackCenter.Application.Contract.Dtos.Warning.Transport; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.WarningAggregate.Transport; +using TrackCenter.Domain.Dtos.Forewarning; -namespace SJZY.Track.Application.Services.Warning.Model; +namespace TrackCenter.Application.Services.Warning.Model; public sealed class TransportWarningSceneBO { diff --git a/src/SJZY.Track.Application/Services/Warning/Model/TransportWarningSceneRuleItemBO.cs b/src/TrackCenter.Application/Services/Warning/Model/TransportWarningSceneRuleItemBO.cs similarity index 94% rename from src/SJZY.Track.Application/Services/Warning/Model/TransportWarningSceneRuleItemBO.cs rename to src/TrackCenter.Application/Services/Warning/Model/TransportWarningSceneRuleItemBO.cs index 47aab970..6b3ee32d 100644 --- a/src/SJZY.Track.Application/Services/Warning/Model/TransportWarningSceneRuleItemBO.cs +++ b/src/TrackCenter.Application/Services/Warning/Model/TransportWarningSceneRuleItemBO.cs @@ -1,9 +1,9 @@ -using SJZY.Track.Application.Contract.Dtos.Warning; -using SJZY.Track.Application.Contract.Dtos.Warning.Transport; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Transport; -using SJZY.Track.Domain.Extensions; +using TrackCenter.Application.Contract.Dtos.Warning; +using TrackCenter.Application.Contract.Dtos.Warning.Transport; +using TrackCenter.Domain.Aggregates.WarningAggregate.Transport; +using TrackCenter.Domain.Extensions; -namespace SJZY.Track.Application.Services.Warning.Model; +namespace TrackCenter.Application.Services.Warning.Model; /// /// 处理运输时效规则项目的业务模型 diff --git a/src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs b/src/TrackCenter.Application/Services/Warning/ReturnWarningService.cs similarity index 93% rename from src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs rename to src/TrackCenter.Application/Services/Warning/ReturnWarningService.cs index 8496435d..6197b04a 100644 --- a/src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs +++ b/src/TrackCenter.Application/Services/Warning/ReturnWarningService.cs @@ -1,21 +1,21 @@ using DotNetCore.CAP; using SJZY.Expand.ABP.Core.PublicMethords; -using SJZY.Track.Application.Caching; -using SJZY.Track.Application.Contract.Dtos.Warning; -using SJZY.Track.Application.Contract.Dtos.Warning.Return; -using SJZY.Track.Application.Contract.Events; -using SJZY.Track.Application.Helpers; -using SJZY.Track.Application.Services.Warning.Handlers; -using SJZY.Track.Application.Services.Warning.Model; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.WarningAggregate; -using SJZY.Track.Domain.Dtos.Warning; -using SJZY.Track.Domain.Enums; -using SJZY.Track.Domain.Queries; +using TrackCenter.Application.Contract.Dtos.Warning; +using TrackCenter.Application.Contract.Dtos.Warning.Return; +using TrackCenter.Application.Contract.Events; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.WarningAggregate; +using TrackCenter.Domain.Dtos.Warning; +using TrackCenter.Domain.Enums; +using TrackCenter.Domain.Queries; using SJZY.UserCenter.HttpApi.Services.User; +using TrackCenter.Application.Caching; +using TrackCenter.Application.Helpers; +using TrackCenter.Application.Services.Warning.Handlers; +using TrackCenter.Application.Services.Warning.Model; using Volo.Abp.Http.Client.DynamicProxying; -namespace SJZY.Track.Application.Services.Warning; +namespace TrackCenter.Application.Services.Warning; /// /// 回传预警服务 @@ -108,13 +108,13 @@ public class ReturnWarningService : ApplicationService /// /// [HttpPost("GetPageReturnWarningDetails")] - public async Task> GetPageReturnWarningDetails(GetPageReturnWarningDetailsInput input) + public async Task> GetPageReturnWarningDetails(GetPageReturnWarningDetailsInput input) { var vo = ObjectMapper.Map(input); var result = await _warningDetailsEsRepository.GetPageReturnWarningDetailsAsync(vo); if (result.List.Count == 0) { - return new UnifyPageResultDto(new List(), + return new PagedResult(new List(), result.Pagination.PageIndex, result.Pagination.PageSize, result.Pagination.Total); @@ -173,7 +173,7 @@ public class ReturnWarningService : ApplicationService .OrderBy(x => x.Status == (int) ReturnWarningStatus.人工介入 ? 1 : 2) .ThenByDescending(x => x.CreateTime); //同状态组按时间降序; - return new UnifyPageResultDto( + return new PagedResult( sorted.ToList(), result.Pagination.PageIndex, result.Pagination.PageSize, diff --git a/src/SJZY.Track.Application/Services/Warning/Signals/WarningSignal.cs b/src/TrackCenter.Application/Services/Warning/Signals/WarningSignal.cs similarity index 92% rename from src/SJZY.Track.Application/Services/Warning/Signals/WarningSignal.cs rename to src/TrackCenter.Application/Services/Warning/Signals/WarningSignal.cs index 28479223..f288ea01 100644 --- a/src/SJZY.Track.Application/Services/Warning/Signals/WarningSignal.cs +++ b/src/TrackCenter.Application/Services/Warning/Signals/WarningSignal.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; +using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; -namespace SJZY.Track.Application.Services.Warning.Signals; +namespace TrackCenter.Application.Services.Warning.Signals; /// /// 预警信号，目前只是操作轨迹时产生 diff --git a/src/SJZY.Track.Application/Services/Warning/Signals/WarningSignalKey.cs b/src/TrackCenter.Application/Services/Warning/Signals/WarningSignalKey.cs similarity index 94% rename from src/SJZY.Track.Application/Services/Warning/Signals/WarningSignalKey.cs rename to src/TrackCenter.Application/Services/Warning/Signals/WarningSignalKey.cs index 32d7e9b1..7d1c20ba 100644 --- a/src/SJZY.Track.Application/Services/Warning/Signals/WarningSignalKey.cs +++ b/src/TrackCenter.Application/Services/Warning/Signals/WarningSignalKey.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace SJZY.Track.Application.Services.Warning.Signals; +namespace TrackCenter.Application.Services.Warning.Signals; /// /// 预警信号key，用于充当分区key diff --git a/src/SJZY.Track.Application/Services/Warning/Signals/WarningSignalMetadata.cs b/src/TrackCenter.Application/Services/Warning/Signals/WarningSignalMetadata.cs similarity index 98% rename from src/SJZY.Track.Application/Services/Warning/Signals/WarningSignalMetadata.cs rename to src/TrackCenter.Application/Services/Warning/Signals/WarningSignalMetadata.cs index 41f39e4b..ed5f85d1 100644 --- a/src/SJZY.Track.Application/Services/Warning/Signals/WarningSignalMetadata.cs +++ b/src/TrackCenter.Application/Services/Warning/Signals/WarningSignalMetadata.cs @@ -2,7 +2,7 @@ using Confluent.Kafka; using Newtonsoft.Json; using JsonSerializer = System.Text.Json.JsonSerializer; -namespace SJZY.Track.Application.Services.Warning.Signals; +namespace TrackCenter.Application.Services.Warning.Signals; /// /// 预警信号元数据 diff --git a/src/SJZY.Track.Application/Services/Warning/Signals/WarningSignalType.cs b/src/TrackCenter.Application/Services/Warning/Signals/WarningSignalType.cs similarity index 74% rename from src/SJZY.Track.Application/Services/Warning/Signals/WarningSignalType.cs rename to src/TrackCenter.Application/Services/Warning/Signals/WarningSignalType.cs index 5e93398d..cc6c9324 100644 --- a/src/SJZY.Track.Application/Services/Warning/Signals/WarningSignalType.cs +++ b/src/TrackCenter.Application/Services/Warning/Signals/WarningSignalType.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Services.Warning.Signals; +namespace TrackCenter.Application.Services.Warning.Signals; /// /// 预警信号类型 diff --git a/src/SJZY.Track.Application/Services/Warning/TransportWarningService.cs b/src/TrackCenter.Application/Services/Warning/TransportWarningService.cs similarity index 94% rename from src/SJZY.Track.Application/Services/Warning/TransportWarningService.cs rename to src/TrackCenter.Application/Services/Warning/TransportWarningService.cs index 5dd4b4b7..ea1b71f2 100644 --- a/src/SJZY.Track.Application/Services/Warning/TransportWarningService.cs +++ b/src/TrackCenter.Application/Services/Warning/TransportWarningService.cs @@ -1,20 +1,20 @@ using SJZY.Expand.ABP.Core.PublicMethords; -using SJZY.Track.Application.Caching; -using SJZY.Track.Application.Contract.Dtos.Warning; -using SJZY.Track.Application.Contract.Dtos.Warning.Transport; -using SJZY.Track.Application.Helpers; -using SJZY.Track.Application.Services.Warning.Handlers; -using SJZY.Track.Application.Services.Warning.Model; -using SJZY.Track.Domain.Aggregates.KPIAreaAggregate; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; -using SJZY.Track.Domain.Aggregates.WarningAggregate; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Transport; -using SJZY.Track.Domain.Dtos.Warning; -using SJZY.Track.Domain.Enums; -using SJZY.Track.Domain.Extensions; +using TrackCenter.Application.Contract.Dtos.Warning; +using TrackCenter.Application.Contract.Dtos.Warning.Transport; +using TrackCenter.Application.Caching; +using TrackCenter.Application.Helpers; +using TrackCenter.Application.Services.Warning.Handlers; +using TrackCenter.Application.Services.Warning.Model; +using TrackCenter.Domain.Aggregates.KPIAreaAggregate; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; +using TrackCenter.Domain.Aggregates.WarningAggregate; +using TrackCenter.Domain.Aggregates.WarningAggregate.Transport; +using TrackCenter.Domain.Dtos.Warning; +using TrackCenter.Domain.Enums; +using TrackCenter.Domain.Extensions; -namespace SJZY.Track.Application.Services.Warning; +namespace TrackCenter.Application.Services.Warning; /// /// 运输时效预警服务 @@ -172,7 +172,7 @@ public class TransportWarningService : ApplicationService /// /// [HttpPost("GetPageTransportWarningDetails")] - public async Task> GetPageTransportWarningDetails(GetPageTransportWarningDetailsInput input) + public async Task> GetPageTransportWarningDetails(GetPageTransportWarningDetailsInput input) { var vo = ObjectMapper.Map(input); // 存储只存即将超时，对于已超时的则是查出计算后过滤 @@ -181,7 +181,7 @@ public class TransportWarningService : ApplicationService var result = await _warningDetailsEsRepository.GetPageTransportWarningDetailsAsync(vo); if (result.List.Count == 0) { - return new UnifyPageResultDto(new List(), + return new PagedResult(new List(), result.Pagination.PageIndex, result.Pagination.PageSize, result.Pagination.Total); @@ -260,7 +260,7 @@ public class TransportWarningService : ApplicationService .ThenByDescending(x => x.CreateTime) //同状态组按时间降序 .ToList(); - return new UnifyPageResultDto( + return new PagedResult( sorted, result.Pagination.PageIndex, result.Pagination.PageSize, diff --git a/src/SJZY.Track.Application/Services/Warning/WarningService.cs b/src/TrackCenter.Application/Services/Warning/WarningService.cs similarity index 96% rename from src/SJZY.Track.Application/Services/Warning/WarningService.cs rename to src/TrackCenter.Application/Services/Warning/WarningService.cs index bba24081..eaf884d2 100644 --- a/src/SJZY.Track.Application/Services/Warning/WarningService.cs +++ b/src/TrackCenter.Application/Services/Warning/WarningService.cs @@ -1,10 +1,10 @@ -using SJZY.Track.Application.Caching; -using SJZY.Track.Application.Contract.Dtos.Warning; -using SJZY.Track.Application.Services.Warning.Handlers; -using SJZY.Track.Domain.Aggregates.WarningAggregate; -using SJZY.Track.Domain.Enums; +using TrackCenter.Application.Contract.Dtos.Warning; +using TrackCenter.Application.Caching; +using TrackCenter.Application.Services.Warning.Handlers; +using TrackCenter.Domain.Aggregates.WarningAggregate; +using TrackCenter.Domain.Enums; -namespace SJZY.Track.Application.Services.Warning; +namespace TrackCenter.Application.Services.Warning; /// /// 预警规则主体 diff --git a/src/SJZY.Track.Application/Track2InterfaceRelay/Track2InterfaceRelayHttpMessageHandler.cs b/src/TrackCenter.Application/Track2InterfaceRelay/Track2InterfaceRelayHttpMessageHandler.cs similarity index 96% rename from src/SJZY.Track.Application/Track2InterfaceRelay/Track2InterfaceRelayHttpMessageHandler.cs rename to src/TrackCenter.Application/Track2InterfaceRelay/Track2InterfaceRelayHttpMessageHandler.cs index 0320ac1a..1e10fce3 100644 --- a/src/SJZY.Track.Application/Track2InterfaceRelay/Track2InterfaceRelayHttpMessageHandler.cs +++ b/src/TrackCenter.Application/Track2InterfaceRelay/Track2InterfaceRelayHttpMessageHandler.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.Options; using SJZY.InterfaceRelay.Application.Contracts; using Volo.Abp.DependencyInjection; -namespace SJZY.Track.Application.Track2InterfaceRelay; +namespace TrackCenter.Application.Track2InterfaceRelay; public class Track2InterfaceRelayHttpMessageHandler : DelegatingHandler, ITransientDependency { diff --git a/src/SJZY.Track.Application/Track2InterfaceRelay/Track2InterfaceRelayOptions.cs b/src/TrackCenter.Application/Track2InterfaceRelay/Track2InterfaceRelayOptions.cs similarity index 89% rename from src/SJZY.Track.Application/Track2InterfaceRelay/Track2InterfaceRelayOptions.cs rename to src/TrackCenter.Application/Track2InterfaceRelay/Track2InterfaceRelayOptions.cs index 093501ad..ee104ce0 100644 --- a/src/SJZY.Track.Application/Track2InterfaceRelay/Track2InterfaceRelayOptions.cs +++ b/src/TrackCenter.Application/Track2InterfaceRelay/Track2InterfaceRelayOptions.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Track2InterfaceRelay; +namespace TrackCenter.Application.Track2InterfaceRelay; public class Track2InterfaceRelayOptions : Dictionary { diff --git a/src/SJZY.Track.Application/Track2InterfaceRelay/Track2InterfaceRelaySubSystemContext.cs b/src/TrackCenter.Application/Track2InterfaceRelay/Track2InterfaceRelaySubSystemContext.cs similarity index 93% rename from src/SJZY.Track.Application/Track2InterfaceRelay/Track2InterfaceRelaySubSystemContext.cs rename to src/TrackCenter.Application/Track2InterfaceRelay/Track2InterfaceRelaySubSystemContext.cs index 9f271000..f76aff87 100644 --- a/src/SJZY.Track.Application/Track2InterfaceRelay/Track2InterfaceRelaySubSystemContext.cs +++ b/src/TrackCenter.Application/Track2InterfaceRelay/Track2InterfaceRelaySubSystemContext.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Track2InterfaceRelay; +namespace TrackCenter.Application.Track2InterfaceRelay; public class Track2InterfaceRelaySubSystemContext { diff --git a/src/SJZY.Track.Application/SJZY.Track.Application.csproj b/src/TrackCenter.Application/TrackCenter.Application.csproj similarity index 56% rename from src/SJZY.Track.Application/SJZY.Track.Application.csproj rename to src/TrackCenter.Application/TrackCenter.Application.csproj index 06efb7c6..1a330223 100644 --- a/src/SJZY.Track.Application/SJZY.Track.Application.csproj +++ b/src/TrackCenter.Application/TrackCenter.Application.csproj @@ -3,34 +3,31 @@ - net7.0 + net8 True - + + + + - - - - - - - - - + + + diff --git a/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs b/src/TrackCenter.Application/TrackCenterApplicationModule.cs similarity index 73% rename from src/SJZY.Track.Application/SjzyTrackApplicationModule.cs rename to src/TrackCenter.Application/TrackCenterApplicationModule.cs index 3a059835..40d73529 100644 --- a/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs +++ b/src/TrackCenter.Application/TrackCenterApplicationModule.cs @@ -1,90 +1,42 @@ using System.Net; -using BSI.Stack.Rabbit; using DotNetCore.CAP; using DotNetCore.CAP.Internal; +using Fake.AspNetCore; +using Fake.EventBus.RabbitMQ; +using Fake.Modularity; +using Fake.ObjectMapping.AutoMapper; +using Fake.RabbitMQ; using Hangfire; using Hangfire.Redis.StackExchange; +using InterfaceForward.Domain.Shared.Helpers; using Microsoft.Extensions.Configuration; using RabbitMQ.Client; using Savorboard.CAP.InMemoryMessageQueue; -using SJZY.Expand.ABP.Core.Localization; -using SJZY.Expand.ABP.Core.Logger; -using SJZY.Expand.ABP.Core.PublicMethords; -using SJZY.Expand.AliyunOSS; -using SJZY.InterfaceRelay.Application.Contracts; -using SJZY.Track.Application.CAP; -using SJZY.Track.Application.Contract; -using SJZY.Track.Application.Hangfire; -using SJZY.Track.Application.Kafka; -using SJZY.Track.Application.Localization; -using SJZY.Track.Application.Options; -using SJZY.Track.Application.Track2InterfaceRelay; -using SJZY.UserCenter.Contracts; -using SJZY.UserCenter.SharedModel; -using SJZY.UserCenter.SharedModel.Pub; -using Volo.Abp.AspNetCore.Mvc; -using Volo.Abp.AutoMapper; -using Volo.Abp.FluentValidation; -using Volo.Abp.Http.Client; -using Volo.Abp.Localization; -using Volo.Abp.Modularity; -using Volo.Abp.VirtualFileSystem; +using TrackCenter.Application.Kafka; +using TrackCenter.Application.CAP; +using TrackCenter.Application.Hangfire; +using TrackCenter.Application.Options; +using TrackCenter.Domain.Extensions; -namespace SJZY.Track.Application; +namespace TrackCenter.Application; -[DependsOn( - typeof(AbpAutoMapperModule), - typeof(AbpFluentValidationModule), - typeof(AbpLocalizationModule), - typeof(AbpVirtualFileSystemModule), - typeof(AbpHttpClientModule), - typeof(SjzyUserCenterHttpApiModule), - typeof(SJZYInterfaceRelayApplicationContractsModule), - typeof(SjzyTrackDomainModule), - typeof(SjzyTrackApplicationContractModule) -)] -public class SjzyTrackApplicationModule : AbpModule +[DependsOn(typeof(FakeRabbitMqModule))] +[DependsOn(typeof(FakeAspNetCoreModule))] +[DependsOn(typeof(FakeObjectMappingAutoMapperModule))] +[DependsOn(typeof(FakeEventBusRabbitMqModule))] +public class TrackCenterApplicationModule : FakeModule { public override void ConfigureServices(ServiceConfigurationContext context) { var configuration = context.Services.GetConfiguration(); - Configure(options => { options.AddMaps(true); }); - Configure(options => + context.Services.Configure(options => { - options.ConventionalControllers.Create(typeof(SjzyTrackApplicationModule).Assembly); //创建动态api + options.ScanProfiles(); }); - //添加虚拟文件系统 - Configure(options => { options.FileSets.AddEmbedded("SJZY.Track.Application"); }); - - //添加多语言 - var languageConfig = configuration.GetSection("Language"); - Configure(options => - { - options.Resources - .Add("zh") - .AddBaseTypes(typeof(SjzyBasicLocalization)) - .AddRedisResource(languageConfig) - .AddVirtualJson("/Localization/Resources"); - }); - //授权拦截提示 - context.Services.Configure(options => { options.Filters.Add(new ApiAsyncAuthorizationFilter()); }); - - //用户中心 - context.Services.AddHttpClientProxies(typeof(SjzyUserCenterHttpApiModule).Assembly, "UserCenter", false); - - // 接口通 - context.Services.Configure(configuration.GetSection("Track2InterfaceRelay")); - context.Services.AddHttpClient("InterfaceForward") - .AddHttpMessageHandler(); - context.Services.AddHttpClientProxies(typeof(SJZYInterfaceRelayApplicationContractsModule).Assembly, - "InterfaceForward", false - ); - //CAP context.Services.AddSingleton(); - context.Services.AddCapTableNameService(); if (!System.Diagnostics.Debugger.IsAttached) { context.Services.AddCap(options => @@ -181,7 +133,7 @@ public class SjzyTrackApplicationModule : AbpModule }; context.Services.Configure(action); - context.Services.AddRabbitBoot(action, typeof(SjzyTrackApplicationModule).Assembly); + context.Services.AddRabbitBoot(action, typeof(TrackCenterApplicationModule).Assembly); context.Services.Configure(configuration.GetSection("TrackApp")); context.Services.Configure( diff --git a/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentInputValidation.cs b/src/TrackCenter.Application/Validations/TrackContents/EditTrackContentInputValidation.cs similarity index 91% rename from src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentInputValidation.cs rename to src/TrackCenter.Application/Validations/TrackContents/EditTrackContentInputValidation.cs index 600dec8c..3e614672 100644 --- a/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentInputValidation.cs +++ b/src/TrackCenter.Application/Validations/TrackContents/EditTrackContentInputValidation.cs @@ -1,7 +1,7 @@ using FluentValidation; -using SJZY.Track.Application.Contract.Dtos.TrackContents; +using TrackCenter.Application.Contract.Dtos.TrackContents; -namespace SJZY.Track.Application.Validations.TrackContents; +namespace TrackCenter.Application.Validations.TrackContents; public class EditTrackContentInputValidation : AbstractValidator, IValidationEnabled { diff --git a/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentMapInputValidation.cs b/src/TrackCenter.Application/Validations/TrackContents/EditTrackContentMapInputValidation.cs similarity index 94% rename from src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentMapInputValidation.cs rename to src/TrackCenter.Application/Validations/TrackContents/EditTrackContentMapInputValidation.cs index 33341e79..606309c4 100644 --- a/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentMapInputValidation.cs +++ b/src/TrackCenter.Application/Validations/TrackContents/EditTrackContentMapInputValidation.cs @@ -1,10 +1,10 @@ using FluentValidation; using Microsoft.Extensions.Localization; using SJZY.Expand.ABP.Core.Localization; -using SJZY.Track.Application.Contract.Dtos.TrackContents; -using SJZY.Track.Application.Localization; +using TrackCenter.Application.Contract.Dtos.TrackContents; +using TrackCenter.Application.Localization; -namespace SJZY.Track.Application.Validations.TrackContents; +namespace TrackCenter.Application.Validations.TrackContents; public class EditTrackContentMapInputValidation : AbstractValidator, IValidationEnabled { diff --git a/src/SJZY.Track.Application/Validations/TrackFlags/EditTrackFlagInputValidation.cs b/src/TrackCenter.Application/Validations/TrackFlags/EditTrackFlagInputValidation.cs similarity index 90% rename from src/SJZY.Track.Application/Validations/TrackFlags/EditTrackFlagInputValidation.cs rename to src/TrackCenter.Application/Validations/TrackFlags/EditTrackFlagInputValidation.cs index 1a596799..8d33bea8 100644 --- a/src/SJZY.Track.Application/Validations/TrackFlags/EditTrackFlagInputValidation.cs +++ b/src/TrackCenter.Application/Validations/TrackFlags/EditTrackFlagInputValidation.cs @@ -1,7 +1,7 @@ using FluentValidation; -using SJZY.Track.Application.Contract.Dtos.TrackFlags; +using TrackCenter.Application.Contract.Dtos.TrackFlags; -namespace SJZY.Track.Application.Validations.TrackFlags; +namespace TrackCenter.Application.Validations.TrackFlags; public class EditTrackFlagInputValidation : AbstractValidator, IValidationEnabled { diff --git a/src/SJZY.Track.Application/Validations/TrackPull/EditTrackPullConfigInputValidation.cs b/src/TrackCenter.Application/Validations/TrackPull/EditTrackPullConfigInputValidation.cs similarity index 93% rename from src/SJZY.Track.Application/Validations/TrackPull/EditTrackPullConfigInputValidation.cs rename to src/TrackCenter.Application/Validations/TrackPull/EditTrackPullConfigInputValidation.cs index 84ae5166..6c9cd0cc 100644 --- a/src/SJZY.Track.Application/Validations/TrackPull/EditTrackPullConfigInputValidation.cs +++ b/src/TrackCenter.Application/Validations/TrackPull/EditTrackPullConfigInputValidation.cs @@ -1,10 +1,10 @@ using FluentValidation; using Microsoft.Extensions.Localization; using SJZY.Expand.ABP.Core.Localization; -using SJZY.Track.Application.Contract.Dtos.TrackPull; -using SJZY.Track.Application.Localization; +using TrackCenter.Application.Contract.Dtos.TrackPull; +using TrackCenter.Application.Localization; -namespace SJZY.Track.Application.Validations.TrackPull; +namespace TrackCenter.Application.Validations.TrackPull; public class EditTrackPullConfigInputValidation : AbstractValidator, IValidationEnabled { diff --git a/src/SJZY.Track.Application/Validations/TrackPull/EditTrackPullContentInputValidation.cs b/src/TrackCenter.Application/Validations/TrackPull/EditTrackPullContentInputValidation.cs similarity index 92% rename from src/SJZY.Track.Application/Validations/TrackPull/EditTrackPullContentInputValidation.cs rename to src/TrackCenter.Application/Validations/TrackPull/EditTrackPullContentInputValidation.cs index 51ae24a7..f694e164 100644 --- a/src/SJZY.Track.Application/Validations/TrackPull/EditTrackPullContentInputValidation.cs +++ b/src/TrackCenter.Application/Validations/TrackPull/EditTrackPullContentInputValidation.cs @@ -1,10 +1,10 @@ using FluentValidation; using Microsoft.Extensions.Localization; using SJZY.Expand.ABP.Core.Localization; -using SJZY.Track.Application.Contract.Dtos.TrackPull; -using SJZY.Track.Application.Localization; +using TrackCenter.Application.Contract.Dtos.TrackPull; +using TrackCenter.Application.Localization; -namespace SJZY.Track.Application.Validations.TrackPull; +namespace TrackCenter.Application.Validations.TrackPull; public class EditTrackPullContentInputValidation : AbstractValidator, IValidationEnabled { diff --git a/src/SJZY.Track.Application/Validations/TrackStatus/EditTrackStatusInputValidation.cs b/src/TrackCenter.Application/Validations/TrackStatus/EditTrackStatusInputValidation.cs similarity index 91% rename from src/SJZY.Track.Application/Validations/TrackStatus/EditTrackStatusInputValidation.cs rename to src/TrackCenter.Application/Validations/TrackStatus/EditTrackStatusInputValidation.cs index 96a00eff..bffeeb0c 100644 --- a/src/SJZY.Track.Application/Validations/TrackStatus/EditTrackStatusInputValidation.cs +++ b/src/TrackCenter.Application/Validations/TrackStatus/EditTrackStatusInputValidation.cs @@ -1,7 +1,7 @@ using FluentValidation; -using SJZY.Track.Application.Contract.Dtos.TrackStatus; +using TrackCenter.Application.Contract.Dtos.TrackStatus; -namespace SJZY.Track.Application.Validations.TrackStatus; +namespace TrackCenter.Application.Validations.TrackStatus; public class EditTrackStatusInputValidation : AbstractValidator, IValidationEnabled { diff --git a/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateContentInputValidation.cs b/src/TrackCenter.Application/Validations/TrackTemplates/EditTrackTemplateContentInputValidation.cs similarity index 91% rename from src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateContentInputValidation.cs rename to src/TrackCenter.Application/Validations/TrackTemplates/EditTrackTemplateContentInputValidation.cs index 5fdf076c..f43d0aa8 100644 --- a/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateContentInputValidation.cs +++ b/src/TrackCenter.Application/Validations/TrackTemplates/EditTrackTemplateContentInputValidation.cs @@ -1,10 +1,10 @@ using FluentValidation; using Microsoft.Extensions.Localization; using SJZY.Expand.ABP.Core.Localization; -using SJZY.Track.Application.Contract.Dtos.TrackTemplates; -using SJZY.Track.Application.Localization; +using TrackCenter.Application.Contract.Dtos.TrackTemplates; +using TrackCenter.Application.Localization; -namespace SJZY.Track.Application.Validations.TrackTemplates; +namespace TrackCenter.Application.Validations.TrackTemplates; public class EditTrackTemplateContentInputValidation : AbstractValidator, IValidationEnabled diff --git a/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateInputValidation.cs b/src/TrackCenter.Application/Validations/TrackTemplates/EditTrackTemplateInputValidation.cs similarity index 89% rename from src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateInputValidation.cs rename to src/TrackCenter.Application/Validations/TrackTemplates/EditTrackTemplateInputValidation.cs index afa52d4d..b90ca949 100644 --- a/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateInputValidation.cs +++ b/src/TrackCenter.Application/Validations/TrackTemplates/EditTrackTemplateInputValidation.cs @@ -1,7 +1,7 @@ using FluentValidation; -using SJZY.Track.Application.Contract.Dtos.TrackTemplates; +using TrackCenter.Application.Contract.Dtos.TrackTemplates; -namespace SJZY.Track.Application.Validations.TrackTemplates; +namespace TrackCenter.Application.Validations.TrackTemplates; /// /// 轨迹模版编辑校验 diff --git a/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/IKpiAreaRepository.cs b/src/TrackCenter.Domain/Aggregates/KPIAreaAggregate/IKpiAreaRepository.cs similarity index 86% rename from src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/IKpiAreaRepository.cs rename to src/TrackCenter.Domain/Aggregates/KPIAreaAggregate/IKpiAreaRepository.cs index 01c0e0ff..21f29a0d 100644 --- a/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/IKpiAreaRepository.cs +++ b/src/TrackCenter.Domain/Aggregates/KPIAreaAggregate/IKpiAreaRepository.cs @@ -1,6 +1,7 @@ -using SJZY.Track.Domain.Dtos.Forewarning; +using Fake.Application.Dtos; +using TrackCenter.Domain.Dtos.Forewarning; -namespace SJZY.Track.Domain.Aggregates.KPIAreaAggregate; +namespace TrackCenter.Domain.Aggregates.KPIAreaAggregate; public interface IKpiAreaRepository : IBasicRepository { @@ -44,14 +45,14 @@ public interface IKpiAreaRepository : IBasicRepository /// /// /// - Task> GetAreas(QueryAreaRequest query); + Task> GetAreas(QueryAreaRequest query); /// /// 获取分区信息 /// /// /// - Task> GetAreaInfos(QueryAreaInfoRequest query); + Task> GetAreaInfos(QueryAreaInfoRequest query); /// /// 获取分区信息通过id diff --git a/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaEntity.cs b/src/TrackCenter.Domain/Aggregates/KPIAreaAggregate/RuleAreaEntity.cs similarity index 80% rename from src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaEntity.cs rename to src/TrackCenter.Domain/Aggregates/KPIAreaAggregate/RuleAreaEntity.cs index 192119f6..269a98ff 100644 --- a/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/KPIAreaAggregate/RuleAreaEntity.cs @@ -1,7 +1,10 @@ -namespace SJZY.Track.Domain.Aggregates.KPIAreaAggregate; +using Fake.Domain.Entities; +using Fake.Domain.Entities.Auditing; + +namespace TrackCenter.Domain.Aggregates.KPIAreaAggregate; [SugarTable("t_area", TableDescription = "KPI分区主表")] -public class RuleAreaEntity : IAggregateRoot +public class RuleAreaEntity : AggregateRoot, IHasCreateUserId, IHasCreateTime, IHasUpdateUserId, IHasUpdateTime { /// /// 自增主键 @@ -25,7 +28,7 @@ public class RuleAreaEntity : IAggregateRoot /// 创建人 /// [SugarColumn(ColumnName = "CreateUserId", ColumnDescription = "创建人")] - public int CreateUserId { get; set; } + public Guid CreateUserId { get; set; } /// /// 创建时间 @@ -37,7 +40,7 @@ public class RuleAreaEntity : IAggregateRoot /// 更新人 /// [SugarColumn(ColumnName = "UpdateUserId", ColumnDescription = "更新人")] - public int UpdateUserId { get; set; } + public Guid UpdateUserId { get; set; } /// /// 更新时间 diff --git a/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs b/src/TrackCenter.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs similarity index 88% rename from src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs rename to src/TrackCenter.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs index b2f14b30..70e3d568 100644 --- a/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs @@ -1,7 +1,10 @@ -namespace SJZY.Track.Domain.Aggregates.KPIAreaAggregate; +using Fake.Domain.Entities; +using Fake.Domain.Entities.Auditing; + +namespace TrackCenter.Domain.Aggregates.KPIAreaAggregate; [SugarTable("t_area_details", TableDescription = "kpi 区域子表")] -public class RuleAreaInfoEntity : IEntity +public class RuleAreaInfoEntity : Entity, IHasCreateUserId, IHasCreateTime, IHasUpdateUserId, IHasUpdateTime { /// /// 自增主键 @@ -55,7 +58,7 @@ public class RuleAreaInfoEntity : IEntity /// 创建人 /// [SugarColumn(ColumnName = "CreateUserId", ColumnDescription = "创建人")] - public int CreateUserId { get; set; } + public Guid CreateUserId { get; set; } /// /// 创建时间 @@ -67,7 +70,7 @@ public class RuleAreaInfoEntity : IEntity /// 更新人 /// [SugarColumn(ColumnName = "UpdateUserId", IsNullable = false, ColumnDescription = "更新人")] - public int UpdateUserId { get; set; } + public Guid UpdateUserId { get; set; } /// /// 更新时间 diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderOperationRecordEsRepository.cs b/src/TrackCenter.Domain/Aggregates/OrderAggregate/IOrderOperationRecordEsRepository.cs similarity index 89% rename from src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderOperationRecordEsRepository.cs rename to src/TrackCenter.Domain/Aggregates/OrderAggregate/IOrderOperationRecordEsRepository.cs index 18485b5a..2280585f 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderOperationRecordEsRepository.cs +++ b/src/TrackCenter.Domain/Aggregates/OrderAggregate/IOrderOperationRecordEsRepository.cs @@ -1,4 +1,6 @@ -namespace SJZY.Track.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.OrderAggregate; + +namespace TrackCenter.Repository.Aggregates.OrderAggregate; public interface IOrderOperationRecordEsRepository { diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs b/src/TrackCenter.Domain/Aggregates/OrderAggregate/IOrderRepository.cs similarity index 95% rename from src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs rename to src/TrackCenter.Domain/Aggregates/OrderAggregate/IOrderRepository.cs index fc8834f9..d9da9053 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs +++ b/src/TrackCenter.Domain/Aggregates/OrderAggregate/IOrderRepository.cs @@ -1,7 +1,8 @@ -using SJZY.Track.Domain.Dtos.Order; -using SJZY.Track.Domain.VEntities; +using Fake.Application.Dtos; +using TrackCenter.Domain.Dtos.Order; +using TrackCenter.Domain.VEntities; -namespace SJZY.Track.Domain.Aggregates.OrderAggregate; +namespace TrackCenter.Domain.Aggregates.OrderAggregate; public interface IOrderRepository : IBasicRepository { @@ -17,7 +18,7 @@ public interface IOrderRepository : IBasicRepository /// /// /// - Task> GetTrackOrderPagedList(GetPageTrackOrderInputVO input); + Task> GetTrackOrderPagedList(GetPageTrackOrderInputVO input); /// /// 通过三方平台和三方单号查询订单 diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs b/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderEntity.cs similarity index 97% rename from src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs rename to src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderEntity.cs index 447a3989..93d3089d 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderEntity.cs @@ -1,12 +1,13 @@ -using SJZY.Track.Domain.Consts; +using Fake.Domain.Entities.Auditing; +using TrackCenter.Domain.Consts; -namespace SJZY.Track.Domain.Aggregates.OrderAggregate; +namespace TrackCenter.Domain.Aggregates.OrderAggregate; /// /// 轨迹订单主表 /// [SugarTable("t_order")] -public class OrderEntity : IFullAuditedBasicEntitys, IAggregateRoot +public class OrderEntity : FullAuditedAggregateRoot { /// /// 自增主键 diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs b/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs similarity index 77% rename from src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs rename to src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs index 766c0d27..afbc2918 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs @@ -1,10 +1,13 @@ -namespace SJZY.Track.Domain.Aggregates.OrderAggregate; +using Fake.Domain.Entities; +using Fake.Domain.Entities.Auditing; + +namespace TrackCenter.Domain.Aggregates.OrderAggregate; /// /// 订单航班表（1：N） /// [SugarTable("t_order_flight")] -public class OrderFlightEntity : ICreateBaicEntity, ISoftDeleteBasicEntity, IEntity +public class OrderFlightEntity : CreateAuditedEntity, ISoftDelete { /// /// 自增主键 @@ -34,13 +37,13 @@ public class OrderFlightEntity : ICreateBaicEntity, ISoftDeleteBasicEntity, IEnt /// 创建人 /// [SugarColumn(ColumnName = "CreateUserId")] - public int CreateUserId { get; set; } + public override Guid CreateUserId { get; set; } /// /// 创建时间 /// [SugarColumn(ColumnName = "CreateTime")] - public DateTime CreateTime { get; set; } + public override DateTime CreateTime { get; set; } /// /// 是否删除 diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs b/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs similarity index 85% rename from src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs rename to src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs index 65b43567..5eba16aa 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs @@ -1,10 +1,12 @@ -namespace SJZY.Track.Domain.Aggregates.OrderAggregate; +using Fake.Domain.Entities.Auditing; + +namespace TrackCenter.Domain.Aggregates.OrderAggregate; /// /// 轨迹订单关联表（1：N） /// [SugarTable("t_order_link")] -public class OrderLinkEntity : ICreateBaicEntity, ISoftDeleteBasicEntity, IEntity +public class OrderLinkEntity : CreateAuditedEntity, ISoftDelete { /// /// 自增主键 diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderOperationRecordIndex.cs b/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderOperationRecordIndex.cs similarity index 90% rename from src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderOperationRecordIndex.cs rename to src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderOperationRecordIndex.cs index c53ed8c5..8c315e43 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderOperationRecordIndex.cs +++ b/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderOperationRecordIndex.cs @@ -1,8 +1,8 @@ using Nest; -using SJZY.Expand.ElasticSearch; -using SJZY.Track.Domain.Consts; +using TrackCenter.Domain.Consts; +using TrackCenter.Domain.SeedWork; -namespace SJZY.Track.Domain.Aggregates.OrderAggregate; +namespace TrackCenter.Domain.Aggregates.OrderAggregate; /// /// 订单操作记录 diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderTrackPullStatusEntity.cs b/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderTrackPullStatusEntity.cs similarity index 89% rename from src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderTrackPullStatusEntity.cs rename to src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderTrackPullStatusEntity.cs index b4db417c..640254af 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderTrackPullStatusEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/OrderAggregate/OrderTrackPullStatusEntity.cs @@ -1,10 +1,13 @@ -namespace SJZY.Track.Domain.Aggregates.OrderAggregate; +using Fake.Domain.Entities.Auditing; +using TrackCenter.Domain.SeedWork; + +namespace TrackCenter.Domain.Aggregates.OrderAggregate; /// /// 订单轨迹拉取状态表（1：N） /// [SugarTable("t_order_pull_status")] -public class OrderPullStatusEntity : ICreateBaicEntity, IUpdateBasicEntity, IEntity +public class OrderPullStatusEntity : FullAuditedEntity { /// /// 自增主键 @@ -76,7 +79,7 @@ public class OrderPullStatusEntity : ICreateBaicEntity, IUpdateBasicEntity, IEnt /// 创建人 /// [SugarColumn(ColumnName = "CreateUserId")] - public int CreateUserId { get; set; } + public Guid CreateUserId { get; set; } /// /// 创建时间 @@ -88,5 +91,5 @@ public class OrderPullStatusEntity : ICreateBaicEntity, IUpdateBasicEntity, IEnt public DateTime? UpdateTime { get; set; } [SugarColumn(ColumnName = "UpdateUserId")] - public int? UpdateUserId { get; set; } + public Guid UpdateUserId { get; set; } } diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/TrackPullStatus.cs b/src/TrackCenter.Domain/Aggregates/OrderAggregate/TrackPullStatus.cs similarity index 95% rename from src/SJZY.Track.Domain/Aggregates/OrderAggregate/TrackPullStatus.cs rename to src/TrackCenter.Domain/Aggregates/OrderAggregate/TrackPullStatus.cs index 6c1ef506..1ca40073 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/TrackPullStatus.cs +++ b/src/TrackCenter.Domain/Aggregates/OrderAggregate/TrackPullStatus.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Aggregates.OrderAggregate; +namespace TrackCenter.Domain.Aggregates.OrderAggregate; /* * 订单轨迹拉取状态： diff --git a/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/ITrackContentRepository.cs b/src/TrackCenter.Domain/Aggregates/TrackContentAggregate/ITrackContentRepository.cs similarity index 75% rename from src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/ITrackContentRepository.cs rename to src/TrackCenter.Domain/Aggregates/TrackContentAggregate/ITrackContentRepository.cs index fe3a81d7..8b59eefe 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/ITrackContentRepository.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackContentAggregate/ITrackContentRepository.cs @@ -1,14 +1,15 @@ -using SJZY.Track.Domain.Dtos.TrackContents; +using Fake.Application.Dtos; +using TrackCenter.Domain.Dtos.TrackContents; -namespace SJZY.Track.Domain.Aggregates.TrackContentAggregate; +namespace TrackCenter.Domain.Aggregates.TrackContentAggregate; public interface ITrackContentRepository : IBasicRepository { Task GetDetailAsync(int id); - Task> GetPageTrackContent(GetPageTrackContentVO input); + Task> GetPageTrackContent(GetPageTrackContentVO input); - Task> GetMapPageAsync(GetTrackContentMapPageInputVO input); + Task> GetMapPageAsync(GetTrackContentMapPageInputVO input); Task GetMapDetailAsync(int id); diff --git a/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs similarity index 90% rename from src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs rename to src/TrackCenter.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs index b6809891..afecebaa 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs @@ -1,10 +1,13 @@ -namespace SJZY.Track.Domain.Aggregates.TrackContentAggregate; +using Fake.Domain.Entities.Auditing; +using TrackCenter.Domain.SeedWork; + +namespace TrackCenter.Domain.Aggregates.TrackContentAggregate; /// /// 轨迹内容 /// [SugarTable("t_track_content")] -public class TrackContentEntity : IFullAuditedBasicEntitys, IAggregateRoot +public class TrackContentEntity : FullAuditedAggregateRoot { /// /// 自增主键 diff --git a/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentMapEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackContentAggregate/TrackContentMapEntity.cs similarity index 88% rename from src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentMapEntity.cs rename to src/TrackCenter.Domain/Aggregates/TrackContentAggregate/TrackContentMapEntity.cs index 7bf52c06..ac016167 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentMapEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackContentAggregate/TrackContentMapEntity.cs @@ -1,10 +1,12 @@ -namespace SJZY.Track.Domain.Aggregates.TrackContentAggregate; +using Fake.Domain.Entities.Auditing; + +namespace TrackCenter.Domain.Aggregates.TrackContentAggregate; /// /// 轨迹内容映射表 /// [SugarTable("t_track_content_map")] -public class TrackContentMapEntity : IFullAuditedBasicEntitys, IEntity +public class TrackContentMapEntity : FullAuditedEntity { /// /// 自增主键 diff --git a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/FileItem.cs b/src/TrackCenter.Domain/Aggregates/TrackDetailsAggregate/FileItem.cs similarity index 78% rename from src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/FileItem.cs rename to src/TrackCenter.Domain/Aggregates/TrackDetailsAggregate/FileItem.cs index 2d2dc4a3..07f4681c 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/FileItem.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackDetailsAggregate/FileItem.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; +namespace TrackCenter.Domain.Aggregates.TrackDetailsAggregate; public class FileItem { diff --git a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsEsRepository.cs b/src/TrackCenter.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsEsRepository.cs similarity index 91% rename from src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsEsRepository.cs rename to src/TrackCenter.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsEsRepository.cs index 840b2d51..f6456fe0 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsEsRepository.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsEsRepository.cs @@ -1,8 +1,8 @@ -using SJZY.Expand.ElasticSearch.Services; -using SJZY.Track.Domain.Dtos.TrackDetails; -using SJZY.Track.Domain.Enums; +using TrackCenter.Domain.Dtos.TrackDetails; +using TrackCenter.Domain.Enums; +using TrackCenter.Domain.SeedWork; -namespace SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; +namespace TrackCenter.Domain.Aggregates.TrackDetailsAggregate; public interface ITrackDetailsEsRepository : IElasticsearchClientService { diff --git a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs b/src/TrackCenter.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs similarity index 97% rename from src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs rename to src/TrackCenter.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs index ed914a2d..464abb88 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs @@ -1,7 +1,8 @@ using Nest; -using SJZY.Track.Domain.Consts; +using TrackCenter.Domain.Consts; +using TrackCenter.Domain.SeedWork; -namespace SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; +namespace TrackCenter.Domain.Aggregates.TrackDetailsAggregate; [ElasticsearchType(RelationName = GlobalConst.TrackDetailsIndex)] public class TrackDetailsIndex : IdVersionIndex diff --git a/src/TrackCenter.Domain/Aggregates/TrackFlagAggregate/ITrackFlagRepository.cs b/src/TrackCenter.Domain/Aggregates/TrackFlagAggregate/ITrackFlagRepository.cs new file mode 100644 index 00000000..4d6258da --- /dev/null +++ b/src/TrackCenter.Domain/Aggregates/TrackFlagAggregate/ITrackFlagRepository.cs @@ -0,0 +1,10 @@ +using Fake.Application.Dtos; +using TrackCenter.Domain.Dtos.TrackFlags; + +namespace TrackCenter.Domain.Aggregates.TrackFlagAggregate; + +public interface ITrackFlagRepository : IBasicRepository +{ + Task GetDetailAsync(int id); + Task> GetPageTrackFlag(GetPageTrackFlagVO input); +} diff --git a/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs similarity index 80% rename from src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs rename to src/TrackCenter.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs index bd43d84f..f2e2c1ca 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs @@ -1,10 +1,13 @@ -namespace SJZY.Track.Domain.Aggregates.TrackFlagAggregate; +using Fake.Domain.Entities.Auditing; +using TrackCenter.Domain.SeedWork; + +namespace TrackCenter.Domain.Aggregates.TrackFlagAggregate; /// /// 轨迹标记表 /// [SugarTable("t_track_flag")] -public class TrackFlagEntity : IFullAuditedBasicEntitys, IAggregateRoot +public class TrackFlagEntity : FullAuditedAggregateRoot { /// /// 自增主键 diff --git a/src/SJZY.Track.Domain/Aggregates/TrackNodeAggregate/ITrackNodeRepository.cs b/src/TrackCenter.Domain/Aggregates/TrackNodeAggregate/ITrackNodeRepository.cs similarity index 69% rename from src/SJZY.Track.Domain/Aggregates/TrackNodeAggregate/ITrackNodeRepository.cs rename to src/TrackCenter.Domain/Aggregates/TrackNodeAggregate/ITrackNodeRepository.cs index 80c29962..cc55596b 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackNodeAggregate/ITrackNodeRepository.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackNodeAggregate/ITrackNodeRepository.cs @@ -1,6 +1,7 @@ -using SJZY.Track.Domain.Dtos.TrackNode; +using Fake.Application.Dtos; +using TrackCenter.Domain.Dtos.TrackNode; -namespace SJZY.Track.Domain.Aggregates.TrackNodeAggregate; +namespace TrackCenter.Domain.Aggregates.TrackNodeAggregate; public interface ITrackNodeRepository : IBasicRepository { @@ -9,14 +10,14 @@ public interface ITrackNodeRepository : IBasicRepository /// /// /// - Task> GetPageList(TrackNodePageDto queryParam); + Task> GetPageList(TrackNodePageDto queryParam); /// /// 分页查询字典 /// /// /// - Task> GetPageDicList(TrackNodePageDto queryParam); + Task> GetPageDicList(TrackNodePageDto queryParam); /// /// 删除 diff --git a/src/SJZY.Track.Domain/Aggregates/TrackNodeAggregate/TrackNodeEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackNodeAggregate/TrackNodeEntity.cs similarity index 82% rename from src/SJZY.Track.Domain/Aggregates/TrackNodeAggregate/TrackNodeEntity.cs rename to src/TrackCenter.Domain/Aggregates/TrackNodeAggregate/TrackNodeEntity.cs index 2e9432f8..52f9263c 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackNodeAggregate/TrackNodeEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackNodeAggregate/TrackNodeEntity.cs @@ -1,10 +1,13 @@ -namespace SJZY.Track.Domain.Aggregates.TrackNodeAggregate; +using Fake.Domain.Entities.Auditing; +using TrackCenter.Domain.SeedWork; + +namespace TrackCenter.Domain.Aggregates.TrackNodeAggregate; /// /// 轨迹节点主表 /// [SugarTable("t_track_node", TableDescription = "轨迹节点主表")] -public class TrackNodeEntity : IFullAuditedBasicEntitys, IAggregateRoot +public class TrackNodeEntity : FullAuditedAggregateRoot { /// /// 自增主键 diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs b/src/TrackCenter.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs similarity index 80% rename from src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs rename to src/TrackCenter.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs index 28534b3f..d74352e7 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs @@ -1,7 +1,8 @@ -using SJZY.Track.Domain.Dtos.Common; -using SJZY.Track.Domain.Dtos.TrackPull; +using Fake.Application.Dtos; +using TrackCenter.Domain.Dtos.Common; +using TrackCenter.Domain.Dtos.TrackPull; -namespace SJZY.Track.Domain.Aggregates.TrackPullAggregate; +namespace TrackCenter.Domain.Aggregates.TrackPullAggregate; public interface ITrackPullConfigRepository : IBasicRepository { @@ -10,14 +11,14 @@ public interface ITrackPullConfigRepository : IBasicRepository /// /// - Task> GetPageAsync(KeywordsInputVO input); + Task> GetPageAsync(KeywordsInputVO input); /// /// 轨迹拉取配置内容列表 /// /// /// - Task> GetContentPageAsync(GetTrackPullContentPageInputVO input); + Task> GetContentPageAsync(GetTrackPullContentPageInputVO input); /// /// 轨迹拉取配置内容集合（缓存使用） diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/ParseMethod.cs b/src/TrackCenter.Domain/Aggregates/TrackPullAggregate/ParseMethod.cs similarity index 81% rename from src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/ParseMethod.cs rename to src/TrackCenter.Domain/Aggregates/TrackPullAggregate/ParseMethod.cs index 96df3144..8a279569 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/ParseMethod.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackPullAggregate/ParseMethod.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Aggregates.TrackPullAggregate; +namespace TrackCenter.Domain.Aggregates.TrackPullAggregate; /// /// 解析方式 diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs similarity index 94% rename from src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs rename to src/TrackCenter.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs index 17f48688..a16e1176 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs @@ -1,10 +1,12 @@ -namespace SJZY.Track.Domain.Aggregates.TrackPullAggregate; +using Fake.Domain.Entities.Auditing; + +namespace TrackCenter.Domain.Aggregates.TrackPullAggregate; /// /// 轨迹拉取配置表 /// [SugarTable("t_track_pull_config")] -public class TrackPullConfigEntity : IFullAuditedBasicEntitys, IAggregateRoot +public class TrackPullConfigEntity : FullAuditedAggregateRoot { /// /// 自增主键 diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs similarity index 88% rename from src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs rename to src/TrackCenter.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs index 43a55bc7..cba2a370 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs @@ -1,10 +1,13 @@ -namespace SJZY.Track.Domain.Aggregates.TrackPullAggregate; +using Fake.Domain.Entities.Auditing; +using TrackCenter.Domain.SeedWork; + +namespace TrackCenter.Domain.Aggregates.TrackPullAggregate; /// /// 轨迹拉取内容配置表 /// [SugarTable("t_track_pull_content_config")] -public class TrackPullContentConfigEntity : IFullAuditedBasicEntitys, IEntity +public class TrackPullContentConfigEntity : FullAuditedEntity { /// /// 自增主键 diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushConfigRepository.cs b/src/TrackCenter.Domain/Aggregates/TrackPushAggregate/ITrackPushConfigRepository.cs similarity index 81% rename from src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushConfigRepository.cs rename to src/TrackCenter.Domain/Aggregates/TrackPushAggregate/ITrackPushConfigRepository.cs index 7ad686ec..376345bb 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushConfigRepository.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackPushAggregate/ITrackPushConfigRepository.cs @@ -1,13 +1,14 @@ -using SJZY.Track.Domain.Dtos.Common; -using SJZY.Track.Domain.Dtos.TrackPush; +using Fake.Application.Dtos; +using TrackCenter.Domain.Dtos.Common; +using TrackCenter.Domain.Dtos.TrackPush; -namespace SJZY.Track.Domain.Aggregates.TrackPushAggregate; +namespace TrackCenter.Domain.Aggregates.TrackPushAggregate; public interface ITrackPushConfigRepository : IBasicRepository { - Task> GetPageAsync(KeywordsInputVO input); + Task> GetPageAsync(KeywordsInputVO input); - Task> GetContentPageAsync(GetTrackPushContentPageInputVO input); + Task> GetContentPageAsync(GetTrackPushContentPageInputVO input); Task GetDetailAsync(int id); diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushRecordEsRepository.cs b/src/TrackCenter.Domain/Aggregates/TrackPushAggregate/ITrackPushRecordEsRepository.cs similarity index 97% rename from src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushRecordEsRepository.cs rename to src/TrackCenter.Domain/Aggregates/TrackPushAggregate/ITrackPushRecordEsRepository.cs index 95b336d3..8a064cbb 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushRecordEsRepository.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackPushAggregate/ITrackPushRecordEsRepository.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Aggregates.TrackPushAggregate; +namespace TrackCenter.Domain.Aggregates.TrackPushAggregate; public class GetTrackPushRecordsVO { diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs similarity index 89% rename from src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs rename to src/TrackCenter.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs index 8dc04097..3f6dbe3e 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs @@ -1,12 +1,14 @@ -using SJZY.Track.Domain.Enums; +using Fake.Domain.Entities.Auditing; +using TrackCenter.Domain.Enums; +using TrackCenter.Domain.SeedWork; -namespace SJZY.Track.Domain.Aggregates.TrackPushAggregate; +namespace TrackCenter.Domain.Aggregates.TrackPushAggregate; /// /// 轨迹推送配置表 /// [SugarTable("t_track_push_config")] -public class TrackPushConfigEntity : IFullAuditedBasicEntitys, IAggregateRoot +public class TrackPushConfigEntity : FullAuditedAggregateRoot { /// /// 自增主键 diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs similarity index 91% rename from src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs rename to src/TrackCenter.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs index 5d9b9c02..6e9c806a 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs @@ -1,10 +1,13 @@ -namespace SJZY.Track.Domain.Aggregates.TrackPushAggregate; +using Fake.Domain.Entities.Auditing; +using TrackCenter.Domain.SeedWork; + +namespace TrackCenter.Domain.Aggregates.TrackPushAggregate; /// /// 轨迹推送内容配置表 /// [SugarTable("t_track_push_content_config")] -public class TrackPushContentConfigEntity : IFullAuditedBasicEntitys, IEntity +public class TrackPushContentConfigEntity : FullAuditedEntity { /// /// 自增主键 diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs b/src/TrackCenter.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs similarity index 95% rename from src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs rename to src/TrackCenter.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs index 3939e28b..c13ecebb 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs @@ -1,8 +1,8 @@ using Nest; -using SJZY.Expand.ElasticSearch; -using SJZY.Track.Domain.Consts; +using TrackCenter.Domain.Consts; +using TrackCenter.Domain.SeedWork; -namespace SJZY.Track.Domain.Aggregates.TrackPushAggregate; +namespace TrackCenter.Domain.Aggregates.TrackPushAggregate; [ElasticsearchType(RelationName = GlobalConst.TrackPushRecordIndex)] public class TrackPushRecordIndex : IdBaseIndex diff --git a/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/ITrackStatusRepository.cs b/src/TrackCenter.Domain/Aggregates/TrackStatusAggregate/ITrackStatusRepository.cs similarity index 55% rename from src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/ITrackStatusRepository.cs rename to src/TrackCenter.Domain/Aggregates/TrackStatusAggregate/ITrackStatusRepository.cs index 5719fcd8..c5c14661 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/ITrackStatusRepository.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackStatusAggregate/ITrackStatusRepository.cs @@ -1,12 +1,13 @@ -using SJZY.Track.Domain.Dtos.TrackStatus; +using Fake.Application.Dtos; +using TrackCenter.Domain.Dtos.TrackStatus; -namespace SJZY.Track.Domain.Aggregates.TrackStatusAggregate; +namespace TrackCenter.Domain.Aggregates.TrackStatusAggregate; public interface ITrackStatusRepository : IBasicRepository { Task GetDetailAsync(int id); - Task> GetPageTrackStatus(GetPagedTrackStatusVO input); + Task> GetPageTrackStatus(GetPagedTrackStatusVO input); // 获取轨迹状态Id与名称字典 Task> GetTrackStatusIdNameDictAsync(HashSet trackStatusIds); diff --git a/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs similarity index 87% rename from src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs rename to src/TrackCenter.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs index b0fa80b7..3ae80d66 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs @@ -1,10 +1,13 @@ -namespace SJZY.Track.Domain.Aggregates.TrackStatusAggregate; +using Fake.Domain.Entities.Auditing; +using TrackCenter.Domain.SeedWork; + +namespace TrackCenter.Domain.Aggregates.TrackStatusAggregate; /// /// 轨迹状态表 /// [SugarTable("t_track_status")] -public class TrackStatusEntity : IFullAuditedBasicEntitys, IAggregateRoot +public class TrackStatusEntity : FullAuditedAggregateRoot { /// /// 自增主键 diff --git a/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/ITrackTemplateRepository.cs b/src/TrackCenter.Domain/Aggregates/TrackTemplateAggregate/ITrackTemplateRepository.cs similarity index 79% rename from src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/ITrackTemplateRepository.cs rename to src/TrackCenter.Domain/Aggregates/TrackTemplateAggregate/ITrackTemplateRepository.cs index e8a50f2d..a9aec2b9 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/ITrackTemplateRepository.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackTemplateAggregate/ITrackTemplateRepository.cs @@ -1,19 +1,20 @@ -using SJZY.Track.Domain.Dtos.TrackTemplate; +using Fake.Application.Dtos; +using TrackCenter.Domain.Dtos.TrackTemplate; -namespace SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; +namespace TrackCenter.Domain.Aggregates.TrackTemplateAggregate; public interface ITrackTemplateRepository : IBasicRepository { Task GetDetailAsync(int id); - Task> GetPageTrackTemplate(GetPageTrackTemplateVO input); + Task> GetPageTrackTemplate(GetPageTrackTemplateVO input); /// /// 轨迹模板内容列表 /// /// /// - Task> GetContentPageAsync( + Task> GetContentPageAsync( GetTrackTemplateContentPageInputVO input); /// @@ -46,7 +47,7 @@ public interface ITrackTemplateRepository : IBasicRepository> GetTrackTemplateListAsync(GetTrackTemplateListInputVo input); - Task> GetPageTrackTemplateListAsync(GetPageTrackTemplateListInputVo input); + Task> GetPageTrackTemplateListAsync(GetPageTrackTemplateListInputVo input); Task> GetContentByTemplateCodes(string[] codes, int systemId); } diff --git a/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateContentEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateContentEntity.cs similarity index 77% rename from src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateContentEntity.cs rename to src/TrackCenter.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateContentEntity.cs index f8874401..7a4c0078 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateContentEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateContentEntity.cs @@ -1,10 +1,13 @@ -namespace SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; +using Fake.Domain.Entities.Auditing; +using TrackCenter.Domain.SeedWork; + +namespace TrackCenter.Domain.Aggregates.TrackTemplateAggregate; /// /// 轨迹模板内容表（1：N） /// [SugarTable("t_track_template_content")] -public class TrackTemplateContentEntity : IFullAuditedBasicEntitys, IEntity +public class TrackTemplateContentEntity : FullAuditedEntity { /// /// 自增主键 diff --git a/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateEntity.cs similarity index 85% rename from src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateEntity.cs rename to src/TrackCenter.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateEntity.cs index d525300f..bbc8e36c 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateEntity.cs @@ -1,10 +1,12 @@ -namespace SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; +using Fake.Domain.Entities.Auditing; + +namespace TrackCenter.Domain.Aggregates.TrackTemplateAggregate; /// /// 轨迹模板表 /// [SugarTable("t_track_template")] -public class TrackTemplateEntity : IFullAuditedBasicEntitys, IAggregateRoot +public class TrackTemplateEntity : FullAuditedAggregateRoot { /// /// 自增主键 diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningDetailsIndex.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningDetailsIndex.cs similarity index 93% rename from src/SJZY.Track.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningDetailsIndex.cs rename to src/TrackCenter.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningDetailsIndex.cs index 092f599c..06326a9f 100644 --- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningDetailsIndex.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningDetailsIndex.cs @@ -1,9 +1,9 @@ using Nest; -using SJZY.Expand.ElasticSearch; -using SJZY.Track.Domain.Consts; -using SJZY.Track.Domain.Extensions; +using TrackCenter.Domain.Consts; +using TrackCenter.Domain.Extensions; +using TrackCenter.Domain.SeedWork; -namespace SJZY.Track.Domain.Aggregates.WarningAggregate.Complete; +namespace TrackCenter.Domain.Aggregates.WarningAggregate.Complete; [ElasticsearchType(RelationName = GlobalConst.CompleteWarningDetailsIndex)] public sealed class CompleteWarningDetailsIndex : IdBaseIndex diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningRuleItemEntity.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningRuleItemEntity.cs similarity index 96% rename from src/SJZY.Track.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningRuleItemEntity.cs rename to src/TrackCenter.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningRuleItemEntity.cs index c3880646..2376170a 100644 --- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningRuleItemEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningRuleItemEntity.cs @@ -1,7 +1,9 @@ -namespace SJZY.Track.Domain.Aggregates.WarningAggregate.Complete; +using Fake.Domain.Entities.Auditing; + +namespace TrackCenter.Domain.Aggregates.WarningAggregate.Complete; [SugarTable("t_warning_complete_rule_item", TableDescription = "完整预警规则项")] -public sealed class CompleteWarningRuleItemEntity : IFullAuditedBasicEntitys, IEntity +public sealed class CompleteWarningRuleItemEntity : FullAuditedEntity { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/IWarningDetailsEsRepository.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/IWarningDetailsEsRepository.cs similarity index 82% rename from src/SJZY.Track.Domain/Aggregates/WarningAggregate/IWarningDetailsEsRepository.cs rename to src/TrackCenter.Domain/Aggregates/WarningAggregate/IWarningDetailsEsRepository.cs index bd17f207..5816a620 100644 --- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/IWarningDetailsEsRepository.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/IWarningDetailsEsRepository.cs @@ -1,16 +1,17 @@ -using SJZY.Track.Domain.Aggregates.WarningAggregate.Complete; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Return; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Transport; -using SJZY.Track.Domain.Dtos.Warning; +using Fake.Application.Dtos; +using TrackCenter.Domain.Aggregates.WarningAggregate.Complete; +using TrackCenter.Domain.Aggregates.WarningAggregate.Return; +using TrackCenter.Domain.Aggregates.WarningAggregate.Transport; +using TrackCenter.Domain.Dtos.Warning; -namespace SJZY.Track.Domain.Aggregates.WarningAggregate; +namespace TrackCenter.Domain.Aggregates.WarningAggregate; public interface IWarningDetailsEsRepository { #region 运输预警明细 // 分页获取运输预警明细 - Task> GetPageTransportWarningDetailsAsync(GetPageTransportWarningDetailsInputVO input); + Task> GetPageTransportWarningDetailsAsync(GetPageTransportWarningDetailsInputVO input); // 复杂查询，只关注默认只关注（即将超时/已超时） Task> GetTransportWarningDetailsAsync(GetTransportWarningDetailsVO input); @@ -35,7 +36,7 @@ public interface IWarningDetailsEsRepository #region 回传预警明细 // 分页获取回传预警明细 - Task> GetPageReturnWarningDetailsAsync(GetPageReturnWarningDetailsInputVO input); + Task> GetPageReturnWarningDetailsAsync(GetPageReturnWarningDetailsInputVO input); // 复杂查询，只关注默认只关注（重试中/人工介入） Task> GetReturnWarningDetailsAsync(GetReturnWarningDetailsVO input); @@ -72,7 +73,7 @@ public interface IWarningDetailsEsRepository #region 完整预警明细 // 分页获取完整预警明细 - Task> GetPageCompleteWarningDetailsAsync(GetPageCompleteWarningDetailsInputVO input); + Task> GetPageCompleteWarningDetailsAsync(GetPageCompleteWarningDetailsInputVO input); // 复杂查询，只关注默认只关注（待处理） Task> GetCompleteWarningDetailsAsync(GetCompleteWarningDetailsVO input); diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/IWarningRuleRepository.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/IWarningRuleRepository.cs similarity index 92% rename from src/SJZY.Track.Domain/Aggregates/WarningAggregate/IWarningRuleRepository.cs rename to src/TrackCenter.Domain/Aggregates/WarningAggregate/IWarningRuleRepository.cs index 3d571369..776800d9 100644 --- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/IWarningRuleRepository.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/IWarningRuleRepository.cs @@ -1,9 +1,9 @@ -using SJZY.Track.Domain.Aggregates.WarningAggregate.Complete; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Return; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Transport; -using SJZY.Track.Domain.Enums; +using TrackCenter.Domain.Aggregates.WarningAggregate.Complete; +using TrackCenter.Domain.Aggregates.WarningAggregate.Return; +using TrackCenter.Domain.Aggregates.WarningAggregate.Transport; +using TrackCenter.Domain.Enums; -namespace SJZY.Track.Domain.Aggregates.WarningAggregate; +namespace TrackCenter.Domain.Aggregates.WarningAggregate; /// /// 预警规则仓储 @@ -31,7 +31,7 @@ public interface IWarningRuleRepository : IBasicRepository Task GetWarningRuleForEnabledAsync(int subSystemId, int customId, WarningRuleType warningType); // 获取启用的预警规则主体 - Task> GetWarningRuleForEnabledAsync(HashSet<(int SubSystemId, int CustomId)> conditions, WarningRuleType warningType); + Task> GetWarningRuleForEnabledAsync(List customers, WarningRuleType warningType); // 获取预警规则主体根据id Task GetWarningRuleByIdAsync(int id, WarningRuleType? warningType = null); diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/IWarningTaskRepository.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/IWarningTaskRepository.cs similarity index 94% rename from src/SJZY.Track.Domain/Aggregates/WarningAggregate/IWarningTaskRepository.cs rename to src/TrackCenter.Domain/Aggregates/WarningAggregate/IWarningTaskRepository.cs index 5923e371..f87fd24f 100644 --- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/IWarningTaskRepository.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/IWarningTaskRepository.cs @@ -1,7 +1,7 @@ -using SJZY.Track.Domain.Aggregates.WarningAggregate.Return; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Transport; +using TrackCenter.Domain.Aggregates.WarningAggregate.Return; +using TrackCenter.Domain.Aggregates.WarningAggregate.Transport; -namespace SJZY.Track.Domain.Aggregates.WarningAggregate; +namespace TrackCenter.Domain.Aggregates.WarningAggregate; public interface IWarningTaskRepository { diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Return/ReturnMessageRecordIndex.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Return/ReturnMessageRecordIndex.cs similarity index 78% rename from src/SJZY.Track.Domain/Aggregates/WarningAggregate/Return/ReturnMessageRecordIndex.cs rename to src/TrackCenter.Domain/Aggregates/WarningAggregate/Return/ReturnMessageRecordIndex.cs index e5fb9a67..0419a457 100644 --- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Return/ReturnMessageRecordIndex.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Return/ReturnMessageRecordIndex.cs @@ -1,8 +1,8 @@ using Nest; -using SJZY.Expand.ElasticSearch; -using SJZY.Track.Domain.Consts; +using TrackCenter.Domain.Consts; +using TrackCenter.Domain.SeedWork; -namespace SJZY.Track.Domain.Aggregates.WarningAggregate.Return; +namespace TrackCenter.Domain.Aggregates.WarningAggregate.Return; [ElasticsearchType(RelationName = GlobalConst.ReturnMessageRecordIndex)] public class ReturnMessageRecordIndex : IdBaseIndex diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Return/ReturnWarningDetailsIndex.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Return/ReturnWarningDetailsIndex.cs similarity index 96% rename from src/SJZY.Track.Domain/Aggregates/WarningAggregate/Return/ReturnWarningDetailsIndex.cs rename to src/TrackCenter.Domain/Aggregates/WarningAggregate/Return/ReturnWarningDetailsIndex.cs index 90ba2f81..b531eaf9 100644 --- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Return/ReturnWarningDetailsIndex.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Return/ReturnWarningDetailsIndex.cs @@ -1,9 +1,8 @@ using Nest; -using SJZY.Expand.ElasticSearch; -using SJZY.Track.Domain.Consts; -using SJZY.Track.Domain.Extensions; +using TrackCenter.Domain.Consts; +using TrackCenter.Domain.SeedWork; -namespace SJZY.Track.Domain.Aggregates.WarningAggregate.Return; +namespace TrackCenter.Domain.Aggregates.WarningAggregate.Return; // 回传时效预警明细 [ElasticsearchType(RelationName = GlobalConst.ReturnWarningDetailsIndex)] diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Return/ReturnWarningRetryPushTaskEntity.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Return/ReturnWarningRetryPushTaskEntity.cs similarity index 91% rename from src/SJZY.Track.Domain/Aggregates/WarningAggregate/Return/ReturnWarningRetryPushTaskEntity.cs rename to src/TrackCenter.Domain/Aggregates/WarningAggregate/Return/ReturnWarningRetryPushTaskEntity.cs index e3f1b9d0..eaf66c3b 100644 --- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Return/ReturnWarningRetryPushTaskEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Return/ReturnWarningRetryPushTaskEntity.cs @@ -1,8 +1,11 @@ -namespace SJZY.Track.Domain.Aggregates.WarningAggregate.Return; +using Fake.Domain.Entities.Auditing; +using TrackCenter.Domain.SeedWork; + +namespace TrackCenter.Domain.Aggregates.WarningAggregate.Return; // 预警重试推送任务 [SugarTable("t_warning_return_retry_task", TableDescription = "回传预警重试推送任务")] -public sealed class ReturnWarningRetryPushTaskEntity : IFullAuditedBasicEntitys, IEntity +public sealed class ReturnWarningRetryPushTaskEntity : FullAuditedEntity { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Return/ReturnWarningRuleItemEntity.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Return/ReturnWarningRuleItemEntity.cs similarity index 91% rename from src/SJZY.Track.Domain/Aggregates/WarningAggregate/Return/ReturnWarningRuleItemEntity.cs rename to src/TrackCenter.Domain/Aggregates/WarningAggregate/Return/ReturnWarningRuleItemEntity.cs index ab675e5f..5af4420b 100644 --- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Return/ReturnWarningRuleItemEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Return/ReturnWarningRuleItemEntity.cs @@ -1,8 +1,10 @@ -namespace SJZY.Track.Domain.Aggregates.WarningAggregate.Return; +using Fake.Domain.Entities.Auditing; + +namespace TrackCenter.Domain.Aggregates.WarningAggregate.Return; // 回传预警规则项 [SugarTable("t_warning_return_rule_item", TableDescription = "回传预警规则项")] -public sealed class ReturnWarningRuleItemEntity : IFullAuditedBasicEntitys, IEntity +public sealed class ReturnWarningRuleItemEntity : FullAuditedEntity { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsGenerateTaskEntity.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsGenerateTaskEntity.cs similarity index 93% rename from src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsGenerateTaskEntity.cs rename to src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsGenerateTaskEntity.cs index d9d8657d..a76013c7 100644 --- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsGenerateTaskEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsGenerateTaskEntity.cs @@ -1,10 +1,12 @@ -using SJZY.Track.Domain.Consts; +using Fake.Domain.Entities.Auditing; +using TrackCenter.Domain.Consts; +using TrackCenter.Domain.SeedWork; -namespace SJZY.Track.Domain.Aggregates.WarningAggregate.Transport; +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 : IFullAuditedBasicEntitys, IEntity +public sealed class TransportWarningDetailsGenerateTaskEntity : FullAuditedEntity { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs similarity index 96% rename from src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs rename to src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs index 7ec85ec8..0c0fdaa5 100644 --- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs @@ -1,12 +1,12 @@ using System.Text; using Nest; -using SJZY.Expand.ElasticSearch; -using SJZY.Track.Domain.Aggregates.KPIAreaAggregate; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; -using SJZY.Track.Domain.Consts; -using SJZY.Track.Domain.Enums; +using TrackCenter.Domain.Aggregates.KPIAreaAggregate; +using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; +using TrackCenter.Domain.Consts; +using TrackCenter.Domain.Enums; +using TrackCenter.Domain.SeedWork; -namespace SJZY.Track.Domain.Aggregates.WarningAggregate.Transport; +namespace TrackCenter.Domain.Aggregates.WarningAggregate.Transport; // 运输时效预警明细 [ElasticsearchType(RelationName = GlobalConst.TransportWarningDetailsIndex)] diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningSceneEntity.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningSceneEntity.cs similarity index 88% rename from src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningSceneEntity.cs rename to src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningSceneEntity.cs index 451aaa96..da7bb0d0 100644 --- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningSceneEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningSceneEntity.cs @@ -1,8 +1,11 @@ -namespace SJZY.Track.Domain.Aggregates.WarningAggregate.Transport; +using Fake.Domain.Entities.Auditing; +using TrackCenter.Domain.SeedWork; + +namespace TrackCenter.Domain.Aggregates.WarningAggregate.Transport; // 运输时效场景 [SugarTable("t_warning_transport_scene", TableDescription = "运输时效规则场景")] -public sealed class TransportWarningSceneEntity : IFullAuditedBasicEntitys, IEntity +public sealed class TransportWarningSceneEntity : FullAuditedEntity { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningSceneRuleItemEntity.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningSceneRuleItemEntity.cs similarity index 93% rename from src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningSceneRuleItemEntity.cs rename to src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningSceneRuleItemEntity.cs index c967ae94..230058cc 100644 --- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningSceneRuleItemEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/Transport/TransportWarningSceneRuleItemEntity.cs @@ -1,8 +1,11 @@ -namespace SJZY.Track.Domain.Aggregates.WarningAggregate.Transport; +using Fake.Domain.Entities.Auditing; +using TrackCenter.Domain.SeedWork; + +namespace TrackCenter.Domain.Aggregates.WarningAggregate.Transport; // 运输时效场景规则项 [SugarTable("t_warning_transport_scene_rule_item", TableDescription = "运输时效规则场景规则项")] -public sealed class TransportWarningSceneRuleItemEntity : IFullAuditedBasicEntitys, IEntity +public sealed class TransportWarningSceneRuleItemEntity : FullAuditedEntity { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } @@ -59,7 +62,7 @@ public sealed class TransportWarningSceneRuleItemEntity : IFullAuditedBasicEntit return trackStatusIds.Contains(StartTrackStatusId) //存在起始 && !trackStatusIds.Contains(EndTrackStatusId); //不存在截止 } - + // 判断未命中规则 public bool CanNotHit(HashSet? trackStatusIds) { @@ -71,5 +74,5 @@ public sealed class TransportWarningSceneRuleItemEntity : IFullAuditedBasicEntit return trackStatusIds.Contains(EndTrackStatusId); //存在起始并且存在截止，为完成态，也属于规则未命中 } - -} \ No newline at end of file + +} diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/WarningNotifyTaskEntity.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/WarningNotifyTaskEntity.cs similarity index 92% rename from src/SJZY.Track.Domain/Aggregates/WarningAggregate/WarningNotifyTaskEntity.cs rename to src/TrackCenter.Domain/Aggregates/WarningAggregate/WarningNotifyTaskEntity.cs index 86a33192..ec79a90c 100644 --- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/WarningNotifyTaskEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/WarningNotifyTaskEntity.cs @@ -1,7 +1,10 @@ -namespace SJZY.Track.Domain.Aggregates.WarningAggregate; +using Fake.Domain.Entities.Auditing; +using TrackCenter.Domain.SeedWork; + +namespace TrackCenter.Domain.Aggregates.WarningAggregate; [SugarTable("t_warning_notify_task", TableDescription = "预警通知任务")] -public sealed class WarningNotifyTaskEntity : IFullAuditedBasicEntitys, IAggregateRoot +public sealed class WarningNotifyTaskEntity : FullAuditedAggregateRoot { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/WarningRuleEntity.cs b/src/TrackCenter.Domain/Aggregates/WarningAggregate/WarningRuleEntity.cs similarity index 91% rename from src/SJZY.Track.Domain/Aggregates/WarningAggregate/WarningRuleEntity.cs rename to src/TrackCenter.Domain/Aggregates/WarningAggregate/WarningRuleEntity.cs index 57378781..3604187d 100644 --- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/WarningRuleEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/WarningAggregate/WarningRuleEntity.cs @@ -1,11 +1,13 @@ -using SJZY.Track.Domain.Extensions; +using Fake.Domain.Entities.Auditing; +using TrackCenter.Domain.Extensions; +using TrackCenter.Domain.SeedWork; -namespace SJZY.Track.Domain.Aggregates.WarningAggregate; +namespace TrackCenter.Domain.Aggregates.WarningAggregate; // 预警规则主体 [SugarTable("t_warning", TableDescription = "预警规则主体")] [SugarIndex("IDX_CustomId_SubSystemId", nameof(CustomId), OrderByType.Asc, nameof(SubSystemId), OrderByType.Asc)] -public sealed class WarningRuleEntity : IFullAuditedBasicEntitys, IAggregateRoot +public sealed class WarningRuleEntity : FullAuditedAggregateRoot { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } diff --git a/src/SJZY.Track.Domain/Consts/GlobalConst.ES.cs b/src/TrackCenter.Domain/Consts/GlobalConst.ES.cs similarity index 97% rename from src/SJZY.Track.Domain/Consts/GlobalConst.ES.cs rename to src/TrackCenter.Domain/Consts/GlobalConst.ES.cs index b9492f33..c98d7060 100644 --- a/src/SJZY.Track.Domain/Consts/GlobalConst.ES.cs +++ b/src/TrackCenter.Domain/Consts/GlobalConst.ES.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Consts; +namespace TrackCenter.Domain.Consts; public partial class GlobalConst { diff --git a/src/SJZY.Track.Domain/Consts/GlobalConst.MQ.cs b/src/TrackCenter.Domain/Consts/GlobalConst.MQ.cs similarity index 72% rename from src/SJZY.Track.Domain/Consts/GlobalConst.MQ.cs rename to src/TrackCenter.Domain/Consts/GlobalConst.MQ.cs index 3fab82d2..fa9805e5 100644 --- a/src/SJZY.Track.Domain/Consts/GlobalConst.MQ.cs +++ b/src/TrackCenter.Domain/Consts/GlobalConst.MQ.cs @@ -1,36 +1,36 @@ -namespace SJZY.Track.Domain.Consts; +namespace TrackCenter.Domain.Consts; public partial class GlobalConst { /// /// 轨迹新增/更新 /// - public const string TrackUpsertSubscribe = "SJZY.Track.TrackUpsert"; + public const string TrackUpsertSubscribe = "TrackCenter.TrackUpsert"; /// /// 轨迹刷新引发的新增/更新 专用 /// - public const string TrackUpsertForRefreshSubscribe = "SJZY.Track.TrackUpsertForRefresh"; + public const string TrackUpsertForRefreshSubscribe = "TrackCenter.TrackUpsertForRefresh"; /// /// 轨迹删除 /// - public const string TrackDeleteSubscribe = "SJZY.Track.TrackDelete"; + public const string TrackDeleteSubscribe = "TrackCenter.TrackDelete"; /// /// 接口通批量轨迹刷新 /// - public const string TrackRefreshSubscribe = "SJZY.Track.TrackRefresh"; + public const string TrackRefreshSubscribe = "TrackCenter.TrackRefresh"; /// /// 轨迹推送 /// - public const string TrackPushSubscribe = "SJZY.Track.TrackPush"; + public const string TrackPushSubscribe = "TrackCenter.TrackPush"; /// /// 轨迹人工手动推送 /// - public const string TrackManualPushSubscribe = "SJZY.Track.TrackManualPush"; + public const string TrackManualPushSubscribe = "TrackCenter.TrackManualPush"; /// /// 接口通交换机 @@ -40,17 +40,17 @@ public partial class GlobalConst /// /// 轨迹推送完成（接口通回调） /// - public const string TrackPushCompletedSubscribe = "SJZY.Track.TrackPushCompleted"; + public const string TrackPushCompletedSubscribe = "TrackCenter.TrackPushCompleted"; /// /// 轨迹新增/更新/删除后触发更新订单主表 /// - public const string TrackChangeAfterUpdateOrderSubscribe = "SJZY.Track.TrackChangeAfterUpdateOrder"; + public const string TrackChangeAfterUpdateOrderSubscribe = "TrackCenter.TrackChangeAfterUpdateOrder"; /// /// 预警计算任务 /// - public const string TrackWarningCalcSubscribe = "SJZY.Track.TrackWarningCalc"; + public const string TrackWarningCalcSubscribe = "TrackCenter.TrackWarningCalc"; /// /// 轨迹变更通知交换机 diff --git a/src/SJZY.Track.Domain/Consts/GlobalConst.Redis.cs b/src/TrackCenter.Domain/Consts/GlobalConst.Redis.cs similarity index 98% rename from src/SJZY.Track.Domain/Consts/GlobalConst.Redis.cs rename to src/TrackCenter.Domain/Consts/GlobalConst.Redis.cs index 950444cc..15d8a55e 100644 --- a/src/SJZY.Track.Domain/Consts/GlobalConst.Redis.cs +++ b/src/TrackCenter.Domain/Consts/GlobalConst.Redis.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Consts; +namespace TrackCenter.Domain.Consts; public partial class GlobalConst { diff --git a/src/SJZY.Track.Domain/Consts/GlobalConst.Task.cs b/src/TrackCenter.Domain/Consts/GlobalConst.Task.cs similarity index 95% rename from src/SJZY.Track.Domain/Consts/GlobalConst.Task.cs rename to src/TrackCenter.Domain/Consts/GlobalConst.Task.cs index 78f1e7ca..a3b99016 100644 --- a/src/SJZY.Track.Domain/Consts/GlobalConst.Task.cs +++ b/src/TrackCenter.Domain/Consts/GlobalConst.Task.cs @@ -1,6 +1,6 @@ using System.Collections.Immutable; -namespace SJZY.Track.Domain.Consts; +namespace TrackCenter.Domain.Consts; public partial class GlobalConst { diff --git a/src/SJZY.Track.Domain/Consts/GlobalConst.Track.cs b/src/TrackCenter.Domain/Consts/GlobalConst.Track.cs similarity index 94% rename from src/SJZY.Track.Domain/Consts/GlobalConst.Track.cs rename to src/TrackCenter.Domain/Consts/GlobalConst.Track.cs index ec33cc4e..ac2eb204 100644 --- a/src/SJZY.Track.Domain/Consts/GlobalConst.Track.cs +++ b/src/TrackCenter.Domain/Consts/GlobalConst.Track.cs @@ -1,6 +1,6 @@ using System.Collections.Immutable; -namespace SJZY.Track.Domain.Consts; +namespace TrackCenter.Domain.Consts; public partial class GlobalConst { diff --git a/src/SJZY.Track.Domain/Consts/GlobalConst.cs b/src/TrackCenter.Domain/Consts/GlobalConst.cs similarity index 95% rename from src/SJZY.Track.Domain/Consts/GlobalConst.cs rename to src/TrackCenter.Domain/Consts/GlobalConst.cs index 145ef0dc..1cf9d1fc 100644 --- a/src/SJZY.Track.Domain/Consts/GlobalConst.cs +++ b/src/TrackCenter.Domain/Consts/GlobalConst.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Consts; +namespace TrackCenter.Domain.Consts; public partial class GlobalConst { diff --git a/src/SJZY.Track.Domain/Dtos/Common/CityTimezoneDto.cs b/src/TrackCenter.Domain/Dtos/Common/CityTimezoneDto.cs similarity index 84% rename from src/SJZY.Track.Domain/Dtos/Common/CityTimezoneDto.cs rename to src/TrackCenter.Domain/Dtos/Common/CityTimezoneDto.cs index 998ad0c6..a4eb118a 100644 --- a/src/SJZY.Track.Domain/Dtos/Common/CityTimezoneDto.cs +++ b/src/TrackCenter.Domain/Dtos/Common/CityTimezoneDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Common; +namespace TrackCenter.Domain.Dtos.Common; public class CityTimezoneDto { diff --git a/src/SJZY.Track.Domain/Dtos/Common/IdWithNameDto.cs b/src/TrackCenter.Domain/Dtos/Common/IdWithNameDto.cs similarity index 70% rename from src/SJZY.Track.Domain/Dtos/Common/IdWithNameDto.cs rename to src/TrackCenter.Domain/Dtos/Common/IdWithNameDto.cs index ad19228d..995f8e0b 100644 --- a/src/SJZY.Track.Domain/Dtos/Common/IdWithNameDto.cs +++ b/src/TrackCenter.Domain/Dtos/Common/IdWithNameDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Common; +namespace TrackCenter.Domain.Dtos.Common; public class IdWithNameDto { diff --git a/src/SJZY.Track.Domain/Dtos/Common/KeywordsInputVO.cs b/src/TrackCenter.Domain/Dtos/Common/KeywordsInputVO.cs similarity index 89% rename from src/SJZY.Track.Domain/Dtos/Common/KeywordsInputVO.cs rename to src/TrackCenter.Domain/Dtos/Common/KeywordsInputVO.cs index f509edbe..98bad8ed 100644 --- a/src/SJZY.Track.Domain/Dtos/Common/KeywordsInputVO.cs +++ b/src/TrackCenter.Domain/Dtos/Common/KeywordsInputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Common; +namespace TrackCenter.Domain.Dtos.Common; public class KeywordsInputVO : PageInfoInput { diff --git a/src/TrackCenter.Domain/Dtos/Common/OptionType.cs b/src/TrackCenter.Domain/Dtos/Common/OptionType.cs new file mode 100644 index 00000000..feb58784 --- /dev/null +++ b/src/TrackCenter.Domain/Dtos/Common/OptionType.cs @@ -0,0 +1,15 @@ +using System.ComponentModel; + +namespace TrackCenter.Domain.Dtos.Common; + +public enum OptionType +{ + [Description("无")] + 无 = 0, + [Description("新增")] + 新增 = 1, + [Description("删除")] + 删除 = 2, + [Description("修改")] + 修改 = 3 +} diff --git a/src/TrackCenter.Domain/Dtos/Common/PageInfoInput.cs b/src/TrackCenter.Domain/Dtos/Common/PageInfoInput.cs new file mode 100644 index 00000000..52a0e84a --- /dev/null +++ b/src/TrackCenter.Domain/Dtos/Common/PageInfoInput.cs @@ -0,0 +1,8 @@ +namespace TrackCenter.Domain.Dtos.Common; + +public class PageInfoInput +{ + public int PageIndex { get; set; } + + public int PageSize { get; set; } +} diff --git a/src/SJZY.Track.Domain/Dtos/Common/PortTimezoneDto.cs b/src/TrackCenter.Domain/Dtos/Common/PortTimezoneDto.cs similarity index 84% rename from src/SJZY.Track.Domain/Dtos/Common/PortTimezoneDto.cs rename to src/TrackCenter.Domain/Dtos/Common/PortTimezoneDto.cs index 321b575f..2082d77c 100644 --- a/src/SJZY.Track.Domain/Dtos/Common/PortTimezoneDto.cs +++ b/src/TrackCenter.Domain/Dtos/Common/PortTimezoneDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Common; +namespace TrackCenter.Domain.Dtos.Common; public class PortTimezoneDto { diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/AddRuleAreaInfoRequest.cs b/src/TrackCenter.Domain/Dtos/Forewarning/AddRuleAreaInfoRequest.cs similarity index 95% rename from src/SJZY.Track.Domain/Dtos/Forewarning/AddRuleAreaInfoRequest.cs rename to src/TrackCenter.Domain/Dtos/Forewarning/AddRuleAreaInfoRequest.cs index 4b914187..29c655c0 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/AddRuleAreaInfoRequest.cs +++ b/src/TrackCenter.Domain/Dtos/Forewarning/AddRuleAreaInfoRequest.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace SJZY.Track.Domain.Dtos.Forewarning; +namespace TrackCenter.Domain.Dtos.Forewarning; public class AddRuleAreaInfoRequest { diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/AreaDto.cs b/src/TrackCenter.Domain/Dtos/Forewarning/AreaDto.cs similarity index 91% rename from src/SJZY.Track.Domain/Dtos/Forewarning/AreaDto.cs rename to src/TrackCenter.Domain/Dtos/Forewarning/AreaDto.cs index cfce4f93..18121c40 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/AreaDto.cs +++ b/src/TrackCenter.Domain/Dtos/Forewarning/AreaDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Forewarning; +namespace TrackCenter.Domain.Dtos.Forewarning; public class AreaDto { diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/AreaInfoDto.cs b/src/TrackCenter.Domain/Dtos/Forewarning/AreaInfoDto.cs similarity index 94% rename from src/SJZY.Track.Domain/Dtos/Forewarning/AreaInfoDto.cs rename to src/TrackCenter.Domain/Dtos/Forewarning/AreaInfoDto.cs index b52978de..f6fc8dbf 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/AreaInfoDto.cs +++ b/src/TrackCenter.Domain/Dtos/Forewarning/AreaInfoDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Forewarning; +namespace TrackCenter.Domain.Dtos.Forewarning; public class RuleAreaInfoDto { diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/CreateRuleAreaRequest.cs b/src/TrackCenter.Domain/Dtos/Forewarning/CreateRuleAreaRequest.cs similarity index 86% rename from src/SJZY.Track.Domain/Dtos/Forewarning/CreateRuleAreaRequest.cs rename to src/TrackCenter.Domain/Dtos/Forewarning/CreateRuleAreaRequest.cs index 2dc8bdf3..9cc1561d 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/CreateRuleAreaRequest.cs +++ b/src/TrackCenter.Domain/Dtos/Forewarning/CreateRuleAreaRequest.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace SJZY.Track.Domain.Dtos.Forewarning; +namespace TrackCenter.Domain.Dtos.Forewarning; public class CreateRuleAreaRequest { diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/KpiAreaInfo.cs b/src/TrackCenter.Domain/Dtos/Forewarning/KpiAreaInfo.cs similarity index 92% rename from src/SJZY.Track.Domain/Dtos/Forewarning/KpiAreaInfo.cs rename to src/TrackCenter.Domain/Dtos/Forewarning/KpiAreaInfo.cs index 3b249ffb..ddb313e4 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/KpiAreaInfo.cs +++ b/src/TrackCenter.Domain/Dtos/Forewarning/KpiAreaInfo.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Forewarning; +namespace TrackCenter.Domain.Dtos.Forewarning; public class KpiAreaInfo { diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/QueryAreaInfoRequest.cs b/src/TrackCenter.Domain/Dtos/Forewarning/QueryAreaInfoRequest.cs similarity index 75% rename from src/SJZY.Track.Domain/Dtos/Forewarning/QueryAreaInfoRequest.cs rename to src/TrackCenter.Domain/Dtos/Forewarning/QueryAreaInfoRequest.cs index 4f551d67..e8b4c553 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/QueryAreaInfoRequest.cs +++ b/src/TrackCenter.Domain/Dtos/Forewarning/QueryAreaInfoRequest.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Forewarning; +namespace TrackCenter.Domain.Dtos.Forewarning; public class QueryAreaInfoRequest : PageInfoInput { diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/QueryAreaRequest.cs b/src/TrackCenter.Domain/Dtos/Forewarning/QueryAreaRequest.cs similarity index 83% rename from src/SJZY.Track.Domain/Dtos/Forewarning/QueryAreaRequest.cs rename to src/TrackCenter.Domain/Dtos/Forewarning/QueryAreaRequest.cs index 7bd8524f..fd681ba9 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/QueryAreaRequest.cs +++ b/src/TrackCenter.Domain/Dtos/Forewarning/QueryAreaRequest.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Forewarning; +namespace TrackCenter.Domain.Dtos.Forewarning; public class QueryAreaRequest : PageInfoInput { diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaInfoRequest.cs b/src/TrackCenter.Domain/Dtos/Forewarning/UpdateRuleAreaInfoRequest.cs similarity index 95% rename from src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaInfoRequest.cs rename to src/TrackCenter.Domain/Dtos/Forewarning/UpdateRuleAreaInfoRequest.cs index 30b23150..42497fa1 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaInfoRequest.cs +++ b/src/TrackCenter.Domain/Dtos/Forewarning/UpdateRuleAreaInfoRequest.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace SJZY.Track.Domain.Dtos.Forewarning; +namespace TrackCenter.Domain.Dtos.Forewarning; /// /// 更新规则区域信息请求 diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaRequest.cs b/src/TrackCenter.Domain/Dtos/Forewarning/UpdateRuleAreaRequest.cs similarity index 85% rename from src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaRequest.cs rename to src/TrackCenter.Domain/Dtos/Forewarning/UpdateRuleAreaRequest.cs index 89831ba3..14e8b8bc 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaRequest.cs +++ b/src/TrackCenter.Domain/Dtos/Forewarning/UpdateRuleAreaRequest.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace SJZY.Track.Domain.Dtos.Forewarning; +namespace TrackCenter.Domain.Dtos.Forewarning; public class UpdateRuleAreaRequest { diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs b/src/TrackCenter.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs similarity index 98% rename from src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs rename to src/TrackCenter.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs index 79241239..3ef4b299 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs +++ b/src/TrackCenter.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Order; +namespace TrackCenter.Domain.Dtos.Order; public class GetPageTrackOrderInputVO : PageInfoInput { diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetTrackCounterVO.cs b/src/TrackCenter.Domain/Dtos/Order/GetTrackCounterVO.cs similarity index 84% rename from src/SJZY.Track.Domain/Dtos/Order/GetTrackCounterVO.cs rename to src/TrackCenter.Domain/Dtos/Order/GetTrackCounterVO.cs index 64794434..97788fdb 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/GetTrackCounterVO.cs +++ b/src/TrackCenter.Domain/Dtos/Order/GetTrackCounterVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Order; +namespace TrackCenter.Domain.Dtos.Order; public class GetTrackCounterVO { diff --git a/src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs b/src/TrackCenter.Domain/Dtos/Order/LinkedOrderVO.cs similarity index 94% rename from src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs rename to src/TrackCenter.Domain/Dtos/Order/LinkedOrderVO.cs index 2bc90ca0..fd6b737a 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs +++ b/src/TrackCenter.Domain/Dtos/Order/LinkedOrderVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Order; +namespace TrackCenter.Domain.Dtos.Order; public class LinkedOrderVO { diff --git a/src/SJZY.Track.Domain/Dtos/Order/OrderIdentifier.cs b/src/TrackCenter.Domain/Dtos/Order/OrderIdentifier.cs similarity index 90% rename from src/SJZY.Track.Domain/Dtos/Order/OrderIdentifier.cs rename to src/TrackCenter.Domain/Dtos/Order/OrderIdentifier.cs index fc4a22c4..a82047c5 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/OrderIdentifier.cs +++ b/src/TrackCenter.Domain/Dtos/Order/OrderIdentifier.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Order; +namespace TrackCenter.Domain.Dtos.Order; /// /// 订单标识符 diff --git a/src/SJZY.Track.Domain/Dtos/Order/OrderTemplateLinkDto.cs b/src/TrackCenter.Domain/Dtos/Order/OrderTemplateLinkDto.cs similarity index 85% rename from src/SJZY.Track.Domain/Dtos/Order/OrderTemplateLinkDto.cs rename to src/TrackCenter.Domain/Dtos/Order/OrderTemplateLinkDto.cs index 6d6f4528..3d7cd239 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/OrderTemplateLinkDto.cs +++ b/src/TrackCenter.Domain/Dtos/Order/OrderTemplateLinkDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Order; +namespace TrackCenter.Domain.Dtos.Order; public class OrderTemplateLinkDto { diff --git a/src/SJZY.Track.Domain/Dtos/Order/OrderTemplateVO.cs b/src/TrackCenter.Domain/Dtos/Order/OrderTemplateVO.cs similarity index 84% rename from src/SJZY.Track.Domain/Dtos/Order/OrderTemplateVO.cs rename to src/TrackCenter.Domain/Dtos/Order/OrderTemplateVO.cs index 26c110a0..9ba944ca 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/OrderTemplateVO.cs +++ b/src/TrackCenter.Domain/Dtos/Order/OrderTemplateVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Order; +namespace TrackCenter.Domain.Dtos.Order; /// /// 订单关联的模板模型 diff --git a/src/SJZY.Track.Domain/Dtos/Order/OrderTransportDto.cs b/src/TrackCenter.Domain/Dtos/Order/OrderTransportDto.cs similarity index 79% rename from src/SJZY.Track.Domain/Dtos/Order/OrderTransportDto.cs rename to src/TrackCenter.Domain/Dtos/Order/OrderTransportDto.cs index 360e3bce..ee240ccd 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/OrderTransportDto.cs +++ b/src/TrackCenter.Domain/Dtos/Order/OrderTransportDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Order; +namespace TrackCenter.Domain.Dtos.Order; public class OrderTransportDto { diff --git a/src/SJZY.Track.Domain/Dtos/Order/OrderWithServiceProviderVO.cs b/src/TrackCenter.Domain/Dtos/Order/OrderWithServiceProviderVO.cs similarity index 93% rename from src/SJZY.Track.Domain/Dtos/Order/OrderWithServiceProviderVO.cs rename to src/TrackCenter.Domain/Dtos/Order/OrderWithServiceProviderVO.cs index b3f6488a..171cf61b 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/OrderWithServiceProviderVO.cs +++ b/src/TrackCenter.Domain/Dtos/Order/OrderWithServiceProviderVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Order; +namespace TrackCenter.Domain.Dtos.Order; public class OrderWithServiceProviderVO { diff --git a/src/SJZY.Track.Domain/Dtos/Order/UpdateOrderPullConfigForServiceProviderInputVo.cs b/src/TrackCenter.Domain/Dtos/Order/UpdateOrderPullConfigForServiceProviderInputVo.cs similarity index 94% rename from src/SJZY.Track.Domain/Dtos/Order/UpdateOrderPullConfigForServiceProviderInputVo.cs rename to src/TrackCenter.Domain/Dtos/Order/UpdateOrderPullConfigForServiceProviderInputVo.cs index 73c1943d..9a6a1e09 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/UpdateOrderPullConfigForServiceProviderInputVo.cs +++ b/src/TrackCenter.Domain/Dtos/Order/UpdateOrderPullConfigForServiceProviderInputVo.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Order; +namespace TrackCenter.Domain.Dtos.Order; public class UpdateOrderPullConfigsInputVo { diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs b/src/TrackCenter.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs similarity index 97% rename from src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs rename to src/TrackCenter.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs index 81a9ee9e..f9f17e99 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackContents; +namespace TrackCenter.Domain.Dtos.TrackContents; public class GetPageTrackContentVO : PageInfoInput { diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs b/src/TrackCenter.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs similarity index 96% rename from src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs rename to src/TrackCenter.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs index fe5b29d2..3f4865cc 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackContents; +namespace TrackCenter.Domain.Dtos.TrackContents; public class GetTrackContentDetailVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapDetailOutputVO.cs b/src/TrackCenter.Domain/Dtos/TrackContents/GetTrackContentMapDetailOutputVO.cs similarity index 96% rename from src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapDetailOutputVO.cs rename to src/TrackCenter.Domain/Dtos/TrackContents/GetTrackContentMapDetailOutputVO.cs index f7372508..7d0a221d 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapDetailOutputVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackContents/GetTrackContentMapDetailOutputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackContents; +namespace TrackCenter.Domain.Dtos.TrackContents; public class GetTrackContentMapDetailOutputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageInputVO.cs b/src/TrackCenter.Domain/Dtos/TrackContents/GetTrackContentMapPageInputVO.cs similarity index 66% rename from src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageInputVO.cs rename to src/TrackCenter.Domain/Dtos/TrackContents/GetTrackContentMapPageInputVO.cs index 16a35377..857964f9 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageInputVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackContents/GetTrackContentMapPageInputVO.cs @@ -1,6 +1,4 @@ -using SJZY.Track.Domain.Dtos.Common; - -namespace SJZY.Track.Domain.Dtos.TrackContents; +namespace TrackCenter.Domain.Dtos.TrackContents; public class GetTrackContentMapPageInputVO : KeywordsInputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageOutputVO.cs b/src/TrackCenter.Domain/Dtos/TrackContents/GetTrackContentMapPageOutputVO.cs similarity index 95% rename from src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageOutputVO.cs rename to src/TrackCenter.Domain/Dtos/TrackContents/GetTrackContentMapPageOutputVO.cs index c98f653e..b573d60f 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageOutputVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackContents/GetTrackContentMapPageOutputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackContents; +namespace TrackCenter.Domain.Dtos.TrackContents; public class GetTrackContentMapPageOutputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/TrackCodeMapVO.cs b/src/TrackCenter.Domain/Dtos/TrackContents/TrackCodeMapVO.cs similarity index 91% rename from src/SJZY.Track.Domain/Dtos/TrackContents/TrackCodeMapVO.cs rename to src/TrackCenter.Domain/Dtos/TrackContents/TrackCodeMapVO.cs index c06fc740..12725001 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackContents/TrackCodeMapVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackContents/TrackCodeMapVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackContents; +namespace TrackCenter.Domain.Dtos.TrackContents; /// /// 轨迹代码映射 diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/TrackContentVO.cs b/src/TrackCenter.Domain/Dtos/TrackContents/TrackContentVO.cs similarity index 97% rename from src/SJZY.Track.Domain/Dtos/TrackContents/TrackContentVO.cs rename to src/TrackCenter.Domain/Dtos/TrackContents/TrackContentVO.cs index f9a126fb..946bb5d4 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackContents/TrackContentVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackContents/TrackContentVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackContents; +namespace TrackCenter.Domain.Dtos.TrackContents; public class TrackContentVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackDetails/GetOrderTracksDictVO.cs b/src/TrackCenter.Domain/Dtos/TrackDetails/GetOrderTracksDictVO.cs similarity index 95% rename from src/SJZY.Track.Domain/Dtos/TrackDetails/GetOrderTracksDictVO.cs rename to src/TrackCenter.Domain/Dtos/TrackDetails/GetOrderTracksDictVO.cs index b44a8e1f..78eeb10c 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackDetails/GetOrderTracksDictVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackDetails/GetOrderTracksDictVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackDetails; +namespace TrackCenter.Domain.Dtos.TrackDetails; public class GetOrderTracksDictVO { @@ -10,7 +10,7 @@ public class GetOrderTracksDictVO // 订单id 与 轨迹内容id 同时满足 public Dictionary>? OrderIdTrackContentIdsDict { get; set; } - + // 订单id 与 轨迹code 同时满足 public Dictionary>? OrderIdTrackCodesDict { get; set; } @@ -25,4 +25,4 @@ public class GetOrderTracksDictVO public bool HasOrderIdTrackContentIdsDict => OrderIdTrackContentIdsDict?.Count > 0; public bool HasOrderIdTrackCodesDict => OrderIdTrackCodesDict?.Count > 0; public bool HasOrderIdTracksStatusIdDict => OrderIdTracksStatusIdsDict?.Count > 0; -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs b/src/TrackCenter.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs similarity index 96% rename from src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs rename to src/TrackCenter.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs index 230b04f1..58541015 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackFlags; +namespace TrackCenter.Domain.Dtos.TrackFlags; public class GetPageTrackFlagVO : PageInfoInput { diff --git a/src/SJZY.Track.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs b/src/TrackCenter.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs similarity index 92% rename from src/SJZY.Track.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs rename to src/TrackCenter.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs index 566ee661..1abddd3c 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackFlags; +namespace TrackCenter.Domain.Dtos.TrackFlags; public class GetTrackFlagDetailVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackNode/TrackNodeDicDto.cs b/src/TrackCenter.Domain/Dtos/TrackNode/TrackNodeDicDto.cs similarity index 87% rename from src/SJZY.Track.Domain/Dtos/TrackNode/TrackNodeDicDto.cs rename to src/TrackCenter.Domain/Dtos/TrackNode/TrackNodeDicDto.cs index fd54eb6a..a34f24f8 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackNode/TrackNodeDicDto.cs +++ b/src/TrackCenter.Domain/Dtos/TrackNode/TrackNodeDicDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackNode; +namespace TrackCenter.Domain.Dtos.TrackNode; public class TrackNodeDicDto { diff --git a/src/SJZY.Track.Domain/Dtos/TrackNode/TrackNodeDto.cs b/src/TrackCenter.Domain/Dtos/TrackNode/TrackNodeDto.cs similarity index 96% rename from src/SJZY.Track.Domain/Dtos/TrackNode/TrackNodeDto.cs rename to src/TrackCenter.Domain/Dtos/TrackNode/TrackNodeDto.cs index fbb8e783..fbf3709e 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackNode/TrackNodeDto.cs +++ b/src/TrackCenter.Domain/Dtos/TrackNode/TrackNodeDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackNode; +namespace TrackCenter.Domain.Dtos.TrackNode; /// /// 轨迹节点主表 DTO diff --git a/src/SJZY.Track.Domain/Dtos/TrackNode/TrackNodePageDto.cs b/src/TrackCenter.Domain/Dtos/TrackNode/TrackNodePageDto.cs similarity index 85% rename from src/SJZY.Track.Domain/Dtos/TrackNode/TrackNodePageDto.cs rename to src/TrackCenter.Domain/Dtos/TrackNode/TrackNodePageDto.cs index 9de6342e..436dd535 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackNode/TrackNodePageDto.cs +++ b/src/TrackCenter.Domain/Dtos/TrackNode/TrackNodePageDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackNode; +namespace TrackCenter.Domain.Dtos.TrackNode; public class TrackNodePageDto : PageInfoInput { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs b/src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs similarity index 97% rename from src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs rename to src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs index 57e1f3f9..e919a1cb 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPull; +namespace TrackCenter.Domain.Dtos.TrackPull; public class GetTrackPullConfigDetailOutputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigPageOutputVO.cs b/src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullConfigPageOutputVO.cs similarity index 91% rename from src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigPageOutputVO.cs rename to src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullConfigPageOutputVO.cs index 7090affb..8935232a 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigPageOutputVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullConfigPageOutputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPull; +namespace TrackCenter.Domain.Dtos.TrackPull; public class GetTrackPullConfigPageOutputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs b/src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs similarity index 96% rename from src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs rename to src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs index 952c02ef..7aaa7b05 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPull; +namespace TrackCenter.Domain.Dtos.TrackPull; public class GetTrackPullContentDetailOutputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentListCacheVO.cs b/src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullContentListCacheVO.cs similarity index 96% rename from src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentListCacheVO.cs rename to src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullContentListCacheVO.cs index 100b9577..8d3c17c2 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentListCacheVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullContentListCacheVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPull; +namespace TrackCenter.Domain.Dtos.TrackPull; public class GetTrackPullContentListCacheVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageInputVO.cs b/src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullContentPageInputVO.cs similarity index 79% rename from src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageInputVO.cs rename to src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullContentPageInputVO.cs index 6367be32..1a509d6f 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageInputVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullContentPageInputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPull; +namespace TrackCenter.Domain.Dtos.TrackPull; public class GetTrackPullContentPageInputVO : PageInfoInput { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageOutputVO.cs b/src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullContentPageOutputVO.cs similarity index 96% rename from src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageOutputVO.cs rename to src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullContentPageOutputVO.cs index 2fac5ae1..b822f874 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageOutputVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullContentPageOutputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPull; +namespace TrackCenter.Domain.Dtos.TrackPull; public class GetTrackPullContentPageOutputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/TrackPullConfigVo.cs b/src/TrackCenter.Domain/Dtos/TrackPull/TrackPullConfigVo.cs similarity index 92% rename from src/SJZY.Track.Domain/Dtos/TrackPull/TrackPullConfigVo.cs rename to src/TrackCenter.Domain/Dtos/TrackPull/TrackPullConfigVo.cs index 1a28568d..628533d7 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPull/TrackPullConfigVo.cs +++ b/src/TrackCenter.Domain/Dtos/TrackPull/TrackPullConfigVo.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPull; +namespace TrackCenter.Domain.Dtos.TrackPull; public class TrackPullConfigVo { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetConfigTagsInputVO.cs b/src/TrackCenter.Domain/Dtos/TrackPush/GetConfigTagsInputVO.cs similarity index 77% rename from src/SJZY.Track.Domain/Dtos/TrackPush/GetConfigTagsInputVO.cs rename to src/TrackCenter.Domain/Dtos/TrackPush/GetConfigTagsInputVO.cs index 95c4745b..b301b54b 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetConfigTagsInputVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackPush/GetConfigTagsInputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPush; +namespace TrackCenter.Domain.Dtos.TrackPush; public class GetConfigTagsInputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs b/src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs similarity index 94% rename from src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs rename to src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs index f8cff929..8e5246c0 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs @@ -1,6 +1,6 @@ -using SJZY.Track.Domain.Enums; +using TrackCenter.Domain.Enums; -namespace SJZY.Track.Domain.Dtos.TrackPush; +namespace TrackCenter.Domain.Dtos.TrackPush; public class GetTrackPushConfigDetailOutputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigPageOutputVO.cs b/src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushConfigPageOutputVO.cs similarity index 91% rename from src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigPageOutputVO.cs rename to src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushConfigPageOutputVO.cs index 8ec22d34..9ce1c152 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigPageOutputVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushConfigPageOutputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPush; +namespace TrackCenter.Domain.Dtos.TrackPush; public class GetTrackPushConfigPageOutputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs b/src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs similarity index 96% rename from src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs rename to src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs index 7ef7e9f8..0dff6496 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPush; +namespace TrackCenter.Domain.Dtos.TrackPush; public class GetTrackPushContentDetailOutputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentListVo.cs b/src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushContentListVo.cs similarity index 94% rename from src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentListVo.cs rename to src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushContentListVo.cs index f2261703..9c6d8cdd 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentListVo.cs +++ b/src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushContentListVo.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPush; +namespace TrackCenter.Domain.Dtos.TrackPush; public class GetTrackPushContentListVo { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageInputVO.cs b/src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushContentPageInputVO.cs similarity index 88% rename from src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageInputVO.cs rename to src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushContentPageInputVO.cs index 6ad38fbe..50abfed2 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageInputVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushContentPageInputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPush; +namespace TrackCenter.Domain.Dtos.TrackPush; public class GetTrackPushContentPageInputVO : PageInfoInput { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs b/src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs similarity index 96% rename from src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs rename to src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs index 6b730f2b..899c97e2 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPush; +namespace TrackCenter.Domain.Dtos.TrackPush; public class GetTrackPushContentPageOutputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/QueryTrackPullMappingsInfoVO.cs b/src/TrackCenter.Domain/Dtos/TrackPush/QueryTrackPullMappingsInfoVO.cs similarity index 95% rename from src/SJZY.Track.Domain/Dtos/TrackPush/QueryTrackPullMappingsInfoVO.cs rename to src/TrackCenter.Domain/Dtos/TrackPush/QueryTrackPullMappingsInfoVO.cs index 170e127c..776f24ed 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/QueryTrackPullMappingsInfoVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackPush/QueryTrackPullMappingsInfoVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPush; +namespace TrackCenter.Domain.Dtos.TrackPush; /// /// 查询轨迹推送关系入参 diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/TrackPushContentConfigVO.cs b/src/TrackCenter.Domain/Dtos/TrackPush/TrackPushContentConfigVO.cs similarity index 97% rename from src/SJZY.Track.Domain/Dtos/TrackPush/TrackPushContentConfigVO.cs rename to src/TrackCenter.Domain/Dtos/TrackPush/TrackPushContentConfigVO.cs index 98f6f9ee..95f71773 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/TrackPushContentConfigVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackPush/TrackPushContentConfigVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPush; +namespace TrackCenter.Domain.Dtos.TrackPush; public class TrackPushContentConfigVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs b/src/TrackCenter.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs similarity index 88% rename from src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs rename to src/TrackCenter.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs index 2b288d02..82f5e702 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackStatus; +namespace TrackCenter.Domain.Dtos.TrackStatus; public class GetPagedTrackStatusVO : PageInfoInput { diff --git a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs b/src/TrackCenter.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs similarity index 95% rename from src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs rename to src/TrackCenter.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs index c72d5e64..f5bad1d3 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackStatus; +namespace TrackCenter.Domain.Dtos.TrackStatus; public class GetTrackStatusDetailVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs b/src/TrackCenter.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs similarity index 96% rename from src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs rename to src/TrackCenter.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs index f5d157c9..b9c85f7e 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackStatus; +namespace TrackCenter.Domain.Dtos.TrackStatus; public class GetTrackStatusListVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/CanDeleteTrackCodeVO.cs b/src/TrackCenter.Domain/Dtos/TrackTemplate/CanDeleteTrackCodeVO.cs similarity index 70% rename from src/SJZY.Track.Domain/Dtos/TrackTemplate/CanDeleteTrackCodeVO.cs rename to src/TrackCenter.Domain/Dtos/TrackTemplate/CanDeleteTrackCodeVO.cs index c2714285..9a308a5a 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/CanDeleteTrackCodeVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackTemplate/CanDeleteTrackCodeVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackTemplate; +namespace TrackCenter.Domain.Dtos.TrackTemplate; public class CanDeleteTrackCodeVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateListInputVo.cs b/src/TrackCenter.Domain/Dtos/TrackTemplate/GetPageTrackTemplateListInputVo.cs similarity index 91% rename from src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateListInputVo.cs rename to src/TrackCenter.Domain/Dtos/TrackTemplate/GetPageTrackTemplateListInputVo.cs index f801ffdc..11087e4c 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateListInputVo.cs +++ b/src/TrackCenter.Domain/Dtos/TrackTemplate/GetPageTrackTemplateListInputVo.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackTemplate; +namespace TrackCenter.Domain.Dtos.TrackTemplate; public class GetPageTrackTemplateListInputVo : PageInfoInput { diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateVO.cs b/src/TrackCenter.Domain/Dtos/TrackTemplate/GetPageTrackTemplateVO.cs similarity index 88% rename from src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateVO.cs rename to src/TrackCenter.Domain/Dtos/TrackTemplate/GetPageTrackTemplateVO.cs index d82741d0..685dc650 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackTemplate/GetPageTrackTemplateVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackTemplate; +namespace TrackCenter.Domain.Dtos.TrackTemplate; public class GetPageTrackTemplateVO : PageInfoInput { diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentDetailOutputVo.cs b/src/TrackCenter.Domain/Dtos/TrackTemplate/GetTrackTemplateContentDetailOutputVo.cs similarity index 94% rename from src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentDetailOutputVo.cs rename to src/TrackCenter.Domain/Dtos/TrackTemplate/GetTrackTemplateContentDetailOutputVo.cs index f8c1d629..7021027e 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentDetailOutputVo.cs +++ b/src/TrackCenter.Domain/Dtos/TrackTemplate/GetTrackTemplateContentDetailOutputVo.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackTemplate; +namespace TrackCenter.Domain.Dtos.TrackTemplate; public class GetTrackTemplateContentDetailOutputVo { diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageInputVO.cs b/src/TrackCenter.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageInputVO.cs similarity index 78% rename from src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageInputVO.cs rename to src/TrackCenter.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageInputVO.cs index 4d5bc0db..64da5036 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageInputVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageInputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackTemplate; +namespace TrackCenter.Domain.Dtos.TrackTemplate; public class GetTrackTemplateContentPageInputVO : PageInfoInput { diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs b/src/TrackCenter.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs similarity index 96% rename from src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs rename to src/TrackCenter.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs index 64de62bb..9d7c1c7e 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackTemplate; +namespace TrackCenter.Domain.Dtos.TrackTemplate; public class GetTrackTemplateContentPageOutputVO { diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs b/src/TrackCenter.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs similarity index 96% rename from src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs rename to src/TrackCenter.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs index 1fa2b4a0..5b2a18c3 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackTemplate; +namespace TrackCenter.Domain.Dtos.TrackTemplate; /// /// 获取轨迹模版明细 diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateListInputVo.cs b/src/TrackCenter.Domain/Dtos/TrackTemplate/GetTrackTemplateListInputVo.cs similarity index 90% rename from src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateListInputVo.cs rename to src/TrackCenter.Domain/Dtos/TrackTemplate/GetTrackTemplateListInputVo.cs index a2f111a7..b785b6d5 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateListInputVo.cs +++ b/src/TrackCenter.Domain/Dtos/TrackTemplate/GetTrackTemplateListInputVo.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackTemplate; +namespace TrackCenter.Domain.Dtos.TrackTemplate; public class GetTrackTemplateListInputVo { diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/OrderedTrackCodeDto.cs b/src/TrackCenter.Domain/Dtos/TrackTemplate/OrderedTrackCodeDto.cs similarity index 90% rename from src/SJZY.Track.Domain/Dtos/TrackTemplate/OrderedTrackCodeDto.cs rename to src/TrackCenter.Domain/Dtos/TrackTemplate/OrderedTrackCodeDto.cs index 0a5e25a2..2a4ca35c 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/OrderedTrackCodeDto.cs +++ b/src/TrackCenter.Domain/Dtos/TrackTemplate/OrderedTrackCodeDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackTemplate; +namespace TrackCenter.Domain.Dtos.TrackTemplate; public class OrderedTrackCodeDto { diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/TrackTemplateOutputVo.cs b/src/TrackCenter.Domain/Dtos/TrackTemplate/TrackTemplateOutputVo.cs similarity index 97% rename from src/SJZY.Track.Domain/Dtos/TrackTemplate/TrackTemplateOutputVo.cs rename to src/TrackCenter.Domain/Dtos/TrackTemplate/TrackTemplateOutputVo.cs index 0483afa8..c1064d82 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/TrackTemplateOutputVo.cs +++ b/src/TrackCenter.Domain/Dtos/TrackTemplate/TrackTemplateOutputVo.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackTemplate; +namespace TrackCenter.Domain.Dtos.TrackTemplate; public class TrackTemplateOutputVo { diff --git a/src/SJZY.Track.Domain/Dtos/Warning/BulkCloseCompleteWarningDetailsVO.cs b/src/TrackCenter.Domain/Dtos/Warning/BulkCloseCompleteWarningDetailsVO.cs similarity index 92% rename from src/SJZY.Track.Domain/Dtos/Warning/BulkCloseCompleteWarningDetailsVO.cs rename to src/TrackCenter.Domain/Dtos/Warning/BulkCloseCompleteWarningDetailsVO.cs index 3bbb8c78..5da6feec 100644 --- a/src/SJZY.Track.Domain/Dtos/Warning/BulkCloseCompleteWarningDetailsVO.cs +++ b/src/TrackCenter.Domain/Dtos/Warning/BulkCloseCompleteWarningDetailsVO.cs @@ -1,6 +1,6 @@ -using SJZY.Track.Domain.Enums; +using TrackCenter.Domain.Enums; -namespace SJZY.Track.Domain.Dtos.Warning; +namespace TrackCenter.Domain.Dtos.Warning; public class BulkCloseCompleteWarningDetailsVO { diff --git a/src/SJZY.Track.Domain/Dtos/Warning/BulkCloseReturnWarningDetailsVO.cs b/src/TrackCenter.Domain/Dtos/Warning/BulkCloseReturnWarningDetailsVO.cs similarity index 91% rename from src/SJZY.Track.Domain/Dtos/Warning/BulkCloseReturnWarningDetailsVO.cs rename to src/TrackCenter.Domain/Dtos/Warning/BulkCloseReturnWarningDetailsVO.cs index 34e1ed55..194c37e3 100644 --- a/src/SJZY.Track.Domain/Dtos/Warning/BulkCloseReturnWarningDetailsVO.cs +++ b/src/TrackCenter.Domain/Dtos/Warning/BulkCloseReturnWarningDetailsVO.cs @@ -1,6 +1,6 @@ -using SJZY.Track.Domain.Enums; +using TrackCenter.Domain.Enums; -namespace SJZY.Track.Domain.Dtos.Warning; +namespace TrackCenter.Domain.Dtos.Warning; public class BulkCloseReturnWarningDetailsVO { diff --git a/src/SJZY.Track.Domain/Dtos/Warning/BulkCloseTransportWarningDetailsVO.cs b/src/TrackCenter.Domain/Dtos/Warning/BulkCloseTransportWarningDetailsVO.cs similarity index 91% rename from src/SJZY.Track.Domain/Dtos/Warning/BulkCloseTransportWarningDetailsVO.cs rename to src/TrackCenter.Domain/Dtos/Warning/BulkCloseTransportWarningDetailsVO.cs index 2eb0f68e..8cf3bbd9 100644 --- a/src/SJZY.Track.Domain/Dtos/Warning/BulkCloseTransportWarningDetailsVO.cs +++ b/src/TrackCenter.Domain/Dtos/Warning/BulkCloseTransportWarningDetailsVO.cs @@ -1,6 +1,6 @@ -using SJZY.Track.Domain.Enums; +using TrackCenter.Domain.Enums; -namespace SJZY.Track.Domain.Dtos.Warning; +namespace TrackCenter.Domain.Dtos.Warning; public class BulkCloseTransportWarningDetailsVO { @@ -10,13 +10,13 @@ public class BulkCloseTransportWarningDetailsVO TransportWarningStatus.即将超时.GetHashCode(), TransportWarningStatus.已超时.GetHashCode() }; - + public HashSet? DetailsIds { get; set; } public HashSet? RuleItemIds { get; set; } public HashSet? SceneIds { get; set; } public HashSet? WarningIds { get; set; } public HashSet? OrderIds { get; set; } - + public HashSet Status { get; set; } = DefaultFollowStatus; public bool HasDetailsIds => DetailsIds?.Count > 0; @@ -24,4 +24,4 @@ public class BulkCloseTransportWarningDetailsVO public bool HasSceneIds => SceneIds?.Count > 0; public bool HasWarningIds => WarningIds?.Count > 0; public bool HasOrderIds => OrderIds?.Count > 0; -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Domain/Dtos/Warning/GetCompleteWarningDetailsVO.cs b/src/TrackCenter.Domain/Dtos/Warning/GetCompleteWarningDetailsVO.cs similarity index 93% rename from src/SJZY.Track.Domain/Dtos/Warning/GetCompleteWarningDetailsVO.cs rename to src/TrackCenter.Domain/Dtos/Warning/GetCompleteWarningDetailsVO.cs index 1e704c75..43257eb8 100644 --- a/src/SJZY.Track.Domain/Dtos/Warning/GetCompleteWarningDetailsVO.cs +++ b/src/TrackCenter.Domain/Dtos/Warning/GetCompleteWarningDetailsVO.cs @@ -1,6 +1,6 @@ -using SJZY.Track.Domain.Enums; +using TrackCenter.Domain.Enums; -namespace SJZY.Track.Domain.Dtos.Warning; +namespace TrackCenter.Domain.Dtos.Warning; public class GetCompleteWarningDetailsVO { diff --git a/src/SJZY.Track.Domain/Dtos/Warning/GetPageCompleteWarningDetailsInputVO.cs b/src/TrackCenter.Domain/Dtos/Warning/GetPageCompleteWarningDetailsInputVO.cs similarity index 96% rename from src/SJZY.Track.Domain/Dtos/Warning/GetPageCompleteWarningDetailsInputVO.cs rename to src/TrackCenter.Domain/Dtos/Warning/GetPageCompleteWarningDetailsInputVO.cs index 294b17b8..b77a0e59 100644 --- a/src/SJZY.Track.Domain/Dtos/Warning/GetPageCompleteWarningDetailsInputVO.cs +++ b/src/TrackCenter.Domain/Dtos/Warning/GetPageCompleteWarningDetailsInputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Warning; +namespace TrackCenter.Domain.Dtos.Warning; public class GetPageCompleteWarningDetailsInputVO : PageInfoInput { diff --git a/src/SJZY.Track.Domain/Dtos/Warning/GetPageReturnWarningDetailsInputVO.cs b/src/TrackCenter.Domain/Dtos/Warning/GetPageReturnWarningDetailsInputVO.cs similarity index 98% rename from src/SJZY.Track.Domain/Dtos/Warning/GetPageReturnWarningDetailsInputVO.cs rename to src/TrackCenter.Domain/Dtos/Warning/GetPageReturnWarningDetailsInputVO.cs index 2f54b823..7229a4fd 100644 --- a/src/SJZY.Track.Domain/Dtos/Warning/GetPageReturnWarningDetailsInputVO.cs +++ b/src/TrackCenter.Domain/Dtos/Warning/GetPageReturnWarningDetailsInputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Warning; +namespace TrackCenter.Domain.Dtos.Warning; /// /// 分页获取回传预警明细输入 diff --git a/src/SJZY.Track.Domain/Dtos/Warning/GetPageTransportWarningDetailsInputVO.cs b/src/TrackCenter.Domain/Dtos/Warning/GetPageTransportWarningDetailsInputVO.cs similarity index 96% rename from src/SJZY.Track.Domain/Dtos/Warning/GetPageTransportWarningDetailsInputVO.cs rename to src/TrackCenter.Domain/Dtos/Warning/GetPageTransportWarningDetailsInputVO.cs index 738fabc0..b332a662 100644 --- a/src/SJZY.Track.Domain/Dtos/Warning/GetPageTransportWarningDetailsInputVO.cs +++ b/src/TrackCenter.Domain/Dtos/Warning/GetPageTransportWarningDetailsInputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.Warning; +namespace TrackCenter.Domain.Dtos.Warning; /// /// 分页获取运输预警明细 diff --git a/src/SJZY.Track.Domain/Dtos/Warning/GetReturnWarningDetailsVO.cs b/src/TrackCenter.Domain/Dtos/Warning/GetReturnWarningDetailsVO.cs similarity index 94% rename from src/SJZY.Track.Domain/Dtos/Warning/GetReturnWarningDetailsVO.cs rename to src/TrackCenter.Domain/Dtos/Warning/GetReturnWarningDetailsVO.cs index 795cfaa6..e1f19388 100644 --- a/src/SJZY.Track.Domain/Dtos/Warning/GetReturnWarningDetailsVO.cs +++ b/src/TrackCenter.Domain/Dtos/Warning/GetReturnWarningDetailsVO.cs @@ -1,6 +1,6 @@ -using SJZY.Track.Domain.Enums; +using TrackCenter.Domain.Enums; -namespace SJZY.Track.Domain.Dtos.Warning; +namespace TrackCenter.Domain.Dtos.Warning; public class GetReturnWarningDetailsVO { diff --git a/src/SJZY.Track.Domain/Dtos/Warning/GetTransportWarningDetailsVO.cs b/src/TrackCenter.Domain/Dtos/Warning/GetTransportWarningDetailsVO.cs similarity index 94% rename from src/SJZY.Track.Domain/Dtos/Warning/GetTransportWarningDetailsVO.cs rename to src/TrackCenter.Domain/Dtos/Warning/GetTransportWarningDetailsVO.cs index dc14d3c4..6147eef6 100644 --- a/src/SJZY.Track.Domain/Dtos/Warning/GetTransportWarningDetailsVO.cs +++ b/src/TrackCenter.Domain/Dtos/Warning/GetTransportWarningDetailsVO.cs @@ -1,6 +1,6 @@ -using SJZY.Track.Domain.Enums; +using TrackCenter.Domain.Enums; -namespace SJZY.Track.Domain.Dtos.Warning; +namespace TrackCenter.Domain.Dtos.Warning; public class GetTransportWarningDetailsVO { diff --git a/src/SJZY.Track.Domain/Enums/CompleteWarningStatus.cs b/src/TrackCenter.Domain/Enums/CompleteWarningStatus.cs similarity index 72% rename from src/SJZY.Track.Domain/Enums/CompleteWarningStatus.cs rename to src/TrackCenter.Domain/Enums/CompleteWarningStatus.cs index 943dccf7..d17cf686 100644 --- a/src/SJZY.Track.Domain/Enums/CompleteWarningStatus.cs +++ b/src/TrackCenter.Domain/Enums/CompleteWarningStatus.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Enums; +namespace TrackCenter.Domain.Enums; public enum CompleteWarningStatus { diff --git a/src/SJZY.Track.Domain/Enums/DateTimeFormatEnum.cs b/src/TrackCenter.Domain/Enums/DateTimeFormatEnum.cs similarity index 89% rename from src/SJZY.Track.Domain/Enums/DateTimeFormatEnum.cs rename to src/TrackCenter.Domain/Enums/DateTimeFormatEnum.cs index a54e6ece..357e73eb 100644 --- a/src/SJZY.Track.Domain/Enums/DateTimeFormatEnum.cs +++ b/src/TrackCenter.Domain/Enums/DateTimeFormatEnum.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Enums; +namespace TrackCenter.Domain.Enums; /// /// 时间样式枚举 diff --git a/src/SJZY.Track.Domain/Enums/EnumPropertyEnums.cs b/src/TrackCenter.Domain/Enums/EnumPropertyEnums.cs similarity index 92% rename from src/SJZY.Track.Domain/Enums/EnumPropertyEnums.cs rename to src/TrackCenter.Domain/Enums/EnumPropertyEnums.cs index 35bcc3ae..89d04bf1 100644 --- a/src/SJZY.Track.Domain/Enums/EnumPropertyEnums.cs +++ b/src/TrackCenter.Domain/Enums/EnumPropertyEnums.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace SJZY.Track.Domain.Enums; +namespace TrackCenter.Domain.Enums; /// /// 枚举属性 diff --git a/src/SJZY.Track.Domain/Enums/ReturnWarningStatus.cs b/src/TrackCenter.Domain/Enums/ReturnWarningStatus.cs similarity index 76% rename from src/SJZY.Track.Domain/Enums/ReturnWarningStatus.cs rename to src/TrackCenter.Domain/Enums/ReturnWarningStatus.cs index a0d28b00..ad399fc8 100644 --- a/src/SJZY.Track.Domain/Enums/ReturnWarningStatus.cs +++ b/src/TrackCenter.Domain/Enums/ReturnWarningStatus.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Enums; +namespace TrackCenter.Domain.Enums; public enum ReturnWarningStatus { diff --git a/src/SJZY.Track.Domain/Enums/TimezoneSourceEnum.cs b/src/TrackCenter.Domain/Enums/TimezoneSourceEnum.cs similarity index 94% rename from src/SJZY.Track.Domain/Enums/TimezoneSourceEnum.cs rename to src/TrackCenter.Domain/Enums/TimezoneSourceEnum.cs index 17c55bb5..68b9ede7 100644 --- a/src/SJZY.Track.Domain/Enums/TimezoneSourceEnum.cs +++ b/src/TrackCenter.Domain/Enums/TimezoneSourceEnum.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Enums; +namespace TrackCenter.Domain.Enums; /// /// 推送轨迹时区来源 diff --git a/src/SJZY.Track.Domain/Enums/TrackLocationValue.cs b/src/TrackCenter.Domain/Enums/TrackLocationValue.cs similarity index 81% rename from src/SJZY.Track.Domain/Enums/TrackLocationValue.cs rename to src/TrackCenter.Domain/Enums/TrackLocationValue.cs index 61259829..78080982 100644 --- a/src/SJZY.Track.Domain/Enums/TrackLocationValue.cs +++ b/src/TrackCenter.Domain/Enums/TrackLocationValue.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Enums; +namespace TrackCenter.Domain.Enums; public enum TrackLocationValue { diff --git a/src/SJZY.Track.Domain/Enums/TrackProblemType.cs b/src/TrackCenter.Domain/Enums/TrackProblemType.cs similarity index 90% rename from src/SJZY.Track.Domain/Enums/TrackProblemType.cs rename to src/TrackCenter.Domain/Enums/TrackProblemType.cs index ef7ba7bf..913b71c5 100644 --- a/src/SJZY.Track.Domain/Enums/TrackProblemType.cs +++ b/src/TrackCenter.Domain/Enums/TrackProblemType.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace SJZY.Track.Domain.Enums; +namespace TrackCenter.Domain.Enums; [Flags] public enum TrackProblemType diff --git a/src/SJZY.Track.Domain/Enums/TrackSourceEnum.cs b/src/TrackCenter.Domain/Enums/TrackSourceEnum.cs similarity index 92% rename from src/SJZY.Track.Domain/Enums/TrackSourceEnum.cs rename to src/TrackCenter.Domain/Enums/TrackSourceEnum.cs index a0107979..1802af9b 100644 --- a/src/SJZY.Track.Domain/Enums/TrackSourceEnum.cs +++ b/src/TrackCenter.Domain/Enums/TrackSourceEnum.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace SJZY.Track.Domain.Enums; +namespace TrackCenter.Domain.Enums; /// /// 轨迹来源 diff --git a/src/SJZY.Track.Domain/Enums/TransportWarningStatus.cs b/src/TrackCenter.Domain/Enums/TransportWarningStatus.cs similarity index 79% rename from src/SJZY.Track.Domain/Enums/TransportWarningStatus.cs rename to src/TrackCenter.Domain/Enums/TransportWarningStatus.cs index fe4d605d..e8f979c3 100644 --- a/src/SJZY.Track.Domain/Enums/TransportWarningStatus.cs +++ b/src/TrackCenter.Domain/Enums/TransportWarningStatus.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Enums; +namespace TrackCenter.Domain.Enums; public enum TransportWarningStatus { diff --git a/src/SJZY.Track.Domain/Enums/WarningRuleType.cs b/src/TrackCenter.Domain/Enums/WarningRuleType.cs similarity index 75% rename from src/SJZY.Track.Domain/Enums/WarningRuleType.cs rename to src/TrackCenter.Domain/Enums/WarningRuleType.cs index 889de9c1..c66ad3db 100644 --- a/src/SJZY.Track.Domain/Enums/WarningRuleType.cs +++ b/src/TrackCenter.Domain/Enums/WarningRuleType.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Enums; +namespace TrackCenter.Domain.Enums; public enum WarningRuleType { diff --git a/src/SJZY.Track.Domain/Extensions/Empty.cs b/src/TrackCenter.Domain/Extensions/Empty.cs similarity index 86% rename from src/SJZY.Track.Domain/Extensions/Empty.cs rename to src/TrackCenter.Domain/Extensions/Empty.cs index cddd8027..cf7615dd 100644 --- a/src/SJZY.Track.Domain/Extensions/Empty.cs +++ b/src/TrackCenter.Domain/Extensions/Empty.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Extensions; +namespace TrackCenter.Domain.Extensions; public static class Empty { diff --git a/src/SJZY.Track.Domain/Extensions/EnumExtensions.cs b/src/TrackCenter.Domain/Extensions/EnumExtensions.cs similarity index 81% rename from src/SJZY.Track.Domain/Extensions/EnumExtensions.cs rename to src/TrackCenter.Domain/Extensions/EnumExtensions.cs index 1c4762ab..0d2c4164 100644 --- a/src/SJZY.Track.Domain/Extensions/EnumExtensions.cs +++ b/src/TrackCenter.Domain/Extensions/EnumExtensions.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Extensions; +namespace TrackCenter.Domain.Extensions; public static class EnumExtensions { diff --git a/src/TrackCenter.Domain/Extensions/LogHelper.cs b/src/TrackCenter.Domain/Extensions/LogHelper.cs new file mode 100644 index 00000000..2c3d5df9 --- /dev/null +++ b/src/TrackCenter.Domain/Extensions/LogHelper.cs @@ -0,0 +1,115 @@ +using System.Net.Http.Headers; +using System.Text; +using System.Text.Json; +using Fake.SyncEx; +using Serilog; + +namespace TrackCenter.Domain.Extensions; + +public static class LogHelper +{ + private static FeiShuNoticeOptions _options = null!; + + public static void Init(FeiShuNoticeOptions options) + { + _options = options; + } + public static void Info(string msg, bool isSend = false) + { + Log.Information(msg); + if (!isSend) + return; + SyncContext.Run(() => NoticeAsync(msg, isSend, "Info")); + } + + public static void Warn(string msg, bool isSend = false) + { + Log.Warning(msg); + if (!isSend) + return; + SyncContext.Run(() => NoticeAsync(msg, isSend, "Warn")); + } + + public static void Error(string msg, bool isSend = true) + { + Log.Error(msg); + SyncContext.Run(() => NoticeAsync(msg, isSend, "Error")); + } + + public static async Task NoticeAsync(string content, bool isSend, string subTitle = "") + { +#if DEBUG + // 调试模式下不发送通知 + return; +#endif + if (!isSend) + { + return; + } + + if (_options.Webhook.IsNullOrWhiteSpace()) + { + Log.Warning("未配置飞书webhook"); + return; + } + + var title = subTitle.IsNullOrWhiteSpace() + ? _options.TitlePrefix + : _options.TitlePrefix + "_" + subTitle; + + await HandleNoticeAsync(content, title); + } + + private static async Task HandleNoticeAsync(string content, string title) + { + var message = new + { + msg_type = "post", + content = new + { + post = new + { + zh_cn = new + { + title, + content = new List() + { + new List() + { + new + { + tag = "text", + text = content + Environment.NewLine + } + } + } + } + } + } + }; + + using var httpClient = new HttpClient(); + httpClient.Timeout = TimeSpan.FromSeconds(_options.Timeout); + using var httpContent = new StringContent(JsonSerializer.Serialize(message), Encoding.UTF8); + httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json"); + await httpClient.PostAsync(_options.Webhook, httpContent); + } +} + +public class FeiShuNoticeOptions +{ + /// + /// 飞书通知webhook + /// + public string Webhook { get; set; } + + /// + /// 消息标题前缀 + /// + public string TitlePrefix { get; set; } + + /// + /// 超时时间 秒 + /// + public int Timeout { get; set; } = 20; +} diff --git a/src/SJZY.Track.Domain/Extensions/PollyHelper.cs b/src/TrackCenter.Domain/Extensions/PollyHelper.cs similarity index 93% rename from src/SJZY.Track.Domain/Extensions/PollyHelper.cs rename to src/TrackCenter.Domain/Extensions/PollyHelper.cs index 4fcf508f..425aac25 100644 --- a/src/SJZY.Track.Domain/Extensions/PollyHelper.cs +++ b/src/TrackCenter.Domain/Extensions/PollyHelper.cs @@ -1,6 +1,6 @@ -using SJZY.Expand.ABP.Core.PublicMethords; +using InterfaceForward.Domain.Shared.Helpers; -namespace SJZY.Track.Domain.Extensions; +namespace TrackCenter.Domain.Extensions; public static class PollyHelper { diff --git a/src/TrackCenter.Domain/Extensions/PublicExtensions.cs b/src/TrackCenter.Domain/Extensions/PublicExtensions.cs new file mode 100644 index 00000000..df75a37a --- /dev/null +++ b/src/TrackCenter.Domain/Extensions/PublicExtensions.cs @@ -0,0 +1,327 @@ +using System.ComponentModel; +using System.Reflection; +using System.Security.Cryptography; +using System.Text; +using System.Text.Json; +using System.Text.RegularExpressions; +using Fake; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; + +namespace InterfaceForward.Domain.Shared.Helpers; + +public static class PublicExtensions +{ + public static string If(this string str, bool condition) + { + return condition ? str : string.Empty; + } + + public static int ToInt(this string str) + { + int iValue = 0; + int.TryParse(str, out iValue); + return iValue; + } + + #region Json 操作 + + /// + /// 获取对象Json序列化结果 + /// + /// + /// + public static string ToJson(this object jsonObject) + { + return jsonObject == null ? null : JsonConvert.SerializeObject(jsonObject); + } + + /// + /// 获取字符串的Json反序列化结果 + /// + /// + /// + public static T? ToObject(this string json) + { + return json.IsNullOrWhiteSpace() ? default : JsonConvert.DeserializeObject(json); + } + + /// + /// 获取对象Json序列化结果，忽略异常 + /// + /// + /// + public static string TryToJson(this object obj) + { + try + { + return obj.ToJson(); + } + catch + { + } + + return ""; + } + + /// + /// 简单判断一个对象是否是有效json + /// + /// + /// + public static bool IsJson(this string jsonStr) + { + const string jsonPattern = @"^(\{.*\}|\[.*\])$"; + return Regex.IsMatch(jsonStr.Trim(), jsonPattern); + } + + #endregion + + #region Base64 操作 + + /// + /// 获取字符串base64 + /// + /// + /// + public static string GetBase64EncodeString(this string str) + { + if (string.IsNullOrEmpty(str)) + { + return ""; + } + + byte[] bytes = Encoding.UTF8.GetBytes(str); + return Convert.ToBase64String(bytes); + } + + /// + /// 解析base64 + /// + /// + /// + public static string GetBase64DecodeString(this string str) + { + if (string.IsNullOrEmpty(str)) + { + return ""; + } + + byte[] bytes = Convert.FromBase64String(str); + return Encoding.UTF8.GetString(bytes); + } + + #endregion + + #region MD5 操作 + + /// + /// 获取字符串MD5 + /// + /// 原串 + /// 盐 + /// + public static string GetMD5(this string target, string salt = "") + { + byte[] bytes = Encoding.UTF8.GetBytes(target + (string.IsNullOrEmpty(salt) ? "" : salt)); + return bytes.GetMD5(); + } + + /// + /// 获得字符MD5 + /// + /// + /// + public static string GetMD5(this byte[] bytes) + { + using (MD5 md5 = MD5.Create()) + { + byte[] computeBytes = md5.ComputeHash(bytes); + string result = ""; + for (int i = 0; i < computeBytes.Length; i++) + { + result += computeBytes[i].ToString("X").Length == 1 + ? "0" + computeBytes[i].ToString("X") + : computeBytes[i].ToString("X"); + } + + return result; + } + } + + #endregion + + #region Hash操作 + + /// + /// 获取字符串的hash值 + /// + /// + /// + public static string GetHash(this string target) + { + StringBuilder sb = new StringBuilder(); + byte[] strBytes = Encoding.UTF8.GetBytes(target); + using (SHA1 sha1 = SHA1.Create()) + { + byte[] hashBytes = sha1.ComputeHash(strBytes); + + foreach (byte hashByte in hashBytes) + { + sb.Append(hashByte.ToString("x2")); + } + } + + return sb.ToString(); + } + + #endregion + + #region 枚举操作 + + /// + /// 获取枚举类型的描述 + /// + /// + /// + public static string GetDescription(this System.Enum enumeration) + { + Type type = enumeration.GetType(); + MemberInfo[] memInfo = type.GetMember(enumeration.ToString()); + if (null != memInfo && memInfo.Length > 0) + { + object[] attrs = memInfo[0].GetCustomAttributes(typeof(DescriptionAttribute), false); + if (null != attrs && attrs.Length > 0) + return ((DescriptionAttribute)attrs[0]).Description; + } + + return enumeration.ToString(); + } + + #endregion + + #region 枚举转下拉列表方法 + + /// + /// 枚举转下拉列表方法 + /// + /// + /// + //public static List GetDropdownListDataSource() + //{ + // var res = new List(); + // if (!typeof(T).IsEnum) + // { + // return res; + // } + // string desc = string.Empty; + // foreach (var item in Enum.GetValues(typeof(T))) + // { + // var attrs = item.GetType().GetField(item.ToString()).GetCustomAttributes(typeof(DescriptionAttribute), true); + // if (attrs != null && attrs.Length > 0) + // { + // DescriptionAttribute descAttr = attrs[0] as DescriptionAttribute; + // desc = descAttr.Description; + // } + // else + // { + // desc = item.ToString(); + // } + // res.Add(new DropdownListDataDto() { Value = Convert.ToInt32(item), Key = desc }); + // } + // return res; + //} + + #endregion + + #region 深拷贝 + + /// + /// 深拷贝 + /// + /// + /// + /// + public static T DeepCopy(this T obj) + { + if (obj == null) + return default(T); + + var options = new JsonSerializerOptions + { + PropertyNameCaseInsensitive = true, + PropertyNamingPolicy = JsonNamingPolicy.CamelCase + }; + + // 将对象序列化为 JSON 字符串 + var jsonString = System.Text.Json.JsonSerializer.Serialize(obj, options); + + // 使用 JSON 字符串创建一个新的对象 + var clonedObject = System.Text.Json.JsonSerializer.Deserialize(jsonString, options); + + return clonedObject; + } + + #endregion + + #region JObject转字典 + + /// + /// Json转字典 + /// + /// + /// + /// + public static Dictionary TryToDictionary(this JObject jObject, out Exception error) + { + try + { + error = null; + return ToDictionaryInternal(jObject); + } + catch (Exception ex) + { + error = ex; + return null; + } + } + + private static Dictionary ToDictionaryInternal(JObject jObject) + { + var dictionary = new Dictionary(); + + foreach (var property in jObject.Properties()) + { + var key = property.Name; + var value = property.Value; + + if (value is JObject nestedObject) + { + dictionary[key] = ToDictionaryInternal(nestedObject); + } + else if (value is JArray array) + { + dictionary[key] = array.ToObject>(); + } + else + { + dictionary[key] = ((JValue)value).Value; + } + } + + return dictionary; + } + + #endregion + + + /// Removes all items from the collection. + /// Type of the items in the collection + /// The collection + /// Items to be removed from the list + public static void RemoveAll(this ICollection source, IEnumerable items) + { + foreach (T obj in items) + source.Remove(obj); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Extensions/TextJsonHelper.cs b/src/TrackCenter.Domain/Extensions/TextJsonHelper.cs similarity index 99% rename from src/SJZY.Track.Domain/Extensions/TextJsonHelper.cs rename to src/TrackCenter.Domain/Extensions/TextJsonHelper.cs index b53d682a..943ec231 100644 --- a/src/SJZY.Track.Domain/Extensions/TextJsonHelper.cs +++ b/src/TrackCenter.Domain/Extensions/TextJsonHelper.cs @@ -1,6 +1,6 @@ using System.Text.Json; -namespace SJZY.Track.Domain.Extensions; +namespace TrackCenter.Domain.Extensions; /// /// 针对 Text.Json 的一些辅助方法 diff --git a/src/SJZY.Track.Domain/Extensions/VersionGenerate.cs b/src/TrackCenter.Domain/Extensions/VersionGenerate.cs similarity index 88% rename from src/SJZY.Track.Domain/Extensions/VersionGenerate.cs rename to src/TrackCenter.Domain/Extensions/VersionGenerate.cs index 71927df7..c504a132 100644 --- a/src/SJZY.Track.Domain/Extensions/VersionGenerate.cs +++ b/src/TrackCenter.Domain/Extensions/VersionGenerate.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Extensions; +namespace TrackCenter.Domain.Extensions; public static class VersionGenerate { diff --git a/src/SJZY.Track.Domain/FodyWeavers.xml b/src/TrackCenter.Domain/FodyWeavers.xml similarity index 100% rename from src/SJZY.Track.Domain/FodyWeavers.xml rename to src/TrackCenter.Domain/FodyWeavers.xml diff --git a/src/SJZY.Track.Domain/FodyWeavers.xsd b/src/TrackCenter.Domain/FodyWeavers.xsd similarity index 100% rename from src/SJZY.Track.Domain/FodyWeavers.xsd rename to src/TrackCenter.Domain/FodyWeavers.xsd diff --git a/src/TrackCenter.Domain/GlobalUsings.cs b/src/TrackCenter.Domain/GlobalUsings.cs new file mode 100644 index 00000000..ceee0009 --- /dev/null +++ b/src/TrackCenter.Domain/GlobalUsings.cs @@ -0,0 +1,6 @@ +// Global using directives + +global using System; +global using System.Linq.Expressions; +global using SqlSugar; +global using TrackCenter.Domain.Dtos.Common; diff --git a/src/SJZY.Track.Domain/IBasicRepository.cs b/src/TrackCenter.Domain/IBasicRepository.cs similarity index 91% rename from src/SJZY.Track.Domain/IBasicRepository.cs rename to src/TrackCenter.Domain/IBasicRepository.cs index 9d6a4796..6f0bc64b 100644 --- a/src/SJZY.Track.Domain/IBasicRepository.cs +++ b/src/TrackCenter.Domain/IBasicRepository.cs @@ -1,8 +1,9 @@ -using SJZY.Track.Domain.Queries; +using Fake.Domain.Entities; +using Fake.Domain.Repositories; -namespace SJZY.Track.Domain; +namespace TrackCenter.Domain; -public interface IBasicRepository : IBasicQuery where T : IAggregateRoot +public interface IBasicRepository : IRepository where T : class, IAggregateRoot, new() { /// /// update diff --git a/src/TrackCenter.Domain/SJZYTrackDomainModule.cs b/src/TrackCenter.Domain/SJZYTrackDomainModule.cs new file mode 100644 index 00000000..ef8e476a --- /dev/null +++ b/src/TrackCenter.Domain/SJZYTrackDomainModule.cs @@ -0,0 +1,7 @@ +using Fake.Modularity; + +namespace TrackCenter.Domain; + +public class SjzyTrackDomainModule : FakeModule +{ +} diff --git a/src/TrackCenter.Domain/SeedWork/IElasticsearchClientService.cs b/src/TrackCenter.Domain/SeedWork/IElasticsearchClientService.cs new file mode 100644 index 00000000..cc0e3e88 --- /dev/null +++ b/src/TrackCenter.Domain/SeedWork/IElasticsearchClientService.cs @@ -0,0 +1,50 @@ +using Nest; + +namespace TrackCenter.Domain.SeedWork; + +public interface IElasticsearchClientService where T : class +{ + /// + /// 新增文档 + /// + /// 索引数据 + /// + /// + Task IndexDocumentAsync(T data); + + /// + /// 批量新增文档 + /// + /// + /// + /// + /// + /// + Task IndexManyDocumentAsync(List list, bool refresh); + + /// + /// 根据ID获取单条文档 + /// + /// + /// + /// + Task GetByIdAsync(string id); + + /// + /// 修改指定的文档 + /// + /// + /// + /// + /// + /// + Task UpdateAsync(string id, T data); + + /// + /// 根据Id删除文档 + /// + /// + /// + /// + Task DeleteByIdAsync(string id); +} diff --git a/src/TrackCenter.Domain/SeedWork/IdBaseIndex.cs b/src/TrackCenter.Domain/SeedWork/IdBaseIndex.cs new file mode 100644 index 00000000..dbc64cb6 --- /dev/null +++ b/src/TrackCenter.Domain/SeedWork/IdBaseIndex.cs @@ -0,0 +1,6 @@ +namespace TrackCenter.Domain.SeedWork; + +public class IdBaseIndex +{ + public string Id { get; set; } +} diff --git a/src/SJZY.Track.Domain/SeedWork/IdVersionIndex.cs b/src/TrackCenter.Domain/SeedWork/IdVersionIndex.cs similarity index 88% rename from src/SJZY.Track.Domain/SeedWork/IdVersionIndex.cs rename to src/TrackCenter.Domain/SeedWork/IdVersionIndex.cs index 26c93e38..8bb73e96 100644 --- a/src/SJZY.Track.Domain/SeedWork/IdVersionIndex.cs +++ b/src/TrackCenter.Domain/SeedWork/IdVersionIndex.cs @@ -1,7 +1,6 @@ using Nest; -using SJZY.Expand.ElasticSearch; -namespace SJZY.Track.Domain.SeedWork; +namespace TrackCenter.Domain.SeedWork; /// /// 支持返回id和version的es索引 diff --git a/src/TrackCenter.Domain/TrackCenter.Domain.csproj b/src/TrackCenter.Domain/TrackCenter.Domain.csproj new file mode 100644 index 00000000..134ceee4 --- /dev/null +++ b/src/TrackCenter.Domain/TrackCenter.Domain.csproj @@ -0,0 +1,19 @@ + + + + + + net8 + True + + + + + + + + + + + + diff --git a/src/SJZY.Track.Domain/TransactionHelper.cs b/src/TrackCenter.Domain/TransactionHelper.cs similarity index 94% rename from src/SJZY.Track.Domain/TransactionHelper.cs rename to src/TrackCenter.Domain/TransactionHelper.cs index dfe40bcb..804b01b2 100644 --- a/src/SJZY.Track.Domain/TransactionHelper.cs +++ b/src/TrackCenter.Domain/TransactionHelper.cs @@ -1,6 +1,6 @@ using System.Transactions; -namespace SJZY.Track.Domain; +namespace TrackCenter.Domain; public class TransactionHelper { diff --git a/src/SJZY.Track.Domain/VEntities/VAirportEntity.cs b/src/TrackCenter.Domain/VEntities/VAirportEntity.cs similarity index 94% rename from src/SJZY.Track.Domain/VEntities/VAirportEntity.cs rename to src/TrackCenter.Domain/VEntities/VAirportEntity.cs index 4120c0b4..98fa3a93 100644 --- a/src/SJZY.Track.Domain/VEntities/VAirportEntity.cs +++ b/src/TrackCenter.Domain/VEntities/VAirportEntity.cs @@ -1,10 +1,12 @@ -namespace SJZY.Track.Domain.VEntities; +using Fake.Domain.Entities.Auditing; + +namespace TrackCenter.Domain.VEntities; /// /// 空港 /// [SugarTable("v_airport", "空港")] -public class VAirportEntity : IFullAuditedBasicEntitys +public class VAirportEntity : FullAuditedEntity { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } diff --git a/src/SJZY.Track.Domain/VEntities/VCityEntity.cs b/src/TrackCenter.Domain/VEntities/VCityEntity.cs similarity index 95% rename from src/SJZY.Track.Domain/VEntities/VCityEntity.cs rename to src/TrackCenter.Domain/VEntities/VCityEntity.cs index 040fdf19..3d0bbdb3 100644 --- a/src/SJZY.Track.Domain/VEntities/VCityEntity.cs +++ b/src/TrackCenter.Domain/VEntities/VCityEntity.cs @@ -1,7 +1,9 @@ -namespace SJZY.Track.Domain.VEntities; +using Fake.Domain.Entities.Auditing; + +namespace TrackCenter.Domain.VEntities; [SugarTable("v_city")] -public class VCityEntity : IFullAuditedBasicEntitys +public class VCityEntity : FullAuditedEntity { /// /// 主键 diff --git a/src/SJZY.Track.Domain/VEntities/VCountryEntity.cs b/src/TrackCenter.Domain/VEntities/VCountryEntity.cs similarity index 93% rename from src/SJZY.Track.Domain/VEntities/VCountryEntity.cs rename to src/TrackCenter.Domain/VEntities/VCountryEntity.cs index 126cbd18..b5372196 100644 --- a/src/SJZY.Track.Domain/VEntities/VCountryEntity.cs +++ b/src/TrackCenter.Domain/VEntities/VCountryEntity.cs @@ -1,7 +1,9 @@ -namespace SJZY.Track.Domain.VEntities; +using Fake.Domain.Entities.Auditing; + +namespace TrackCenter.Domain.VEntities; [SugarTable("v_country")] -public class VCountryEntity : IFullAuditedBasicEntitys +public class VCountryEntity : FullAuditedEntity { /// /// 主键 diff --git a/src/SJZY.Track.Domain/VEntities/VEnumValueInfo.cs b/src/TrackCenter.Domain/VEntities/VEnumValueInfo.cs similarity index 90% rename from src/SJZY.Track.Domain/VEntities/VEnumValueInfo.cs rename to src/TrackCenter.Domain/VEntities/VEnumValueInfo.cs index eca94a79..8a5fac2f 100644 --- a/src/SJZY.Track.Domain/VEntities/VEnumValueInfo.cs +++ b/src/TrackCenter.Domain/VEntities/VEnumValueInfo.cs @@ -1,10 +1,12 @@ -namespace SJZY.Track.Domain.VEntities; +using Fake.Domain.Entities.Auditing; + +namespace TrackCenter.Domain.VEntities; /// /// 主数据枚举 /// [SugarTable("v_enum_value_info")] -public class VEnumValueInfoEntity : IFullAuditedBasicEntitys +public class VEnumValueInfoEntity : FullAuditedEntity { /// /// diff --git a/src/SJZY.Track.Domain/VEntities/VExternalSubjectEntity.cs b/src/TrackCenter.Domain/VEntities/VExternalSubjectEntity.cs similarity index 96% rename from src/SJZY.Track.Domain/VEntities/VExternalSubjectEntity.cs rename to src/TrackCenter.Domain/VEntities/VExternalSubjectEntity.cs index f088c3e8..c7f5e9b6 100644 --- a/src/SJZY.Track.Domain/VEntities/VExternalSubjectEntity.cs +++ b/src/TrackCenter.Domain/VEntities/VExternalSubjectEntity.cs @@ -1,10 +1,12 @@ -namespace SJZY.Track.Domain.VEntities; +using Fake.Domain.Entities.Auditing; + +namespace TrackCenter.Domain.VEntities; /// /// 外部主体 /// [SugarTable("v_external_subject")] -public class VExternalSubjectEntity : IFullAuditedBasicEntitys,IEntity +public class VExternalSubjectEntity : FullAuditedEntity { /// /// diff --git a/src/SJZY.Track.Domain/VEntities/VFSUserEntity.cs b/src/TrackCenter.Domain/VEntities/VFSUserEntity.cs similarity index 89% rename from src/SJZY.Track.Domain/VEntities/VFSUserEntity.cs rename to src/TrackCenter.Domain/VEntities/VFSUserEntity.cs index 71297838..8fb64c60 100644 --- a/src/SJZY.Track.Domain/VEntities/VFSUserEntity.cs +++ b/src/TrackCenter.Domain/VEntities/VFSUserEntity.cs @@ -1,10 +1,13 @@ -namespace SJZY.Track.Domain.VEntities; +using Fake.Domain.Entities; +using Fake.Domain.Entities.Auditing; + +namespace TrackCenter.Domain.VEntities; /// /// 飞书用户表，用户中心用户关联飞书用户 /// [SugarTable("v_fs_user")] -public class VFSUserEntity : IEntity +public class VFSUserEntity : AggregateRoot, IHasCreateTime, IHasUpdateTime { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } diff --git a/src/SJZY.Track.Domain/VEntities/VServiceProviderEntity.cs b/src/TrackCenter.Domain/VEntities/VServiceProviderEntity.cs similarity index 92% rename from src/SJZY.Track.Domain/VEntities/VServiceProviderEntity.cs rename to src/TrackCenter.Domain/VEntities/VServiceProviderEntity.cs index 3bf955c1..dcd6a9e2 100644 --- a/src/SJZY.Track.Domain/VEntities/VServiceProviderEntity.cs +++ b/src/TrackCenter.Domain/VEntities/VServiceProviderEntity.cs @@ -1,10 +1,12 @@ -namespace SJZY.Track.Domain.VEntities; +using Fake.Domain.Entities.Auditing; + +namespace TrackCenter.Domain.VEntities; /// /// 服务商主表 /// [SugarTable("v_service_provider")] -public class VServiceProviderEntity : IFullAuditedBasicEntitys +public class VServiceProviderEntity : FullAuditedEntity { /// /// 自增主键 diff --git a/src/SJZY.Track.Domain/VEntities/VSystemEntity.cs b/src/TrackCenter.Domain/VEntities/VSystemEntity.cs similarity index 96% rename from src/SJZY.Track.Domain/VEntities/VSystemEntity.cs rename to src/TrackCenter.Domain/VEntities/VSystemEntity.cs index b5a84874..0a027774 100644 --- a/src/SJZY.Track.Domain/VEntities/VSystemEntity.cs +++ b/src/TrackCenter.Domain/VEntities/VSystemEntity.cs @@ -1,10 +1,12 @@ -namespace SJZY.Track.Domain.VEntities; +using Fake.Domain.Entities.Auditing; + +namespace TrackCenter.Domain.VEntities; /// /// /// [SugarTable("v_system")] -public class VSystemEntity : IFullAuditedBasicEntitys, IEntity +public class VSystemEntity : FullAuditedEntity { /// /// 子系统id diff --git a/src/SJZY.Track.Domain/VEntities/VUserEntity.cs b/src/TrackCenter.Domain/VEntities/VUserEntity.cs similarity index 89% rename from src/SJZY.Track.Domain/VEntities/VUserEntity.cs rename to src/TrackCenter.Domain/VEntities/VUserEntity.cs index 82daae59..63a1362b 100644 --- a/src/SJZY.Track.Domain/VEntities/VUserEntity.cs +++ b/src/TrackCenter.Domain/VEntities/VUserEntity.cs @@ -1,17 +1,13 @@ -namespace SJZY.Track.Domain.VEntities; +using Fake.Domain.Entities.Auditing; + +namespace TrackCenter.Domain.VEntities; /// /// 用户信息表 /// [SugarTable("v_user")] -public class VUserEntity : IFullAuditedBasicEntitys +public class VUserEntity : FullAuditedEntity { - /// - /// 用户id - /// - [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] - public int Id { get; set; } - /// /// 账号 /// diff --git a/src/SJZY.Track.Domain/Extensions/CollectionExtensions.cs b/src/TrackCenter.Repository/CollectionExtensions.cs similarity index 97% rename from src/SJZY.Track.Domain/Extensions/CollectionExtensions.cs rename to src/TrackCenter.Repository/CollectionExtensions.cs index 220c4ebc..c8d9381d 100644 --- a/src/SJZY.Track.Domain/Extensions/CollectionExtensions.cs +++ b/src/TrackCenter.Repository/CollectionExtensions.cs @@ -1,8 +1,8 @@ using System.Collections.Concurrent; using Nest; -using SJZY.Expand.ElasticSearch; +using TrackCenter.Domain.SeedWork; -namespace SJZY.Track.Domain.Extensions; +namespace TrackCenter.Repository; public static class ListWrapperFactory { diff --git a/src/TrackCenter.Repository/ES/CollectionExtensions.cs b/src/TrackCenter.Repository/ES/CollectionExtensions.cs new file mode 100644 index 00000000..b7e055c3 --- /dev/null +++ b/src/TrackCenter.Repository/ES/CollectionExtensions.cs @@ -0,0 +1,119 @@ +using System.Collections.Concurrent; +using Nest; +using TrackCenter.Domain.SeedWork; + +namespace TrackCenter.Repository.ES; + +public static class ListWrapperFactory +{ + public static ListWrapper, QueryContainer>> CreateListWrapper(TInput input) + where TIndex : IdBaseIndex + { + return new ListWrapper, QueryContainer>>(new List, QueryContainer>>(), input); + } +} +public class ListWrapper : List +{ + public TInput Input { get; set; } + + public ListWrapper(List list, TInput input) + { + AddRange(list);; + Input = input; + } + + public void AddIf(Predicate predicate,TItem item) + { + if(predicate(Input)) + Add(item); + } +} + +public static class CollectionExtensions +{ + private static readonly ConcurrentDictionary DefaultValueCache = new(); + + public static void AddNotEmpty(this ICollection list, TInput input, TItem item) + { + if (input is null) return; + + var t = typeof(TInput); + if (t == typeof(string)) + { + if (!string.IsNullOrWhiteSpace(input as string)) + list.Add(item); + return; + } + + // 如果是Nullable类型，则获取其UnderlyingType + if (t.Name.StartsWith("Nullable")) + { + t = Nullable.GetUnderlyingType(t)!; + // 判断是否为数值类型 + if (t.IsNumericType()) + { + // 动态转换为数值比较 + dynamic val = Convert.ChangeType(input, t); + dynamic defaultVal = Activator.CreateInstance(t); + + // 当值为0时视为默认值 + if (val != defaultVal) + { + list.Add(item); + } + } + + return; + } + + // 获取类型对应的默认值（带缓存） + var defaultValue = (TInput)DefaultValueCache.GetOrAdd(t, _ => default(TInput))!; + + // 使用 EqualityComparer 避免装箱拆箱 + if (!EqualityComparer.Default.Equals(input, defaultValue)) + { + list.Add(item); + } + } + + public static void AddNotEmpty(this ICollection list, TInput input, Func factory) + { + AddNotEmpty(list, input, factory(input)); + } + + + public static void AddIf(this ICollection list, TInput input, Func predicate, TItem item) + { + if (predicate(input)) + list.Add(item); + } + + public static void AddIf(this ICollection list, TInput input, Func predicate, Func factory) + { + if (predicate(input)) + list.Add(factory(input)); + } + + + private static bool IsNumericType(this Type? type) + { + if (type == null) return false; + + return Type.GetTypeCode(type) switch + { + TypeCode.Byte or + TypeCode.SByte or + TypeCode.UInt16 or + TypeCode.UInt32 or + TypeCode.UInt64 or + TypeCode.Int16 or + TypeCode.Int32 or + TypeCode.Int64 or + TypeCode.Decimal or + TypeCode.Double or + TypeCode.Single => true, + _ => false + }; + } + +} diff --git a/src/TrackCenter.Repository/ES/ConnectionFactory.cs b/src/TrackCenter.Repository/ES/ConnectionFactory.cs new file mode 100644 index 00000000..5196fedd --- /dev/null +++ b/src/TrackCenter.Repository/ES/ConnectionFactory.cs @@ -0,0 +1,94 @@ +using System.Collections.Concurrent; +using System.Reflection; +using Elasticsearch.Net; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; +using Nest; + +namespace TrackCenter.Repository.ES; + +public class ConnectionFactory : ISingletonDependency +{ + private readonly ILogger _logger; + private readonly ElasticSearchOptions _options; + private readonly ConnectionSettings _connectionSettings; + private readonly ConcurrentDictionary _clientDic = new(); + + + public ConnectionFactory(IOptions options, ILogger logger) + { + _logger = logger; + _options = options.Value; + + var uris = new List(); + foreach (var item in _options.NodeUrls) + { + uris.Add(new Uri(item)); + } + + //using var connectionPool = new SniffingConnectionPool(uris);//集群连接池，支持嗅探，ping + + using var connectionPool = new SingleNodeConnectionPool(uris[0]); //单点连接池 + _connectionSettings = + new ConnectionSettings(connectionPool).BasicAuthentication(_options.LoginName, _options.Password); + } + + + public IElasticClient GetContext(Type type) + { + //如果有缓存，直接从缓存返回 + if (_clientDic.TryGetValue(type, out var value)) + { + return value; + } + + IElasticClient client; + var defaultIndex = ""; + + var attr = type.GetCustomAttribute(false); + if (attr == null) + throw new Exception("未找到指定对象的index名称"); + + defaultIndex = !_options.IndexPrefix.IsNullOrWhiteSpace() + ? $"{_options.IndexPrefix}{attr.RelationName}" + : attr.RelationName; + _connectionSettings.DefaultIndex(defaultIndex); + + //是否输出日志 + if (_options.ShowLogInfo) + { + _connectionSettings.EnableDebugMode(); + client = new ElasticClient(_connectionSettings + //打印请求、回复，可能影响性能 + .DisableDirectStreaming() + .OnRequestCompleted(apiCallDetails => + { + string infos = GetInfosFromApiCallDetails(apiCallDetails); + Console.WriteLine($"{Environment.NewLine}{infos}{Environment.NewLine}"); + })); + } + else + { + client = new ElasticClient(_connectionSettings); + } + + + _clientDic.TryAdd(type, client); + + return client; + } + + + /// + /// 输出执行结果 + /// + /// + /// + private string GetInfosFromApiCallDetails(IApiCallDetails details) + { + var infos = $@" + |-执行时间：{DateTime.Now:yyyy-MM-dd HH:mm:ss ffff} + |-请求响应：{details.DebugInformation} "; + return infos; + } +} diff --git a/src/TrackCenter.Repository/ES/ElasticSearchContextAbstract.cs b/src/TrackCenter.Repository/ES/ElasticSearchContextAbstract.cs new file mode 100644 index 00000000..c05b01f3 --- /dev/null +++ b/src/TrackCenter.Repository/ES/ElasticSearchContextAbstract.cs @@ -0,0 +1,67 @@ +using Nest; +using TrackCenter.Domain.SeedWork; +using TrackCenter.Repository.ES; + +namespace TrackCenter.Repository.ES; + +public abstract class ElasticSearchContextAbstract : IElasticsearchClientService where T : IdBaseIndex, new() +{ + private readonly string _indexName; + protected IElasticClient Context { get; } + + protected ElasticSearchContextAbstract(ConnectionFactory connectionFactory) + { + Context = connectionFactory.GetContext(typeof(T)); + _indexName = Context.ConnectionSettings.DefaultIndex; + } + + public virtual async Task IndexDocumentAsync(T data) + { + var response = await Context.IndexAsync(data, request => request.Index(_indexName)); + if (!response.IsValid) + throw new Exception($"数据添加失败，原因：{response.DebugInformation}"); + + return response.Id; + } + + public virtual async Task IndexManyDocumentAsync(List list, bool refresh = false) + { + var response = await Context.IndexManyAsync(list, _indexName); + if (!response.IsValid) + throw new Exception($"数据添加失败，原因：{response.DebugInformation}"); + + if (refresh) + await Context.Indices.RefreshAsync(_indexName); + + return response; + } + + public virtual async Task DeleteByIdAsync(string id) + { + var response = await Context.DeleteAsync(id, i => i.Index(_indexName)); + if (!response.IsValid) + throw new Exception($"数据删除失败，原因：{response.DebugInformation}"); + } + + public virtual async Task UpdateAsync(string id, T data) + { + var response = await Context.UpdateAsync(id, u => u.Doc(data).Index(_indexName)); + if (!response.IsValid) + throw new Exception($"数据修改失败，原因：{response.DebugInformation}"); + } + + public virtual async Task GetByIdAsync(string id) + { + var response = await Context.GetAsync(id, i => i.Index(_indexName)); + if (response.Source != null) + response.Source.Id = response.Id; + + switch (response.ApiCall.HttpStatusCode) + { + case 200: return response.Source; + case 404: return null; + default: throw new Exception($"数据查询失败，原因：{response.DebugInformation}"); + } + } + +} diff --git a/src/TrackCenter.Repository/ES/ElasticSearchOptions.cs b/src/TrackCenter.Repository/ES/ElasticSearchOptions.cs new file mode 100644 index 00000000..a803763f --- /dev/null +++ b/src/TrackCenter.Repository/ES/ElasticSearchOptions.cs @@ -0,0 +1,29 @@ +namespace TrackCenter.Repository.ES; + +public class ElasticSearchOptions +{ + /// + /// 是否显示日志 + /// + public bool ShowLogInfo { get; set; } + + /// + /// 服务节点 + /// + public List NodeUrls { get; set; } = []; + + /// + /// 索引前缀 + /// + public string? IndexPrefix { get; set; } + + /// + /// 登录账号 + /// + public string LoginName { get; set; } = null!; + + /// + /// 登录密码（明文） + /// + public string Password { get; set; } = null!; +} diff --git a/src/SJZY.Track.Repository/EsExtensions.cs b/src/TrackCenter.Repository/ES/EsExtensions.cs similarity index 90% rename from src/SJZY.Track.Repository/EsExtensions.cs rename to src/TrackCenter.Repository/ES/EsExtensions.cs index f2c3d62d..cbc9bf06 100644 --- a/src/SJZY.Track.Repository/EsExtensions.cs +++ b/src/TrackCenter.Repository/ES/EsExtensions.cs @@ -1,8 +1,8 @@ +using TrackCenter.Repository.ES; using Nest; -using SJZY.Expand.ElasticSearch; -using SJZY.Track.Domain.SeedWork; +using TrackCenter.Domain.SeedWork; -namespace SJZY.Track.Repository; +namespace TrackCenter.Repository.ES; /// /// es extensions diff --git a/src/TrackCenter.Repository/GlobalUsing.cs b/src/TrackCenter.Repository/GlobalUsing.cs new file mode 100644 index 00000000..4e1ea556 --- /dev/null +++ b/src/TrackCenter.Repository/GlobalUsing.cs @@ -0,0 +1,3 @@ +global using SqlSugar; +global using Fake.Application.Dtos; +global using TrackCenter.Repository; diff --git a/src/TrackCenter.Repository/GlobalUsings.cs b/src/TrackCenter.Repository/GlobalUsings.cs new file mode 100644 index 00000000..8b675552 --- /dev/null +++ b/src/TrackCenter.Repository/GlobalUsings.cs @@ -0,0 +1 @@ +global using Fake.DependencyInjection; diff --git a/src/TrackCenter.Repository/Redis/RedisHelper.cs b/src/TrackCenter.Repository/Redis/RedisHelper.cs new file mode 100644 index 00000000..7bb2af08 --- /dev/null +++ b/src/TrackCenter.Repository/Redis/RedisHelper.cs @@ -0,0 +1,88 @@ +using FreeRedis; +using Newtonsoft.Json; +using Serilog; + +namespace TrackCenter.Repository.Redis; + +public static class RedisHelper +{ + private static readonly object Lock = new(); + private static RedisClient? _client; + private static ConnectionStringBuilder Options; + + #region 初始化方法 + + internal static void Init(ConnectionStringBuilder options, bool showLogInfo) + { + Options = options; + + if (_client == null) + { + lock (Lock) + { + if (_client == null) + { + _client = new RedisClient(options); + _client.Serialize = obj => JsonConvert.SerializeObject(obj); + _client.Deserialize = (json, type) => JsonConvert.DeserializeObject(json, type); + if (showLogInfo) + _client.Notice += (s, e) => Log.Information(Environment.NewLine + e.Log); + } + } + } + } + + /// + /// 创建一个新的客户端 + /// + /// + /// + /// + public static RedisClient Create(Action action, EventHandler notice) + { + var builder = new ConnectionStringBuilder + { + Database = Options.Database, + ExitAutoDisposePool = Options.ExitAutoDisposePool, + ClientName = Options.ClientName, + ConnectTimeout = Options.ConnectTimeout, + Encoding = Options.Encoding, + Host = Options.Host, + IdleTimeout = Options.IdleTimeout, + MaxPoolSize = Options.MaxPoolSize, + MinPoolSize = Options.MinPoolSize, + Password = Options.Password, + Prefix = Options.Prefix, + Protocol = Options.Protocol, + ReceiveTimeout = Options.ReceiveTimeout, + Retry = Options.Retry, + SendTimeout = Options.SendTimeout, + Ssl = Options.Ssl, + SubscribeReadbytes = Options.SubscribeReadbytes, + User = Options.User + }; + + if (action != null) + { + action.Invoke(builder); + } + + var client = new RedisClient(builder); + + client.Serialize = obj => JsonConvert.SerializeObject(obj); + client.Deserialize = (json, type) => JsonConvert.DeserializeObject(json, type); + client.Notice += notice; + return client; + } + + #endregion + + #region 返回客户端类 + + public static RedisClient Client + { + get { return _client; } + } + + #endregion +} diff --git a/src/SJZY.Track.Repository/Repositories/BasicRepository.cs b/src/TrackCenter.Repository/Repositories/BasicRepository.cs similarity index 60% rename from src/SJZY.Track.Repository/Repositories/BasicRepository.cs rename to src/TrackCenter.Repository/Repositories/BasicRepository.cs index 83e2052d..b4b22d8a 100644 --- a/src/SJZY.Track.Repository/Repositories/BasicRepository.cs +++ b/src/TrackCenter.Repository/Repositories/BasicRepository.cs @@ -1,17 +1,20 @@ using System.Linq.Expressions; -using SJZY.Track.Domain; -using SJZY.Track.Domain.SeedWork; -using SJZY.Track.Repository.Queries; -using Volo.Abp; +using Fake.Application; +using Fake.Domain.Entities; +using Fake.Domain.Entities.Auditing; +using Fake.DomainDrivenDesign.Repositories.SqlSugarCore; +using TrackCenter.Domain; -namespace SJZY.Track.Repository.Repositories; +namespace TrackCenter.Repository.Repositories; /// /// 仓储基类实现 /// /// -public class BasicRepository : BasicQuery, IBasicRepository where T : class, IAggregateRoot, new() +public class BasicRepository : SqlSugarRepository, IBasicRepository where T : class, IAggregateRoot, new() { + protected ISqlSugarClient Context => GetDbContextAsync().Result; + public async Task UpdateAsync(T entity, Expression>? ignoreColumns) { return await Context.Updateable(entity) @@ -43,13 +46,28 @@ public class BasicRepository : BasicQuery, IBasicRepository where T : c // tips: required where public async Task SoftDeleteAsync(Expression> where) { - if (!typeof(T).IsAssignableTo()) + if (!typeof(T).IsAssignableTo()) throw new BusinessException( - message: $"实体没有实现{nameof(ISoftDeleteBasicEntity)}不能调用{nameof(SoftDeleteAsync)}"); + message: $"实体没有实现{nameof(ISoftDelete)}不能调用{nameof(SoftDeleteAsync)}"); return await Context.Updateable() .Where(where) - .SetColumns(nameof(ISoftDeleteBasicEntity.IsDeleted), 1) + .SetColumns(nameof(ISoftDelete.IsDeleted), 1) .ExecuteCommandHasChangeAsync(); } + + public async Task InsertAsync(T insertObj) + { + return await Context.Insertable(insertObj).ExecuteCommandAsync() > 0; + } + + public async Task InsertReturnIdentityAsync(T insertObj) + { + return await Context.Insertable(insertObj).ExecuteReturnIdentityAsync(); + } + + public async Task InsertRangeAsync(List entities) + { + return await Context.Insertable(entities).ExecuteCommandAsync() > 0; + } } diff --git a/src/TrackCenter.Repository/Repositories/KpiAreaInfoRepository.cs b/src/TrackCenter.Repository/Repositories/KpiAreaInfoRepository.cs new file mode 100644 index 00000000..329c1ace --- /dev/null +++ b/src/TrackCenter.Repository/Repositories/KpiAreaInfoRepository.cs @@ -0,0 +1,5 @@ +namespace TrackCenter.Repository.Repositories; + +public class KpiAreaInfoRepository +{ +} diff --git a/src/SJZY.Track.Repository/Repositories/KpiAreaRepository.cs b/src/TrackCenter.Repository/Repositories/KpiAreaRepository.cs similarity index 80% rename from src/SJZY.Track.Repository/Repositories/KpiAreaRepository.cs rename to src/TrackCenter.Repository/Repositories/KpiAreaRepository.cs index a10a62af..b0b8aae0 100644 --- a/src/SJZY.Track.Repository/Repositories/KpiAreaRepository.cs +++ b/src/TrackCenter.Repository/Repositories/KpiAreaRepository.cs @@ -1,9 +1,9 @@ -using SJZY.Track.Domain; -using SJZY.Track.Domain.Aggregates.KPIAreaAggregate; -using SJZY.Track.Domain.Dtos.Forewarning; -using SJZY.Track.Domain.VEntities; +using TrackCenter.Domain; +using TrackCenter.Domain.Aggregates.KPIAreaAggregate; +using TrackCenter.Domain.Dtos.Forewarning; +using TrackCenter.Domain.VEntities; -namespace SJZY.Track.Repository.Repositories; +namespace TrackCenter.Repository.Repositories; public class KpiAreaRepository : BasicRepository, IKpiAreaRepository, ITransientDependency { @@ -20,7 +20,7 @@ public class KpiAreaRepository : BasicRepository, IKpiAreaReposi public async ValueTask DeleteArea(int areaId) { using var transaction = TransactionHelper.GetReadCommitted(); - await DeleteByIdAsync(areaId); + await DeleteAsync(x => x.Id == areaId); await Context.Deleteable().Where(x => x.AreaId == areaId).ExecuteCommandAsync(); transaction.Complete(); } @@ -32,7 +32,7 @@ public class KpiAreaRepository : BasicRepository, IKpiAreaReposi public Task UpdateAreaInfoAsync(RuleAreaInfoEntity entity) { - return Context.Updateable(entity).ExecuteCommandAsync(); + return Context.Updateable(entity).ExecuteCommandAsync(); } /// @@ -40,18 +40,15 @@ public class KpiAreaRepository : BasicRepository, IKpiAreaReposi /// /// /// - public async Task> GetAreas(QueryAreaRequest query) + public async Task> GetAreas(QueryAreaRequest query) { return await Context.Queryable() - .InnerJoin((area, sys) => area.SubSystemId == sys.Id) - .WhereIF(!string.IsNullOrEmpty(query.Name), (area, sys) => area.Name.Contains(query.Name)) - .WhereIF(query.SystemId.HasValue, (area, sys) => area.SubSystemId == query.SystemId.Value) - .OrderBy((area, sys) => area.UpdateTime, OrderByType.Desc) - .Select((area, sys) => new AreaDto() + .WhereIF(!string.IsNullOrEmpty(query.Name), area => area.Name.Contains(query.Name!)) + .OrderBy(area => area.UpdateTime, OrderByType.Desc) + .Select(area => new AreaDto() { Id = area.Id, Name = area.Name, - SystemName = sys.CnName, SubSystemId = area.SubSystemId, UpdateTime = area.CreateTime }) @@ -63,7 +60,7 @@ public class KpiAreaRepository : BasicRepository, IKpiAreaReposi /// /// /// - public async Task> GetAreaInfos(QueryAreaInfoRequest query) + public async Task> GetAreaInfos(QueryAreaInfoRequest query) { return await Context.Queryable() .InnerJoin((x, c) => x.CountryCode == c.Digit2Code) diff --git a/src/SJZY.Track.Repository/Repositories/OrderOperationRecordEsRepository.cs b/src/TrackCenter.Repository/Repositories/OrderOperationRecordEsRepository.cs similarity index 89% rename from src/SJZY.Track.Repository/Repositories/OrderOperationRecordEsRepository.cs rename to src/TrackCenter.Repository/Repositories/OrderOperationRecordEsRepository.cs index f3efa1fa..6807a49a 100644 --- a/src/SJZY.Track.Repository/Repositories/OrderOperationRecordEsRepository.cs +++ b/src/TrackCenter.Repository/Repositories/OrderOperationRecordEsRepository.cs @@ -1,10 +1,11 @@ using Nest; -using SJZY.Expand.ABP.Core.Logger; -using SJZY.Expand.ElasticSearch.Services; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Consts; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Consts; +using TrackCenter.Domain.Extensions; +using TrackCenter.Repository.Aggregates.OrderAggregate; +using TrackCenter.Repository.ES; -namespace SJZY.Track.Repository.Repositories; +namespace TrackCenter.Repository.Repositories; public class OrderOperationRecordEsRepository : ElasticSearchContextAbstract, IOrderOperationRecordEsRepository, diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/TrackCenter.Repository/Repositories/OrderRepository.cs similarity index 95% rename from src/SJZY.Track.Repository/Repositories/OrderRepository.cs rename to src/TrackCenter.Repository/Repositories/OrderRepository.cs index dfca67d1..d10e09ad 100644 --- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs +++ b/src/TrackCenter.Repository/Repositories/OrderRepository.cs @@ -1,13 +1,14 @@ using Microsoft.Extensions.Caching.Memory; -using SJZY.Expand.ABP.Core.Logger; -using SJZY.Track.Domain; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Consts; -using SJZY.Track.Domain.Dtos.Order; -using SJZY.Track.Domain.Enums; -using SJZY.Track.Domain.VEntities; +using TrackCenter.Domain; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Consts; +using TrackCenter.Domain.Dtos.Order; +using TrackCenter.Domain.Enums; +using TrackCenter.Domain.Extensions; +using TrackCenter.Domain.VEntities; +using TrackCenter.Repository.Redis; -namespace SJZY.Track.Repository.Repositories; +namespace TrackCenter.Repository.Repositories; public class OrderRepository : BasicRepository, IOrderRepository, ITransientDependency { @@ -87,10 +88,10 @@ public class OrderRepository : BasicRepository, IOrderRepository, I return dict; } - public async Task> GetTrackOrderPagedList(GetPageTrackOrderInputVO input) + public async Task> GetTrackOrderPagedList(GetPageTrackOrderInputVO input) { //查询完去重 - UnifyPageResultDto pageList; + PagedResult pageList; //没传递单号时 if (input.OrderNos.IsNullOrEmpty()) { @@ -158,16 +159,7 @@ public class OrderRepository : BasicRepository, IOrderRepository, I //没有任何单 if (orderIds.Count == 0) { - return new UnifyPageResultDto - { - List = new List(), - Pagination = new PageInfoOutput() - { - PageIndex = input.PageIndex, - PageSize = input.PageSize, - Total = 0 - } - }; + return new PagedResult(); } pageList = await Context.Queryable() @@ -213,12 +205,12 @@ public class OrderRepository : BasicRepository, IOrderRepository, I } //查询订单类型描述，从缓存中加速查 - var orderTypes = pageList.List.Select(x => x.OrderType).Distinct().ToList(); - var questTypes = pageList.List.Select(x => x.QuestionType).Distinct().ToList(); + var orderTypes = pageList.Items.Select(x => x.OrderType).Distinct().ToList(); + var questTypes = pageList.Items.Select(x => x.QuestionType).Distinct().ToList(); var typeDisplayDict = await GetMainDataEnumForCacheAsync(orderTypes, questTypes); //填充数描述信息 - pageList.List.ForEach(x => + pageList.Items.ForEach(x => { x.OrderTypeName = typeDisplayDict.TryGetValue(GlobalConst.MainDataKey_OrderType, out var orderTypeDisplayDict) ? orderTypeDisplayDict.TryGetValue(x.OrderType, out var orderTypeDisplay) @@ -298,11 +290,14 @@ public class OrderRepository : BasicRepository, IOrderRepository, I exp.Or(x => x.OrderType == order.OrderType && x.SubSystemId == order.SubSystemId && x.OrderNo == order.OrderNo); // 查出id - var queryOrders = await GetListAsync(exp.ToExpression(), x => new - { - x.Id, - x.OrderNo - }); + var queryOrders = await Context.Queryable() + .WhereIF(exp != null, exp!.ToExpression()) + .Select(x => new + { + x.Id, + x.OrderNo + }) + .ToListAsync(); // 填充订单关联数据中的OrderId orderNoIdDict = queryOrders.ToDictionary(x => x.OrderNo, x => x.Id); @@ -436,8 +431,8 @@ public class OrderRepository : BasicRepository, IOrderRepository, I ? 2 : 0; if (item.QuestionType == questionType) continue; - if (questionType == 2) latestPushTimeIds.AddLast(item.Id); - else questionZeroIds.AddLast(item.Id); + if (questionType == 2) latestPushTimeIds.Add(item.Id); + else questionZeroIds.Add(item.Id); } if (latestPushTimeIds.Count > 0) UpdateOrderQuestionType(2, latestPushTimeIds); diff --git a/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs b/src/TrackCenter.Repository/Repositories/TrackContentRepository.cs similarity index 87% rename from src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs rename to src/TrackCenter.Repository/Repositories/TrackContentRepository.cs index 143777e6..b132531e 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs +++ b/src/TrackCenter.Repository/Repositories/TrackContentRepository.cs @@ -1,12 +1,12 @@ using System.Linq.Expressions; -using SJZY.Track.Domain.Aggregates.TrackContentAggregate; -using SJZY.Track.Domain.Aggregates.TrackFlagAggregate; -using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; -using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; -using SJZY.Track.Domain.Dtos.TrackContents; -using SJZY.Track.Domain.VEntities; +using TrackCenter.Domain.Aggregates.TrackContentAggregate; +using TrackCenter.Domain.Aggregates.TrackFlagAggregate; +using TrackCenter.Domain.Aggregates.TrackStatusAggregate; +using TrackCenter.Domain.Aggregates.TrackTemplateAggregate; +using TrackCenter.Domain.Dtos.TrackContents; +using TrackCenter.Repository.VEntities; -namespace SJZY.Track.Repository.Repositories; +namespace TrackCenter.Repository.Repositories; public class TrackContentRepository : BasicRepository, ITrackContentRepository, IScopedDependency { @@ -19,13 +19,11 @@ public class TrackContentRepository : BasicRepository, ITrac { var detail = await Context.Queryable() .LeftJoin((a, b) => a.TrackStatusId == b.Id && b.IsDeleted == false) - .LeftJoin((a, b, d) => a.SubSystemId == d.Id && d.IsDeleted == false) - .Where((a, b, d) => a.Id == id) - .Select((a, b, d) => new GetTrackContentDetailVO + .Where((a, b) => a.Id == id) + .Select((a, b) => new GetTrackContentDetailVO { Id = a.Id, SubSystemId = a.SubSystemId, - SubSystem = d.CnName, TrackStatusId = a.TrackStatusId, TrackStatus = b.Status, Code = a.Code, @@ -47,26 +45,24 @@ public class TrackContentRepository : BasicRepository, ITrac /// /// /// - public async Task> GetPageTrackContent(GetPageTrackContentVO input) + public async Task> GetPageTrackContent(GetPageTrackContentVO input) { var pagedList = await Context.Queryable() .LeftJoin((a, b) => a.TrackStatusId == b.Id && b.IsDeleted == false) - .LeftJoin((a, b, d) => a.SubSystemId == d.Id && d.IsDeleted == false) - .LeftJoin((a, b, d, e) => a.CreateUserId == e.Id && e.IsDeleted == false) - .LeftJoin((a, b, d, e, f) => a.UpdateUserId == f.Id && f.IsDeleted == false) - .WhereIF(input.SubSystemId > 0, (a, b, d, e, f) => a.SubSystemId == input.SubSystemId) + .LeftJoin((a, b, e) => a.CreateUserId == e.Id && e.IsDeleted == false) + .LeftJoin((a, b, e, f) => a.UpdateUserId == f.Id && f.IsDeleted == false) + .WhereIF(input.SubSystemId > 0, (a, b, e, f) => a.SubSystemId == input.SubSystemId) .WhereIF(!input.Keywords.IsNullOrWhiteSpace(), - (a, b, d, e, f) => a.Code.Contains(input.Keywords) || a.Content.Contains(input.Keywords) + (a, b, e, f) => a.Code.Contains(input.Keywords) || a.Content.Contains(input.Keywords) || a.EnContent.Contains(input.Keywords)) - .WhereIF(input.TrackStatusId.HasValue && input.TrackStatusId > 0, (a, b, d, e, f) => a.TrackStatusId == input.TrackStatusId) - .OrderByIF(input.SelectIds.IsNullOrEmpty(), (a, b, d, e, f) => a.CreateTime, OrderByType.Desc) + .WhereIF(input.TrackStatusId.HasValue && input.TrackStatusId > 0, (a, b, e, f) => a.TrackStatusId == input.TrackStatusId) + .OrderByIF(input.SelectIds.IsNullOrEmpty(), (a, b, e, f) => a.CreateTime, OrderByType.Desc) .OrderByIF(!input.SelectIds.IsNullOrEmpty(), - (a, b, d, e, f) => SqlFunc.IIF(input.SelectIds.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), + (a, b, e, f) => SqlFunc.IIF(input.SelectIds.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), a.CreateTime), OrderByType.Desc) - .Select((a, b, d, e, f) => new GetTrackContentListVO + .Select((a, b, e, f) => new GetTrackContentListVO { Id = a.Id, - SubSystem = d.CnName, Code = a.Code, Content = a.Content, EnContent = a.EnContent, @@ -119,7 +115,7 @@ public class TrackContentRepository : BasicRepository, ITrac return false; } - public async Task> GetMapPageAsync( + public async Task> GetMapPageAsync( GetTrackContentMapPageInputVO input) { return await Context.Queryable() diff --git a/src/SJZY.Track.Repository/Repositories/TrackDetailsEsRepository.cs b/src/TrackCenter.Repository/Repositories/TrackDetailsEsRepository.cs similarity index 98% rename from src/SJZY.Track.Repository/Repositories/TrackDetailsEsRepository.cs rename to src/TrackCenter.Repository/Repositories/TrackDetailsEsRepository.cs index 495c0621..055bea66 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackDetailsEsRepository.cs +++ b/src/TrackCenter.Repository/Repositories/TrackDetailsEsRepository.cs @@ -1,15 +1,18 @@ using Nest; using SJZY.Expand.ABP.Core.PublicMethords; using SJZY.Expand.ElasticSearch.Services; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; -using SJZY.Track.Domain.Aggregates.TrackPushAggregate; -using SJZY.Track.Domain.Consts; -using SJZY.Track.Domain.Dtos.TrackDetails; -using SJZY.Track.Domain.Enums; -using SJZY.Track.Domain.Extensions; +using TrackCenter.Domain.Aggregates.OrderAggregate; +using TrackCenter.Domain.Aggregates.TrackDetailsAggregate; +using TrackCenter.Domain.Aggregates.TrackPushAggregate; +using TrackCenter.Domain.Consts; +using TrackCenter.Domain.Dtos.TrackDetails; +using TrackCenter.Domain.Enums; +using TrackCenter.Domain.Extensions; +using TrackCenter.Repository.Aggregates.OrderAggregate; +using TrackCenter.Repository.ES; +using ListWrapperFactory = TrackCenter.Repository.ES.ListWrapperFactory; -namespace SJZY.Track.Repository.Repositories; +namespace TrackCenter.Repository.Repositories; public class TrackDetailsEsRepository : ElasticSearchContextAbstract, ITrackDetailsEsRepository, ITransientDependency diff --git a/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs b/src/TrackCenter.Repository/Repositories/TrackFlagRepository.cs similarity index 86% rename from src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs rename to src/TrackCenter.Repository/Repositories/TrackFlagRepository.cs index 72f588e6..71c1ee1b 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs +++ b/src/TrackCenter.Repository/Repositories/TrackFlagRepository.cs @@ -1,8 +1,8 @@ -using SJZY.Track.Domain.Aggregates.TrackFlagAggregate; -using SJZY.Track.Domain.Dtos.TrackFlags; -using SJZY.Track.Domain.VEntities; +using TrackCenter.Domain.Aggregates.TrackFlagAggregate; +using TrackCenter.Domain.Dtos.TrackFlags; +using TrackCenter.Repository.VEntities; -namespace SJZY.Track.Repository.Repositories; +namespace TrackCenter.Repository.Repositories; public class TrackFlagRepository : BasicRepository, ITrackFlagRepository, IScopedDependency { @@ -38,9 +38,9 @@ public class TrackFlagRepository : BasicRepository, ITrackFlagR /// /// /// - public async Task> GetPageTrackFlag(GetPageTrackFlagVO input) + public async Task> GetPageTrackFlag(GetPageTrackFlagVO input) { - UnifyPageResultDto pagedList = new UnifyPageResultDto(); + PagedResult pagedList = new PagedResult(); pagedList = await Context.Queryable() .LeftJoin((a, b) => a.SubSystemId == b.Id && b.IsDeleted == false) .LeftJoin((a, b, c) => a.CreateUserId == c.Id && c.IsDeleted == false) diff --git a/src/SJZY.Track.Repository/Repositories/TrackNodeRepository.cs b/src/TrackCenter.Repository/Repositories/TrackNodeRepository.cs similarity index 89% rename from src/SJZY.Track.Repository/Repositories/TrackNodeRepository.cs rename to src/TrackCenter.Repository/Repositories/TrackNodeRepository.cs index fcee8c2e..e03d68ce 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackNodeRepository.cs +++ b/src/TrackCenter.Repository/Repositories/TrackNodeRepository.cs @@ -1,12 +1,12 @@ -using SJZY.Track.Domain.Aggregates.TrackNodeAggregate; -using SJZY.Track.Domain.Dtos.TrackNode; -using SJZY.Track.Domain.VEntities; +using TrackCenter.Domain.Aggregates.TrackNodeAggregate; +using TrackCenter.Domain.Dtos.TrackNode; +using TrackCenter.Repository.VEntities; -namespace SJZY.Track.Repository.Repositories; +namespace TrackCenter.Repository.Repositories; public class TrackNodeRepository : BasicRepository, ITrackNodeRepository, IScopedDependency { - public async Task> GetPageList(TrackNodePageDto queryParam) + public async Task> GetPageList(TrackNodePageDto queryParam) { var result = await Context.Queryable() .LeftJoin((t, u1) => t.CreateUserId == u1.Id) @@ -33,7 +33,7 @@ public class TrackNodeRepository : BasicRepository, ITrackNodeR return result; } - public async Task> GetPageDicList(TrackNodePageDto queryParam) + public async Task> GetPageDicList(TrackNodePageDto queryParam) { var result = await Context.Queryable() .Where((t) => !t.IsDeleted) diff --git a/src/SJZY.Track.Repository/Repositories/TrackPullConfigRepository.cs b/src/TrackCenter.Repository/Repositories/TrackPullConfigRepository.cs similarity index 92% rename from src/SJZY.Track.Repository/Repositories/TrackPullConfigRepository.cs rename to src/TrackCenter.Repository/Repositories/TrackPullConfigRepository.cs index 821557e2..eb50d391 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackPullConfigRepository.cs +++ b/src/TrackCenter.Repository/Repositories/TrackPullConfigRepository.cs @@ -1,19 +1,19 @@ using System.Linq.Expressions; using SJZY.Expand.ABP.Core.PublicMethords; -using SJZY.Track.Domain.Aggregates.TrackContentAggregate; -using SJZY.Track.Domain.Aggregates.TrackPullAggregate; -using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; -using SJZY.Track.Domain.Dtos.Common; -using SJZY.Track.Domain.Dtos.TrackPull; -using SJZY.Track.Domain.Enums; -using SJZY.Track.Domain.VEntities; +using TrackCenter.Domain.Aggregates.TrackContentAggregate; +using TrackCenter.Domain.Aggregates.TrackPullAggregate; +using TrackCenter.Domain.Aggregates.TrackStatusAggregate; +using TrackCenter.Domain.Dtos.Common; +using TrackCenter.Domain.Dtos.TrackPull; +using TrackCenter.Domain.Enums; +using TrackCenter.Repository.VEntities; -namespace SJZY.Track.Repository.Repositories; +namespace TrackCenter.Repository.Repositories; public class TrackPullConfigRepository : BasicRepository, ITrackPullConfigRepository, IScopedDependency { - public async Task> GetPageAsync(KeywordsInputVO input) + public async Task> GetPageAsync(KeywordsInputVO input) { return await Context.Queryable() .LeftJoin((trackPull, system) => trackPull.SubSystemId == system.Id) @@ -33,7 +33,7 @@ public class TrackPullConfigRepository : BasicRepository, .ToPagedListAsync(input.PageIndex, input.PageSize); } - public async Task> GetContentPageAsync( + public async Task> GetContentPageAsync( GetTrackPullContentPageInputVO input) { return await Context.Queryable() diff --git a/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs b/src/TrackCenter.Repository/Repositories/TrackPushConfigRepository.cs similarity index 95% rename from src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs rename to src/TrackCenter.Repository/Repositories/TrackPushConfigRepository.cs index 334136f3..00e2144b 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs +++ b/src/TrackCenter.Repository/Repositories/TrackPushConfigRepository.cs @@ -1,18 +1,18 @@ using System.Linq.Expressions; using SJZY.Expand.ABP.Core.PublicMethords; -using SJZY.Track.Domain.Aggregates.TrackContentAggregate; -using SJZY.Track.Domain.Aggregates.TrackPushAggregate; -using SJZY.Track.Domain.Dtos.Common; -using SJZY.Track.Domain.Dtos.TrackPush; -using SJZY.Track.Domain.Enums; -using SJZY.Track.Domain.VEntities; +using TrackCenter.Domain.Aggregates.TrackContentAggregate; +using TrackCenter.Domain.Aggregates.TrackPushAggregate; +using TrackCenter.Domain.Dtos.Common; +using TrackCenter.Domain.Dtos.TrackPush; +using TrackCenter.Domain.Enums; +using TrackCenter.Repository.VEntities; -namespace SJZY.Track.Repository.Repositories; +namespace TrackCenter.Repository.Repositories; public class TrackPushConfigRepository : BasicRepository, ITrackPushConfigRepository, IScopedDependency { - public async Task> GetPageAsync(KeywordsInputVO input) + public async Task> GetPageAsync(KeywordsInputVO input) { return await AsQueryable() .LeftJoin((trackPush, system) => trackPush.SubSystemId == system.Id && !system.IsDeleted) @@ -36,7 +36,7 @@ public class TrackPushConfigRepository : BasicRepository, .ToPagedListAsync(input.PageIndex, input.PageSize); } - public async Task> GetContentPageAsync( + public async Task> GetContentPageAsync( GetTrackPushContentPageInputVO input) { return await Context.Queryable() diff --git a/src/SJZY.Track.Repository/Repositories/TrackPushRecordEsRepository.cs b/src/TrackCenter.Repository/Repositories/TrackPushRecordEsRepository.cs similarity index 96% rename from src/SJZY.Track.Repository/Repositories/TrackPushRecordEsRepository.cs rename to src/TrackCenter.Repository/Repositories/TrackPushRecordEsRepository.cs index 3cbef5e2..89161bc5 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackPushRecordEsRepository.cs +++ b/src/TrackCenter.Repository/Repositories/TrackPushRecordEsRepository.cs @@ -1,11 +1,13 @@ using Nest; using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ElasticSearch.Services; -using SJZY.Track.Domain.Aggregates.TrackPushAggregate; -using SJZY.Track.Domain.Consts; -using SJZY.Track.Domain.Extensions; +using TrackCenter.Domain.Aggregates.TrackPushAggregate; +using TrackCenter.Domain.Consts; +using TrackCenter.Domain.Extensions; +using TrackCenter.Repository.ES; +using ListWrapperFactory = TrackCenter.Repository.ES.ListWrapperFactory; -namespace SJZY.Track.Repository.Repositories; +namespace TrackCenter.Repository.Repositories; public class TrackPushRecordEsRepository : ElasticSearchContextAbstract, ITrackPushRecordEsRepository, diff --git a/src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs b/src/TrackCenter.Repository/Repositories/TrackStatusRepository.cs similarity index 58% rename from src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs rename to src/TrackCenter.Repository/Repositories/TrackStatusRepository.cs index 223ba914..b66be35d 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs +++ b/src/TrackCenter.Repository/Repositories/TrackStatusRepository.cs @@ -1,9 +1,9 @@ -using SJZY.Track.Domain.Aggregates.TrackNodeAggregate; -using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; -using SJZY.Track.Domain.Dtos.TrackStatus; -using SJZY.Track.Domain.VEntities; +using TrackCenter.Domain.Aggregates.TrackNodeAggregate; +using TrackCenter.Domain.Aggregates.TrackStatusAggregate; +using TrackCenter.Domain.Dtos.TrackStatus; +using TrackCenter.Domain.VEntities; -namespace SJZY.Track.Repository.Repositories; +namespace TrackCenter.Repository.Repositories; public class TrackStatusRepository : BasicRepository, ITrackStatusRepository, IScopedDependency { @@ -16,13 +16,11 @@ public class TrackStatusRepository : BasicRepository, ITrackS { var detail = await Context.Queryable() .InnerJoin((a, t) => a.Node == t.Id) - .LeftJoin((a, t, b) => a.SubSystemId == b.Id && b.IsDeleted == false) - .Where((a, t, b) => a.Id == id) - .Select((a, t, b) => new GetTrackStatusDetailVO + .Where((a, t) => a.Id == id) + .Select((a, t) => new GetTrackStatusDetailVO { Id = a.Id, SubSystemId = a.SubSystemId, - SubSystem = b.CnName, Code = a.Code, EnTrackStatus = a.EnStatus, NodeId = a.Node, @@ -40,22 +38,21 @@ public class TrackStatusRepository : BasicRepository, ITrackS /// /// /// - public async Task> GetPageTrackStatus(GetPagedTrackStatusVO input) + public async Task> GetPageTrackStatus(GetPagedTrackStatusVO input) { var pagedList = await Context.Queryable() - .LeftJoin((a, b) => a.SubSystemId == b.Id && 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) - .InnerJoin((a, b, c, d, e) => a.Node == e.Id && a.SubSystemId == e.SubSystemId) - .WhereIF(input.SubSystemId > 0, (a, b, c, d) => a.SubSystemId == input.SubSystemId) + .LeftJoin((a, b) => a.CreateUserId == b.Id && b.IsDeleted == false) + .LeftJoin((a, b, d) => a.UpdateUserId == d.Id && d.IsDeleted == false) + .InnerJoin((a, b, d, e) => a.Node == e.Id && a.SubSystemId == e.SubSystemId) + .WhereIF(input.SubSystemId > 0, (a, b, d) => a.SubSystemId == input.SubSystemId) .WhereIF(!input.Keywords.IsNullOrWhiteSpace(), - (a, b, c, d) => a.Status.Contains(input.Keywords) || a.EnStatus.Contains(input.Keywords) || - a.Code.Contains(input.Keywords)) - .OrderByIF(input.SelectIds.IsNullOrEmpty(), (a, b, c, d) => a.CreateTime, OrderByType.Desc) + (a, b, d) => a.Status.Contains(input.Keywords!) || a.EnStatus.Contains(input.Keywords!) || + a.Code.Contains(input.Keywords!)) + .OrderByIF(input.SelectIds.IsNullOrEmpty(), (a, b, d) => a.CreateTime, OrderByType.Desc) .OrderByIF(!input.SelectIds.IsNullOrEmpty(), - (a, b, c, d) => SqlFunc.IIF(input.SelectIds.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), + (a, b, d) => SqlFunc.IIF(input.SelectIds.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), a.CreateTime), OrderByType.Desc) - .Select((a, b, c, d, e) => new GetTrackStatusListVO + .Select((a, b, d, e) => new GetTrackStatusListVO { Id = a.Id, Code = a.Code, @@ -64,10 +61,9 @@ public class TrackStatusRepository : BasicRepository, ITrackS NodeId = a.Node, Node = e.NodeName!, CreateTime = a.CreateTime, - CreateUser = c.Name, + CreateUser = b.Name, UpdateTime = a.UpdateTime, UpdateUser = d.Name, - SubSystem = b.CnName, IsCompleted = a.IsCompleted, IsToMq = a.IsToMq }) diff --git a/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs b/src/TrackCenter.Repository/Repositories/TrackTemplateRepository.cs similarity index 85% rename from src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs rename to src/TrackCenter.Repository/Repositories/TrackTemplateRepository.cs index 6ec8434b..9732250c 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs +++ b/src/TrackCenter.Repository/Repositories/TrackTemplateRepository.cs @@ -1,16 +1,16 @@ using System.Linq.Expressions; -using SJZY.Expand.ABP.Core.PublicMethords; -using SJZY.Track.Domain.Aggregates.TrackContentAggregate; -using SJZY.Track.Domain.Aggregates.TrackFlagAggregate; -using SJZY.Track.Domain.Aggregates.TrackNodeAggregate; -using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; -using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; -using SJZY.Track.Domain.Dtos.TrackTemplate; -using SJZY.Track.Domain.Enums; -using SJZY.Track.Domain.VEntities; -using SJZY.Expand.ABP.Core.SqlSugar.Tools; +using Fake.Domain.Entities.Auditing; +using InterfaceForward.Domain.Shared.Helpers; +using TrackCenter.Domain.Aggregates.TrackContentAggregate; +using TrackCenter.Domain.Aggregates.TrackFlagAggregate; +using TrackCenter.Domain.Aggregates.TrackNodeAggregate; +using TrackCenter.Domain.Aggregates.TrackStatusAggregate; +using TrackCenter.Domain.Aggregates.TrackTemplateAggregate; +using TrackCenter.Domain.Dtos.TrackTemplate; +using TrackCenter.Domain.Enums; +using TrackCenter.Domain.VEntities; -namespace SJZY.Track.Repository.Repositories; +namespace TrackCenter.Repository.Repositories; public class TrackTemplateRepository : BasicRepository, ITrackTemplateRepository, IScopedDependency { @@ -22,15 +22,13 @@ public class TrackTemplateRepository : BasicRepository, ITr public async Task GetDetailAsync(int id) { var detail = await Context.Queryable() - .LeftJoin((a, b) => a.SubSystemId == b.Id && b.IsDeleted == false) - .Where((a, b) => a.Id == id) - .Select((a, b) => new GetTrackTemplateDetailVO + .Where(a => a.Id == id) + .Select(a => new GetTrackTemplateDetailVO { Id = a.Id, Code = a.Code, Name = a.Name, SubSystemId = a.SubSystemId, - SubSystem = b.CnName, CustomerId = a.CustomerId, CategoryId = a.CategoryId, }).FirstAsync(); @@ -43,25 +41,23 @@ public class TrackTemplateRepository : BasicRepository, ITr /// /// /// - public async Task> GetPageTrackTemplate(GetPageTrackTemplateVO input) + public async Task> GetPageTrackTemplate(GetPageTrackTemplateVO input) { var pagedList = await Context.Queryable() - .LeftJoin((a, b) => a.SubSystemId == b.Id && b.IsDeleted == false) - .WhereIF(input.SubSystemId > 0, (a, b) => a.SubSystemId == input.SubSystemId) + .WhereIF(input.SubSystemId > 0, a => a.SubSystemId == input.SubSystemId) .WhereIF(!input.Keywords.IsNullOrWhiteSpace(), - (a, b) => a.Name.Contains(input.Keywords!) || a.Code.Contains(input.Keywords!)) - .OrderByIF(input.SelectIds.IsNullOrEmpty(), (a, b) => a.CreateTime, OrderByType.Desc) + a => a.Name.Contains(input.Keywords!) || a.Code.Contains(input.Keywords!)) + .OrderByIF(input.SelectIds.IsNullOrEmpty(), a => a.CreateTime, OrderByType.Desc) .OrderByIF(!input.SelectIds.IsNullOrEmpty(), - (a, b) => SqlFunc.IIF(input.SelectIds!.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), + a => SqlFunc.IIF(input.SelectIds!.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), a.CreateTime), OrderByType.Desc) - .Select((a, b) => new GetTrackTemplateListVO + .Select(a => new GetTrackTemplateListVO { Id = a.Id, Code = a.Code, CreateTime = a.CreateTime, Name = a.Name, - SubSystem = b.CnName, - SubSystemId = b.Id + SubSystemId = a.SubSystemId }) .ToPagedListAsync(input.PageIndex, input.PageSize); //.OrderByIF(input.TrackTemplateId > 0, @@ -71,7 +67,7 @@ public class TrackTemplateRepository : BasicRepository, ITr } /// - public async Task> GetContentPageAsync( + public async Task> GetContentPageAsync( GetTrackTemplateContentPageInputVO input) { return await Context.Queryable() @@ -157,7 +153,7 @@ public class TrackTemplateRepository : BasicRepository, ITr { return await Context.Updateable() .Where(x => x.Id == id) - .SetColumns(nameof(ISoftDeleteBasicEntity.IsDeleted), true) + .SetColumns(nameof(ISoftDelete.IsDeleted), true) .ExecuteCommandHasChangeAsync(); } @@ -230,7 +226,7 @@ public class TrackTemplateRepository : BasicRepository, ITr return templates; } - public async Task> GetPageTrackTemplateListAsync(GetPageTrackTemplateListInputVo input) + public async Task> GetPageTrackTemplateListAsync(GetPageTrackTemplateListInputVo input) { var templates = await Context.Queryable() .Where(x => x.SubSystemId == input.SubSystemId) @@ -245,7 +241,7 @@ public class TrackTemplateRepository : BasicRepository, ITr }) .ToListAsync(); - if (templates == default) return new UnifyPageResultDto(); + if (templates == default) return new PagedResult(); var templateIds = templates.Select(x => x.Id).ToArray(); var contents = await Context.Queryable() .LeftJoin((a, b) => a.TrackContentId == b.Id) @@ -276,7 +272,7 @@ public class TrackTemplateRepository : BasicRepository, ITr .ToPagedListAsync(input.PageIndex, input.PageSize); //返回轨迹模板内容时按排序键排序 - contents.List = contents.List.OrderBy(x => x.Sort).ToList(); + contents.Items = contents.Items.OrderBy(x => x.Sort).ToList(); return contents; } diff --git a/src/SJZY.Track.Repository/Repositories/WarningDetailsEsRepository.cs b/src/TrackCenter.Repository/Repositories/WarningDetailsEsRepository.cs similarity index 85% rename from src/SJZY.Track.Repository/Repositories/WarningDetailsEsRepository.cs rename to src/TrackCenter.Repository/Repositories/WarningDetailsEsRepository.cs index 0c28646a..f49303bb 100644 --- a/src/SJZY.Track.Repository/Repositories/WarningDetailsEsRepository.cs +++ b/src/TrackCenter.Repository/Repositories/WarningDetailsEsRepository.cs @@ -1,16 +1,16 @@ +using InterfaceForward.Domain.Shared.Helpers; using Nest; -using SJZY.Expand.ABP.Core.PublicMethords; -using SJZY.Expand.ElasticSearch.Services; -using SJZY.Track.Domain.Aggregates.WarningAggregate; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Complete; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Return; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Transport; -using SJZY.Track.Domain.Consts; -using SJZY.Track.Domain.Dtos.Warning; -using SJZY.Track.Domain.Enums; -using SJZY.Track.Domain.Extensions; +using TrackCenter.Domain.Aggregates.WarningAggregate; +using TrackCenter.Domain.Aggregates.WarningAggregate.Complete; +using TrackCenter.Domain.Aggregates.WarningAggregate.Return; +using TrackCenter.Domain.Aggregates.WarningAggregate.Transport; +using TrackCenter.Domain.Consts; +using TrackCenter.Domain.Dtos.Warning; +using TrackCenter.Domain.Enums; +using TrackCenter.Domain.Extensions; +using TrackCenter.Repository.ES; -namespace SJZY.Track.Repository.Repositories; +namespace TrackCenter.Repository.Repositories; public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransientDependency { @@ -24,22 +24,29 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien #region 运输时效 - public async Task> GetPageTransportWarningDetailsAsync(GetPageTransportWarningDetailsInputVO input) + public async Task> GetPageTransportWarningDetailsAsync( + GetPageTransportWarningDetailsInputVO input) { - var musts = ListWrapperFactory.CreateListWrapper(input); + var musts = ListWrapperFactory + .CreateListWrapper(input); // 精确匹配 musts.AddIf(x => x.CustomId > 0, c => c.Term(f => f.CustomId, input.CustomId)); - musts.AddIf(x => x.OrderNos?.Count > 0, c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(input.OrderNos))); + musts.AddIf(x => x.OrderNos?.Count > 0, + c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(input.OrderNos))); musts.AddIf(x => x.OrderType > 0, c => c.Term(f => f.OrderType, input.OrderType)); musts.AddIf(x => x.Status > 0, c => c.Term(f => f.Status, input.Status)); musts.AddIf(x => x.SubSystemId > 0, c => c.Term(f => f.SubSystemId, input.SubSystemId)); - musts.AddIf(x => !string.IsNullOrWhiteSpace(x.WarningName), c => c.Match(f => f.Field(d => d.WarningName).Query(input.WarningName))); - musts.AddIf(x => x.CreateTimeStart.HasValue, c => c.DateRange(r => r.Field(f => f.CreateTime).GreaterThanOrEquals(input.CreateTimeStart))); - musts.AddIf(x => x.CreateTimeEnd.HasValue, c => c.DateRange(r => r.Field(f => f.CreateTime).LessThanOrEquals(input.CreateTimeEnd))); + musts.AddIf(x => !string.IsNullOrWhiteSpace(x.WarningName), + c => c.Match(f => f.Field(d => d.WarningName).Query(input.WarningName))); + musts.AddIf(x => x.CreateTimeStart.HasValue, + c => c.DateRange(r => r.Field(f => f.CreateTime).GreaterThanOrEquals(input.CreateTimeStart))); + musts.AddIf(x => x.CreateTimeEnd.HasValue, + c => c.DateRange(r => r.Field(f => f.CreateTime).LessThanOrEquals(input.CreateTimeEnd))); // 模糊匹配userId - musts.AddIf(x => x.NotifyUserId.HasValue, c => c.Match(f => f.Field(d => d.NotifyUsers).Query(input.NotifyUserId.ToString()))); + musts.AddIf(x => x.NotifyUserId.HasValue, + c => c.Match(f => f.Field(d => d.NotifyUsers).Query(input.NotifyUserId.ToString()))); var r = await _client.SearchAsync(x => x .Index(GlobalConst.TransportWarningDetailsIndex) @@ -55,12 +62,14 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien throw new InvalidOperationException($"运输预警明细查询失败，原因：{r.DebugInformation}。"); } - return new UnifyPageResultDto(r.ToIdList(), input.PageIndex, input.PageSize, (int) r.Total); + return new PagedResult(r.Total, r.ToIdList()); } - public async Task> GetTransportWarningDetailsAsync(GetTransportWarningDetailsVO input) + public async Task> GetTransportWarningDetailsAsync( + GetTransportWarningDetailsVO input) { - var musts = ListWrapperFactory.CreateListWrapper(input); + var musts = + ListWrapperFactory.CreateListWrapper(input); var isShouldQuery = false; if (input.HasDetailsIds) @@ -95,7 +104,8 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien } else { - musts.AddIf(x => x.HasRuleItemIds, c => c.Terms(t => t.Field(f => f.WarningSceneRuleItemId).Terms(input.RuleItemIds))); + musts.AddIf(x => x.HasRuleItemIds, + c => c.Terms(t => t.Field(f => f.WarningSceneRuleItemId).Terms(input.RuleItemIds))); musts.AddIf(x => x.HasSceneIds, c => c.Terms(t => t.Field(f => f.WarningSceneId).Terms(input.SceneIds))); musts.AddIf(x => x.HasWarningIds, c => c.Terms(t => t.Field(f => f.WarningId).Terms(input.WarningIds))); musts.AddIf(x => x.HasOrderIds, c => c.Terms(t => t.Field(f => f.OrderId).Terms(input.OrderIds))); @@ -177,7 +187,8 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien } } - public async Task BulkUpdateTransportWarningDetailsAsync(List details, int maxRetries = 3) + public async Task BulkUpdateTransportWarningDetailsAsync(List details, + int maxRetries = 3) { if (details.Count == 0) return; @@ -266,14 +277,17 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien }); } - public async Task BulkCloseTransportWarningDetailsAsync(BulkCloseTransportWarningDetailsVO input, int maxRetries = 3) + public async Task BulkCloseTransportWarningDetailsAsync(BulkCloseTransportWarningDetailsVO input, + int maxRetries = 3) { - var musts = ListWrapperFactory.CreateListWrapper(input); + var musts = ListWrapperFactory + .CreateListWrapper(input); // 关注状态，即将超时/已超时 musts.Add(c => c.Terms(t => t.Field(f => f.Status).Terms(input.Status))); musts.AddIf(x => x.HasDetailsIds, c => c.Ids(i => i.Values(input.DetailsIds))); - musts.AddIf(x => x.HasRuleItemIds, c => c.Terms(t => t.Field(f => f.WarningSceneRuleItemId).Terms(input.RuleItemIds))); + musts.AddIf(x => x.HasRuleItemIds, + c => c.Terms(t => t.Field(f => f.WarningSceneRuleItemId).Terms(input.RuleItemIds))); musts.AddIf(x => x.HasSceneIds, c => c.Terms(t => t.Field(f => f.WarningSceneId).Terms(input.SceneIds))); musts.AddIf(x => x.HasWarningIds, c => c.Terms(t => t.Field(f => f.WarningId).Terms(input.WarningIds))); musts.AddIf(x => x.HasOrderIds, c => c.Terms(t => t.Field(f => f.OrderId).Terms(input.OrderIds))); @@ -314,7 +328,8 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien } } - public async Task BulkInsertTransportWarningDetailsAsync(List details, int maxRetries = 3) + public async Task BulkInsertTransportWarningDetailsAsync(List details, + int maxRetries = 3) { // 按天写入es var indexName = $"{GlobalConst.TransportWarningDetailsIndex}-{DateTime.Now:yyyy.MM}"; @@ -332,30 +347,42 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien #region 回传时效 - public async Task> GetPageReturnWarningDetailsAsync(GetPageReturnWarningDetailsInputVO input) + public async Task> GetPageReturnWarningDetailsAsync( + GetPageReturnWarningDetailsInputVO input) { - var musts = ListWrapperFactory.CreateListWrapper(input); + var musts = + ListWrapperFactory.CreateListWrapper(input); // 精确匹配 musts.AddIf(x => x.SubSystemId > 0, c => c.Term(f => f.SubSystemId, input.SubSystemId)); - musts.AddIf(x => x.OrderNos?.Count > 0, c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(input.OrderNos))); + musts.AddIf(x => x.OrderNos?.Count > 0, + c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(input.OrderNos))); musts.AddIf(x => x.OrderType > 0, c => c.Term(f => f.OrderType, input.OrderType)); musts.AddIf(x => x.Status > 0, c => c.Term(f => f.Status, input.Status)); musts.AddIf(x => x.CustomId > 0, c => c.Term(f => f.CustomId, input.CustomId)); musts.AddIf(x => x.TrackStatusId > 0, c => c.Term(f => f.TrackStatusId, input.TrackStatusId)); musts.AddIf(x => x.TrackContentId > 0, c => c.Term(f => f.TrackContentId, input.TrackContentId)); musts.AddIf(x => x.IsKpi.HasValue, c => c.Term(f => f.IsExistsKpi, input.IsKpi!.Value)); - musts.AddIf(x => x.TrackTimeStart.HasValue, c => c.DateRange(r => r.Field(f => f.TrackTime).GreaterThanOrEquals(input.TrackTimeStart))); - musts.AddIf(x => x.TrackTimeEnd.HasValue, c => c.DateRange(r => r.Field(f => f.TrackTime).LessThanOrEquals(input.TrackTimeEnd))); - musts.AddIf(x => x.TrackCreateTimeStart.HasValue, c => c.DateRange(r => r.Field(f => f.TrackCreateTime).GreaterThanOrEquals(input.TrackCreateTimeStart))); - musts.AddIf(x => x.TrackCreateTimeEnd.HasValue, c => c.DateRange(r => r.Field(f => f.TrackCreateTime).LessThanOrEquals(input.TrackCreateTimeEnd))); - musts.AddIf(x => x.TrackReturnTimeStart.HasValue, c => c.DateRange(r => r.Field(f => f.TrackReturnTime).GreaterThanOrEquals(input.TrackReturnTimeStart))); - musts.AddIf(x => x.TrackReturnTimeEnd.HasValue, c => c.DateRange(r => r.Field(f => f.TrackReturnTime).LessThanOrEquals(input.TrackReturnTimeEnd))); - musts.AddIf(x => x.WarningCreateTimeStart.HasValue, c => c.DateRange(r => r.Field(f => f.CreateTime).GreaterThanOrEquals(input.WarningCreateTimeStart))); - musts.AddIf(x => x.WarningCreateTimeEnd.HasValue, c => c.DateRange(r => r.Field(f => f.CreateTime).LessThanOrEquals(input.WarningCreateTimeEnd))); + musts.AddIf(x => x.TrackTimeStart.HasValue, + c => c.DateRange(r => r.Field(f => f.TrackTime).GreaterThanOrEquals(input.TrackTimeStart))); + musts.AddIf(x => x.TrackTimeEnd.HasValue, + c => c.DateRange(r => r.Field(f => f.TrackTime).LessThanOrEquals(input.TrackTimeEnd))); + musts.AddIf(x => x.TrackCreateTimeStart.HasValue, + c => c.DateRange(r => r.Field(f => f.TrackCreateTime).GreaterThanOrEquals(input.TrackCreateTimeStart))); + musts.AddIf(x => x.TrackCreateTimeEnd.HasValue, + c => c.DateRange(r => r.Field(f => f.TrackCreateTime).LessThanOrEquals(input.TrackCreateTimeEnd))); + musts.AddIf(x => x.TrackReturnTimeStart.HasValue, + c => c.DateRange(r => r.Field(f => f.TrackReturnTime).GreaterThanOrEquals(input.TrackReturnTimeStart))); + musts.AddIf(x => x.TrackReturnTimeEnd.HasValue, + c => c.DateRange(r => r.Field(f => f.TrackReturnTime).LessThanOrEquals(input.TrackReturnTimeEnd))); + musts.AddIf(x => x.WarningCreateTimeStart.HasValue, + c => c.DateRange(r => r.Field(f => f.CreateTime).GreaterThanOrEquals(input.WarningCreateTimeStart))); + musts.AddIf(x => x.WarningCreateTimeEnd.HasValue, + c => c.DateRange(r => r.Field(f => f.CreateTime).LessThanOrEquals(input.WarningCreateTimeEnd))); // 模糊匹配userId（json字符串包含userId） - musts.AddIf(x => x.NotifyUserId.HasValue, c => c.Match(f => f.Field(d => d.NotifyUsers).Query(input.NotifyUserId.ToString()))); + musts.AddIf(x => x.NotifyUserId.HasValue, + c => c.Match(f => f.Field(d => d.NotifyUsers).Query(input.NotifyUserId.ToString()))); var r = await _client.SearchAsync(x => x .Index(GlobalConst.ReturnWarningDetailsIndex) @@ -371,7 +398,7 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien throw new InvalidOperationException($"回传预警明细查询失败，原因：{r.DebugInformation}。"); } - return new UnifyPageResultDto(r.ToIdList(), input.PageIndex, input.PageSize, (int) r.Total); + return new PagedResult(r.Total, r.ToIdList()); } public async Task> GetReturnWarningDetailsAsync(GetReturnWarningDetailsVO input) @@ -401,10 +428,12 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien } else { - musts.AddIf(x => x.HasRuleItemIds, c => c.Terms(t => t.Field(f => f.ReturnWarningRuleItemId).Terms(input.RuleItemIds))); + musts.AddIf(x => x.HasRuleItemIds, + c => c.Terms(t => t.Field(f => f.ReturnWarningRuleItemId).Terms(input.RuleItemIds))); musts.AddIf(x => x.HasWarningIds, c => c.Terms(t => t.Field(f => f.WarningId).Terms(input.WarningIds))); musts.AddIf(x => x.HasOrderIds, c => c.Terms(t => t.Field(f => f.OrderId).Terms(input.OrderIds))); - musts.AddIf(x => x.HasPushContentConfigIds, c => c.Terms(f => f.Field(d => d.PushContentConfigId).Terms(input.PushContentConfigIds))); + musts.AddIf(x => x.HasPushContentConfigIds, + c => c.Terms(f => f.Field(d => d.PushContentConfigId).Terms(input.PushContentConfigIds))); } ISearchResponse r; @@ -618,12 +647,14 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien public async Task BulkCloseReturnWarningDetailsAsync(BulkCloseReturnWarningDetailsVO input, int maxRetries = 3) { - var musts = ListWrapperFactory.CreateListWrapper(input); + var musts = + ListWrapperFactory.CreateListWrapper(input); // 关注状态，重试中/人工介入 musts.Add(c => c.Terms(t => t.Field(f => f.Status).Terms(input.Status))); musts.AddIf(x => x.HasDetailsIds, c => c.Ids(i => i.Values(input.DetailsIds))); - musts.AddIf(x => x.HasRuleItemIds, c => c.Terms(t => t.Field(f => f.ReturnWarningRuleItemId).Terms(input.RuleItemIds))); + musts.AddIf(x => x.HasRuleItemIds, + c => c.Terms(t => t.Field(f => f.ReturnWarningRuleItemId).Terms(input.RuleItemIds))); musts.AddIf(x => x.HasWarningIds, c => c.Terms(t => t.Field(f => f.WarningId).Terms(input.WarningIds))); musts.AddIf(x => x.HasOrderIds, c => c.Terms(t => t.Field(f => f.OrderId).Terms(input.OrderIds))); @@ -699,24 +730,33 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien #region 完整 - public async Task> GetPageCompleteWarningDetailsAsync(GetPageCompleteWarningDetailsInputVO input) + public async Task> GetPageCompleteWarningDetailsAsync( + GetPageCompleteWarningDetailsInputVO input) { - var musts = ListWrapperFactory.CreateListWrapper(input); + var musts = ListWrapperFactory + .CreateListWrapper(input); musts.AddIf(x => x.SubSystemId > 0, c => c.Term(f => f.SubSystemId, input.SubSystemId)); - musts.AddIf(x => x.OrderNos?.Count > 0, c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(input.OrderNos))); + musts.AddIf(x => x.OrderNos?.Count > 0, + c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(input.OrderNos))); musts.AddIf(x => x.OrderType > 0, c => c.Term(f => f.OrderType, input.OrderType)); musts.AddIf(x => x.Status > 0, c => c.Term(f => f.Status, input.Status)); musts.AddIf(x => x.CustomId > 0, c => c.Term(f => f.CustomId, input.CustomId)); - musts.AddIf(x => x.WarningCreateTimeStart.HasValue, c => c.DateRange(r => r.Field(f => f.CreateTime).GreaterThanOrEquals(input.WarningCreateTimeStart))); - musts.AddIf(x => x.WarningCreateTimeEnd.HasValue, c => c.DateRange(r => r.Field(f => f.CreateTime).LessThanOrEquals(input.WarningCreateTimeEnd))); - musts.AddIf(x => x.WarningHandleTimeStart.HasValue, c => c.DateRange(r => r.Field(f => f.ProcessedTime).GreaterThanOrEquals(input.WarningHandleTimeStart))); - musts.AddIf(x => x.WarningHandleTimeEnd.HasValue, c => c.DateRange(r => r.Field(f => f.ProcessedTime).LessThanOrEquals(input.WarningHandleTimeEnd))); + musts.AddIf(x => x.WarningCreateTimeStart.HasValue, + c => c.DateRange(r => r.Field(f => f.CreateTime).GreaterThanOrEquals(input.WarningCreateTimeStart))); + musts.AddIf(x => x.WarningCreateTimeEnd.HasValue, + c => c.DateRange(r => r.Field(f => f.CreateTime).LessThanOrEquals(input.WarningCreateTimeEnd))); + musts.AddIf(x => x.WarningHandleTimeStart.HasValue, + c => c.DateRange(r => r.Field(f => f.ProcessedTime).GreaterThanOrEquals(input.WarningHandleTimeStart))); + musts.AddIf(x => x.WarningHandleTimeEnd.HasValue, + c => c.DateRange(r => r.Field(f => f.ProcessedTime).LessThanOrEquals(input.WarningHandleTimeEnd))); // 模糊匹配userId - musts.AddIf(x => x.NotifyUserId.HasValue, c => c.Match(f => f.Field(d => d.NotifyUsers).Query(input.NotifyUserId.ToString()))); + musts.AddIf(x => x.NotifyUserId.HasValue, + c => c.Match(f => f.Field(d => d.NotifyUsers).Query(input.NotifyUserId.ToString()))); // 匹配缺失轨迹状态 - musts.AddIf(x => x.MissingTrackStatusId > 0, c => c.Script(s => s.Script(a => a.Source("doc['missingTrackStatusIds.keyword'].value.contains(params.value)") + musts.AddIf(x => x.MissingTrackStatusId > 0, c => c.Script(s => s.Script(a => a + .Source("doc['missingTrackStatusIds.keyword'].value.contains(params.value)") .Params(p => p.Add("value", input.MissingTrackStatusId.ToString()))))); var r = await _client.SearchAsync(x => x @@ -733,13 +773,15 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien throw new InvalidOperationException($"回传预警明细查询失败，原因：{r.DebugInformation}。"); } - return new UnifyPageResultDto(r.ToIdList(), input.PageIndex, input.PageSize, (int) r.Total); + return new PagedResult(r.Total, r.ToIdList()); } - public async Task> GetCompleteWarningDetailsAsync(GetCompleteWarningDetailsVO input) + public async Task> GetCompleteWarningDetailsAsync( + GetCompleteWarningDetailsVO input) { var isShouldQuery = false; - var musts = ListWrapperFactory.CreateListWrapper(input); + var musts = + ListWrapperFactory.CreateListWrapper(input); if (input.HasDetailsIds) { musts.Add(c => c.Ids(i => i.Values(input.DetailsIds))); @@ -772,7 +814,8 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien } else { - musts.AddIf(x => x.HasRuleItemIds, c => c.Terms(t => t.Field(f => f.CompleteWarningRuleItemId).Terms(input.RuleItemIds))); + musts.AddIf(x => x.HasRuleItemIds, + c => c.Terms(t => t.Field(f => f.CompleteWarningRuleItemId).Terms(input.RuleItemIds))); musts.AddIf(x => x.HasWarningIds, c => c.Terms(t => t.Field(f => f.WarningId).Terms(input.WarningIds))); musts.AddIf(x => x.HasOrderIds, c => c.Terms(t => t.Field(f => f.OrderId).Terms(input.OrderIds))); } @@ -811,12 +854,14 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien public async Task BulkCloseCompleteWarningDetailsAsync(BulkCloseCompleteWarningDetailsVO input, int maxRetries = 3) { - var musts = ListWrapperFactory.CreateListWrapper(input); + var musts = + ListWrapperFactory.CreateListWrapper(input); // 关注状态，待处理 musts.Add(c => c.Terms(t => t.Field(f => f.Status).Terms(input.Status))); musts.AddIf(x => x.HasDetailsIds, c => c.Ids(i => i.Values(input.DetailsIds))); - musts.AddIf(x => x.HasRuleItemIds, c => c.Terms(t => t.Field(f => f.CompleteWarningRuleItemId).Terms(input.RuleItemIds))); + musts.AddIf(x => x.HasRuleItemIds, + c => c.Terms(t => t.Field(f => f.CompleteWarningRuleItemId).Terms(input.RuleItemIds))); musts.AddIf(x => x.HasWarningIds, c => c.Terms(t => t.Field(f => f.WarningId).Terms(input.WarningIds))); musts.AddIf(x => x.HasOrderIds, c => c.Terms(t => t.Field(f => f.OrderId).Terms(input.OrderIds))); @@ -871,7 +916,8 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien } } - public async Task BulkUpdateCompleteWarningDetailsAsync(List details, int maxRetries = 3) + public async Task BulkUpdateCompleteWarningDetailsAsync(List details, + int maxRetries = 3) { if (details.Count == 0) return; @@ -940,7 +986,8 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien } } - public async Task BulkInsertCompleteWarningDetailsAsync(List details, int maxRetries = 3) + public async Task BulkInsertCompleteWarningDetailsAsync(List details, + int maxRetries = 3) { // 按天写入es var indexName = $"{GlobalConst.CompleteWarningDetailsIndex}-{DateTime.Now:yyyy.MM}"; diff --git a/src/SJZY.Track.Repository/Repositories/WarningRuleRepository.cs b/src/TrackCenter.Repository/Repositories/WarningRuleRepository.cs similarity index 92% rename from src/SJZY.Track.Repository/Repositories/WarningRuleRepository.cs rename to src/TrackCenter.Repository/Repositories/WarningRuleRepository.cs index c79c1c54..de8cdf99 100644 --- a/src/SJZY.Track.Repository/Repositories/WarningRuleRepository.cs +++ b/src/TrackCenter.Repository/Repositories/WarningRuleRepository.cs @@ -1,13 +1,13 @@ using System.Linq.Expressions; -using SJZY.Track.Domain; -using SJZY.Track.Domain.Aggregates.WarningAggregate; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Complete; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Return; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Transport; -using SJZY.Track.Domain.Enums; -using SJZY.Track.Domain.Extensions; +using TrackCenter.Domain; +using TrackCenter.Domain.Aggregates.WarningAggregate; +using TrackCenter.Domain.Aggregates.WarningAggregate.Complete; +using TrackCenter.Domain.Aggregates.WarningAggregate.Return; +using TrackCenter.Domain.Aggregates.WarningAggregate.Transport; +using TrackCenter.Domain.Enums; +using TrackCenter.Domain.Extensions; -namespace SJZY.Track.Repository.Repositories; +namespace TrackCenter.Repository.Repositories; public class WarningRuleRepository : BasicRepository, IWarningRuleRepository, ITransientDependency { @@ -100,16 +100,10 @@ public class WarningRuleRepository : BasicRepository, IWarnin return warningRules.FirstOrDefault(); } - public async Task> GetWarningRuleForEnabledAsync(HashSet<(int SubSystemId, int CustomId)> conditions, WarningRuleType warningType) + public async Task> GetWarningRuleForEnabledAsync(List customers, WarningRuleType warningType) { - Expression> baseExp = x => x.WarningType == (int) warningType && x.IsEnabled; - - var exp = Expressionable.Create(); - foreach (var condition in conditions) - exp.Or(x => x.CustomId == condition.CustomId && x.SubSystemId == condition.SubSystemId); - var list = await Context.Queryable() - .Where(baseExp.And(exp.ToExpression())) + .Where(x => x.WarningType == (int) warningType && x.IsEnabled && customers.Contains(x.CustomId)) .ToListAsync(); return list.Count == 0 diff --git a/src/SJZY.Track.Repository/Repositories/WarningTaskRepository.cs b/src/TrackCenter.Repository/Repositories/WarningTaskRepository.cs similarity index 96% rename from src/SJZY.Track.Repository/Repositories/WarningTaskRepository.cs rename to src/TrackCenter.Repository/Repositories/WarningTaskRepository.cs index be4bc9ff..e81b231b 100644 --- a/src/SJZY.Track.Repository/Repositories/WarningTaskRepository.cs +++ b/src/TrackCenter.Repository/Repositories/WarningTaskRepository.cs @@ -1,9 +1,9 @@ using System.Linq.Expressions; -using SJZY.Track.Domain.Aggregates.WarningAggregate; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Return; -using SJZY.Track.Domain.Aggregates.WarningAggregate.Transport; +using TrackCenter.Domain.Aggregates.WarningAggregate; +using TrackCenter.Domain.Aggregates.WarningAggregate.Return; +using TrackCenter.Domain.Aggregates.WarningAggregate.Transport; -namespace SJZY.Track.Repository.Repositories; +namespace TrackCenter.Repository.Repositories; public sealed class WarningTaskRepository : BasicRepository, IWarningTaskRepository, ITransientDependency { diff --git a/src/TrackCenter.Repository/SugarQueryableExtensions.cs b/src/TrackCenter.Repository/SugarQueryableExtensions.cs new file mode 100644 index 00000000..e50abec4 --- /dev/null +++ b/src/TrackCenter.Repository/SugarQueryableExtensions.cs @@ -0,0 +1,14 @@ + +namespace TrackCenter.Repository; + +public static class SugarQueryableExtensions +{ + public static async Task> ToPagedListAsync(this ISugarQueryable query, + int pageIndex, int pageSize) where TEntity : class + { + RefAsync totalCount = 0; + var items = await query.ToPageListAsync(pageIndex, pageSize, totalCount); + + return new PagedResult(totalCount, items); + } +} diff --git a/src/TrackCenter.Repository/TrackCenter.Repository.csproj b/src/TrackCenter.Repository/TrackCenter.Repository.csproj new file mode 100644 index 00000000..5c484242 --- /dev/null +++ b/src/TrackCenter.Repository/TrackCenter.Repository.csproj @@ -0,0 +1,17 @@ + + + + net8 + True + + + + + + + + + + + + diff --git a/src/TrackCenter.Repository/TrackCenterDbContext.cs b/src/TrackCenter.Repository/TrackCenterDbContext.cs new file mode 100644 index 00000000..35663736 --- /dev/null +++ b/src/TrackCenter.Repository/TrackCenterDbContext.cs @@ -0,0 +1,22 @@ +using System.Reflection; +using Fake.Domain.Entities; +using Fake.SqlSugarCore; + +namespace TrackCenter.Repository; + +public class TrackCenterDbContext : SugarDbContext +{ + public TrackCenterDbContext(SugarDbConnOptions options) : base(options) + { + } + + protected override void ConfigureEntityService(PropertyInfo property, EntityColumnInfo column) + { + if (property.Name == nameof(IAggregateRoot.ConcurrencyStamp)) + { + column.IsIgnore = true; + } + + base.ConfigureEntityService(property, column); + } +} diff --git a/src/TrackCenter.Repository/TrackCenterRepositoryModule.cs b/src/TrackCenter.Repository/TrackCenterRepositoryModule.cs new file mode 100644 index 00000000..d6b085f9 --- /dev/null +++ b/src/TrackCenter.Repository/TrackCenterRepositoryModule.cs @@ -0,0 +1,36 @@ +using Fake.Modularity; +using Fake.SqlSugarCore; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using TrackCenter.Domain; +using TrackCenter.Repository.ES; +using TrackCenter.Repository.Repositories; +namespace TrackCenter.Repository; + +/// +/// 仓储模块 +/// +[DependsOn(typeof(FakeSqlSugarCoreModule))] +public class TrackCenterRepositoryModule : FakeModule +{ + public override void ConfigureServices(ServiceConfigurationContext context) + { + var configuration = context.Services.GetConfiguration(); + + context.Services.AddSugarDbContext(options => + { + options.ConnectionString = configuration.GetConnectionString("Default")!; + options.DbType = DbType.MySql; + }); + + context.Services.AddTransient(typeof(IBasicRepository<>), typeof(BasicRepository<>)); + + context.Services.Configure(options => + { + configuration.GetSection("ElasticSearch").Bind(options); +#if !DEBUG + options.ShowLogInfo = false; +#endif + }); + } +} diff --git a/test/SJZY.Track.Test/SJZY.Track.Test.csproj b/test/SJZY.Track.Test/SJZY.Track.Test.csproj index c2b5048f..e1102396 100644 --- a/test/SJZY.Track.Test/SJZY.Track.Test.csproj +++ b/test/SJZY.Track.Test/SJZY.Track.Test.csproj @@ -1,7 +1,7 @@  - net7.0 + net8 enable enable @@ -39,7 +39,7 @@ - + diff --git a/test/SJZY.Track.Test/Startup.cs b/test/SJZY.Track.Test/Startup.cs index b18b5cd5..2a827811 100644 --- a/test/SJZY.Track.Test/Startup.cs +++ b/test/SJZY.Track.Test/Startup.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace SJZY.Track.Test; +namespace TrackCenter.Test; public class Startup { diff --git a/test/SJZY.Track.Test/TestModule.cs b/test/SJZY.Track.Test/TestModule.cs index 31af0048..6e63ae62 100644 --- a/test/SJZY.Track.Test/TestModule.cs +++ b/test/SJZY.Track.Test/TestModule.cs @@ -1,8 +1,8 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; -using SJZY.Track.Api; -using SJZY.Track.Application; -using SJZY.Track.Repository; +using TrackCenter.Application; +using TrackCenter.Repository; +using TrackCenter.Api; using Volo.Abp; using Volo.Abp.AspNetCore.TestBase; using Volo.Abp.Authorization; @@ -14,7 +14,7 @@ using Volo.Abp.Threading; [assembly: HostingStartup(typeof(SJZY.Expand.ABP.Core.HostingStartup))] -namespace SJZY.Track.Test; +namespace TrackCenter.Test; [DependsOn( typeof(AbpAspNetCoreTestBaseModule), @@ -22,11 +22,11 @@ namespace SJZY.Track.Test; typeof(AbpAuthorizationModule), typeof(SjzyTrackRepositoryModule), typeof(SjzyTrackApplicationModule), - typeof(SjzyTrackApiModule), + typeof(TrackCenterApiModule), typeof(AbpHttpClientModule) //添加abp的http代理模块 )] [assembly: HostingStartup(typeof(Expand.ABP.Core.HostingStartup))] -public class TestModule : AbpModule +public class TestModule : FakeModule { public override void ConfigureServices(ServiceConfigurationContext context) { diff --git a/test/SJZY.Track.Test/TestModuleTestBase.cs b/test/SJZY.Track.Test/TestModuleTestBase.cs index 4be0763d..86ab1b04 100644 --- a/test/SJZY.Track.Test/TestModuleTestBase.cs +++ b/test/SJZY.Track.Test/TestModuleTestBase.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Volo.Abp.AspNetCore.TestBase; -namespace SJZY.Track.Test; +namespace TrackCenter.Test; public class TestModuleTestBase : AbpAspNetCoreIntegratedTestBase {