diff --git a/SJZY.Track.Api.sln b/SJZY.Track.Api.sln index 45fdba01..0c457eb0 100644 --- a/SJZY.Track.Api.sln +++ b/SJZY.Track.Api.sln @@ -12,10 +12,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0E2537C3-6 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SJZY.Track.Repository", "src\SJZY.Track.Repository\SJZY.Track.Repository.csproj", "{D9CF5706-1972-414F-821E-AA32C13B8570}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SJZY.Track.HttpApi", "src\SJZY.Track.HttpApi\SJZY.Track.HttpApi.csproj", "{390A44FB-0DB5-4B66-86AB-7712DC3030F5}" +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}" 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}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "solution items", "solution items", "{086C7812-46F9-49FD-B490-A769E2C0729E}" + ProjectSection(SolutionItems) = preProject + common.props = common.props + NuGet.Config = NuGet.Config + .gitignore = .gitignore + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -42,6 +51,10 @@ Global {3A53539C-4A85-4E5D-A071-7B4B193AB0E0}.Debug|Any CPU.Build.0 = Debug|Any CPU {3A53539C-4A85-4E5D-A071-7B4B193AB0E0}.Release|Any CPU.ActiveCfg = Release|Any CPU {3A53539C-4A85-4E5D-A071-7B4B193AB0E0}.Release|Any CPU.Build.0 = Release|Any CPU + {073EB297-E752-49AC-BED8-B4AEBAB518F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {073EB297-E752-49AC-BED8-B4AEBAB518F6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {073EB297-E752-49AC-BED8-B4AEBAB518F6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {073EB297-E752-49AC-BED8-B4AEBAB518F6}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -52,9 +65,10 @@ Global {D9CF5706-1972-414F-821E-AA32C13B8570} = {DAC93270-5A25-40E5-B851-E7CA398DBC31} {390A44FB-0DB5-4B66-86AB-7712DC3030F5} = {DAC93270-5A25-40E5-B851-E7CA398DBC31} {3A53539C-4A85-4E5D-A071-7B4B193AB0E0} = {0E2537C3-6EF3-4085-9BD2-CF923E53F82A} + {073EB297-E752-49AC-BED8-B4AEBAB518F6} = {DAC93270-5A25-40E5-B851-E7CA398DBC31} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = { 8289A516 - 787C - 4D9D - B972 - E7047BDD206B} + SolutionGuid = { 8289A516 - 787C - 4D9D - B972 - E7047BDD206B} SolutionGuid = {C8AD8123-683D-406E-A8FB-1D0184C19472} EndGlobalSection EndGlobal diff --git a/SJZY.Track.Api.sln.DotSettings b/SJZY.Track.Api.sln.DotSettings new file mode 100644 index 00000000..2363a683 --- /dev/null +++ b/SJZY.Track.Api.sln.DotSettings @@ -0,0 +1,2 @@ + + True \ No newline at end of file diff --git a/common.props b/common.props new file mode 100644 index 00000000..492bcb09 --- /dev/null +++ b/common.props @@ -0,0 +1,9 @@ + + + latest + enable + enable + $(NoWarn);CS1591;CS0436;NU1803 + + + diff --git a/src/SJZY.Track.Api/Program.cs b/src/SJZY.Track.Api/Program.cs index a9d373a7..db266046 100644 --- a/src/SJZY.Track.Api/Program.cs +++ b/src/SJZY.Track.Api/Program.cs @@ -10,10 +10,10 @@ try .AddConfigurationContainer() .AddOptionsFromConfiguration() .UseSerilogDefault() - .Host.AddAppSettingsSecretsJson() + .Host.AddAppSettingsSecretsJson() .UseAutofac(); - await builder.AddApplicationAsync(); + await builder.AddApplicationAsync(); var app = builder.Build(); await app.InitializeApplicationAsync(); @@ -21,5 +21,5 @@ try } catch (Exception ex) { - Console.WriteLine($"项目启动失败，异常信息：{ex}"); + Console.WriteLine($"椤圭洰鍚姩澶辫触锛屽紓甯镐俊鎭細{ex}"); } \ No newline at end of file diff --git a/src/SJZY.Track.Api/SJZY.Track.Api.csproj b/src/SJZY.Track.Api/SJZY.Track.Api.csproj index 0d485cec..be47c0cf 100644 --- a/src/SJZY.Track.Api/SJZY.Track.Api.csproj +++ b/src/SJZY.Track.Api/SJZY.Track.Api.csproj @@ -1,32 +1,26 @@ 锘 - - net7.0 - enable - enable - True - Linux - ..\.. - + - - - - - - + + net7.0 + True + Linux + ..\.. + - - - - - - + + + + + + + + + + + + - - - - - diff --git a/src/SJZY.Track.Api/ApiModule.cs b/src/SJZY.Track.Api/SjzyTrackApiModule.cs similarity index 87% rename from src/SJZY.Track.Api/ApiModule.cs rename to src/SJZY.Track.Api/SjzyTrackApiModule.cs index f679135d..13d9633a 100644 --- a/src/SJZY.Track.Api/ApiModule.cs +++ b/src/SJZY.Track.Api/SjzyTrackApiModule.cs @@ -9,6 +9,7 @@ using SJZY.Expand.ABP.Core.Prometheus; using SJZY.Expand.ABP.Core.Redis; using SJZY.Expand.ABP.Core.Swagger; using SJZY.Track.Application; +using SJZY.Track.Repository; using Volo.Abp; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Serilog; @@ -17,23 +18,26 @@ using Volo.Abp.Autofac; using Volo.Abp.Json; using Volo.Abp.Modularity; -[assembly: HostingStartup(typeof(SJZY.Expand.ABP.Core.HostingStartup))] +[assembly: HostingStartup(typeof(HostingStartup))] + namespace SJZY.Track.Api { [DependsOn( typeof(AbpAutofacModule), typeof(SjzyAbpCodeModule), - typeof(ApplicationModule), typeof(AbpAspNetCoreMvcModule), - typeof(AbpAspNetCoreSerilogModule) + typeof(AbpAspNetCoreSerilogModule), + typeof(SjzyTrackApplicationModule), + typeof(SjzyTrackRepositoryModule) )] - public class ApiModule : AbpModule + 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 => { @@ -47,7 +51,9 @@ namespace SJZY.Track.Api //Json鏍煎紡鍖栧叏灞澶勭悊 context.Services.Configure(options => { - options.SerializerSettings.ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver();//.DefaultContractResolver(); + 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()); }); @@ -55,9 +61,7 @@ namespace SJZY.Track.Api Configure(options => options.OutputDateTimeFormat = "yyyy-MM-dd HH:mm:ss"); Configure(options => { options.IsEnabled = false; }); - context.Services.AddRedis(); - } public override void OnApplicationInitialization(ApplicationInitializationContext context) @@ -77,6 +81,7 @@ namespace SJZY.Track.Api app.UsePrometheus(); #region 鍚姩鎻愮ず + Console.WriteLine($@" +-------------------------------------------------------+ | | @@ -87,8 +92,8 @@ namespace SJZY.Track.Api | | +-------------------------------------------------------+ "); + #endregion } } - -} +} \ No newline at end of file diff --git a/src/SJZY.Track.Api/appsettings.Development.json b/src/SJZY.Track.Api/appsettings.Development.json index 0856dfd7..671ae998 100644 --- a/src/SJZY.Track.Api/appsettings.Development.json +++ b/src/SJZY.Track.Api/appsettings.Development.json @@ -2,13 +2,12 @@ "Environment": "Dev", "Logging": { "LogLevel": { - "Default": "Information", + "Default": "Debug", "Microsoft.AspNetCore": "Warning" } }, "ConnectionStrings": { - "DefaultConnection": "server=mysql-dev.default.svc.cluster.local;Database=sjzy_openapi;Uid=sjzy_dev_user;Pwd=818f83e5;AllowLoadLocalInfile=true;SslMode=None;Charset=utf8mb4;", - "BICenterConnection": "server=mysql-test.default.svc.cluster.local;Database=sjzy_bi_center;Uid=sjzy_test_user;Pwd=848c1c31;AllowLoadLocalInfile=true;SslMode=None;Charset=utf8mb4;" + "DefaultConnection": "server=mysql-dev.default.svc.cluster.local;Database=sjzy_track;Uid=sjzy_dev_user;Pwd=818f83e5;AllowLoadLocalInfile=true;SslMode=None;Charset=utf8mb4;", }, "Redis": { "Host": "redis-dev.default.svc.cluster.local:6379", @@ -60,9 +59,20 @@ "BucketName": "cams3", "ReturnHttpsUrl": true }, + "ElasticSearch": { + "NodeUrls": [ "http://elasticsearch-dev.default.svc.cluster.local:9200" ], + "LoginName": "elastic", + "Password": "afyTgmVb8jq6", + "Base64PassPassword": "Basic ZWxhc3RpYzphZnlUZ21WYjhqcTY=" + }, "RemoteServices": { "UserCenter": { "BaseUrl": "http://192.168.80.55:5020/" + }, + "InterfaceForward": { + "BaseUrl": "http://192.168.80.55:5041/", //寮鍙戠幆澧80.55锛屾祴璇曠幆澧80.57 + "AppKey": "浠庢帴鍙ｉ氬簲鐢ㄨ幏鍙", + "AppSecret": "浠庢帴鍙ｉ氬簲鐢ㄨ幏鍙" } } } diff --git a/src/SJZY.Track.Api/appsettings.Test.json b/src/SJZY.Track.Api/appsettings.Test.json index 825693ce..c62fc382 100644 --- a/src/SJZY.Track.Api/appsettings.Test.json +++ b/src/SJZY.Track.Api/appsettings.Test.json @@ -7,8 +7,8 @@ } }, "ConnectionStrings": { - "DefaultConnection": "server=192.168.80.84;Database=sjzy_package_setting;Uid=sjzy_test_user;Pwd=848c1c31;AllowLoadLocalInfile=true;SslMode=None;Charset=utf8mb4;", - "canalView": "server=192.168.80.84;Database=sjzy_data_center;Uid=sjzy_test_user;Pwd=848c1c31;AllowLoadLocalInfile=true;SslMode=None;Charset=utf8mb4;" + "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", diff --git a/src/SJZY.Track.Api/appsettings.json b/src/SJZY.Track.Api/appsettings.json index 850809ba..d69cb0c1 100644 --- a/src/SJZY.Track.Api/appsettings.json +++ b/src/SJZY.Track.Api/appsettings.json @@ -1,20 +1,20 @@ { "Configuration": { - "UseLocalConfiguration": true, // 鏄惁浣跨敤鏈湴閰嶇疆鏂囦欢 - "ConfiguraFileName": "appsettings.Development.json", //鎸囧畾閰嶇疆鏂囦欢鍚嶇О锛屽紑鍚 UseLocalConfiguration 鏃剁敓鏁 + "UseLocalConfiguration": false, //鏄惁浣跨敤鏈湴閰嶇疆鏂囦欢 + "ConfiguraFileName": "appsettings.Development.json", //鎸囧畾閰嶇疆鏂囦欢鍚嶇О锛屽紑鍚疷seLocalConfiguration鏃剁敓鏁 "Apollo": { "AppId": "SJZY.Track.Configuration", "Env": "DEV", - "Namespace": "Dev", + "Namespace": "Test", "MetaServer": "http://apollo-service-test-apollo-configservice.apollo.svc.cluster.local:8080", "ConfigServer": [ "http://apollo-service-test-apollo-configservice.apollo.svc.cluster.local:8080" ] } - }, - "Kestrel": { - "EndPoints": { - "Http": { - "Url": "http://*:5056" - } + }, + "Kestrel": { + "EndPoints": { + "Http": { + "Url": "http://*:5056" } } } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/DeleteOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/DeleteOrderInput.cs new file mode 100644 index 00000000..0e318811 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/DeleteOrderInput.cs @@ -0,0 +1,13 @@ +锘縩amespace SJZY.Track.Application.Contract.Dtos.ProvideServices; + +public class DeleteOrderInput : OrderNoInfo +{ +} + +public class DeleteTrackInput : OrderNoInfo +{ + /// + /// 杞ㄨ抗code + /// + public List TrackCodes { get; set; } = new(); +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs new file mode 100644 index 00000000..3920f5c1 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs @@ -0,0 +1,90 @@ +锘縰sing System.Reflection.Metadata.Ecma335; + +namespace SJZY.Track.Application.Contract.Dtos.ProvideServices +{ + public class GetOrderDetailsInput + { + /// + /// 杞ㄨ抗璁㈠崟id + /// + public int OrderId { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 杞ㄨ抗妯℃澘Id + /// + public List? TrackTemplateIds { get; set; } = new List(); + } + + public class TrackOrderDetailDto + { + /// + /// Id es涓婚敭 + /// + public int Id { get; set; } + + /// + /// 杞ㄨ抗璁㈠崟id + /// + public int OrderId { set; get; } + + /// + /// 杞ㄨ抗浠ｇ爜 + /// + public string? Code { get; set; } + + /// + /// 杞ㄨ抗鍐呭 + /// + public string? Content { get; set; } + + /// + /// 杞ㄨ抗鍐呭鑻辨枃 + /// + public string? EnContent { get; set; } + + /// + /// 杞ㄨ抗鍙戠敓鍦 + /// + public string? TrackPlace { get; set; } + + /// + /// 杞ㄨ抗鍙戠敓鏃堕棿 + /// + public DateTime? TrackTime { get; set; } + + /// + /// 杞ㄨ抗鍙戠敓鏃跺尯 + /// + public string? TrackTimeZone { get; set; } + + /// + /// 鏃跺尯鐨勫 + /// + public float TrackTimeZoneValue { get; set; } + + /// + /// 鏄惁鍙垹 + /// + public bool IsCanDelete { get; set; } + + /// + /// 鏄惁瀵瑰 + /// + public bool IsExternal { get; set; } + + /// + /// 鍒涘缓鏃堕棿 + /// + public DateTime CreateTime { get; set; } + + /// + /// 鍒涘缓浜 + /// + public string? CreateUser { get; set; } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs new file mode 100644 index 00000000..81aa553e --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs @@ -0,0 +1,117 @@ +锘縩amespace SJZY.Track.Application.Contract.Dtos.ProvideServices; + +public class GetPageTrackOrderInput : PageInfoInput +{ + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + ///// + ///// 鍗曞彿 + ///// + //public List? OrderNos { get; set; } + + /// + /// 鍗曞彿 + /// + public string? OrderNos { get; set; } + + /// + /// 鍒涘缓鏃堕棿寮濮 + /// + public DateTime? CreateTimeStart { get; set; } + + /// + /// 鍒涘缓鏃堕棿鎴 + /// + public DateTime? CreateTimeEnd { get; set; } +} + +/// +/// 杞ㄨ抗璁㈠崟Dto +/// +public class TrackOrderDto +{ + /// + /// 杞ㄨ抗璁㈠崟id + /// + public int Id { get; set; } + + /// + /// 璁㈠崟绫诲瀷id + /// + public int OrderType { get; set; } + + /// + /// 璁㈠崟鍚嶇О + /// + public string? OrderTypeName { get; set; } + + /// + /// 璁㈠崟鍙 + /// + public string? OrderNumber { get; set; } + + /// + /// 杞ㄨ抗妯＄増 + /// + public string? TrackTemplateNames { get; set; } + + /// + /// 杞ㄨ抗妯℃澘Id鏁扮粍 + /// + public List? TrackTemplateIds { get; set; } + + /// + /// 瀹㈡埛绠绉 + /// + public string? CustomerShortName { get; set; } + + /// + /// 瀹㈡埛浠ｇ爜 + /// + public string? CustomerCode { get; set; } + + /// + /// 璁㈠崟鏄庣粏锛坖son锛 + /// + public string? OrderDetails { get; set; } + + /// + /// 鏈鏂拌建杩瑰唴瀹 + /// + public string? NewestTrackContent { get; set; } + + /// + /// 鏈鏂拌建杩瑰唴瀹硅嫳鏂 + /// + public string? NewestTrackEnContent { get; set; } + + /// + /// 鏈鏂拌建杩瑰彂鐢熷湴 + /// + public string? NewestTrackPlace { get; set; } + + /// + /// 鏈鏂拌建杩规椂闂 + /// + public DateTime? NewestTrackTime { get; set; } + + /// + /// 鏄惁瀹岀粨 + /// + public bool IsFinish { get; set; } + + /// + /// 鍒涘缓鏃堕棿 + /// + public DateTime? CreateTime { get; set; } + + /// + /// 瀛愮郴缁 + /// + public string SubSystem { get; set; } + + public int SubSystemId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackInput.cs new file mode 100644 index 00000000..598ee759 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackInput.cs @@ -0,0 +1,54 @@ +using System.ComponentModel.DataAnnotations; + +namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; + +public class GetTrackInput +{ + /// + /// 璁㈠崟绫诲瀷 + /// + [Required] + [Range(1, int.MaxValue)] + public int OrderType { get; set; } + + /// + /// 璁㈠崟鍙 + /// + public List OrderNos { get; set; } = new(); + + /// + /// 鏃跺尯 +8 +8.25 -8.5 -9 + /// 涓嶄紶榛樿+8 + /// + private float? _timeZone; + + public float? TimeZone + { + get => _timeZone ?? 8; + set => _timeZone = value; + } + + /// + /// 鎺掑簭鏂瑰紡 + /// + [Required] + public SortMethod SortMethod { get; set; } +} + +public enum SortMethod +{ + /// + /// 鎸夎建杩瑰彂鐢熸椂闂存帓搴 + /// + ByTrackTime, + + /// + /// 鎸夎建杩瑰彂鐢熸椂闂撮檷搴 + /// + ByTrackTimeDesc, + + /// + /// 鎸夎鍗曟ā鏉挎帓搴 + /// + ByTemplate +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs new file mode 100644 index 00000000..eda7ecbc --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs @@ -0,0 +1,21 @@ +namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; + +public class GetTrackOutput +{ + /// + /// 璁㈠崟鍙 + /// + public string OrderNo { get; set; } + + public List TrackDetails { get; set; } +} + +public class TrackDetail +{ + public string Code { get; set; } + public string Status { get; set; } + public string Content { get; set; } + public string Location { get; set; } + public DateTime Time { get; set; } + public float TimeZone { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/LinkOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/LinkOrderInput.cs new file mode 100644 index 00000000..cf3e5b79 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/LinkOrderInput.cs @@ -0,0 +1,31 @@ +锘縰sing System.ComponentModel.DataAnnotations; + +namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; + +public class LinkOrderInput +{ + /// + /// false瑙ｇ粦锛宼rue鍏宠仈 + /// + [Required] + public bool IsLink { get; set; } + + /// + /// 璁㈠崟绫诲瀷锛屽繀濉 + /// + [Required] + public int OrderType { get; set; } + + /// + /// 璁㈠崟鍙凤紝蹇呭～ + /// + [Required] + public string OrderNo { get; set; } + + [Required] public int LinkOrderType { get; set; } + + /// + /// 鍏宠仈鐨勫崟鍙 + /// + public List LinkOrderNos { get; set; } = new(); +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/OrderNoInfo.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/OrderNoInfo.cs new file mode 100644 index 00000000..eda65e4a --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/OrderNoInfo.cs @@ -0,0 +1,20 @@ +锘縰sing System.ComponentModel.DataAnnotations; + +namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; + +public class OrderNoInfo +{ + /// + /// 璁㈠崟绫诲瀷锛屽繀濉 + /// + [Required] + [Range(1, int.MaxValue)] + public int OrderType { get; set; } + + /// + /// 璁㈠崟鍙凤紝蹇呭～ + /// + [Required] + [MaxLength(100)] + public string OrderNo { get; set; } = null!; +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/RefreshTrackInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/RefreshTrackInput.cs new file mode 100644 index 00000000..4e6e2955 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/RefreshTrackInput.cs @@ -0,0 +1,9 @@ +锘縩amespace SJZY.Track.Application.Contract.Dtos.ProvideServices; + +public class RefreshTrackInput +{ + /// + /// 璁㈠崟鍙 + /// + public List OrderNos { get; set; } = new(); +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderInput.cs new file mode 100644 index 00000000..69ad9a0b --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpdateOrderInput.cs @@ -0,0 +1,54 @@ +锘縰sing System.ComponentModel.DataAnnotations; + +namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; + +public class UpdateOrderInput : OrderNoInfo +{ + /// + /// 鐩殑娓彛 + /// + public string? ArrivalPort { get; set; } + + /// + /// 璧疯繍娓彛 + /// + public string? LeavePort { get; set; } + + /// + /// 鐩殑鍥藉锛屽繀濉 + /// + [Required] + [MaxLength(200)] + public string ArrivalCountry { get; set; } = null!; + + /// + /// 璧疯繍鍥藉锛屽繀濉 + /// + [Required] + [MaxLength(200)] + public string LeaveCountry { get; set; } = null!; + + /// + /// 鐩殑鍩庡競锛屽繀濉 + /// + [Required] + [MaxLength(200)] + public string ArrivalCity { get; set; } = null!; + + /// + /// 璧疯繍鍩庡競锛屽繀濉 + /// + [Required] + [MaxLength(200)] + public string LeaveCity { get; set; } = null!; + + /// + /// 璁㈠崟妯℃澘锛堜紶鍏ㄩ噺锛 + /// + public List? Templates { get; set; } = new(); + + /// + /// 璁㈠崟鑸彮淇℃伅 + /// + public List? FlightInfos { get; set; } = new(); +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs new file mode 100644 index 00000000..91ae6d11 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs @@ -0,0 +1,42 @@ +锘縰sing System.ComponentModel.DataAnnotations; + +namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; + +public class UpsertOrderInput : UpdateOrderInput +{ + /// + /// 瀹㈡埛id + /// + [Required] + public int CustomId { get; set; } +} + +public class OrderTemplateInfo +{ + /// + /// 妯℃澘id + /// + [Required] + public int TemplateId { get; set; } + + /// + /// 鏈嶅姟鍟唅d + /// + public int? ServiceProviderId { get; set; } +} + +public class OrderFlightInfo +{ + /// + /// 鑸彮鍙 + /// + [Required] + [MaxLength(50)] + public string FlightNo { get; set; } + + /// + /// 鐝湡 + /// + [Required] + public DateTime FlightDate { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs new file mode 100644 index 00000000..b62cf77b --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs @@ -0,0 +1,47 @@ +锘縰sing System.ComponentModel.DataAnnotations; + +namespace SJZY.Track.Application.Contract.Dtos.ProvideServices; + +public class UpsertTrackInput : OrderNoInfo +{ + /// + /// 杞ㄨ抗鍐呭浠ｇ爜 + /// + [Required] + [MaxLength(50)] + public string TrackCode { get; set; } = null!; + + /// + /// 杞ㄨ抗鍙戠敓鍦 + /// + [Required] + [MaxLength(200)] + public string TrackPlace { get; set; } = null!; + + /// + /// 杞ㄨ抗鍙戠敓鏃堕棿 + /// + [Required] + public DateTime? TrackTime { get; set; } + + /// + /// 杞ㄨ抗鍙戠敓鏃跺尯 + /// + [Required] + [Range(-12, 12)] + public float? TrackTimeZone { get; set; } +} + +public class NotNullAttribute : ValidationAttribute +{ + protected override ValidationResult IsValid(object value, ValidationContext validationContext) + { + if (value == null) + { + return new ValidationResult(ErrorMessage ?? "The field is required.", + new[] { validationContext.MemberName }); + } + + return ValidationResult.Success; + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs new file mode 100644 index 00000000..f13eac46 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs @@ -0,0 +1,108 @@ +锘縩amespace SJZY.Track.Application.Contract.Dtos.TrackContents +{ + public class EditTrackContentInput + { + /// + /// Id + /// + public int Id { get; set; } + + /// + /// 鎿嶄綔绫诲瀷 + /// + public OptionType Options { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 鎵灞炶建杩圭姸鎬乮d + /// + public int TrackStatusId { get; set; } + + /// + /// 杞ㄨ抗鍐呭浠ｇ爜 + /// + public string? Code { get; set; } + + /// + /// 杞ㄨ抗鍐呭 + /// + public string? Content { get; set; } + + /// + /// 杞ㄨ抗鍐呭鑻辨枃 + /// + public string? EnContent { get; set; } + + /// + /// 杞ㄨ抗鏍囪id + /// + public int TrackFlagId { get; set; } + + /// + /// 鏄惁瀹岀粨 + /// + public bool IsFinish { get; set; } + } + + public class GetTrackContentDetailDto + { + /// + /// Id + /// + public int Id { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 瀛愮郴缁 + /// + public string SubSystem { get; set; } + + /// + /// 鎵灞炶建杩圭姸鎬乮d + /// + public int TrackStatusId { get; set; } + + /// + /// 鎵灞炶建杩圭姸鎬 + /// + public string TrackStatus { get; set; } + + /// + /// 杞ㄨ抗鍐呭浠ｇ爜 + /// + public string Code { get; set; } + + /// + /// 杞ㄨ抗鍐呭 + /// + public string Content { get; set; } + + /// + /// 杞ㄨ抗鍐呭鑻辨枃 + /// + public string EnContent { get; set; } + + /// + /// 杞ㄨ抗鏍囪id + /// + public int TrackFlagId { get; set; } + + /// + /// 杞ㄨ抗鏍囪 + /// + public string TrackFlag { get; set; } + + /// + /// 鏄惁瀹岀粨 + /// + public bool IsFinish { get; set; } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentMapInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentMapInput.cs new file mode 100644 index 00000000..e207654d --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentMapInput.cs @@ -0,0 +1,41 @@ +锘縩amespace SJZY.Track.Application.Contract.Dtos.TrackContents; + +public class EditTrackContentMapInput +{ + public int? Id { get; set; } + + /// + /// 鏄犲皠瀛愮郴缁焛d + /// + public int? MapSubSystemId { get; set; } + + /// + /// 鏄犲皠杞ㄨ抗鍐呭浠ｇ爜 + /// + public string? MapTrackContentCode { get; set; } + + /// + /// 鏄犲皠杞ㄨ抗鍐呭id + /// + public int? MapTrackContentId { get; set; } + + /// + /// 鎿嶄綔绫诲瀷 + /// + public OptionTypeNoNull Options { get; set; } + + /// + /// 婧愬瓙绯荤粺id + /// + public int? SubSystemId { get; set; } + + /// + /// 婧愯建杩瑰唴瀹逛唬鐮 + /// + public string? TrackContentCode { get; set; } + + /// + /// 婧愯建杩瑰唴瀹筰d + /// + public int? TrackContentId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs new file mode 100644 index 00000000..8c0b6b05 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs @@ -0,0 +1,93 @@ +锘縩amespace SJZY.Track.Application.Contract.Dtos.TrackContents +{ + public class GetPageTrackContentInput : PageInfoInput + { + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 鍏抽敭瀛 + /// + public string? Keywords { get; set; } + + /// + /// 杞ㄨ抗鐘舵乮d + /// + public int TrackStatusId { get; set; } + + /// + /// 閫変腑鐨勮建杩瑰唴瀹筰d + /// + public List? SelectIds { get; set; } + } + + public class GetTrackContentListDto + { + /// + /// Id + /// + public int Id { get; set; } + + /// + /// 瀛愮郴缁 + /// + public string SubSystem { get; set; } + + /// + /// 杞ㄨ抗鍐呭浠ｇ爜 + /// + public string Code { get; set; } + + /// + /// 杞ㄨ抗鍐呭 + /// + public string Content { get; set; } + + /// + /// 杞ㄨ抗鍐呭鑻辨枃 + /// + public string EnContent { get; set; } + + /// + /// 鎵灞炵姸鎬 + /// + public string TrackStatus { get; set; } + + /// + /// 鎵灞炶妭鐐 + /// + public string Node { get; set; } + + /// + /// 杞ㄨ抗鏍囪 + /// + public string TrackFlag { get; set; } + + /// + /// 鍒涘缓鏃堕棿 + /// + public DateTime? CreateTime { get; set; } + + /// + /// 鍒涘缓浜 + /// + public string CreateUser { get; set; } + + /// + /// 淇敼鏃堕棿 + /// + public DateTime? UpdateTime { get; set; } + + /// + /// 淇敼浜 + /// + public string UpdateUser { get; set; } + + /// + /// 鏄惁瀹岀粨 + /// + public bool IsFinish { get; set; } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/EditTrackFlagInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/EditTrackFlagInput.cs new file mode 100644 index 00000000..49bb942a --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/EditTrackFlagInput.cs @@ -0,0 +1,68 @@ +锘縩amespace SJZY.Track.Application.Contract.Dtos.TrackFlags +{ + public class EditTrackFlagInput + { + /// + /// 鎿嶄綔绫诲瀷 + /// + public OptionType Options { get; set; } + + /// + /// Id + /// + public int Id { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 鏍囪 + /// + public string? Flag { get; set; } + + /// + /// 浠ｇ爜 + /// + public string? Code { get; set; } + + ///// + ///// 鏄惁瀹岀粨 + ///// + //public bool IsFinish { get; set; } + } + + public class GetTrackFlagDetailDto + { + /// + /// Id + /// + public int Id { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 瀛愮郴缁 + /// + public string SubSystem { get; set; } + + /// + /// 浠ｇ爜 + /// + public string Code { get; set; } + + /// + /// + /// + public string Flag { get; set; } + + ///// + ///// 鏄惁瀹岀粨 + ///// + //public bool IsFinish { get; set; } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs new file mode 100644 index 00000000..3964caea --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs @@ -0,0 +1,68 @@ +锘縩amespace SJZY.Track.Application.Contract.Dtos.TrackFlags +{ + public class GetTrackFlagListDto + { + /// + /// Id + /// + public int Id { get; set; } + + /// + /// 瀛愮郴缁 + /// + public string SubSystem { get; set; } + + /// + /// 浠ｇ爜 + /// + public string Code { get; set; } + + /// + /// 鏍囪 + /// + public string Flag { get; set; } + + ///// + ///// 鏄惁瀹岀粨 + ///// + //public bool IsFinish { get; set; } + + /// + /// 鍒涘缓鏃堕棿 + /// + public DateTime? CreateTime { get; set; } + + /// + /// 鍒涘缓浜 + /// + public string CreateUser { get; set; } + + /// + /// 淇敼鏃堕棿 + /// + public DateTime? UpdateTime { get; set; } + + /// + /// 淇敼浜 + /// + public string UpdateUser { get; set; } + } + + public class GetPageTrackFlagInput : PageInfoInput + { + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 閫変腑鐨勮建杩规爣璁癷d + /// + public List? SelectIds { get; set; } + + ///// + ///// 鍏抽敭瀛 + ///// + //public string Keywords { get; set; } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs new file mode 100644 index 00000000..2803a4b3 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs @@ -0,0 +1,71 @@ +锘縩amespace SJZY.Track.Application.Contract.Dtos.TrackPull; + +public class EditTrackPullConfigInput +{ + public int? Id { get; set; } + + /// + /// 鎿嶄綔绫诲瀷 + /// + public OptionTypeNoNull Options { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗璁㈠崟鍙 + /// + public string? OrderNoName { get; set; } + + /// + /// 杩斿弬瑙ｆ瀽瀵硅薄 + /// + public int? ParseMethod { get; set; } + + /// + /// 瀹氭椂浠诲姟锛堝垎閽燂級 + /// + public int? PullInterval { get; set; } + + /// + /// 鏈嶅姟鍟唅d + /// + public int? ServiceProviderId { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + public int? SubSystemId { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鏃跺尯 + /// + public string? TackTimeZoneName { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鍐呭浠ｇ爜 + /// + public string? TrackContentCodeName { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鍐呭 + /// + public string? TrackContentName { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鍙戠敓鍦 + /// + public string? TrackPlaceName { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鐘舵 + /// + public string? TrackStatusName { get; set; } + + /// + /// 杞ㄨ抗妯℃澘id + /// + public int? TrackTemplateId { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鍙戠敓鏃堕棿 + /// + public string? TrackTimeName { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/UpdateTrackPullContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/UpdateTrackPullContentInput.cs new file mode 100644 index 00000000..6f3c76dd --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/UpdateTrackPullContentInput.cs @@ -0,0 +1,51 @@ +锘縩amespace SJZY.Track.Application.Contract.Dtos.TrackPull; + +public class UpdateTrackPullContentInput +{ + public int Id { get; set; } + + /// + /// 鏈嶅姟鍟嗚建杩逛唬鐮佸弬鏁板 + /// + public string? TrackContentCodeValue { get; set; } + + /// + /// 杞ㄨ抗鍐呭id + /// + public int TrackContentId { get; set; } + + /// + /// 鏈嶅姟鍟嗚建杩瑰唴瀹瑰弬鏁板 + /// + public string? TrackContentValue { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鍏抽敭瀛楋紙姝ｅ悜锛 + /// + public List? TrackKeywords { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鍏抽敭瀛楋紙鍙嶅悜锛 + /// + public List? TrackKeywordReverses { get; set; } + + /// + /// 杞ㄨ抗鍙戠敓鍦板弬鏁板 + /// + public int? TrackPlaceValue { get; set; } + + /// + /// 杞ㄨ抗鎷夊彇閰嶇疆id + /// + public int TrackPullConfigId { get; set; } + + /// + /// 鏈嶅姟鍟嗚建杩圭姸鎬佸弬鏁板 + /// + public string? TrackStatusValue { get; set; } + + /// + /// 杞ㄨ抗鏃跺尯GMT + /// + public double? TrackTimeZone { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs new file mode 100644 index 00000000..b462f6a4 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs @@ -0,0 +1,81 @@ +锘縩amespace SJZY.Track.Application.Contract.Dtos.TrackPush; + +public class EditTrackPushConfigInput +{ + /// + /// 瀹㈡埛id + /// + public int CustomId { get; set; } + + /// + /// 鎺ㄩ佹墿灞曞瓧娈 + /// + public string? ExpandFieldsName { get; set; } + + public int? Id { get; set; } + + /// + /// 鏄惁鑷姩鎺ㄩ + /// + public bool IsAutoPush { get; set; } + + /// + /// 鎿嶄綔绫诲瀷 + /// + public OptionTypeNoNull Options { get; set; } + + /// + /// 鎺ㄩ佽建杩硅鍗曞彿 + /// + public string? OrderNoName { get; set; } + + /// + /// 鏈嶅姟鍟唅d + /// + public int ServiceProviderId { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 鎺ㄩ佽建杩规椂鍖 + /// + public string? TackTimeZoneName { get; set; } + + /// + /// 鎺ㄩ佽建杩瑰唴瀹逛唬鐮 + /// + public string? TrackContentCodeName { get; set; } + + /// + /// 鎺ㄩ佽建杩瑰唴瀹 + /// + public string? TrackContentName { get; set; } + + /// + /// 鎺ㄩ佽建杩瑰唴瀹硅嫳鏂 + /// + public string? TrackEnContentName { get; set; } + + /// + /// 鎺ㄩ佽建杩瑰彂鐢熷湴 + /// + public string? TrackPlaceName { get; set; } + + /// + /// 鎺ㄩ佽建杩圭姸鎬 + /// + public string? TrackStatusName { get; set; } + + /// + /// 杞ㄨ抗妯℃澘id + /// + public List? TrackTemplateIds { get; set; } + + /// + /// 鎺ㄩ佽建杩瑰彂鐢熸椂闂 + /// + public string? TrackTimeName { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushContentInput.cs new file mode 100644 index 00000000..ec85498a --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushContentInput.cs @@ -0,0 +1,61 @@ +锘縩amespace SJZY.Track.Application.Contract.Dtos.TrackPush; + +public class EditTrackPushContentInput +{ + /// + /// 鎵╁睍瀛楁鍙傛暟鍊 + /// + public string? ExpandFieldsValue { get; set; } + + public int? Id { get; set; } + + /// + /// 鎿嶄綔绫诲瀷 + /// + public OptionTypeNoNull Options { get; set; } + + /// + /// 鎺ㄩ佸崟鍙风被鍨 + /// + public int OrderNoType { get; set; } + + /// + /// 鎺ㄩ佽建杩规帓搴 + /// + public int Sort { get; set; } + + /// + /// 杞ㄨ抗浠ｇ爜鍙傛暟鍊 + /// + public string? TrackContentCodeValue { get; set; } + + /// + /// 杞ㄨ抗鍐呭id + /// + public int TrackContentId { get; set; } + + /// + /// 杞ㄨ抗鍐呭鍙傛暟鍊 + /// + public string? TrackContentValue { get; set; } + + /// + /// 杞ㄨ抗鍐呭鑻辨枃鍙傛暟鍊 + /// + public string? TrackEnContentValue { get; set; } + + /// + /// 杞ㄨ抗鎺ㄩ侀厤缃甶d + /// + public int TrackPushConfigId { get; set; } + + /// + /// 杞ㄨ抗鐘舵佸弬鏁板 + /// + public string? TrackStatusValue { get; set; } + + /// + /// 杞ㄨ抗鏃跺尯GMT + /// + public double? TrackTimeZone { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/SortTrackPushContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/SortTrackPushContentInput.cs new file mode 100644 index 00000000..ed095f3e --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/SortTrackPushContentInput.cs @@ -0,0 +1,11 @@ +锘縰sing SJZY.Expand.ABP.Core.PublicMethords; + +namespace SJZY.Track.Application.Contract.Dtos.TrackPush; + +public class SortTrackPushContentInput +{ + /// + /// 鎺掑簭淇℃伅 + /// + public List SortInfo { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs new file mode 100644 index 00000000..61a9d98e --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs @@ -0,0 +1,40 @@ +锘縩amespace SJZY.Track.Application.Contract.Dtos.TrackStatus +{ + public class EditTrackStatusInput + { + /// + /// Id + /// + public int Id { get; set; } + + /// + /// 鎿嶄綔绫诲瀷 + /// + public OptionType Options { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 鎵灞炶妭鐐筰d + /// + public int NodeId { get; set; } + + /// + /// 杞ㄨ抗鐘舵佷唬鐮 + /// + public string? Code { get; set; } + + /// + /// 杞ㄨ抗鐘舵 + /// + public string? TrackStatus { get; set; } + + /// + /// 杞ㄨ抗鐘舵佽嫳鏂 + /// + public string? EntrackStatus { get; set; } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs new file mode 100644 index 00000000..fe39c418 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs @@ -0,0 +1,40 @@ +锘縩amespace SJZY.Track.Application.Contract.Dtos.TrackStatus +{ + public class GetTrackStatusDetailDto + { + /// + /// Id + /// + public int Id { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 瀛愮郴缁 + /// + public string SubSystem { get; set; } + + /// + /// 鑺傜偣id + /// + public int NodeId { get; set; } + + /// + /// 鎵灞炶建杩圭姸鎬 + /// + public string TrackStatus { get; set; } + + /// + /// 杞ㄨ抗鐘舵佷唬鐮 + /// + public string Code { get; set; } + + /// + /// 杞ㄨ抗鍐呭鑻辨枃 + /// + public string EntrackStatus { get; set; } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs new file mode 100644 index 00000000..c505aa72 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs @@ -0,0 +1,74 @@ +锘縩amespace SJZY.Track.Application.Contract.Dtos.TrackStatus +{ + public class GetTrackStatusListDto + { + /// + /// Id + /// + public int Id { get; set; } + + /// + /// 瀛愮郴缁 + /// + public string SubSystem { get; set; } + + /// + /// 鎵灞炶妭鐐 + /// + public string Node { get; set; } + + /// + /// 鎵灞炶建杩圭姸鎬 + /// + public string TrackStatus { get; set; } + + /// + /// 杞ㄨ抗鐘舵佷唬鐮 + /// + public string Code { get; set; } + + /// + /// 杞ㄨ抗鍐呭鑻辨枃 + /// + public string EntrackStatus { get; set; } + + /// + /// 鍒涘缓浜 + /// + public string CreateUser { get; set; } + + /// + /// 鍒涘缓鏃堕棿 + /// + public DateTime? CreateTime { get; set; } + + /// + /// 淇敼浜 + /// + public string UpdateUser { get; set; } + + /// + /// 淇敼鏃堕棿 + /// + public DateTime? UpdateTime { get; set; } + } + + + public class GetPageTrackStatusInput : PageInfoInput + { + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 鍏抽敭瀛 + /// + public string? Keywords { get; set; } + + /// + /// 閫変腑鐨勮建杩圭姸鎬乮d + /// + public List? SelectIds { get; set;} + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs new file mode 100644 index 00000000..62ae5922 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs @@ -0,0 +1,33 @@ +锘縩amespace SJZY.Track.Application.Contract.Dtos.TrackTemplates; + +/// +public class EditTrackTemplateContentInput +{ + /// + /// 鎿嶄綔绫诲瀷 + /// + public OptionTypeNoNull Options { get; set; } + + /// + public int? Id { get; set; } + + /// + /// 鏄惁鍙垹 + /// + public bool? IsCanDelete { get; set; } + + /// + /// 鏄惁瀵瑰 + /// + public bool? IsExternal { get; set; } + + /// + /// 杞ㄨ抗鍐呭id + /// + public int? TrackContentId { get; set; } + + /// + /// 杞ㄨ抗妯℃澘id + /// + public int? TrackTemplateId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs new file mode 100644 index 00000000..27d3dfc3 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs @@ -0,0 +1,28 @@ +锘縩amespace SJZY.Track.Application.Contract.Dtos.TrackTemplates +{ + /// + /// 鑾峰彇杞ㄨ抗妯＄増鍒嗛〉杈撳叆 + /// + public class GetPageTrackTemplateInput : PageInfoInput + { + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 鍏抽敭瀛 + /// + public string? Keywords { get; set; } + + ///// + ///// 杞ㄨ抗妯＄増id锛岃建杩规槧灏勭殑鏌ヨ浣跨敤 + ///// + //public int TrackTemplateId { get; set; } + + /// + /// 閫変腑鐨勮建杩规ā鐗坕d + /// + public List? SelectIds { get; set; } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs new file mode 100644 index 00000000..08f7824d --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs @@ -0,0 +1,100 @@ +锘縩amespace SJZY.Track.Application.Contract.Dtos.TrackTemplates +{ + /// + /// 鑾峰彇杞ㄨ抗妯＄増璇︽儏 + /// + public class GetTrackTemplateDetailDto + { + /// + /// Id + /// + public int Id { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 瀛愮郴缁 + /// + public string SubSystem { get; set; } + + /// + /// 妯＄増鍚嶇О + /// + public string Name { get; set; } + + /// + /// 妯＄増浠ｇ爜 + /// + public string Code { get; set; } + } + + /// + /// 鑾峰彇杞ㄨ抗妯＄増鍒楄〃 + /// + public class GetTrackTemplateListDto + { + /// + /// 杞ㄨ抗妯＄増id + /// + public int Id { get; set; } + + /// + /// 妯℃澘鍚嶇О + /// + public string Name { set; get; } + + /// + /// 妯＄増浠ｇ爜 + /// + public string Code { get; set; } + + /// + /// 鎵灞炲瓙绯荤粺 + /// + public string SubSystem { set; get; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { set; get; } + + /// + /// 鍒涘缓鏃堕棿 + /// + public DateTime CreateTime { get; set; } + } + + /// + /// 缂栬緫杞ㄨ抗妯＄増 + /// + public class EditTrackTemplateInput + { + /// + /// Id + /// + public int Id { set; get; } + + /// + /// 鎿嶄綔绫诲瀷 + /// + public OptionType Options { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { set; get; } + + /// + /// 妯℃澘鍚嶇О + /// + public string? Name { set; get; } + + /// + /// 妯℃澘浠ｇ爜 + /// + public string? Code { set; get; } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs new file mode 100644 index 00000000..0dbd5155 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/SortTrackTemplateContentInput.cs @@ -0,0 +1,11 @@ +锘縰sing SJZY.Expand.ABP.Core.PublicMethords; + +namespace SJZY.Track.Application.Contract.Dtos.TrackTemplates; + +public class SortTrackTemplateContentInput +{ + /// + /// 鎺掑簭淇℃伅 + /// + public List SortInfo { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Events/TrackDeleteEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackDeleteEvent.cs new file mode 100644 index 00000000..eccbe955 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Events/TrackDeleteEvent.cs @@ -0,0 +1,29 @@ +锘縩amespace SJZY.Track.Application.Contract.Events; + +public class TrackDeleteEvent +{ + /// + /// 璁㈠崟id + /// + public int OrderId { get; set; } + + /// + /// 杞ㄨ抗浠ｇ爜 + /// + public List TrackCodes { get; set; } = null!; + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 涓婃父瀛愮郴缁焛d + /// + public int UpSubSystemId { get; set; } + + /// + /// 宸茬粡澶勭悊杩囩殑璁㈠崟 + /// + public List Visited { get; set; } = new(); +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs new file mode 100644 index 00000000..04f91415 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs @@ -0,0 +1,36 @@ +锘縰sing SJZY.Track.Application.Contract.Dtos.ProvideServices; + +namespace SJZY.Track.Application.Contract.Events; + +public class TrackUpsertEvent : UpsertTrackInput +{ + /// + /// 璁㈠崟id + /// + public int OrderId { get; set; } + + /// + /// 瀹㈡埛id + /// + public int CustomId { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 璁㈠崟鏄惁鎺ㄩ佸畬鎴愶紙寮傛缁存姢锛 + /// + public bool IsPushCompleted { get; set; } + + /// + /// 涓婃父瀛愮郴缁焛d + /// + public int UpSubSystemId { get; set; } + + /// + /// 宸茬粡澶勭悊杩囩殑璁㈠崟 + /// + public List Visited { get; set; } = new(); +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Events/UpdateOrderTrackEvent.cs b/src/SJZY.Track.Application.Contract/Events/UpdateOrderTrackEvent.cs new file mode 100644 index 00000000..f04cd86c --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Events/UpdateOrderTrackEvent.cs @@ -0,0 +1,39 @@ +锘縩amespace SJZY.Track.Application.Contract.Events; + +public class UpdateOrderTrackEvent +{ + /// + /// 璁㈠崟Id + /// + public int OrderId { get; set; } + + /// + /// 姝ゆ鍙戠敓鐨勮建杩规槸鍚︽剰鍛冲畬鎴 + /// + public bool IsCompleted { get; set; } + + /// + /// 杞ㄨ抗鍐呭 + /// + public string TrackContent { get; set; } = null!; + + /// + /// 杞ㄨ抗鍐呭鑻辨枃 + /// + public string TrackEnContent { get; set; } = null!; + + /// + /// 杞ㄨ抗鍙戠敓鍦 + /// + public string TrackPlace { get; set; } = null!; + + /// + /// 杞ㄨ抗鍙戠敓鏃堕棿 + /// + public DateTime TrackTime { get; set; } + + /// + /// 杞ㄨ抗鏃跺尯 + /// + public float TrackTimeZone { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/GlobalUsings.cs b/src/SJZY.Track.Application.Contract/GlobalUsings.cs new file mode 100644 index 00000000..99b0e5e1 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/GlobalUsings.cs @@ -0,0 +1,4 @@ +锘// Global using directives + +global using SJZY.Expand.ABP.Common.Enums; +global using SJZY.Expand.ABP.Core.Common.Dto; \ No newline at end of file diff --git a/src/SJZY.Track.HttpApi/SJZY.Track.HttpApi.csproj b/src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj similarity index 81% rename from src/SJZY.Track.HttpApi/SJZY.Track.HttpApi.csproj rename to src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj index 1d376964..de5d1421 100644 --- a/src/SJZY.Track.HttpApi/SJZY.Track.HttpApi.csproj +++ b/src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj @@ -1,9 +1,9 @@ + + net7.0 - enable - enable 0.0.2 diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackContentService.cs b/src/SJZY.Track.Application.Contract/Services/ITrackContentService.cs new file mode 100644 index 00000000..08ce5194 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Services/ITrackContentService.cs @@ -0,0 +1,5 @@ +锘縩amespace SJZY.Track.Application.Contract.Services; + +public interface ITrackContentService +{ +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackFlagService.cs b/src/SJZY.Track.Application.Contract/Services/ITrackFlagService.cs new file mode 100644 index 00000000..a7d780b9 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Services/ITrackFlagService.cs @@ -0,0 +1,5 @@ +锘縩amespace SJZY.Track.Application.Contract.Services; + +public interface ITrackFlagService +{ +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackPushCacheService.cs b/src/SJZY.Track.Application.Contract/Services/ITrackPushCacheService.cs new file mode 100644 index 00000000..04369975 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Services/ITrackPushCacheService.cs @@ -0,0 +1,18 @@ +锘縩amespace SJZY.Track.Application.Contract.Services; + +public interface ITrackPushCacheService +{ + /// + /// 鍒ゆ柇瀹㈡埛鏄惁闇瑕佹帹閫 + /// + /// + /// + Task IsPushAsync(int customId); + + /// + /// 鏇存柊缂撳瓨 + /// + /// + /// + Task UpdateAsync(int customId, bool isPush); +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackStatusService.cs b/src/SJZY.Track.Application.Contract/Services/ITrackStatusService.cs new file mode 100644 index 00000000..b350cb93 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Services/ITrackStatusService.cs @@ -0,0 +1,5 @@ +锘縩amespace SJZY.Track.Application.Contract.Services; + +public interface ITrackStatusService +{ +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/SjzyTrackApplicationContractModule.cs b/src/SJZY.Track.Application.Contract/SjzyTrackApplicationContractModule.cs new file mode 100644 index 00000000..0da04423 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/SjzyTrackApplicationContractModule.cs @@ -0,0 +1,10 @@ +锘縰sing Volo.Abp.Modularity; + +namespace SJZY.Track.Application.Contract; + +public class SjzyTrackApplicationContractModule : AbpModule +{ + public override void PreConfigureServices(ServiceConfigurationContext context) + { + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/ApplicationModule.cs b/src/SJZY.Track.Application/ApplicationModule.cs deleted file mode 100644 index 0fa79af5..00000000 --- a/src/SJZY.Track.Application/ApplicationModule.cs +++ /dev/null @@ -1,81 +0,0 @@ -锘縰sing SJZY.Expand.ABP.Core.Localization; -using SJZY.LoggerCenter.HttpApi; -using SJZY.Track.Application.Localization; -using SJZY.UserCenter.Contracts; -using SJZY.UserCenter.SharedModel; -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; - -namespace SJZY.Track.Application -{ - [DependsOn( - typeof(AbpAutoMapperModule), - typeof(RepositoryModule), - typeof(AbpFluentValidationModule), - typeof(AbpLocalizationModule), - typeof(AbpVirtualFileSystemModule), - typeof(AbpHttpClientModule), - typeof(LoggerCenterHttpApiModule) - )] - public class ApplicationModule : AbpModule - { - public override void ConfigureServices(ServiceConfigurationContext context) - { - var configuration = context.Services.GetConfiguration(); - Configure(options => - { - options.AddMaps(true); - }); - - Configure(options => - { - options.ConventionalControllers.Create(typeof(ApplicationModule).Assembly);//鍒涘缓鍔ㄦ乤pi - }); - - - - //娣诲姞铏氭嫙鏂囦欢绯荤粺 - Configure(options => - { - options.FileSets.AddEmbedded("SJZY.Track.Application"); - }); - - //娣诲姞澶氳瑷 - Configure(options => - { - options.Resources - .Add("zh") - .AddBaseTypes(typeof(SjzyBasicLocalization)) - .AddVirtualJson("/Localization/Resources"); - }); - - //鏃ュ織涓績 - context.Services.AddHttpClientProxies(typeof(LoggerCenterHttpApiModule).Assembly, "LoggerCenter", false); - - //鐢ㄦ埛涓績 - context.Services.AddHttpClientProxies(typeof(SjzyUserCenterHttpApiModule).Assembly, "UserCenter", false); - } - - public override void PreConfigureServices(ServiceConfigurationContext context) - { - var configuration = context.Services.GetConfiguration(); - PreConfigure(options => - { - - options.ProxyClientActions.Add(async (remoteName, serviceProvider, httpClient) => - { - //濡傛灉璁剧疆Token锛屽墠绔渶瑕佷紶鍏oken 鍚﹀垯寮曞彂寮傚父 - httpClient.SetTokenHeader(); - httpClient.Timeout = TimeSpan.FromMinutes(3); - await Task.CompletedTask; - }); - }); - } - - } -} diff --git a/src/SJZY.Track.Application/AutoMapper/AutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/AutoMapperProfile.cs deleted file mode 100644 index 563fc396..00000000 --- a/src/SJZY.Track.Application/AutoMapper/AutoMapperProfile.cs +++ /dev/null @@ -1,33 +0,0 @@ -锘縰sing AutoMapper; -using SJZY.Track.Application.Dtos.Demo; -using SJZY.Track.Repository.Demo.ValueObjects; - -namespace SJZY.Track.Application.AutoMapper -{ - internal class AutoMapperProfile : Profile - { - public AutoMapperProfile() - { - CreateMap, UnifyPageResultDto>(MemberList.None); - - CreateMap(MemberList.None).ReverseMap(); - CreateMap, UnifyPageResultDto>(MemberList.None).ReverseMap(); - /* - 浠ｇ爜璇存槑: - MemberList.None鐨勬剰鎬濇槸锛屽拷鐣ユ簮瀵硅薄鍜岀洰鏍囧璞＄殑灞炴у尮閰嶆鏌ワ紝鍏朵粬鍙夊硷細MemberList.Source(妫鏌ユ槸鍚︽槧灏勪簡鎵鏈夋簮鎴愬憳)銆丮emberList.Destination(妫鏌ユ槸鍚︽槧灏勪簡鎵鏈夌洰鏍囨垚鍛) - .ReverseMap()鐨勬剰鎬濇槸閰嶇疆鍙屽悜璋冪敤鍏崇郴锛屾棦涓琛屼唬鐮佹棦鏀寔浠 GetDemoListByPageInput -> DemoValueObject 鐨勬槧灏勶紝鍚屾椂涔熸敮鎸佷粠 DemoValueObject -> GetDemoListByPageInput 鐨勬槧灏 - - - 濡傛灉瀵逛竴瀵规ā鍨嬪娆￠厤缃鍒欙紝浼氫互鏈鍚庝竴娆′负鍑嗭紝閰嶇疆浜嗚繖鏍疯鍒欏悗锛屾渶缁堟墽琛岀粨鏋滄槸 Name + 444 - CreateMap().ForMember(dest => dest.Description, opt => opt.MapFrom(m => m.Name + "22")); - CreateMap().ForMember(dest => dest.Description, opt => opt.MapFrom(m => m.Name + "444")); - - */ - - CreateMap(MemberList.None).ReverseMap(); - CreateMap(MemberList.None); - CreateMap(MemberList.None).ReverseMap(); - - } - } -} \ No newline at end of file diff --git a/src/SJZY.Track.Application/AutoMapper/DemoAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/DemoAutoMapperProfile.cs deleted file mode 100644 index 8e04d1ce..00000000 --- a/src/SJZY.Track.Application/AutoMapper/DemoAutoMapperProfile.cs +++ /dev/null @@ -1,43 +0,0 @@ -锘縰sing AutoMapper; -using SJZY.Expand.ABP.Core.PublicMethords; -using SJZY.Track.Application.Dtos.Demo; - - -namespace SJZY.Track.Application.AutoMapper -{ - /// - /// 绋嶅鏉傜殑閰嶇疆绫 - /// - internal class DemoAutoMapperProfile : Profile - { - public DemoAutoMapperProfile() - { - CreateMap(MemberList.None) - //灞傜骇涓嶄竴鑷寸殑鍦烘櫙 - .ForMember(dest => dest.QQ, opt => opt.MapFrom(source => source.UserInfo.QQ)) - //鏁版嵁绫诲瀷涓嶄竴鑷寸殑鍦烘櫙锛岃繖閲屽鏋滀笉鎸囧畾鏄犲皠瑙勫垯浼氱洿鎺ュ彇鏋氫妇鐨刱ey鍊 - .ForMember(dest => dest.Gender, opt => opt.MapFrom(source => source.Gender.GetDescription())) - //涓浜涚畝鍗曡绠楃殑鍦烘櫙,閰屾儏浣跨敤... - .ForMember(dest => dest.Age, opt => opt.MapFrom(source => GetAgeByBirthdate(source.UserInfo.BirthDay))) - //缁撴瀯涓嶄竴鑷寸殑鍦烘櫙 - .ForMember(dest => dest.RoleIds, opt => opt.MapFrom(source => source.UserRoleInputList.Select(m => m.Id).ToArray())) - //鏉′欢鏄犲皠锛堣繖閲屽彧鏄妇渚嬶紝鏃ュ父寮鍙戞椂sqlsugar鍦ㄦ柊澧炴椂浼氶伩寮鑷涓婚敭锛 - .ForMember(dest => dest.Id, opt => - { - opt.Condition(src => src.OptionType == OptionType.鍒犻櫎 || src.OptionType == OptionType.淇敼); - }); - } - - public int GetAgeByBirthdate(DateTime birthdate) - { - DateTime now = DateTime.Now; - int age = now.Year - birthdate.Year; - if (now.Month < birthdate.Month || (now.Month == birthdate.Month && now.Day < birthdate.Day)) - { - age--; - } - return age < 0 ? 0 : age; - } - - } -} diff --git a/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs new file mode 100644 index 00000000..25cb3b57 --- /dev/null +++ b/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs @@ -0,0 +1,32 @@ +锘縰sing AutoMapper; +using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using SJZY.Track.Domain.Aggregates.OrderAggregate; +using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; +using SJZY.Track.Domain.Dtos.Order; +using Volo.Abp.AutoMapper; + +namespace SJZY.Track.Application.AutoMapper; + +public class OrderAutoMapperProfile : Profile +{ + public OrderAutoMapperProfile() + { + CreateMap(MemberList.None); + CreateMap(MemberList.None); + + CreateMap(MemberList.None) + .ForMember(dest => dest.ServiceProviderId, opt => opt.MapFrom(m => m.ServiceProviderId ?? 0)) + .ForMember(dest => dest.TrackTemplateId, opt => opt.MapFrom(m => m.TemplateId)); + CreateMap(MemberList.None); + + CreateMap(MemberList.None); + CreateMap(MemberList.None); + CreateMap, UnifyPageResultDto>(MemberList.None); + CreateMap(MemberList.None).Ignore(dest => dest.TrackTimeZone) + .ForMember(dest => dest.Id, opt => opt.Ignore()) + .ForMember(dest => dest.Code, opt => opt.MapFrom(m => m.TrackCode)) + .ForMember(dest => dest.Content, opt => opt.MapFrom(m => m.TrackContent)) + .ForMember(dest => dest.EnContent, opt => opt.MapFrom(m => m.TrackEnContent)) + .ForMember(dest => dest.TrackTimeZoneValue, opt => opt.MapFrom(m => m.TrackTimeZone)); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/AutoMapper/TrackAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackAutoMapperProfile.cs new file mode 100644 index 00000000..b9c185d7 --- /dev/null +++ b/src/SJZY.Track.Application/AutoMapper/TrackAutoMapperProfile.cs @@ -0,0 +1,13 @@ +锘縰sing AutoMapper; +using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using SJZY.Track.Application.Contract.Events; + +namespace SJZY.Track.Application.AutoMapper; + +public class TrackAutoMapperProfile:Profile +{ + public TrackAutoMapperProfile() + { + CreateMap(MemberList.None); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/AutoMapper/TrackContentAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackContentAutoMapperProfile.cs new file mode 100644 index 00000000..77b0c47d --- /dev/null +++ b/src/SJZY.Track.Application/AutoMapper/TrackContentAutoMapperProfile.cs @@ -0,0 +1,22 @@ +锘縰sing AutoMapper; +using SJZY.Track.Application.Contract.Dtos.TrackContents; +using SJZY.Track.Domain.Aggregates.TrackContentAggregate; +using SJZY.Track.Domain.Dtos.TrackContents; + +namespace SJZY.Track.Application.AutoMapper +{ + public class TrackContentAutoMapperProfile : Profile + { + public TrackContentAutoMapperProfile() + { + CreateMap(MemberList.None) + .ForMember(dest => dest.IsCompleted, opt => opt.MapFrom(source => source.IsFinish)); + CreateMap(MemberList.None); + CreateMap(MemberList.None); + CreateMap(MemberList.None); + CreateMap, UnifyPageResultDto>( + MemberList.None); + CreateMap(MemberList.None); + } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/AutoMapper/TrackFlagAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackFlagAutoMapperProfile.cs new file mode 100644 index 00000000..bf72f035 --- /dev/null +++ b/src/SJZY.Track.Application/AutoMapper/TrackFlagAutoMapperProfile.cs @@ -0,0 +1,21 @@ +锘縰sing AutoMapper; +using SJZY.Track.Application.Contract.Dtos.TrackFlags; +using SJZY.Track.Domain.Aggregates.TrackFlagAggregate; +using SJZY.Track.Domain.Dtos.TrackFlags; + +namespace SJZY.Track.Application.AutoMapper +{ + public class TrackFlagAutoMapperProfile : Profile + { + public TrackFlagAutoMapperProfile() + { + CreateMap(MemberList.None) + .ForMember(dest => dest.Name, opt => opt.MapFrom(source => source.Flag)); + //.ForMember(dest => dest.IsCompleted, opt => opt.MapFrom(source => source.IsFinish)); + CreateMap(MemberList.None); + CreateMap(MemberList.None); + CreateMap, UnifyPageResultDto>(MemberList.None); + CreateMap(MemberList.None); + } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/AutoMapper/TrackPullAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackPullAutoMapperProfile.cs new file mode 100644 index 00000000..d8dad310 --- /dev/null +++ b/src/SJZY.Track.Application/AutoMapper/TrackPullAutoMapperProfile.cs @@ -0,0 +1,19 @@ +锘縰sing AutoMapper; +using SJZY.Track.Application.Contract.Dtos.TrackPull; +using SJZY.Track.Domain.Aggregates.TrackPullAggregate; +using Volo.Abp.AutoMapper; + +namespace SJZY.Track.Application.AutoMapper; + +public class TrackPullAutoMapperProfile : Profile +{ + public TrackPullAutoMapperProfile() + { + CreateMap(MemberList.None); + CreateMap(MemberList.None).Ignore(dest => dest.Id) + .ForMember(dest => dest.IsPush, opt => opt.MapFrom(source => false)); + CreateMap(MemberList.None) + .ForMember(dest => dest.TrackKeyword, opt => opt.MapFrom(src => string.Join(',', src.TrackKeywords))) + .ForMember(dest => dest.TrackKeywordReverse, opt => opt.MapFrom(src => string.Join(',', src.TrackKeywordReverses))); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/AutoMapper/TrackPushAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackPushAutoMapperProfile.cs new file mode 100644 index 00000000..3a42d0e4 --- /dev/null +++ b/src/SJZY.Track.Application/AutoMapper/TrackPushAutoMapperProfile.cs @@ -0,0 +1,19 @@ +锘縰sing AutoMapper; +using SJZY.Track.Application.Contract.Dtos.TrackPush; +using SJZY.Track.Domain.Aggregates.TrackPullAggregate; +using SJZY.Track.Domain.Aggregates.TrackPushAggregate; +using Volo.Abp.AutoMapper; + +namespace SJZY.Track.Application.AutoMapper; + +public class TrackPushAutoMapperProfile : Profile +{ + public TrackPushAutoMapperProfile() + { + CreateMap(MemberList.None) + .ForMember(dest => dest.TrackTemplateId, opt => opt.MapFrom(source => string.Join(',', source.TrackTemplateIds))); + CreateMap(MemberList.None).Ignore(dest => dest.Id) + .ForMember(dest => dest.IsPush, opt => opt.MapFrom(source => true)); + CreateMap(MemberList.None); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/AutoMapper/TrackStatusAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackStatusAutoMapperProfile.cs new file mode 100644 index 00000000..49796f47 --- /dev/null +++ b/src/SJZY.Track.Application/AutoMapper/TrackStatusAutoMapperProfile.cs @@ -0,0 +1,24 @@ +锘縰sing AutoMapper; +using SJZY.Track.Application.Contract.Dtos.TrackStatus; +using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; +using SJZY.Track.Domain.Dtos.TrackStatus; + +namespace SJZY.Track.Application.AutoMapper +{ + public class TrackStatusAutoMapperProfile : Profile + { + public TrackStatusAutoMapperProfile() + { + CreateMap(MemberList.None) + //灞傜骇涓嶄竴鑷寸殑鍦烘櫙 + .ForMember(dest => dest.Status, opt => opt.MapFrom(source => source.TrackStatus)) + .ForMember(dest => dest.EnStatus, opt => opt.MapFrom(source => source.EntrackStatus)) + .ForMember(dest => dest.Node, opt => opt.MapFrom(source => source.NodeId)); + CreateMap(MemberList.None); + CreateMap(MemberList.None); + CreateMap(MemberList.None); + CreateMap, UnifyPageResultDto>(MemberList + .None); + } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs new file mode 100644 index 00000000..36f0e498 --- /dev/null +++ b/src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs @@ -0,0 +1,23 @@ +锘縰sing AutoMapper; +using SJZY.Track.Application.Contract.Dtos.TrackTemplates; +using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; +using SJZY.Track.Domain.Dtos.TrackTemplate; + +namespace SJZY.Track.Application.AutoMapper; + +/// +/// 杞ㄨ抗妯＄増鑷姩鏄犲皠 +/// +public class TrackTemplateAutoMapperProfile : Profile +{ + public TrackTemplateAutoMapperProfile() + { + CreateMap(MemberList.None); + CreateMap(MemberList.None); + CreateMap(MemberList.None); + CreateMap(MemberList.None); + CreateMap(MemberList.None); + CreateMap, UnifyPageResultDto>(MemberList + .None); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Dtos/Demo/ComplexAutomapperDemoInput.cs b/src/SJZY.Track.Application/Dtos/Demo/ComplexAutomapperDemoInput.cs deleted file mode 100644 index de4bc495..00000000 --- a/src/SJZY.Track.Application/Dtos/Demo/ComplexAutomapperDemoInput.cs +++ /dev/null @@ -1,89 +0,0 @@ -锘縩amespace SJZY.Track.Application.Dtos.Demo -{ - /// - /// automapper 澶嶆潅杞崲鏍蜂緥 - /// - public class ComplexAutomapperDemoInput - { - /// - /// 缂栧彿 - /// - public int Id { get; set; } - - /// - /// 鎿嶄綔绫诲瀷 - /// - public OptionType OptionType { get; set; } - - /// - /// 鎻忚堪 - /// - public string Description { get; set; } - - /// - /// 鎬у埆 - /// - public Gender Gender { get; set; } - - /// - /// 鐢ㄦ埛淇℃伅 - /// - public UserInfoInput UserInfo { get; set; } - - /// - /// 鐢ㄦ埛瑙掕壊 - /// - public List UserRoleInputList { get; set; } - - /// - /// 鎷撳睍婕旂ず锛岀洰鍓嶅ぇ瀹跺叡鍚岀害瀹,鏆傛椂涓嶄娇鐢ㄥ厖琛妯″瀷 - /// - /// - public string GetAddress() - { - return "杈藉畞鐪佹矆闃冲競..."; - } - - } - - public class ComplexAutomapperDemoOutput - { - /// - /// 缂栧彿 - /// - public int Id { get; set; } - - /// - /// 鎬у埆 - /// - public string Gender { get; set; } - - /// - /// 鎻忚堪 - /// - public string Description { get; set; } - - /// - /// 骞撮緞 - /// - public int Age { get; set; } - - /// - /// qq鍙风爜 - /// - public string QQ { get; set; } - - /// - /// 鍦板潃 - /// - public string Address { get; set; } - - /// - /// 瑙掕壊缂栧彿 - /// - public int[] RoleIds { get; set; } - } - - - -} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Dtos/Demo/DemoDetailInput.cs b/src/SJZY.Track.Application/Dtos/Demo/DemoDetailInput.cs deleted file mode 100644 index 30da5896..00000000 --- a/src/SJZY.Track.Application/Dtos/Demo/DemoDetailInput.cs +++ /dev/null @@ -1,48 +0,0 @@ -锘縩amespace SJZY.Track.Application.Dtos.Demo -{ - public class DemoDetailSaveInput - { - /// - /// - /// - public int Id { get; set; } - - /// - /// 濮撳悕 - /// - public string Name { get; set; } - - /// - /// 骞撮緞 - /// - public int Age { get; set; } - - /// - /// 鎻忚堪 - /// - public string Description { get; set; } - - /// - /// 璇︽儏鍚堥泦 - /// - public List DemoDetailList { get; set; } - } - - public class DemoDetailInput - { - /// - /// Id - /// - public int Id { get; set; } - - /// - /// t_demo.id - /// - public int DemoId { get; set; } - - /// - /// 涓浜涜鏄.. - /// - public string OtherInfo { get; set; } - } -} diff --git a/src/SJZY.Track.Application/Dtos/Demo/DemoInput.cs b/src/SJZY.Track.Application/Dtos/Demo/DemoInput.cs deleted file mode 100644 index 13f63049..00000000 --- a/src/SJZY.Track.Application/Dtos/Demo/DemoInput.cs +++ /dev/null @@ -1,42 +0,0 @@ -锘縩amespace SJZY.Track.Application.Dtos.Demo -{ - public class DemoInput - { - /// - /// 鎿嶄綔绫诲瀷 - /// - public OptionType Option { get; set; } - - /// - /// - /// - public int Id { get; set; } - - /// - /// 濮撳悕 - /// - public string Name { get; set; } - - /// - /// 骞撮緞 - /// - public int Age { get; set; } - - /// - /// 鎻忚堪 - /// - public string Description { get; set; } - - //浠ヤ笅涓や釜灞炴х敤鏉ヨ鏄庣被鍨嬭浆鎹 - - /// - /// 鍒涘缓浜篿d - /// - public string CreateUserId { get; set; } - - /// - /// 鍒涘缓鏃堕棿 - /// - public string CreateTime { get; set; } - } -} diff --git a/src/SJZY.Track.Application/Dtos/Demo/ExcelImportOuput.cs b/src/SJZY.Track.Application/Dtos/Demo/ExcelImportOuput.cs deleted file mode 100644 index 46ef9d04..00000000 --- a/src/SJZY.Track.Application/Dtos/Demo/ExcelImportOuput.cs +++ /dev/null @@ -1,11 +0,0 @@ -锘縩amespace SJZY.Track.Application.Dtos.Demo -{ - public class ExcelImportOuput - { - [MiniExcelLibs.Attributes.ExcelColumnName("濮撳悕")] - public string Name { get; set; } - - [MiniExcelLibs.Attributes.ExcelColumnName("骞撮緞")] - public int Age { get; set; } - } -} diff --git a/src/SJZY.Track.Application/Dtos/Demo/GetDemoListByPageInput.cs b/src/SJZY.Track.Application/Dtos/Demo/GetDemoListByPageInput.cs deleted file mode 100644 index 55d86e2c..00000000 --- a/src/SJZY.Track.Application/Dtos/Demo/GetDemoListByPageInput.cs +++ /dev/null @@ -1,10 +0,0 @@ -锘縩amespace SJZY.Track.Application.Dtos.Demo -{ - public class GetDemoListByPageInput : PageInfoInput - { - /// - /// 濮撳悕 - /// - public string Name { get; set; } - } -} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Dtos/Demo/GetDemoListByPageOutput.cs b/src/SJZY.Track.Application/Dtos/Demo/GetDemoListByPageOutput.cs deleted file mode 100644 index 3c5bd96d..00000000 --- a/src/SJZY.Track.Application/Dtos/Demo/GetDemoListByPageOutput.cs +++ /dev/null @@ -1,27 +0,0 @@ -锘縩amespace SJZY.Track.Application.Dtos.Demo -{ - public class GetDemoListByPageOutput - { - /// - /// - /// - public int Id { get; set; } - - /// - /// 濮撳悕 - /// - public string Name { get; set; } - - /// - /// 骞撮緞 - /// - public int Age { get; set; } - - /// - /// 鎻忚堪 - /// - public string Description { get; set; } - - public DateTime CreateTime { get; set; } - } -} diff --git a/src/SJZY.Track.Application/Dtos/Demo/MyCustomerResultOutput.cs b/src/SJZY.Track.Application/Dtos/Demo/MyCustomerResultOutput.cs deleted file mode 100644 index 8d6896ac..00000000 --- a/src/SJZY.Track.Application/Dtos/Demo/MyCustomerResultOutput.cs +++ /dev/null @@ -1,9 +0,0 @@ -锘縩amespace SJZY.Track.Application.Dtos.Demo -{ - public class MyCustomerResultOutput - { - public string Code { get; set; } - - public string Message { get; set; } - } -} diff --git a/src/SJZY.Track.Application/Dtos/Demo/OssUploadOutput.cs b/src/SJZY.Track.Application/Dtos/Demo/OssUploadOutput.cs deleted file mode 100644 index 367d2c54..00000000 --- a/src/SJZY.Track.Application/Dtos/Demo/OssUploadOutput.cs +++ /dev/null @@ -1,15 +0,0 @@ -锘縩amespace SJZY.Track.Application.Dtos.Demo -{ - public class OssUploadOutput - { - /// - /// 鏂囦欢key - /// - public string Key { get; set; } - - /// - /// 鏂囦欢璺緞 - /// - public string Url { get; set; } - } -} diff --git a/src/SJZY.Track.Application/Dtos/Demo/SwaggerDemoInput.cs b/src/SJZY.Track.Application/Dtos/Demo/SwaggerDemoInput.cs deleted file mode 100644 index f521c50e..00000000 --- a/src/SJZY.Track.Application/Dtos/Demo/SwaggerDemoInput.cs +++ /dev/null @@ -1,42 +0,0 @@ -锘縰sing System.ComponentModel; -using System.Text.Json.Serialization; - -namespace SJZY.Track.Application.Dtos.Demo -{ - public class SwaggerDemoInput - { - /// - /// 骞撮緞 - /// - /// 18 杩欓噷鍙互鍐欎竴浜涘垵濮嬪 - public int Age { get; set; } - - /// - /// 濮撳悕 - /// - public string Name { get; set; } - - /// - /// 鎬у埆锛堟灇涓剧殑灞曠ず鏍蜂緥锛 - /// - public Gender Gender { get; set; } - - /// - /// 闅愯棌灞炴 - /// - [JsonIgnore] - public int MyProperty { get; set; } - } - - public enum Gender - { - [Description("绾埛浠")] - 鐢 = 2, - - [Description("澶у濞")] - 濂 = 5, - - [Description("浣犳唻闂")] - 鏈煡 = 8 - } -} diff --git a/src/SJZY.Track.Application/Dtos/Demo/ValidateExecuteInput.cs b/src/SJZY.Track.Application/Dtos/Demo/ValidateExecuteInput.cs deleted file mode 100644 index f1c3fc45..00000000 --- a/src/SJZY.Track.Application/Dtos/Demo/ValidateExecuteInput.cs +++ /dev/null @@ -1,98 +0,0 @@ -锘縩amespace SJZY.Track.Application.Dtos.Demo -{ - public class ValidateExecuteInput - { - /// - /// 鎿嶄綔绫诲瀷 - /// - public OptionType Option { get; set; } - - /// - /// 涓婚敭缂栧彿 - /// - public int Id { get; set; } - - /// - /// 闆姳ID - /// - public long SnowId { get; set; } - - /// - /// 鐧诲綍璐﹀彿 - /// - public string LoginName { get; set; } - - /// - /// 鐧诲綍瀵嗙爜 - /// - public string? PassWord { get; set; } - - /// - /// 鐧诲綍瀵嗙爜纭 - /// - public string PassWordAgain { get; set; } - - /// - /// 鏈澶ч噾棰濋搴 - /// - public decimal TotalQuota { get; set; } - - /// - /// 鏈澶ф暟閲 - /// - public int MaxCount { get; set; } - - /// - /// 鏈灏忔暟閲 - /// - public int MiniCount { get; set; } - - /// - /// 鐢ㄦ埛淇℃伅 - /// - public UserInfoInput UserInfoInput { get; set; } - - /// - /// 鐢ㄦ埛瑙掕壊 - /// - public List UserRoleInputList { get; set; } - - } - - public class UserInfoInput - { - /// - /// 鐢熸棩 - /// - public DateTime BirthDay { get; set; } - - /// - /// qq鍙风爜 - /// - public string QQ { get; set; } - - /// - /// 鐢靛瓙閭 - /// - public string Email { get; set; } - - /// - /// 鐢ㄦ埛濮撳悕 - /// - public string UserName { get; set; } - } - - - public class UserRoleInput - { - /// - /// 瑙掕壊缂栧彿 - /// - public int Id { get; set; } - - /// - /// 瑙掕壊鍚嶇О - /// - public string Name { get; set; } - } -} diff --git a/src/SJZY.Track.Application/Dtos/Demo/ValidateExecuteOutput.cs b/src/SJZY.Track.Application/Dtos/Demo/ValidateExecuteOutput.cs deleted file mode 100644 index 13cede57..00000000 --- a/src/SJZY.Track.Application/Dtos/Demo/ValidateExecuteOutput.cs +++ /dev/null @@ -1,6 +0,0 @@ -锘縩amespace SJZY.Track.Application.Dtos.Demo -{ - public class ValidateExecuteOutput - { - } -} diff --git a/src/SJZY.Track.Application/EventHandlers/InterfaceRelayTrackRefreshEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/InterfaceRelayTrackRefreshEventHandler.cs new file mode 100644 index 00000000..099b1b99 --- /dev/null +++ b/src/SJZY.Track.Application/EventHandlers/InterfaceRelayTrackRefreshEventHandler.cs @@ -0,0 +1,35 @@ +锘縰sing DotNetCore.CAP; +using Newtonsoft.Json; +using SJZY.InterfaceRelay.Application.Contracts; +using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using SJZY.Track.Domain.Aggregates.OrderAggregate; +using SJZY.Track.Domain.Queries; +using Volo.Abp.DependencyInjection; + +namespace SJZY.Track.Application.EventHandlers; + +public class InterfaceRelayTrackRefreshEventHandler : ITransientDependency, ICapSubscribe +{ + private readonly IOrderRepository _orderRepository; + private readonly IProvideQueries _provideQueries; + + public InterfaceRelayTrackRefreshEventHandler(IOrderRepository orderRepository, IProvideQueries provideQueries) + { + _orderRepository = orderRepository; + _provideQueries = provideQueries; + } + + [CapSubscribe(GlobalConst.InterfaceRelayTrackRefreshSubscribe)] + public async Task ConsumerAsync(InterfaceRelayTrackRefreshEvent @event) + { + if (@event.RequestParams is List requestParams) + { + var orderNos = requestParams.Select(x => x.OrderNo).ToList(); + + // tips锛歛ttach杩斿洖鐨勬槸鏈嶅姟鍟唅d锛屽繀鏈 + var pullContentConfigs = await _provideQueries.GetPullContentConfigsAsync(int.Parse(@event.Attach)); + + // 杞ㄨ抗娓呮礂鍏ュ簱 + } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs new file mode 100644 index 00000000..55bb5b1d --- /dev/null +++ b/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs @@ -0,0 +1,76 @@ +锘縰sing DotNetCore.CAP; +using SJZY.Expand.ABP.Core.Logger; +using SJZY.Track.Application.Contract.Events; +using SJZY.Track.Domain.Aggregates.OrderAggregate; +using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; +using SJZY.Track.Domain.Queries; +using Volo.Abp.DependencyInjection; + +namespace SJZY.Track.Application.EventHandlers; + +public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe +{ + private readonly IOrderRepository _orderRepository; + private readonly IProvideQueries _provideQueries; + private readonly ITrackDetailsRepository _trackDetailsRepository; + private readonly ICapPublisher _capPublisher; + + public TrackDeleteEventHandler(IProvideQueries provideQueries, ITrackDetailsRepository trackDetailsRepository, + IOrderRepository orderRepository, ICapPublisher capPublisher) + { + _provideQueries = provideQueries; + _trackDetailsRepository = trackDetailsRepository; + _orderRepository = orderRepository; + _capPublisher = capPublisher; + } + + [CapSubscribe(GlobalConst.TrackDeleteSubscribe)] + public async Task ConsumerAsync(TrackDeleteEvent @event) + { + if (@event.Visited.Contains(@event.OrderId)) + { + LogHelper.Error($"杞ㄨ抗璁㈠崟寰幆渚濊禆棰勮锛歿@event.Visited.JoinAsString(",")}"); + return; + } + + @event.Visited.Add(@event.OrderId); + + // 涓嶅悓瀛愮郴缁熼渶瑕佸仛鍐呭鏄犲皠 + if (@event.UpSubSystemId != 0 && @event.UpSubSystemId != @event.SubSystemId) + { + var mapCodes = await _provideQueries + .MapTrackCodesAsync(@event.UpSubSystemId, @event.SubSystemId, @event.TrackCodes.ToArray()); + + if (mapCodes.Count == 0) + { + //throw new BusinessException(message: "璁㈠崟璺ㄥ瓙绯荤粺锛屾湭閰嶇疆鍐呭鏄犲皠锛岃鑱旂郴绠＄悊鍛"); + return; + } + + @event.TrackCodes = mapCodes; + } + + await DeleteTrackAsync(@event); + } + + private async Task DeleteTrackAsync(TrackDeleteEvent @event) + { + // 鍒犻櫎杞ㄨ抗 + await _trackDetailsRepository.DeleteTrackAsync(@event.OrderId, @event.TrackCodes); + + // 鏍规嵁璁㈠崟鍏宠仈鍏崇郴寮傛鍚戜笅鍒 + var linkedOrders = await _orderRepository.GetLinkedOrdersAsync(@event.OrderId); + foreach (var linkedOrder in linkedOrders) + { + var nextEvent = new TrackDeleteEvent + { + OrderId = linkedOrder.OrderId, + TrackCodes = @event.TrackCodes, + SubSystemId = linkedOrder.SubSystemId, + UpSubSystemId = @event.SubSystemId + }; + + await _capPublisher.PublishAsync(GlobalConst.TrackDeleteSubscribe, nextEvent); + } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs new file mode 100644 index 00000000..29e14bc2 --- /dev/null +++ b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs @@ -0,0 +1,143 @@ +锘縰sing DotNetCore.CAP; +using SJZY.Expand.ABP.Core.Logger; +using SJZY.Expand.ABP.Core.PublicMethords; +using SJZY.Track.Application.Contract.Events; +using SJZY.Track.Application.Contract.Services; +using SJZY.Track.Domain.Aggregates.OrderAggregate; +using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; +using SJZY.Track.Domain.Queries; +using SJZY.UserCenter.HttpApi.Services; +using Volo.Abp.DependencyInjection; + +namespace SJZY.Track.Application.EventHandlers; + +public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe +{ + private readonly IOrderRepository _orderRepository; + private readonly IProvideQueries _provideQueries; + private readonly ITrackDetailsRepository _trackDetailsRepository; + private readonly ITrackPushCacheService _trackPushCacheService; + private readonly ICapPublisher _capPublisher; + + public TrackUpsertEventHandler(IOrderRepository orderRepository, ICapPublisher capPublisher, + IProvideQueries provideQueries, ITrackDetailsRepository trackDetailsRepository, + ITrackPushCacheService trackPushCacheService) + { + _orderRepository = orderRepository; + _capPublisher = capPublisher; + _provideQueries = provideQueries; + _trackDetailsRepository = trackDetailsRepository; + _trackPushCacheService = trackPushCacheService; + } + + [CapSubscribe(GlobalConst.TrackUpsertSubscribe)] + public async Task ConsumerAsync(TrackUpsertEvent @event) + { + if (@event.Visited.Contains(@event.OrderId)) + { + LogHelper.Error($"杞ㄨ抗璁㈠崟寰幆渚濊禆棰勮锛歿@event.Visited.JoinAsString(",")}"); + return; + } + + @event.Visited.Add(@event.OrderId); + + // 涓嶅悓瀛愮郴缁熼渶瑕佸仛鍐呭鏄犲皠 + if (@event.UpSubSystemId != 0 && @event.UpSubSystemId != @event.SubSystemId) + { + var mapCode = (await _provideQueries + .MapTrackCodesAsync(@event.UpSubSystemId, @event.SubSystemId, @event.TrackCode)) + .FirstOrDefault(); + + if (mapCode == default) + { + // 璺ㄥ瓙绯荤粺娌″仛鏄犲皠鐨勮建杩逛笉澶勭悊 + return; + } + + @event.TrackCode = mapCode; + } + + await UpsertTrackAsync(@event); + } + + private async Task UpsertTrackAsync(TrackUpsertEvent @event) + { + // 涓嶅瓨鍦ㄥ垯鏂板杞ㄨ抗锛屽瓨鍦ㄥ垯鏇存柊 + var track = await _trackDetailsRepository.GetFirstOrDefaultAsync(@event.OrderId, @event.TrackCode); + + var orderIsCompleted = false; + if (track == default) + { + // 鏍规嵁杞ㄨ抗code鍦ㄨ鍗曟ā鏉垮唴瀹逛腑瀵绘壘鍖归厤鐨 + var trackContent = await _provideQueries.MatchTrackContentAsync(@event.OrderId, @event.TrackCode); + if (trackContent == default) + { + //throw new BusinessException(message: $"璁㈠崟锛歿@event.OrderNo} 鎵缁戝畾鐨勬ā鏉匡紝娌℃湁涓鏉″唴瀹瑰彲浠ュ尮閰嶈建杩逛唬鐮侊細{@event.TrackCode}"); + return; + } + + orderIsCompleted = trackContent.IsCompleted; + + track = new TrackDetailsIndex + { + IndexName = $"{GlobalConst.TrackIndex}-{DateTime.Now:yyyy.MM.dd}", + OrderId = @event.OrderId, + OrderNo = @event.OrderNo, + OrderType = @event.OrderType, + TrackStatus = trackContent.Status, + TrackCode = @event.TrackCode, + TrackContent = trackContent.Content, + TrackEnContent = trackContent.EnContent, + TrackPlace = @event.TrackPlace, + TrackTime = @event.TrackTime!.Value, + TrackTimeZone = @event.TrackTimeZone!.Value, + IsCanDelete = trackContent.IsCanDelete, + CreateUser = CurrentUserRequest.CurrentUser.Name, + CreateTime = DateTime.Now + }; + + // todo锛氭帹閫佸彧鍋氭柊澧炵殑锛屾洿鏂板拰鍒犻櫎鐨勪笉鍋氬厛 + if (!@event.IsPushCompleted && await _trackPushCacheService.IsPushAsync(@event.CustomId)) + { + //await PushTrack(); + } + } + else + { + track.TrackPlace = @event.TrackPlace; + track.TrackTime = @event.TrackTime!.Value; + track.TrackTimeZone = @event.TrackTimeZone!.Value; + track.UpdateUser = CurrentUserRequest.CurrentUser.Name; + track.UpdateTime = DateTime.Now; + } + + await _trackDetailsRepository.UpsertAsync(track); + + // 瑙﹀彂璁㈠崟涓昏〃鏇存柊浜嬩欢 + await _capPublisher.PublishAsync(GlobalConst.UpdateOrderTrackSubscribe, new UpdateOrderTrackEvent + { + OrderId = track.OrderId, + IsCompleted = orderIsCompleted, + TrackContent = track.TrackContent, + TrackEnContent = track.TrackEnContent, + TrackPlace = track.TrackPlace, + TrackTime = track.TrackTime, + TrackTimeZone = track.TrackTimeZone + }); + + // 鏍规嵁璁㈠崟鍏宠仈鍏崇郴寮傛鍚戜笅鍒 + var linkedOrders = await _orderRepository.GetLinkedOrdersAsync(@event.OrderId); + foreach (var linkedOrder in linkedOrders) + { + var nextEvent = @event.DeepCopy(); + nextEvent.OrderId = linkedOrder.OrderId; + nextEvent.OrderType = linkedOrder.OrderType; + nextEvent.OrderNo = linkedOrder.OrderNo; + nextEvent.SubSystemId = linkedOrder.SubSystemId; + nextEvent.IsPushCompleted = linkedOrder.IsPushCompleted; + nextEvent.CustomId = linkedOrder.CustomId; + nextEvent.UpSubSystemId = @event.SubSystemId; + await _capPublisher.PublishAsync(GlobalConst.TrackUpsertSubscribe, nextEvent); + } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/EventHandlers/UpdateOrderTrackEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/UpdateOrderTrackEventHandler.cs new file mode 100644 index 00000000..0901b2a0 --- /dev/null +++ b/src/SJZY.Track.Application/EventHandlers/UpdateOrderTrackEventHandler.cs @@ -0,0 +1,40 @@ +锘縰sing DotNetCore.CAP; +using SJZY.Track.Application.Contract.Events; +using SJZY.Track.Domain.Aggregates.OrderAggregate; +using Volo.Abp.DependencyInjection; + +namespace SJZY.Track.Application.EventHandlers; + +public class UpdateOrderTrackEventHandler : ITransientDependency, ICapSubscribe +{ + private readonly IOrderRepository _orderRepository; + + public UpdateOrderTrackEventHandler(IOrderRepository orderRepository) + { + _orderRepository = orderRepository; + } + + [CapSubscribe(GlobalConst.UpdateOrderTrackSubscribe)] + public async Task ConsumerAsync(UpdateOrderTrackEvent @event) + { + var order = await _orderRepository.GetFirstAsync(x => x.Id == @event.OrderId); + if (order == default) return; + + if (order.IsCompleted) return; + order.LatestTrackContent = @event.TrackContent; + order.LatestTrackEnContent = @event.TrackEnContent; + order.LatestTrackPlace = @event.TrackPlace; + order.LatestTrackTime = @event.TrackTime; + order.LatestTrackTimeZone = @event.TrackTimeZone; + if (@event.IsCompleted) order.IsCompleted = true; + else if (order.LatestTrackTime != null && + order.LatestTrackTime.Value.Subtract(TimeSpan.FromHours(order.LatestTrackTimeZone ?? 0)) > + @event.TrackTime.Subtract(TimeSpan.FromHours(@event.TrackTimeZone))) return; + + await _orderRepository.UpdateColumnAsync(order, x => new + { + x.IsCompleted, x.LatestTrackContent, x.LatestTrackEnContent, x.LatestTrackPlace, x.LatestTrackTime, + x.LatestTrackTimeZone + }); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/GlobalUsing.cs b/src/SJZY.Track.Application/GlobalUsing.cs index 23e3b927..e4968bf8 100644 --- a/src/SJZY.Track.Application/GlobalUsing.cs +++ b/src/SJZY.Track.Application/GlobalUsing.cs @@ -2,8 +2,7 @@ global using Microsoft.Extensions.DependencyInjection; global using SJZY.Expand.ABP.Common.Enums; global using SJZY.Expand.ABP.Core.Common.Dto; -global using SJZY.Track.Repository; -global using SJZY.Track.Repository.Demo.Entitys; global using Volo.Abp; global using Volo.Abp.Application.Services; global using Volo.Abp.Validation; +global using SJZY.Track.Domain; \ No newline at end of file diff --git a/src/SJZY.Track.Application/Localization/Resources/en.json b/src/SJZY.Track.Application/Localization/Resources/en.json index 5994b511..c7d369bc 100644 --- a/src/SJZY.Track.Application/Localization/Resources/en.json +++ b/src/SJZY.Track.Application/Localization/Resources/en.json @@ -3,6 +3,13 @@ "texts": { "NotNull1": "{0} is not null", "NotFindData": "No data found under the specified number", - "ParameterDemo1": "{0} in {1} to do {2}" + "ParameterDemo1": "{0} in {1} to do {2}", + "TemplateExist": "The template code already exists under the currently selected subsystem", + "TrackContentExist": "The trace code or trace content or trace content in the current subsystem is repeated in English", + "TrackStatusExist": "The trajectory status code or trajectory status or trajectory status in English is repeated under the current subsystem", + "TrackFlagExist": "Duplicate code or flag in the current subsystem", + "IsExistTrackPullConfig": "Track Pull The template has been bound. Delete the track pull before deleting the template", + "IsExistTrackStatus": "The trajectory content has been bound to the trajectory status. Delete the trajectory content before deleting the trajectory status", + "IsExistTrackFlag": "The track content has been bound to the track mark. Delete the track content before deleting the track mark" } } \ No newline at end of file diff --git a/src/SJZY.Track.Application/Localization/Resources/zh.json b/src/SJZY.Track.Application/Localization/Resources/zh.json index 48af2570..38db9ebb 100644 --- a/src/SJZY.Track.Application/Localization/Resources/zh.json +++ b/src/SJZY.Track.Application/Localization/Resources/zh.json @@ -3,6 +3,13 @@ "texts": { "NotFindData": "鏈壘鍒版寚瀹氱紪鍙蜂笅鐨勪换浣曟暟鎹紒", "ParameterDemo": "{0}鍦▄1}鍦版柟鍋氫簡{2}鍔ㄤ綔", - "ParameterDemo1": "{0}鍦▄1}鍦版柟鍋氫簡{2}鍔ㄤ綔" + "ParameterDemo1": "{0}鍦▄1}鍦版柟鍋氫簡{2}鍔ㄤ綔", + "TemplateExist": "妯℃澘浠ｇ爜宸插瓨鍦ㄤ簬褰撳墠閫夋嫨鐨勫瓙绯荤粺涓", + "TrackContentExist": "褰撳墠瀛愮郴缁熶笅杞ㄨ抗浠ｇ爜鎴栬建杩瑰唴瀹规垨杞ㄨ抗鍐呭鑻辨枃閲嶅", + "TrackStatusExist": "褰撳墠瀛愮郴缁熶笅杞ㄨ抗鐘舵佷唬鐮佹垨杞ㄨ抗鐘舵佹垨杞ㄨ抗鐘舵佽嫳鏂囬噸澶", + "TrackFlagExist": "褰撳墠瀛愮郴缁熶笅浠ｇ爜鎴栨爣璁伴噸澶", + "IsExistTrackPullConfig": "杞ㄨ抗鎷夊彇宸茬粦瀹氫簡璇ユā鐗堬紝璇峰厛鍒犻櫎杞ㄨ抗鎷夊彇鍐嶅垹闄よ妯＄増", + "IsExistTrackStatus": "杞ㄨ抗鍐呭宸茬粡缁戝畾浜嗚杞ㄨ抗鐘舵侊紝璇峰厛鍒犻櫎杞ㄨ抗鍐呭鍚庡啀鍒犻櫎璇ヨ建杩圭姸鎬", + "IsExistTrackFlag": "杞ㄨ抗鍐呭宸茬粡缁戝畾浜嗚杞ㄨ抗鏍囪锛岃鍏堝垹闄よ建杩瑰唴瀹瑰悗鍐嶅垹闄よ杞ㄨ抗鏍囪" } } \ No newline at end of file diff --git a/src/SJZY.Track.Application/SJZY.Track.Application.csproj b/src/SJZY.Track.Application/SJZY.Track.Application.csproj index 37c0357f..d2b2eafd 100644 --- a/src/SJZY.Track.Application/SJZY.Track.Application.csproj +++ b/src/SJZY.Track.Application/SJZY.Track.Application.csproj @@ -1,33 +1,26 @@ 锘 - - net7.0 - enable - True - - + - - - - - + + net7.0 + True + - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + diff --git a/src/SJZY.Track.Application/Services/Demo/InterFaceDemoService.cs b/src/SJZY.Track.Application/Services/Demo/InterFaceDemoService.cs deleted file mode 100644 index 145322ac..00000000 --- a/src/SJZY.Track.Application/Services/Demo/InterFaceDemoService.cs +++ /dev/null @@ -1,234 +0,0 @@ -锘縰sing SJZY.Expand.ABP.Core.Common; -using SJZY.Track.Application.Dtos.Demo; -using SJZY.Track.Repository.Demo.Services; -using SJZY.Track.Repository.Demo.ValueObjects; -using Volo.Abp.Http.Client.DynamicProxying; - -namespace SJZY.Track.Application.Services.Demo -{ - /// - /// 鎺ュ彛璇锋眰瀹屾暣鏍蜂緥 - /// - [ApiExplorerSettings(GroupName = "Demo")] - public class InterFaceDemoService : ApplicationService - { - #region 鏋勯犲嚱鏁 - private readonly IDemoRepository _demoRepository; - public InterFaceDemoService(IDemoRepository demoRepository) - { - _demoRepository = demoRepository; - } - #endregion - - #region 澧炲垹鏀 - /// - /// 澧炲垹鏀 - /// - /// - /// - [HttpPost("InterFace/Edit")] - public async Task Edit(DemoInput input) - { - var res = new LongIdBaseDto(); - - if (input.Option == OptionType.鏂板) - { - var entity = ObjectMapper.Map(input); - res.Id = await _demoRepository.InsertReturnIdentityAsync(entity); - } - else if (input.Option == OptionType.淇敼 || input.Option == OptionType.鍒犻櫎) - { - - var demoInfo = await _demoRepository.GetById1(input.Id); - if (demoInfo == null) - { - //鏍￠獙鏁版嵁鏄惁瀛樺湪... - throw new BusinessException(message: "鏈壘鍒版寚瀹氱紪鍙蜂笅鐨勬暟鎹"); - } - - res.Id = demoInfo.Id; - if (input.Option == OptionType.鍒犻櫎) - { - //await _demoRepository.DeleteAsync(demoInfo); //鐪熷垹闄 - - //杞垹闄 - demoInfo.IsDeleted = true; - await _demoRepository.UpdateAsync(demoInfo); - } - else - { - var entity = ObjectMapper.Map(input, demoInfo); - await _demoRepository.UpdateAsync(entity); - } - } - return res; - } - - #endregion - - #region 灞閮ㄦ洿鏂版渶浣冲疄璺 - /// - /// 灞閮ㄦ洿鏂版渶浣冲疄璺 - /// - /// - /// - /// - [HttpPost("InterFace/UpdatePartColumns")] - public async Task UpdatePartColumns(DemoInput input) - { - var demoInfo = await _demoRepository.GetById1(input.Id); - if (demoInfo == null) - { - //鏍￠獙鏁版嵁鏄惁瀛樺湪... - throw new BusinessException(message: "鏈壘鍒版寚瀹氱紪鍙蜂笅鐨勬暟鎹"); - } - - //鏇存柊鍚屾椂蹇界暐鏌愬嚑椤瑰弬鏁 - await _demoRepository.UpdatePartColumns(demoInfo); - - return new IdBaseDto() { Id = input.Id }; - } - #endregion - - #region 鍒嗛〉鏌ヨ鎺ュ彛 - /// - /// 鍒嗛〉鏌ヨ - /// - /// - /// - [HttpPost("InterFace/GetListByPage")] - public async Task> GetListByPage(GetDemoListByPageInput input) - { - //鍒嗛〉鏃惰繑鍥炲肩粺涓鐢 PageResultDto<> 绫诲瀷 - var list = await _demoRepository.GetListByPage(input.PageSize, input.PageIndex, input.Name); - - var res = ObjectMapper.Map, UnifyPageResultDto>(list); - - return res; - } - #endregion - - #region 鍏ュ弬杞崲 - /// - /// 鍏ュ弬杞崲 - /// - /// - /// - [HttpPost("InterFace/InputToValueObject")] - public async Task> InputToValueObject(GetDemoListByPageInput input) - { - var obj = ObjectMapper.Map(input); - var list = await _demoRepository.InputToValueObject(obj); - - var res = ObjectMapper.Map, List>(list); - return res; - } - #endregion - - #region 鍘熺敓sql - - /// - /// 鍘熺敓sql - /// - /// - /// - [HttpPost("InterFace/OriginalSql")] - public async Task> OriginalSql(DemoValueObject obj) - { - var list = await _demoRepository.OriginalSql(obj); - return list; - } - - #endregion - - #region 鑷畾涔夎繑鍥炵粨鏋滄牸寮 - /// - /// 鑷畾涔夎繑鍥炵粨鏋滄牸寮 - /// - /// - /// - [HttpPost("Demo/CustomerResult")] - [CustomerResult] - public async Task GetListAsync() - { - /* - 璇存槑锛 - 鐞嗚涓婃垜浠湁鍏ㄥ叕鍙哥骇鍒殑杩斿洖鍊肩害瀹氾紝涓嶇鏄墠绔皟鍚庣锛岃繕鏄悗绔井鏈嶅姟闂寸殑璋冪敤锛岄兘搴斿畬鍏ㄩ伒寰瑙勮寖銆 - 浣嗕笉鎺掗櫎鏈変簺鐗规畩鎯呭喌涓嬶紝蹇呴』瑕佽繑鍥炶嚜瀹氫箟鏍煎紡鐨勫満鏅 - */ - - var res = new MyCustomerResultOutput(); - res.Code = "200"; - res.Message = "杩欐槸涓涓嚜瀹氫箟杩斿洖缁撴灉"; - - return res; - } - #endregion - - #region 绾﹀畾绫诲瀷涓嬭繑鍥瀗ull - /// - /// 绾﹀畾绫诲瀷涓嬭繑鍥瀗ull - /// - /// - /// - [HttpPost("Demo/ReturnNull")] - public async Task ReturnNull() - { - MyCustomerResultOutput res = null; - return res; - } - #endregion - - #region - /// - /// 娌℃湁杩斿洖鍊 - /// - /// - /// - [HttpPost("Demo/WithoutReturnObject")] - public async Task WithoutReturnObject() - { - return null; - } - #endregion - - #region 涓讳粠鍏崇郴瀹炰綋瀛樺偍 - /// - /// 涓讳粠鍏崇郴瀹炰綋瀛樺偍 - /// - /// - /// - [HttpPost("InterFace/EntityRelationSave")] - public async Task EntityRelationSave(DemoDetailSaveInput input) - { - var obj = ObjectMapper.Map(input); - var res = await _demoRepository.EntityRelationSave(obj); - - return new UnifyResultDto(res); - } - - #endregion - - #region 鏁版嵁缂撳瓨 - /// - /// 鏁版嵁缂撳瓨 - /// - /// - /// - [HttpPost("InterFace/GetDataCache")] - public async Task GetDataCache(IdBaseDto input) - { - var res = await _demoRepository.GetDataCache(input.Id); - return res; - } - #endregion - - //[HttpPost("InterFace/AAAA")] - //public async Task AAAA() - //{ - // var result = await _httpClientProxy.Service.GetSystemTokenAsync("Track"); - - // return result; - //} - } -} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderLinkService.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderLinkService.cs new file mode 100644 index 00000000..c4a6d1db --- /dev/null +++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderLinkService.cs @@ -0,0 +1,100 @@ +锘縰sing SJZY.Track.Application.Contract.Dtos.ProvideServices; +using SJZY.Track.Domain.Aggregates.OrderAggregate; +using SJZY.Track.Domain.Queries; + +namespace SJZY.Track.Application.Services.ProvideServices; + +/// +/// 璁㈠崟鍏宠仈鏈嶅姟 +/// +[ApiExplorerSettings(GroupName = "鎻愪緵鎺ュ彛")] +[Route("/ProviderService")] +public class OrderLinkService : ApplicationService +{ + private readonly IOrderRepository _orderRepository; + private readonly IBasicQuery _orderLinkQuery; + + public OrderLinkService(IBasicQuery orderLinkQuery, IOrderRepository orderRepository) + { + _orderLinkQuery = orderLinkQuery; + _orderRepository = orderRepository; + } + + /// + /// 鍏宠仈璁㈠崟 + /// + /// + /// + [HttpPost("Order/Link")] + public async Task LinkOrderAsync(LinkOrderInput input) + { + var orderId = await _orderRepository.GetFirstAsync(x => + x.OrderType == input.OrderType && x.OrderNo == input.OrderNo, x => x.Id); + if (orderId == default) + { + throw new BusinessException(message: $"璁㈠崟锛歿input.OrderNo}涓嶅瓨鍦"); + } + + //todo锛氬惊鐜叧鑱旓紵 + if (input.OrderType == input.LinkOrderType) + { + throw new BusinessException(message: "涓嶈兘鍚岀骇鍏宠仈"); + } + + if (input.LinkOrderNos.Count < 1 || input.LinkOrderType == 0) return true; + + // 鍗曞彿鍘婚噸锛屽幓绌猴紝鍘昏嚜宸 + input.LinkOrderNos = input.LinkOrderNos + .Where(x => !x.IsNullOrWhiteSpace() && x != input.OrderNo) + .Distinct().ToList(); + + // 瑙ｇ粦 + if (!input.IsLink) return await UnLinkOrderAsync(input); + + // 鍏宠仈璁㈠崟 + return await DoLinkOrderAsync(input, orderId); + } + + private async Task DoLinkOrderAsync(LinkOrderInput input, int orderId) + { + // 鑾峰彇宸插叧鑱旂殑璁㈠崟 + var linkOrderNos = await _orderLinkQuery.GetListAsync(x => + x.OrderType == input.OrderType && x.OrderNo == input.OrderNo && x.LinkOrderType == input.LinkOrderType, + x => x.LinkOrderNo); + + // 璁＄畻鍑烘湭鍏宠仈鐨勮鍗 + var noLinkOrderNos = input.LinkOrderNos.Except(linkOrderNos); + + // 杩囨护鎺変笉瀛樺湪鐨勮鍗 + var canLinkOrders = await _orderRepository.GetListAsync(x => + x.OrderType == input.LinkOrderType && noLinkOrderNos.Contains(x.OrderNo), + x => new { x.Id, x.OrderNo }); + + await _orderRepository.LinkOrderAsync(canLinkOrders.Select(x => new OrderLinkEntity + { + OrderId = orderId, + OrderNo = input.OrderNo, + OrderType = input.OrderType, + LinkOrderId = x.Id, + LinkOrderNo = x.OrderNo, + LinkOrderType = input.LinkOrderType + }).ToList()); + + // todo锛氳ˉ杞ㄨ抗 + + return true; + } + + private async Task UnLinkOrderAsync(LinkOrderInput input) + { + var unLinkIds = await _orderLinkQuery.GetListAsync(x => + x.OrderType == input.OrderType && x.OrderNo == input.OrderNo && + x.LinkOrderType == input.LinkOrderType && input.LinkOrderNos.Contains(x.LinkOrderNo), + x => x.Id); + + // real del + await _orderRepository.UnLinkByIdsAsync(unLinkIds); + + return true; + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs new file mode 100644 index 00000000..a021cd41 --- /dev/null +++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs @@ -0,0 +1,82 @@ +锘縰sing SJZY.Track.Application.Contract.Dtos.ProvideServices; +using SJZY.Track.Domain.Aggregates.OrderAggregate; +using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; +using SJZY.Track.Domain.Dtos.Order; +using SJZY.UserCenter.HttpApi.Services; + +namespace SJZY.Track.Application.Services.ProvideServices; + +/// +/// 璁㈠崟鏈嶅姟 +/// +[ApiExplorerSettings(GroupName = "鎻愪緵鎺ュ彛")] +[Route("/ProviderService")] +public class OrderService : ApplicationService +{ + private readonly IOrderRepository _orderRepository; + private readonly ITrackDetailsRepository _trackDetailsRepository; + + public OrderService(IOrderRepository orderRepository, + ITrackDetailsRepository trackDetailsRepository + ) + { + _orderRepository = orderRepository; + _trackDetailsRepository = trackDetailsRepository; + } + + /// + /// 鍒涘缓璁㈠崟锛岃鍗曞凡瀛樺湪鍒欒涓烘洿鏂 + /// + /// + /// + /// + [HttpPost("Order/Upsert")] + public async Task UpsertAsync(UpsertOrderInput input) + { + var order = await _orderRepository.GetFirstAsync(x => + x.OrderType == input.OrderType && x.OrderNo == input.OrderNo); + if (order != default) + { + // 璁㈠崟宸插瓨鍦ㄥ垯瑙嗕负鏇存柊 + await UpdateOrderAsync(input, order); + return "鏇存柊鎴愬姛"; + } + + order = ObjectMapper.Map(input); + order.SubSystemId = CurrentUserRequest.SubSystemId; + order.OrderTemplates = ObjectMapper.Map, List>(input.Templates!); + order.OrderFlights = ObjectMapper.Map, List>(input.FlightInfos!); + + await _orderRepository.CreateOrderAsync(order); + return "鍒涘缓鎴愬姛"; + } + + /// + /// 鍒犻櫎璁㈠崟 + /// + /// + /// + /// + [HttpPost("Order/Delete")] + public async Task DeleteOrderAsync(DeleteOrderInput input) + { + var orderId = await _orderRepository.GetFirstAsync(x => + x.OrderType == input.OrderType && x.OrderNo == input.OrderNo, x => x.Id); + if (orderId == default) + { + throw new BusinessException(message: $"璁㈠崟锛歿input.OrderNo}涓嶅瓨鍦"); + } + + await _orderRepository.DeleteOrderAsync(orderId); + + return true; + } + + private async Task UpdateOrderAsync(UpdateOrderInput input, OrderEntity order) + { + order = ObjectMapper.Map(input, order); + order.OrderTemplates = ObjectMapper.Map, List>(input.Templates!); + order.OrderFlights = ObjectMapper.Map, List>(input.FlightInfos!); + await _orderRepository.UpdateOrderAsync(order); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs new file mode 100644 index 00000000..53cdfd57 --- /dev/null +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs @@ -0,0 +1,57 @@ +锘縰sing SJZY.InterfaceRelay.Application.Contracts; +using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using SJZY.Track.Domain.Aggregates.OrderAggregate; +using Volo.Abp.Http.Client.DynamicProxying; + +namespace SJZY.Track.Application.Services.ProvideServices; + +/// +/// 杞ㄨ抗鎷夊彇鏈嶅姟 +/// +[ApiExplorerSettings(GroupName = "鎻愪緵鎺ュ彛")] +[Route("/ProviderService")] +public class TrackPullService : ApplicationService +{ + private readonly IOrderRepository _orderRepository; + private readonly IHttpClientProxy _httpClientProxy; + + public TrackPullService(IOrderRepository orderRepository, + IHttpClientProxy httpClientProxy) + { + _orderRepository = orderRepository; + _httpClientProxy = httpClientProxy; + } + + /// + /// 鍒锋柊杞ㄨ抗 + /// + /// + /// + [HttpPost("Track/Refresh")] + public async Task RefreshTrackAsync(RefreshTrackInput input) + { + if (input.OrderNos.Count == 0) + { + throw new BusinessException(message: "璁㈠崟鍙锋暟缁勪笉鑳戒负绌"); + } + + input.OrderNos = input.OrderNos.Distinct().ToList(); + + var orderTemplates = await _orderRepository.GetOrderTemplatesAsync(input.OrderNos); + + foreach (var group in orderTemplates.GroupBy(x => x.ServiceProviderId)) + { + var data = group.Select(x => new OrderNoInfo + { + OrderType = x.OrderType, + OrderNo = x.OrderNo + }).ToList(); + + await _httpClientProxy.Service.BatchForwardThenPushToQueueAsync( + "A012", "yicang", 42, data, GlobalConst.InterfaceRelayTrackRefreshSubscribe + , group.Key.ToString()); + } + + return true; + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs new file mode 100644 index 00000000..f2b5320f --- /dev/null +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs @@ -0,0 +1,11 @@ +锘縩amespace SJZY.Track.Application.Services.ProvideServices; + +/// +/// 杞ㄨ抗鎺ㄩ佹湇鍔 +/// +[ApiExplorerSettings(GroupName = "鎻愪緵鎺ュ彛")] +[Route("/ProviderService")] +public class TrackPushService: ApplicationService +{ + +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackQueryService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackQueryService.cs new file mode 100644 index 00000000..241d9030 --- /dev/null +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackQueryService.cs @@ -0,0 +1,108 @@ +using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using SJZY.Track.Domain.Aggregates.OrderAggregate; +using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; +using SJZY.Track.Domain.Queries; + +namespace SJZY.Track.Application.Services.ProvideServices; + +/// +/// 杞ㄨ抗鏌ヨ鏈嶅姟 +/// +[ApiExplorerSettings(GroupName = "鎻愪緵鎺ュ彛")] +[Route("/ProviderService")] +public class TrackQueryService : ApplicationService +{ + private readonly ITrackDetailsRepository _trackDetailsRepository; + private readonly IOrderRepository _orderRepository; + private readonly IProvideQueries _provideQueries; + + public TrackQueryService(ITrackDetailsRepository trackDetailsRepository, + IOrderRepository orderRepository, + IProvideQueries provideQueries) + { + _trackDetailsRepository = trackDetailsRepository; + _orderRepository = orderRepository; + _provideQueries = provideQueries; + } + + /// + /// 鏍规嵁璁㈠崟鍙疯幏鍙栬建杩 + /// + /// + /// + /// + [HttpPost("Track/Query")] + public async Task> QueryAsync(GetTrackInput input) + { + if (input.OrderNos.Count > 500) + { + throw new BusinessException(message: "鏈澶氬彧鑳芥煡璇500鍗"); + } + + var res = new List(); + input.OrderNos = input.OrderNos.Where(x => !x.IsNullOrWhiteSpace()).Distinct().ToList(); // 鍗曞彿鍘婚噸銆佸幓绌 + var details = await _trackDetailsRepository.GetListAsync(input.OrderType, input.OrderNos); + + foreach (var group in details.GroupBy(x => x.OrderId)) + { + var item = new GetTrackOutput(); + var trackDetails = group.ToList(); + item.OrderNo = trackDetails.First().OrderNo; + + item.TrackDetails = trackDetails.Select(x => new TrackDetail + { + Code = x.TrackCode, + Status = x.TrackStatus, + Content = x.TrackContent, + Location = x.TrackPlace, + Time = x.TrackTime.AddHours(input.TimeZone ?? 8 - x.TrackTimeZone), + TimeZone = input.TimeZone ?? 8 + }).ToList(); + + res.Add(item); + } + + await TrackDetailSort(res, input); + + return res; + } + + private async Task TrackDetailSort(List list, GetTrackInput input) + { + switch (input.SortMethod) + { + case SortMethod.ByTrackTime: + // tips锛歲uick-sort 鐩存帴淇敼鍘焞ist + list.ForEach(item => item.TrackDetails.Sort((a, b) => a.Time.CompareTo(b.Time))); + break; + case SortMethod.ByTrackTimeDesc: + list.ForEach(item => item.TrackDetails.Sort((a, b) => b.Time.CompareTo(a.Time))); + break; + case SortMethod.ByTemplate: + var orderTemplates = await _provideQueries + .GetOrderTemplateLinksAsync(input.OrderType, input.OrderNos); + var distinctTemplateIds = orderTemplates.Select(x => x.TemplateId).Distinct().ToList(); + var templateContent = await _provideQueries.GetOrderedTrackCodesAsync(distinctTemplateIds); + list.ForEach(item => + { + var codes = new List(); + // 澶氭ā鏉挎嫾鎺ユ樉绀 + foreach (var orderTemplate in orderTemplates.Where(x => x.OrderNo == item.OrderNo)) + { + codes.AddRange(templateContent + .Where(t => t.TemplateId == orderTemplate.TemplateId) // 鎸夋ā鏉 + .Where(t => t.IsExternal) // 杩囨护涓嶅澶栫殑 + .Select(t => t.Code)); + } + + item.TrackDetails = item.TrackDetails + .Where(x => codes.Contains(x.Code)) // 鍓旈櫎涓嶅湪妯℃澘鍐呭涓殑鍏冪礌 + .OrderBy(x => codes.IndexOf(x.Code)) // 鎸夌収鍦ㄦā鏉垮唴瀹圭殑浣嶇疆鎺掑簭 + .ToList(); + }); + break; + default: + throw new ArgumentOutOfRangeException(nameof(input.SortMethod), input.SortMethod, "涓嶆敮鎸佺殑鎺掑簭鏂瑰紡"); + } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs new file mode 100644 index 00000000..18adf7fa --- /dev/null +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs @@ -0,0 +1,93 @@ +锘縰sing 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.Queries; + +namespace SJZY.Track.Application.Services.ProvideServices; + +/// +/// 杞ㄨ抗鏈嶅姟 +/// +[ApiExplorerSettings(GroupName = "鎻愪緵鎺ュ彛")] +[Route("/ProviderService")] +public class TrackService : ApplicationService +{ + private readonly IOrderRepository _orderRepository; + private readonly IProvideQueries _provideQueries; + private readonly ICapPublisher _capPublisher; + + public TrackService(IOrderRepository orderRepository, IProvideQueries provideQueries, ICapPublisher capPublisher) + { + _orderRepository = orderRepository; + _provideQueries = provideQueries; + _capPublisher = capPublisher; + } + + /// + /// 鏂板/鏇存柊璁㈠崟杞ㄨ抗鎺ュ彛 + /// + /// + /// + /// + [HttpPost("Track/Upsert")] + public async Task UpsertTrackAsync(UpsertTrackInput input) + { + var order = await _orderRepository.GetFirstAsync(x => + x.OrderType == input.OrderType && x.OrderNo == input.OrderNo, x => new + { + x.Id, x.SubSystemId, x.IsPushCompleted, x.CustomId + }); + if (order == default) + { + throw new BusinessException(message: $"璁㈠崟锛歿input.OrderNo}涓嶅瓨鍦"); + } + + // 鏂板/鏇存柊杞ㄨ抗 + var @event = ObjectMapper.Map(input); + @event.OrderId = order.Id; + @event.SubSystemId = order.SubSystemId; + @event.IsPushCompleted = order.IsPushCompleted; + @event.CustomId = order.CustomId; + await _capPublisher.PublishAsync(GlobalConst.TrackUpsertSubscribe, @event); + return true; + } + + /// + /// 鍒犻櫎杞ㄨ抗 + /// + /// + /// + /// + [HttpPost("Track/Delete")] + public async Task DeleteTrackAsync(DeleteTrackInput input) + { + var order = await _orderRepository.GetFirstAsync(x => + x.OrderType == input.OrderType && x.OrderNo == input.OrderNo, x => new + { + x.Id, x.SubSystemId, x.IsPushCompleted, x.CustomId + }); + if (order == default) + { + throw new BusinessException(message: $"璁㈠崟锛歿input.OrderNo}涓嶅瓨鍦"); + } + + var codes = await _provideQueries.GetCanDeleteTrackCodesAsync(order.Id, input.TrackCodes); + + if (codes.Count == 0) + { + throw new BusinessException(message: "娌℃湁涓涓建杩逛唬鐮佹槸鍙垹鐨"); + } + + // 鍒犻櫎杞ㄨ抗 + var @event = new TrackDeleteEvent + { + OrderId = order.Id, + TrackCodes = codes, + SubSystemId = order.SubSystemId, + }; + await _capPublisher.PublishAsync(GlobalConst.TrackDeleteSubscribe, @event); + + return true; + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs b/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs new file mode 100644 index 00000000..f4946435 --- /dev/null +++ b/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs @@ -0,0 +1,297 @@ +锘縰sing Microsoft.Extensions.Localization; +using SJZY.Expand.ABP.Core.Localization; +using SJZY.Expand.ABP.Core.PublicMethords; +using SJZY.Track.Application.Contract.Dtos.TrackContents; +using SJZY.Track.Application.Localization; +using SJZY.Track.Domain.Aggregates.TrackContentAggregate; +using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; +using SJZY.Track.Domain.Dtos.TrackContents; +using SJZY.Track.Domain.Queries; +using System.Linq.Expressions; +using Volo.Abp.DependencyInjection; + +namespace SJZY.Track.Application.Services.TrackContents +{ + /// + /// 杞ㄨ抗鍐呭鏈嶅姟 + /// + [ApiExplorerSettings(GroupName = "杞ㄨ抗鍐呭")] + [Route("/Track/Content")] + public class TrackContentService : ApplicationService, ITransientDependency + { + private readonly IStringLocalizer _stringLocalizer; + private readonly ITrackContentRepository _trackContentRepository; + private readonly IBasicQuery _trackContentMapBasicQuery; + private readonly IBasicQuery _trackTemplateContentBasicQuery; + + public TrackContentService( + IStringLocalizer stringLocalizer, + ITrackContentRepository trackContentRepository, + IBasicQuery trackContentMapBasicQuery, + IBasicQuery trackTemplateContentBasicQuery + ) + { + this._stringLocalizer = stringLocalizer; + this._trackContentRepository = trackContentRepository; + this._trackContentMapBasicQuery = trackContentMapBasicQuery; + this._trackTemplateContentBasicQuery = trackTemplateContentBasicQuery; + } + + /// + /// 杞ㄨ抗鍐呭缂栬緫 + /// + /// + [HttpPost("Edit")] + public async Task EditAsync(EditTrackContentInput input) + { + return input.Options switch + { + OptionType.鏂板 => await AddAsync(input), + OptionType.淇敼 => await UpdateAsync(input), + OptionType.鍒犻櫎 => await DeleteAsync(input), + _ => throw new BusinessException(message: "褰撳墠鎿嶄綔鍔ㄤ綔涓嶅悎娉") + }; + } + + /// + /// 鏍规嵁鍐呭id鑾峰彇杞ㄨ抗鍐呭 + /// + /// + /// + [HttpGet("GetDetail")] + public async Task> GetDetailAsync(int id) + { + var detailInfo = await _trackContentRepository.GetDetailAsync(id); + if (detailInfo == null) + { + return new UnifyResultDto(false, null, "鏈煡璇㈠埌杞ㄨ抗鐘舵"); + } + + var dto = ObjectMapper.Map(detailInfo); + return new UnifyResultDto("200", "", dto); + } + + /// + /// 鑾峰彇鍒嗛〉杞ㄨ抗鍐呭 + /// + /// + /// + [HttpPost("GetList")] + public async Task> GetPageTrackContent( + GetPageTrackContentInput input) + { + var vo = ObjectMapper.Map(input); + var resultDto = await _trackContentRepository.GetPageTrackContent(vo); + var pageResultDto = + ObjectMapper.Map, UnifyPageResultDto>( + resultDto); + + return pageResultDto; + } + + #region 绉佹湁鏂规硶 + + private async Task AddAsync(EditTrackContentInput input) + { + #region 涓氬姟閫昏緫鏍￠獙 + + var trackContentEntitys = await _trackContentRepository.GetListAsync(a => + a.SubSystemId == input.SubSystemId && (a.Code == input.Code || + a.Content == input.Content || a.EnContent == input.EnContent)); + if (trackContentEntitys.Any()) + { + //throw new BusinessException(message: _stringLocalizer["TrackContentExist"]); + var codes = trackContentEntitys.FirstOrDefault(a => a.Code==input.Code); + if (codes!=null) + { + throw new BusinessException(message: "璇ュ瓙绯荤粺涓嬭建杩逛唬鐮佸凡瀛樺湪"); + } + var contents = trackContentEntitys.FirstOrDefault(a => a.Content==input.Content); + if (contents!=null) + { + throw new BusinessException(message: "璇ュ瓙绯荤粺涓嬭建杩瑰唴瀹瑰凡瀛樺湪"); + } + var contentEns = trackContentEntitys.FirstOrDefault(a => a.EnContent==input.EnContent); + if (contentEns!=null) + { + throw new BusinessException(message: "璇ュ瓙绯荤粺涓嬭建杩瑰唴瀹硅嫳鏂囧凡瀛樺湪"); + } + //throw new BusinessException(message: "褰撳墠瀛愮郴缁熶笅锛岃建杩逛唬鐮佹垨杞ㄨ抗鍐呭鎴栬建杩瑰唴瀹硅嫳鏂囧瓨鍦"); + } + + #endregion 涓氬姟閫昏緫鏍￠獙 + + var entity = ObjectMapper.Map(input); + var isTrue = await _trackContentRepository.InsertAsync(entity); + + return new UnifyResultDto("200", "鏂板鎴愬姛", isTrue); + } + + private async Task UpdateAsync(EditTrackContentInput input) + { + #region 涓氬姟閫昏緫鏍￠獙 + + var trackContentEntitys = await _trackContentRepository.GetListAsync(a => a.Id != input.Id && + a.SubSystemId == input.SubSystemId && (a.Code == input.Code || + a.Content == input.Content || a.EnContent == input.EnContent)); + if (trackContentEntitys.Any()) + { + //throw new BusinessException(message: _stringLocalizer["TrackContentExist"]); + //throw new BusinessException(message: "褰撳墠瀛愮郴缁熶笅锛岃建杩逛唬鐮佹垨杞ㄨ抗鍐呭鎴栬建杩瑰唴瀹硅嫳鏂囧瓨鍦"); + var codes = trackContentEntitys.FirstOrDefault(a => a.Code==input.Code); + if (codes!=null) + { + throw new BusinessException(message: "璇ュ瓙绯荤粺涓嬭建杩逛唬鐮佸凡瀛樺湪"); + } + var contents = trackContentEntitys.FirstOrDefault(a => a.Content==input.Content); + if (contents!=null) + { + throw new BusinessException(message: "璇ュ瓙绯荤粺涓嬭建杩瑰唴瀹瑰凡瀛樺湪"); + } + var contentEns = trackContentEntitys.FirstOrDefault(a => a.EnContent==input.EnContent); + if (contentEns!=null) + { + throw new BusinessException(message: "璇ュ瓙绯荤粺涓嬭建杩瑰唴瀹硅嫳鏂囧凡瀛樺湪"); + } + } + + #endregion 涓氬姟閫昏緫鏍￠獙 + + //鏇存柊鐨勬椂鍊欓渶瑕佽鐩栧唴瀹规槧灏勮建杩逛唬鐮 + var templateEntity = await _trackContentRepository.GetFirstAsync(a => a.Id == input.Id); + + bool isTrue = false; + + using (var ts = TransactionScopeHelper.Create()) + { + // 濡傛灉杞ㄨ抗鍐呭鐨勫瓙绯荤粺鍜宑ode鍙戠敓鍙樺寲锛屽悓姝ュ埌杞ㄨ抗鏄犲皠琛 + if (templateEntity.SubSystemId != input.SubSystemId || templateEntity.Code != input.Code) + { + await _trackContentRepository.UpdateMapAsync(x => new TrackContentMapEntity + { + SubSystemId = input.SubSystemId, + TrackContentCode = input.Code + }, x => x.TrackContentId == input.Id); + + await _trackContentRepository.UpdateMapAsync(x => new TrackContentMapEntity + { + MapSubSystemId = input.SubSystemId, + MapTrackContentCode = input.Code + }, x => x.MapTrackContentId == input.Id); + } + + ObjectMapper.Map(input, templateEntity); + + isTrue = await _trackContentRepository.UpdateAsync(templateEntity); + + ts.Complete(); + } + + return new UnifyResultDto("200", "淇敼鎴愬姛", isTrue); + } + + private async Task DeleteAsync(EditTrackContentInput input) + { + #region 涓氬姟鏍￠獙 + //鏌ヨ鏄惁鍏宠仈浜嗚建杩规ā鐗堝唴瀹 + var isExistTemplate = await _trackContentRepository.GetTemplateIsExist(input.Id); + if (isExistTemplate) + { + throw new BusinessException(message: "璇ヨ建杩瑰唴瀹瑰叧鑱旇建杩规ā鏉匡紝绂佹鍒犻櫎"); + } + //var trackTemplateContents = await _trackTemplateContentBasicQuery.GetListAsync(a => a.TrackContentId == input.Id); + //if (trackTemplateContents.Any()) + //{ + // throw new BusinessException(message: "璇ヨ建杩瑰唴瀹瑰叧鑱旇建杩规ā鏉匡紝绂佹鍒犻櫎"); + //} + + //闇瑕佸姞涓垽鏂紝瀛樺湪鍐呭鏄犲皠锛屽垯鍑烘彁绀 + //var trackContentMapEntities = await _trackContentMapBasicQuery.GetListAsync(a => a.TrackContentId == input.Id || a.MapTrackContentId == input.Id); + //if (trackContentMapEntities.Any()) + //{ + // throw new BusinessException(message: "鏃犳硶鍒犻櫎璇ュ唴瀹癸紝璇ヨ建杩瑰唴瀹瑰凡鍦ㄨ建杩瑰唴瀹规槧灏勪腑浣跨敤浜,璇锋鏌"); + //} + #endregion 涓氬姟鏍￠獙 + + var isTrue = await _trackContentRepository.SoftDeleteAsync(x => x.Id == input.Id); + + return new UnifyResultDto("200", "鍒犻櫎鎴愬姛", isTrue); + } + + #endregion 绉佹湁鏂规硶 + + /// + /// 杞ㄨ抗鍐呭鏄犲皠鍒楄〃 + /// + /// + /// + [HttpPost("GetMapPage")] + public async Task> GetMapPageAsync([FromBody] GetTrackContentMapPageInputVO input) + { + return await _trackContentRepository.GetMapPageAsync(input); + } + + /// + /// 杞ㄨ抗鍐呭鏄犲皠璇︽儏 + /// + /// + /// + [HttpGet("GetMapDetail")] + public async Task GetMapDetailAsync(int id) + { + return await _trackContentRepository.GetMapDetailAsync(id); + } + + /// + /// 杞ㄨ抗鍐呭鏄犲皠缂栬緫 + /// + /// + /// + [HttpPost("EditMap")] + public async Task EditMapAsync([FromBody] EditTrackContentMapInput input) + { + if (input.Options != OptionTypeNoNull.鍒犻櫎) + { + if (input.SubSystemId == input.MapSubSystemId) throw new BusinessException(message: _stringLocalizer["NotAllowedToMapSubSystem"]); + + Expression> isMapAnyExp = x => + x.TrackContentId == input.TrackContentId && x.MapTrackContentId == input.MapTrackContentId; + if (input.Options == OptionTypeNoNull.淇敼) isMapAnyExp.And(x => x.Id != input.Id); + + if (await _trackContentRepository.IsMapAnyAsync(isMapAnyExp)) + throw new BusinessException(message: _stringLocalizer["IsTrackContentMapAny"]); + } + + switch (input.Options) + { + case OptionTypeNoNull.鏂板: + { + var trackContentMapEntity = ObjectMapper.Map(input); + + await _trackContentRepository.InsertMapAsync(trackContentMapEntity); + } + break; + + case OptionTypeNoNull.淇敼: + { + var oldTrackContentMapEntity = await _trackContentRepository.GetMapByIdAsync(input.Id!.Value) ?? throw new BusinessException(message: _stringLocalizer["NotFindData"]); + + ObjectMapper.Map(input, oldTrackContentMapEntity); + + await _trackContentRepository.UpdateMapAsync(oldTrackContentMapEntity); + } + break; + + case OptionTypeNoNull.鍒犻櫎: + await _trackContentRepository.SoftDeleteMapAsync(x => x.Id == input.Id); + break; + + default: + throw new BusinessException(message: _stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum, + nameof(EditTrackContentMapInput.Options)]); + } + + return true; + } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/TrackFlags/TrackFlagService.cs b/src/SJZY.Track.Application/Services/TrackFlags/TrackFlagService.cs new file mode 100644 index 00000000..9e7d4056 --- /dev/null +++ b/src/SJZY.Track.Application/Services/TrackFlags/TrackFlagService.cs @@ -0,0 +1,163 @@ +锘縰sing 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 Volo.Abp.DependencyInjection; + +namespace SJZY.Track.Application.Services.TrackFlags +{ + /// + /// 杞ㄨ抗鏍囪鏈嶅姟 + /// + [ApiExplorerSettings(GroupName = "杞ㄨ抗鏍囪")] + [Route("/Track/Flag")] + public class TrackFlagService : ApplicationService, ITransientDependency + { + private readonly IStringLocalizer _stringLocalizer; + private readonly ITrackFlagRepository _trackFlagRepository; + private readonly ITrackContentRepository _trackContentRepository; + + public TrackFlagService( + IStringLocalizer stringLocalizer, + ITrackFlagRepository trackFlagRepository, + ITrackContentRepository trackContentRepository + ) + { + this._stringLocalizer = stringLocalizer; + this._trackFlagRepository = trackFlagRepository; + this._trackContentRepository=trackContentRepository; + } + + /// + /// 杞ㄨ抗鏍囪缂栬緫 + /// + /// + [HttpPost("Edit")] + public async Task EditAsync(EditTrackFlagInput input) + { + return input.Options switch + { + OptionType.鏂板 => await AddAsync(input), + OptionType.淇敼 => await UpdateAsync(input), + OptionType.鍒犻櫎 => await DeleteAsync(input), + _ => throw new BusinessException(message: "褰撳墠鎿嶄綔鍔ㄤ綔涓嶅悎娉") + }; + } + + /// + /// 鏍规嵁鏍囪id鑾峰彇杞ㄨ抗鏍囪 + /// + /// + /// + [HttpGet("GetDetail")] + public async Task> GetDetailAsync(int id) + { + var detailInfo = await _trackFlagRepository.GetDetailAsync(id); + if (detailInfo == null) + { + return new UnifyResultDto(false, null, "鏈煡璇㈠埌杞ㄨ抗鐘舵"); + } + + var dto = ObjectMapper.Map(detailInfo); + return new UnifyResultDto("200", "", dto); + } + + /// + /// 鑾峰彇鍒嗛〉杞ㄨ抗鏍囪 + /// + /// + /// + [HttpPost("GetList")] + public async Task> GetPageTrackFlag(GetPageTrackFlagInput input) + { + var vo = ObjectMapper.Map(input); + var resultDto = await _trackFlagRepository.GetPageTrackFlag(vo); + var pageResultDto = + ObjectMapper.Map, UnifyPageResultDto>( + resultDto); + + return pageResultDto; + } + + #region 绉佹湁鏂规硶 + + private async Task AddAsync(EditTrackFlagInput input) + { + #region 涓氬姟鏍￠獙 + var trackFlagsEntitys = await _trackFlagRepository.GetListAsync(a => + a.SubSystemId == input.SubSystemId && (a.Code == input.Code || a.Name == input.Flag)); + if (trackFlagsEntitys.Any()) + { + //throw new BusinessException(message: _stringLocalizer["TrackFlagExist"]); + //throw new BusinessException(message: "褰撳墠瀛愮郴缁熶笅宸插瓨鍦ㄨ建杩规爣璁颁唬鐮"); + var trackFlagCode = trackFlagsEntitys.FirstOrDefault(a => a.Code==input.Code); + if (trackFlagCode!=null) + { + throw new BusinessException(message: "璇ュ瓙绯荤粺涓嬩唬鐮佸凡瀛樺湪"); + } + var trackFlagName = trackFlagsEntitys.FirstOrDefault(a => a.Name==input.Flag); + if (trackFlagName!=null) + { + throw new BusinessException(message: "璇ュ瓙绯荤粺涓嬫爣璁板凡瀛樺湪"); + } + } + #endregion + + var entity = ObjectMapper.Map(input); + var isTrue = await _trackFlagRepository.InsertAsync(entity); + + return new UnifyResultDto("200", "鏂板鎴愬姛", isTrue); + } + + private async Task UpdateAsync(EditTrackFlagInput input) + { + #region 涓氬姟鏍￠獙 + + var trackFlagsEntitys = await _trackFlagRepository.GetListAsync(a => a.Id != input.Id && + a.SubSystemId == input.SubSystemId && (a.Code == input.Code || + a.Name == input.Flag)); + if (trackFlagsEntitys.Any()) + { + //throw new BusinessException(message: _stringLocalizer["TrackFlagExist"]); + //throw new BusinessException(message: "褰撳墠瀛愮郴缁熶笅宸插瓨鍦ㄨ建杩规爣璁颁唬鐮"); + var trackFlagCode = trackFlagsEntitys.FirstOrDefault(a => a.Code==input.Code); + if (trackFlagCode!=null) + { + throw new BusinessException(message: "璇ュ瓙绯荤粺涓嬩唬鐮佸凡瀛樺湪"); + } + var trackFlagName = trackFlagsEntitys.FirstOrDefault(a => a.Name==input.Flag); + if (trackFlagName!=null) + { + throw new BusinessException(message: "璇ュ瓙绯荤粺涓嬫爣璁板凡瀛樺湪"); + } + } + + #endregion + + var templateEntity = await _trackFlagRepository.GetFirstAsync(a => a.Id == input.Id); + ObjectMapper.Map(input, templateEntity); + var isTrue = await _trackFlagRepository.UpdateAsync(templateEntity); + + return new UnifyResultDto("200", "淇敼鎴愬姛", isTrue); + } + + private async Task DeleteAsync(EditTrackFlagInput input) + { + #region 涓氬姟鏍￠獙 + var isExistContent = await _trackContentRepository.GetFirstAsync(a => a.TrackFlagId==input.Id); + if (isExistContent!=null) + { + //throw new BusinessException(message: _stringLocalizer["IsExistTrackFlag"]); + throw new BusinessException(message: "璇ユ爣璁板叧鑱旇建杩瑰唴瀹癸紝绂佹鍒犻櫎"); + } + #endregion + var isTrue = await _trackFlagRepository.SoftDeleteAsync(x => x.Id == input.Id); + + return new UnifyResultDto("200", "鍒犻櫎鎴愬姛", isTrue); + } + + #endregion + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs new file mode 100644 index 00000000..908d7227 --- /dev/null +++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs @@ -0,0 +1,115 @@ +锘縰sing SJZY.Track.Application.Contract.Dtos.ProvideServices; +using SJZY.Track.Domain.Aggregates.OrderAggregate; +using SJZY.Track.Domain.Aggregates.TrackContentAggregate; +using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; +using SJZY.Track.Domain.Dtos.Order; +using SJZY.Track.Domain.Dtos.TrackTemplate; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.DependencyInjection; + +namespace SJZY.Track.Application.Services.TrackOrders +{ + [ApiExplorerSettings(GroupName = "杞ㄨ抗璁㈠崟")] + [Route("/Track/Order")] + public class TrackOrderService : ApplicationService, ITransientDependency + { + private readonly IOrderRepository _orderRepository; + private readonly ITrackDetailsRepository _trackDetailsRepository; + private readonly ITrackContentRepository _trackContentRepository; + + public TrackOrderService( + IOrderRepository orderRepository, + ITrackDetailsRepository trackDetailsRepository, + ITrackContentRepository trackContentRepository + ) + { + this._orderRepository=orderRepository; + this._trackDetailsRepository=trackDetailsRepository; + this._trackContentRepository=trackContentRepository; + } + + #region 杞ㄨ抗璁㈠崟鏄庣粏 + /// + /// 鏍规嵁杞ㄨ抗璁㈠崟id鑾峰彇杞ㄨ抗璁㈠崟鏄庣粏鍒楄〃 + /// + /// + /// + [HttpPost("GetDetails")] + public async Task> GetOrderDetails(GetOrderDetailsInput input) + { + var trackDetails = await _trackDetailsRepository.GetListAsync(input.OrderId); + if (!trackDetails.IsNullOrEmpty()) + { + var list = ObjectMapper.Map, List>(trackDetails); + var trackCodes = list.Where(a => !a.Code.IsNullOrWhiteSpace()).Select(a => a.Code).Distinct().ToList(); + + var trackContents = await _trackContentRepository.GetTrackContentAttributeValue(new GetTemplateContentAttributeValueInputVO + { + SubSystemId =input.SubSystemId, + TrackTemplateIds = input.TrackTemplateIds, + TrackCodes=trackCodes + }); + input.TrackTemplateIds =input.TrackTemplateIds.Where(a => a>0).ToList(); + int id = 1; + list.ForEach(a => + { + a.Id = id++; + + var trackContentsOfTemplates = trackContents.Where(b => b.SubSystemId==input.SubSystemId && b.TrackCode==a.Code + && input.TrackTemplateIds.Contains(b.TrackTemplateId)); + GetTemplateContentAttributeValueVO trackContent = null; + var insertData = input.TrackTemplateIds.Intersect(trackContentsOfTemplates.Select(aa => aa.TrackTemplateId)).ToList(); + if (!insertData.IsNullOrEmpty()) + { + trackContent =trackContentsOfTemplates.FirstOrDefault(a => a.TrackTemplateId==insertData.FirstOrDefault()); + } + + if (trackContent!=null) + { + a.IsCanDelete=trackContent.IsCanDelete; + a.IsExternal = trackContent.IsExternal; + } + if (a.TrackTimeZoneValue==0f) + { + a.TrackTimeZone=$"GTM{" "}+00:00"; + } + else + { + // 灏嗗皬鏁板舰寮忕殑灏忔椂杞崲涓烘椂鍖哄亸绉婚噺 + int hours = (int)a.TrackTimeZoneValue; // 鎻愬彇鏁存暟閮ㄥ垎浣滀负灏忔椂 + int minutes = (int)((a.TrackTimeZoneValue - hours) * 60); // 灏嗗皬鏁伴儴鍒嗕箻浠 60 杞崲涓哄垎閽 + TimeSpan offset = new TimeSpan(hours, minutes, 0); + string timeZoneStr = offset.ToString(); + string flag = a.TrackTimeZoneValue>0f ? "+" : ""; + a.TrackTimeZone = $"GTM{" "}{flag}{timeZoneStr.RemovePostFix(":00")}"; + } + }); + return list; + } + + return new List(); + } + #endregion + + #region 杞ㄨ抗璁㈠崟鍒楄〃 + /// + /// 鑾峰彇鍒嗛〉鐨勮建杩硅鍗 + /// + /// + /// + [HttpPost("GetTrackOrderList")] + public async Task> GetPageTrackOrder(GetPageTrackOrderInput input) + { + var vo = ObjectMapper.Map(input); + var pageList = await _orderRepository.GetPageTrackOrder(vo); + var pageResultDto = + ObjectMapper.Map, UnifyPageResultDto>(pageList); + return pageResultDto; + } + #endregion + } +} diff --git a/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs b/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs new file mode 100644 index 00000000..34998b29 --- /dev/null +++ b/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs @@ -0,0 +1,241 @@ +锘縰sing System; +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.TrackPull; +using SJZY.Track.Application.Localization; +using SJZY.Track.Domain.Aggregates.TrackPullAggregate; +using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; +using SJZY.Track.Domain.Dtos.Common; +using SJZY.Track.Domain.Dtos.TrackPull; +using SqlSugar; +using Volo.Abp.DependencyInjection; + +namespace SJZY.Track.Application.Services.TrackPull; + +/// +/// 杞ㄨ抗鎷夊彇 +/// +[ApiExplorerSettings(GroupName = "杞ㄨ抗鎷夊彇")] +[Route("/Track/PullConfig")] +public class TrackPullService : ApplicationService, ITransientDependency +{ + private readonly IStringLocalizer _stringLocalizer; + private readonly ITrackPullConfigRepository _trackPullConfigRepository; + private readonly ITrackTemplateRepository _trackTemplateRepository; + + public TrackPullService( + IStringLocalizer stringLocalizer, + ITrackPullConfigRepository trackPullConfigRepository, + ITrackTemplateRepository trackTemplateRepository) + { + _stringLocalizer = stringLocalizer; + _trackPullConfigRepository = trackPullConfigRepository; + _trackTemplateRepository = trackTemplateRepository; + } + + /// + /// 杞ㄨ抗鎷夊彇閰嶇疆鍒楄〃 + /// + /// + /// + [HttpPost("GetPage")] + public async Task> GetPageAsync([FromBody] KeywordsInputVO input) + { + return await _trackPullConfigRepository.GetPageAsync(input); + } + + /// + /// 杞ㄨ抗鎷夊彇閰嶇疆鍐呭鍒楄〃 + /// + /// + /// + [HttpPost("GetContentPage")] + public async Task> GetContentPageAsync( + [FromBody] GetTrackPullContentPageInputVO input) + { + return await _trackPullConfigRepository.GetContentPageAsync(input); + } + + /// + /// 杞ㄨ抗鎷夊彇閰嶇疆璇︽儏 + /// + /// + /// + [HttpGet("GetDetail")] + public async Task GetDetailAsync(int id) + { + return await _trackPullConfigRepository.GetDetailAsync(id); + } + + /// + /// 杞ㄨ抗鎷夊彇閰嶇疆鍐呭璇︽儏 + /// + /// + /// + [HttpGet("GetContentDetail")] + public async Task GetContentDetailAsync(int id) + { + return await _trackPullConfigRepository.GetContentDetailAsync(id); + } + + /// + /// 杞ㄨ抗鎷夊彇閰嶇疆缂栬緫 + /// + /// + /// + [HttpPost("Edit")] + public async Task EditAsync([FromBody] EditTrackPullConfigInput input) + { + if (input.Options != OptionTypeNoNull.鍒犻櫎) + { + Expression> isAnyExp = x => + x.SubSystemId == input.SubSystemId && x.TrackTemplateId == input.TrackTemplateId && + x.ServiceProviderId == input.ServiceProviderId; + if (input.Options == OptionTypeNoNull.淇敼) isAnyExp = isAnyExp.And(x => x.Id != input.Id); + + if (await _trackPullConfigRepository.IsAnyAsync(isAnyExp)) + throw new BusinessException(message: _stringLocalizer["IsTrackPullConfigAny"]); + } + + switch (input.Options) + { + case OptionTypeNoNull.鏂板: + { + var trackPullEntity = ObjectMapper.Map(input); + var trackPullParamsEntity = + ObjectMapper.Map(input); + + var trackTemplateContentEntities = + await _trackTemplateRepository.GetContentListAsync(x => x.TrackTemplateId == input.TrackTemplateId); + + var trackPullContentEntities = new List(); + + using (var ts = TransactionScopeHelper.Create()) + { + int id = await _trackPullConfigRepository.InsertReturnIdentityAsync(trackPullEntity); + + trackPullParamsEntity.PullOrPushConfigId = id; + await _trackPullConfigRepository.InsertParamsAsync(trackPullParamsEntity); + + foreach (var item in trackTemplateContentEntities) + { + trackPullContentEntities.Add(new() + { + TrackPullConfigId = id, + TrackContentId = item.TrackContentId + }); + } + + await _trackPullConfigRepository.InsertContentRangeAsync(trackPullContentEntities); + + ts.Complete(); + } + } + break; + + case OptionTypeNoNull.淇敼: + { + var oldTrackPullEntity = await _trackPullConfigRepository.GetFirstAsync(x => x.Id == input.Id) ?? + throw new BusinessException(message: _stringLocalizer["NotFindData"]); + + var oldTrackPullParamsEntity = + await _trackPullConfigRepository.GetParamsSingleAsync(x => + x.PullOrPushConfigId == input.Id && !x.IsPush); + + var trackPullContentEntities = new List(); + + if (oldTrackPullEntity.TrackTemplateId != input.TrackTemplateId) + { + var trackTemplateContentEntities = + await _trackTemplateRepository.GetContentListAsync(x => + x.TrackTemplateId == input.TrackTemplateId); + + foreach (var item in trackTemplateContentEntities) + { + trackPullContentEntities.Add(new() + { + TrackPullConfigId = oldTrackPullEntity.Id, + TrackContentId = item.TrackContentId + }); + } + } + + ObjectMapper.Map(input, oldTrackPullEntity); + ObjectMapper.Map(input, oldTrackPullParamsEntity); + + using (var ts = TransactionScopeHelper.Create()) + { + await _trackPullConfigRepository.UpdateAsync(oldTrackPullEntity); + await _trackPullConfigRepository.UpdateParamsAsync(oldTrackPullParamsEntity); + + if (trackPullContentEntities.Count > 0) + { + await _trackPullConfigRepository.SoftDeleteContentAsync(x => x.TrackPullConfigId == input.Id); + await _trackPullConfigRepository.InsertContentRangeAsync(trackPullContentEntities); + } + + ts.Complete(); + } + } + break; + + case OptionTypeNoNull.鍒犻櫎: + using (var ts = TransactionScopeHelper.Create()) + { + await _trackPullConfigRepository.SoftDeleteAsync(x => x.Id == input.Id); + await _trackPullConfigRepository.SoftDeleteParamsAsync(x => + x.PullOrPushConfigId == input.Id && !x.IsPush); + await _trackPullConfigRepository.SoftDeleteContentAsync(x => x.TrackPullConfigId == input.Id); + + ts.Complete(); + } + + break; + + default: + throw new BusinessException(message: _stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum, + nameof(EditTrackPullConfigInput.Options)]); + } + + return true; + } + + /// + /// 杞ㄨ抗鎷夊彇閰嶇疆鍐呭淇敼 + /// + /// + /// + [HttpPost("UpdateContent")] + public async Task UpdateContentAsync([FromBody] UpdateTrackPullContentInput input) + { + Expression> isContentAnyExp = x => x.Id != input.Id && x.TrackPullConfigId == input.TrackPullConfigId; + + if (await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => x.TrackContentId == input.TrackContentId))) + throw new BusinessException(message: _stringLocalizer["IsTrackPullContentAny"]); + else if (!input.TrackContentCodeValue.IsNullOrWhiteSpace() && await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => x.TrackContentCodeValue == input.TrackContentCodeValue))) + throw new BusinessException(message: _stringLocalizer["IsTrackPullContentCodeValueAny"]); + else if (!input.TrackStatusValue.IsNullOrWhiteSpace() && await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => x.TrackStatusValue == input.TrackStatusValue))) + throw new BusinessException(message: _stringLocalizer["IsTrackPullContentStatusValueAny"]); + else if (!input.TrackContentValue.IsNullOrWhiteSpace() && await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => x.TrackContentValue == input.TrackContentValue))) + throw new BusinessException(message: _stringLocalizer["IsTrackPullContentValueAny"]); + else if (!input.TrackKeywords.IsNullOrEmpty()) + { + Expression> trackKeywordExp = _ => false; + input.TrackKeywords!.ForEach(item => { trackKeywordExp = trackKeywordExp.Or(x => SqlFunc.SplitIn(x.TrackKeyword, item)); }); + + if (await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(trackKeywordExp))) + throw new BusinessException(message: _stringLocalizer["IsTrackPullContentKeywordsAny"]); + } + + var oldTrackPullContentEntity = await _trackPullConfigRepository.GetContentByIdAsync(input.Id) ?? + throw new BusinessException(message: _stringLocalizer["NotFindData"]); + + ObjectMapper.Map(input, oldTrackPullContentEntity); + + await _trackPullConfigRepository.UpdateContentAsync(oldTrackPullContentEntity); + + return true; + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/TrackPush/TrackPushCacheService.cs b/src/SJZY.Track.Application/Services/TrackPush/TrackPushCacheService.cs new file mode 100644 index 00000000..62df4046 --- /dev/null +++ b/src/SJZY.Track.Application/Services/TrackPush/TrackPushCacheService.cs @@ -0,0 +1,39 @@ +锘縰sing SJZY.Expand.ABP.Core; +using SJZY.Track.Application.Contract.Services; +using SJZY.Track.Domain.Aggregates.TrackPushAggregate; +using SJZY.Track.Domain.Queries; +using Volo.Abp.DependencyInjection; + +namespace SJZY.Track.Application.Services.TrackPush; + +public class TrackPushCacheService : ITrackPushCacheService, ITransientDependency +{ + private readonly IBasicQuery _trackPushConfigQuery; + + private string RedisKey(int customId) => GlobalConst.TrackPushKeyPrefix + customId; + + public TrackPushCacheService(IBasicQuery trackPushConfigQuery) + { + _trackPushConfigQuery = trackPushConfigQuery; + } + + public async Task IsPushAsync(int customId) + { + var isPush = + await RedisHelper.Client.GetAsync(RedisKey(customId)); + + if (isPush == null) + { + isPush = await _trackPushConfigQuery.GetFirstAsync(x => x.CustomId == customId, + x => x.IsAutoPush); + await RedisHelper.Client.SetAsync(RedisKey(customId), isPush); + } + + return (bool)isPush; + } + + public async Task UpdateAsync(int customId, bool isPush) + { + await RedisHelper.Client.SetAsync(RedisKey(customId), isPush); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs b/src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs new file mode 100644 index 00000000..1b009a95 --- /dev/null +++ b/src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs @@ -0,0 +1,290 @@ +锘縰sing Microsoft.Extensions.Localization; +using SJZY.Expand.ABP.Core; +using SJZY.Expand.ABP.Core.Localization; +using SJZY.Expand.ABP.Core.PublicMethords; +using SJZY.Track.Application.Contract.Dtos.TrackPush; +using SJZY.Track.Application.Contract.Services; +using SJZY.Track.Application.Localization; +using SJZY.Track.Domain.Aggregates.TrackPullAggregate; +using SJZY.Track.Domain.Aggregates.TrackPushAggregate; +using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; +using SJZY.Track.Domain.Dtos.Common; +using SJZY.Track.Domain.Dtos.TrackPush; +using SqlSugar; +using System.Linq.Expressions; +using Volo.Abp.DependencyInjection; + +namespace SJZY.Track.Application.Services.TrackPush; + +/// +/// 杞ㄨ抗鎺ㄩ +/// +[ApiExplorerSettings(GroupName = "杞ㄨ抗鎺ㄩ")] +[Route("/Track/PushConfig")] +public class TrackPushService : ApplicationService, ITransientDependency +{ + private readonly IStringLocalizer _stringLocalizer; + private readonly ITrackPushConfigRepository _trackPushConfigRepository; + private readonly ITrackTemplateRepository _trackTemplateRepository; + private readonly ITrackPullConfigRepository _trackPullConfigRepository; + private readonly ITrackPushCacheService _trackPushCacheService; + + public TrackPushService( + IStringLocalizer stringLocalizer, + ITrackPushConfigRepository trackPushConfigRepository, + ITrackTemplateRepository trackTemplateRepository, + ITrackPullConfigRepository trackPullConfigRepository, + ITrackPushCacheService trackPushCacheService) + { + _stringLocalizer = stringLocalizer; + _trackPushConfigRepository = trackPushConfigRepository; + _trackTemplateRepository = trackTemplateRepository; + _trackPullConfigRepository = trackPullConfigRepository; + _trackPushCacheService = trackPushCacheService; + } + + /// + /// 杞ㄨ抗鎺ㄩ侀厤缃垪琛 + /// + /// + /// + [HttpPost("GetPage")] + public async Task> GetPageAsync([FromBody] KeywordsInputVO input) + { + return await _trackPushConfigRepository.GetPageAsync(input); + } + + /// + /// 杞ㄨ抗鎺ㄩ侀厤缃唴瀹瑰垪琛 + /// + /// + /// + [HttpPost("GetContentPage")] + public async Task> GetContentPageAsync([FromBody] GetTrackPushContentPageInputVO input) + { + return await _trackPushConfigRepository.GetContentPageAsync(input); + } + + /// + /// 杞ㄨ抗鎺ㄩ侀厤缃鎯 + /// + /// + /// + [HttpGet("GetDetail")] + public async Task GetDetailAsync(int id) + { + var res = await _trackPushConfigRepository.GetDetailAsync(id); + if (res is null) return null; + + List trackTemplateIds = res.TrackTemplateId.Split(',').Select(int.Parse).ToList(); + + var trackTemplateEntities = await _trackTemplateRepository.GetListAsync(x => trackTemplateIds.Contains(x.Id)); + + trackTemplateEntities.ForEach(item => { (res.TrackTemplate ??= new()).Add(new() { Value = item.Id, Key = item.Name }); }); + + return res; + } + + /// + /// 杞ㄨ抗鎺ㄩ侀厤缃唴瀹硅鎯 + /// + /// + /// + [HttpGet("GetContentDetail")] + public async Task GetContentDetailAsync(int id) + { + return await _trackPushConfigRepository.GetContentDetailAsync(id); + } + + /// + /// 杞ㄨ抗鎺ㄩ侀厤缃紪杈 + /// + /// + /// + [HttpPost("Edit")] + public async Task EditAsync([FromBody] EditTrackPushConfigInput input) + { + if (input.Options != OptionTypeNoNull.鍒犻櫎) + { + Expression> isAnyExp = x => + x.SubSystemId == input.SubSystemId && x.CustomId == input.CustomId && x.ServiceProviderId == input.ServiceProviderId; + if (input.Options == OptionTypeNoNull.淇敼) isAnyExp = isAnyExp.And(x => x.Id != input.Id); + + var trackTemplateIdExp = Expressionable.Create(); + input.TrackTemplateIds?.ForEach(item => { trackTemplateIdExp.Or(x => SqlFunc.SplitIn(x.TrackTemplateId, item.ToString())); }); + + isAnyExp = isAnyExp.And(trackTemplateIdExp.ToExpression()); + + if (await _trackPushConfigRepository.IsAnyAsync(isAnyExp)) + throw new BusinessException(message: _stringLocalizer["IsTrackPushConfigAny"]); + } + + switch (input.Options) + { + case OptionTypeNoNull.鏂板: + { + var trackPushEntity = ObjectMapper.Map(input); + var trackPushParamsEntity = ObjectMapper.Map(input); + + using (var ts = TransactionScopeHelper.Create()) + { + int id = await _trackPushConfigRepository.InsertReturnIdentityAsync(trackPushEntity); + + trackPushParamsEntity.PullOrPushConfigId = id; + await _trackPullConfigRepository.InsertParamsAsync(trackPushParamsEntity); + + if (input.IsAutoPush) await _trackPushCacheService.IsPushAsync(input.CustomId); + + ts.Complete(); + } + } + break; + + case OptionTypeNoNull.淇敼: + { + var oldTrackPushEntity = await _trackPushConfigRepository.GetFirstAsync(x => x.Id == input.Id) ?? throw new BusinessException(message: _stringLocalizer["NotFindData"]); + + int oldCustomId = oldTrackPushEntity.CustomId; + + var oldTrackPushParamsEntity = + await _trackPullConfigRepository.GetParamsSingleAsync(x => + x.PullOrPushConfigId == input.Id && x.IsPush); + + ObjectMapper.Map(input, oldTrackPushEntity); + ObjectMapper.Map(input, oldTrackPushParamsEntity); + + using (var ts = TransactionScopeHelper.Create()) + { + await _trackPushConfigRepository.UpdateAsync(oldTrackPushEntity); + await _trackPullConfigRepository.UpdateParamsAsync(oldTrackPushParamsEntity); + + await _trackPushCacheService.UpdateAsync(oldCustomId, false); + if (input.IsAutoPush) await _trackPushCacheService.IsPushAsync(input.CustomId); + + ts.Complete(); + } + } + break; + + case OptionTypeNoNull.鍒犻櫎: + { + var oldTrackPushEntity = await _trackPushConfigRepository.GetFirstAsync(x => x.Id == input.Id) ?? throw new BusinessException(message: _stringLocalizer["NotFindData"]); + + using (var ts = TransactionScopeHelper.Create()) + { + await _trackPushConfigRepository.SoftDeleteAsync(x => x.Id == input.Id); + await _trackPullConfigRepository.SoftDeleteParamsAsync(x => + x.PullOrPushConfigId == input.Id && x.IsPush); + await _trackPushConfigRepository.SoftDeleteContentAsync(x => x.TrackPushConfigId == input.Id); + + await _trackPushCacheService.UpdateAsync(oldTrackPushEntity.CustomId, false); + + ts.Complete(); + } + } + break; + + default: + throw new BusinessException(message: _stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum, + nameof(EditTrackPushConfigInput.Options)]); + } + + return true; + } + + /// + /// 杞ㄨ抗鎺ㄩ侀厤缃唴瀹圭紪杈 + /// + /// + /// + [HttpPost("EditContent")] + public async Task EditContentAsync([FromBody] EditTrackPushContentInput input) + { + if (input.Options != OptionTypeNoNull.鍒犻櫎) + { + Expression> isContentAnyExp = x => x.TrackPushConfigId == input.TrackPushConfigId; + if (input.Options == OptionTypeNoNull.淇敼) isContentAnyExp = isContentAnyExp.And(x => x.Id != input.Id); + + if (await _trackPushConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => x.TrackContentId == input.TrackContentId))) + throw new BusinessException(message: _stringLocalizer["IsTrackPushContentAny"]); + else if (!input.TrackContentCodeValue.IsNullOrWhiteSpace() && await _trackPushConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => x.TrackContentCodeValue == input.TrackContentCodeValue))) + throw new BusinessException(message: _stringLocalizer["IsTrackPushContentCodeValueAny"]); + else if (!input.TrackStatusValue.IsNullOrWhiteSpace() && await _trackPushConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => x.TrackStatusValue == input.TrackStatusValue))) + throw new BusinessException(message: _stringLocalizer["IsTrackPushContentStatusValueAny"]); + else if (!input.TrackContentValue.IsNullOrWhiteSpace() && await _trackPushConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => x.TrackContentValue == input.TrackContentValue))) + throw new BusinessException(message: _stringLocalizer["IsTrackPushContentValueAny"]); + else if (!input.TrackEnContentValue.IsNullOrWhiteSpace() && await _trackPushConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => x.TrackEnContentValue == input.TrackEnContentValue))) + throw new BusinessException(message: _stringLocalizer["IsTrackPushEnContentValueAny"]); + } + + switch (input.Options) + { + case OptionTypeNoNull.鏂板: + { + int maxSort = await _trackPushConfigRepository.ContentMaxAsync(x => x.Sort, x => x.TrackPushConfigId == input.TrackPushConfigId); + + var entity = ObjectMapper.Map(input); + entity.Sort = maxSort + 1; + + await _trackPushConfigRepository.InsertContentAsync(entity); + + break; + } + + case OptionTypeNoNull.淇敼: + { + var entity = await _trackPushConfigRepository.GetContentByIdAsync(input.Id!.Value) ?? throw new BusinessException(message: _stringLocalizer["NotFindData"]); + + ObjectMapper.Map(input, entity); + + await _trackPushConfigRepository.UpdateContentAsync(entity); + + break; + } + + case OptionTypeNoNull.鍒犻櫎: + { + var entity = await _trackPushConfigRepository.GetContentByIdAsync(input.Id!.Value) ?? throw new BusinessException(message: _stringLocalizer["NotFindData"]); + + using (var ts = TransactionScopeHelper.Create()) + { + await _trackPushConfigRepository.SoftDeleteContentAsync(x => x.Id == input.Id); + + await _trackPushConfigRepository.UpdateContentAsync(x => x.Sort == x.Sort - 1, x => x.TrackPushConfigId == entity.TrackPushConfigId && x.Sort > entity.Sort); + + ts.Complete(); + } + + break; + } + + default: + throw new BusinessException(message: _stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum, + nameof(EditTrackPushContentInput.Options)]); + } + + return true; + } + + /// + /// 杞ㄨ抗鎺ㄩ侀厤缃唴瀹规帓搴 + /// + /// + /// + [HttpPost("SortContent")] + public async Task SortContentAsync([FromBody] SortTrackPushContentInput input) + { + List ids = input.SortInfo.Select(x => int.Parse(x.Key)).ToList(); + + var trackPushContentEntities = await _trackPushConfigRepository.GetContentListAsync(x => ids.Contains(x.Id)); + + trackPushContentEntities.ForEach(item => + { + item.Sort = input.SortInfo.Single(x => x.Key == item.Id.ToString()).Value; + }); + + await _trackPushConfigRepository.UpdateContentRangeAsync(trackPushContentEntities); + + return true; + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs b/src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs new file mode 100644 index 00000000..979d412d --- /dev/null +++ b/src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs @@ -0,0 +1,175 @@ +锘縰sing Microsoft.Extensions.Localization; +using SJZY.Track.Application.Contract.Dtos.TrackStatus; +using SJZY.Track.Application.Localization; +using SJZY.Track.Domain.Aggregates.TrackContentAggregate; +using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; +using SJZY.Track.Domain.Dtos.TrackStatus; +using Volo.Abp.DependencyInjection; + +namespace SJZY.Track.Application.Services.TrackStatus; + +/// +/// 杞ㄨ抗鐘舵 +/// +[ApiExplorerSettings(GroupName = "杞ㄨ抗鐘舵")] +[Route("/Track/Status")] +public class TrackStatusService : ApplicationService, ITransientDependency +{ + private readonly IStringLocalizer _stringLocalizer; + private readonly ITrackStatusRepository _trackStatusRepository; + private readonly ITrackContentRepository _trackContentRepository; + + public TrackStatusService( + IStringLocalizer stringLocalizer, + ITrackStatusRepository trackStatusRepository, + ITrackContentRepository trackContentRepository + ) + { + this._stringLocalizer = stringLocalizer; + this._trackStatusRepository = trackStatusRepository; + this._trackContentRepository=trackContentRepository; + } + + /// + /// 杞ㄨ抗鐘舵佺紪杈 + /// + /// + [HttpPost("Edit")] + public async Task EditAsync(EditTrackStatusInput input) + { + return input.Options switch + { + OptionType.鏂板 => await AddAsync(input), + OptionType.淇敼 => await UpdateAsync(input), + OptionType.鍒犻櫎 => await DeleteAsync(input), + _ => throw new BusinessException(message: "褰撳墠鎿嶄綔鍔ㄤ綔涓嶅悎娉") + }; + } + + /// + /// 鏍规嵁鐘舵乮d鑾峰彇杞ㄨ抗鐘舵 + /// + /// + /// + [HttpGet("GetDetail")] + public async Task> GetDetailAsync(int id) + { + var detailInfo = await _trackStatusRepository.GetDetailAsync(id); + if (detailInfo == null) + { + return new UnifyResultDto(false, null, "鏈煡璇㈠埌杞ㄨ抗鐘舵"); + } + + var dto = ObjectMapper.Map(detailInfo); + return new UnifyResultDto("200", "", dto); + } + + /// + /// 鑾峰彇鍒嗛〉杞ㄨ抗鐘舵 + /// + /// + /// + [HttpPost("GetList")] + public async Task> GetPageTrackStatus(GetPageTrackStatusInput input) + { + var vo = ObjectMapper.Map(input); + var resultDto = await _trackStatusRepository.GetPageTrackStatus(vo); + var pageResultDto = + ObjectMapper.Map, UnifyPageResultDto>( + resultDto); + + return pageResultDto; + } + + #region 绉佹湁鏂规硶 + + private async Task AddAsync(EditTrackStatusInput input) + { + #region 涓氬姟鏍￠獙 + + var trackStatusEntitys = await _trackStatusRepository.GetListAsync(a => a.SubSystemId == input.SubSystemId && + (a.Code == input.Code || + a.Status == input.TrackStatus || a.EnStatus == input.EntrackStatus)); + if (trackStatusEntitys.Any()) + { + //throw new BusinessException(message: _stringLocalizer["TrackStatusExist"]); + //throw new BusinessException(message: "褰撳墠瀛愮郴缁熶笅锛岃建杩圭姸鎬佷唬鐮佹垨杞ㄨ抗鐘舵佹垨杞ㄨ抗鐘舵佽嫳鏂囧瓨鍦"); + var trackStatusCode = trackStatusEntitys.FirstOrDefault(t => t.Code==input.Code); + if (trackStatusCode!=null) + { + throw new BusinessException(message: "璇ュ瓙绯荤粺涓嬭建杩圭姸鎬佷唬鐮佸凡瀛樺湪"); + } + var trackStatusName = trackStatusEntitys.FirstOrDefault(t => t.Status==input.TrackStatus); + if (trackStatusName!=null) + { + throw new BusinessException(message: "璇ュ瓙绯荤粺涓嬭建杩圭姸鎬佸凡瀛樺湪"); + } + var trackStatusEnName = trackStatusEntitys.FirstOrDefault(t => t.EnStatus==input.EntrackStatus); + if (trackStatusEnName!=null) + { + throw new BusinessException(message: "璇ュ瓙绯荤粺涓嬭建杩圭姸鎬佽嫳鏂囧凡瀛樺湪"); + } + } + + #endregion + + var entity = ObjectMapper.Map(input); + var isTrue = await _trackStatusRepository.InsertAsync(entity); + + return new UnifyResultDto("200", "鏂板鎴愬姛", isTrue); + } + + private async Task UpdateAsync(EditTrackStatusInput input) + { + #region 涓氬姟鏍￠獙 + + var trackStatusEntitys = await _trackStatusRepository.GetListAsync(a => a.Id != input.Id && + a.SubSystemId == input.SubSystemId && (a.Code == input.Code || + a.Status == input.TrackStatus || a.EnStatus == input.EntrackStatus)); + if (trackStatusEntitys.Any()) + { + //throw new BusinessException(message: _stringLocalizer["TrackStatusExist"]); + //throw new BusinessException(message: "褰撳墠瀛愮郴缁熶笅锛岃建杩圭姸鎬佷唬鐮佹垨杞ㄨ抗鐘舵佹垨杞ㄨ抗鐘舵佽嫳鏂囧瓨鍦"); + var trackStatusCode = trackStatusEntitys.FirstOrDefault(t => t.Code==input.Code); + if (trackStatusCode!=null) + { + throw new BusinessException(message: "璇ュ瓙绯荤粺涓嬭建杩圭姸鎬佷唬鐮佸凡瀛樺湪"); + } + var trackStatusName = trackStatusEntitys.FirstOrDefault(t => t.Status==input.TrackStatus); + if (trackStatusName!=null) + { + throw new BusinessException(message: "璇ュ瓙绯荤粺涓嬭建杩圭姸鎬佸凡瀛樺湪"); + } + var trackStatusEnName = trackStatusEntitys.FirstOrDefault(t => t.EnStatus==input.EntrackStatus); + if (trackStatusEnName!=null) + { + throw new BusinessException(message: "璇ュ瓙绯荤粺涓嬭建杩圭姸鎬佽嫳鏂囧凡瀛樺湪"); + } + } + + #endregion + + var templateEntity = await _trackStatusRepository.GetFirstAsync(a => a.Id == input.Id); + ObjectMapper.Map(input, templateEntity); + var isTrue = await _trackStatusRepository.UpdateAsync(templateEntity); + + return new UnifyResultDto("200", "淇敼鎴愬姛", isTrue); + } + + private async Task DeleteAsync(EditTrackStatusInput input) + { + #region 涓氬姟鏍￠獙 + var isExistStatus = await _trackContentRepository.GetFirstAsync(a => a.TrackStatusId==input.Id); + if (isExistStatus!=null) + { + //throw new BusinessException(message: _stringLocalizer["IsExistTrackStatus"]); + throw new BusinessException(message: "璇ョ姸鎬佸叧鑱旇建杩瑰唴瀹癸紝绂佹鍒犻櫎"); + } + #endregion + var isTrue = await _trackStatusRepository.SoftDeleteAsync(x => x.Id == input.Id); + + return new UnifyResultDto("200", "鍒犻櫎鎴愬姛", isTrue); + } + + #endregion +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/TrackTemplates/ITrackTemplateService.cs b/src/SJZY.Track.Application/Services/TrackTemplates/ITrackTemplateService.cs new file mode 100644 index 00000000..f6e29107 --- /dev/null +++ b/src/SJZY.Track.Application/Services/TrackTemplates/ITrackTemplateService.cs @@ -0,0 +1,7 @@ +锘縩amespace SJZY.Track.Application.Services.TrackTemplates +{ + public interface ITrackTemplateService + { + + } +} diff --git a/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs b/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs new file mode 100644 index 00000000..525add23 --- /dev/null +++ b/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs @@ -0,0 +1,308 @@ +锘縰sing 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.TrackPullAggregate; +using SJZY.Track.Domain.Aggregates.TrackPushAggregate; +using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; +using SJZY.Track.Domain.Dtos.TrackTemplate; +using Volo.Abp.DependencyInjection; + +namespace SJZY.Track.Application.Services.TrackTemplates; + +/// +/// 杞ㄨ抗妯＄増 +/// +[ApiExplorerSettings(GroupName = "杞ㄨ抗妯＄増")] +[Route("/Track/Template")] +public class TrackTemplateService : ApplicationService, ITransientDependency +{ + private readonly IStringLocalizer _stringLocalizer; + private readonly ITrackTemplateRepository _trackTemplateRepository; + private readonly ITrackPullConfigRepository _trackPullConfigRepository; + private readonly ITrackPushConfigRepository _trackPushConfigRepository; + + /// + public TrackTemplateService( + IStringLocalizer stringLocalizer, + ITrackTemplateRepository trackTemplateRepository, + ITrackPullConfigRepository trackPullConfigRepository, + ITrackPushConfigRepository trackPushConfigRepository + ) + { + _stringLocalizer = stringLocalizer; + _trackTemplateRepository = trackTemplateRepository; + _trackPullConfigRepository = trackPullConfigRepository; + _trackPushConfigRepository = trackPushConfigRepository; + } + + /// + /// 杞ㄨ抗妯＄増缂栬緫 + /// + /// + [HttpPost("Edit")] + public async Task EditAsync(EditTrackTemplateInput input) + { + return input.Options switch + { + OptionType.鏂板 => await AddAsync(input), + OptionType.淇敼 => await UpdateAsync(input), + OptionType.鍒犻櫎 => await DeleteAsync(input), + _ => throw new BusinessException(message: "褰撳墠鎿嶄綔鍔ㄤ綔涓嶅悎娉") + }; + } + + /// + /// 鏍规嵁妯＄増id鑾峰彇杞ㄨ抗妯＄増 + /// + /// + /// + [HttpGet("GetDetail")] + public async Task> GetDetailAsync(int id) + { + var detailInfo = await _trackTemplateRepository.GetDetailAsync(id); + if (detailInfo == null) + { + return new UnifyResultDto(false, null, "鏈煡璇㈠埌杞ㄨ抗妯＄増"); + } + + var dto = ObjectMapper.Map(detailInfo); + return new UnifyResultDto("200", "", dto); + } + + /// + /// 鑾峰彇鍒嗛〉杞ㄨ抗妯＄増 + /// + /// + /// + [HttpPost("GetList")] + public async Task> GetPageTrackTemplate(GetPageTrackTemplateInput input) + { + var vo = ObjectMapper.Map(input); + var resultDto = await _trackTemplateRepository.GetPageTrackTemplate(vo); + var pageResultDto = + ObjectMapper.Map, UnifyPageResultDto>( + resultDto); + + return pageResultDto; + } + + #region 绉佹湁鏂规硶 + + private async Task AddAsync(EditTrackTemplateInput input) + { + #region 涓氬姟鏍￠獙 + + //鏍￠獙妯＄増浠ｇ爜鍞竴鎬 + //var templateEntity = + // await _trackTemplateRepository.GetFirstAsync( + // a => a.SubSystemId == input.SubSystemId && a.Code == input.Code); + var templateEntitys = await _trackTemplateRepository.GetListAsync(a => a.SubSystemId == input.SubSystemId && (a.Code == input.Code|| a.Name==input.Name)); + if (templateEntitys.Any()) + { + //throw new BusinessException(message: _stringLocalizer["TemplateExist"]); + //throw new BusinessException(message: "妯℃澘浠ｇ爜宸插瓨鍦ㄤ簬褰撳墠閫夋嫨鐨勫瓙绯荤粺涓"); + var trackTemplateCode = templateEntitys.FirstOrDefault(t => t.Code==input.Code); + if (trackTemplateCode!=null) + { + throw new BusinessException(message: "璇ュ瓙绯荤粺涓嬫ā鏉夸唬鐮佸凡瀛樺湪"); + } + var trackTemplateName = templateEntitys.FirstOrDefault(t => t.Name==input.Name); + if (trackTemplateName!=null) + { + throw new BusinessException(message: "璇ュ瓙绯荤粺涓嬫ā鏉垮悕绉板凡瀛樺湪"); + } + } + + #endregion 涓氬姟鏍￠獙 + + var entity = ObjectMapper.Map(input); + var isTrue = await _trackTemplateRepository.InsertAsync(entity); + + return new UnifyResultDto("200", "鏂板鎴愬姛", isTrue); + } + + private async Task UpdateAsync(EditTrackTemplateInput input) + { + #region 涓氬姟鏍￠獙 + + var templateEntitys = await _trackTemplateRepository.GetListAsync(a => + a.Id != input.Id && a.SubSystemId == input.SubSystemId && (a.Code == input.Code || a.Name==input.Name)); + if (templateEntitys.Any()) + { + //throw new BusinessException(message: "妯℃澘浠ｇ爜宸插瓨鍦ㄤ簬褰撳墠閫夋嫨鐨勫瓙绯荤粺涓"); + var trackTemplateCode = templateEntitys.FirstOrDefault(t => t.Code==input.Code); + if (trackTemplateCode!=null) + { + throw new BusinessException(message: "璇ュ瓙绯荤粺涓嬫ā鏉夸唬鐮佸凡瀛樺湪"); + } + var trackTemplateName = templateEntitys.FirstOrDefault(t => t.Name==input.Name); + if (trackTemplateName!=null) + { + throw new BusinessException(message: "璇ュ瓙绯荤粺涓嬫ā鏉垮悕绉板凡瀛樺湪"); + } + } + + #endregion 涓氬姟鏍￠獙 + + var templateEntity = await _trackTemplateRepository.GetFirstAsync(a => a.Id == input.Id); + ObjectMapper.Map(input, templateEntity); + var isTrue = await _trackTemplateRepository.UpdateAsync(templateEntity); + + return new UnifyResultDto("200", "淇敼鎴愬姛", isTrue); + } + + private async Task DeleteAsync(EditTrackTemplateInput input) + { + #region 涓氬姟鏍￠獙 + + //鏌ヨ鐪嬬湅鍦ㄨ建杩规媺鍙栭噷闈㈡湁娌℃湁琚崰鐢 + var isExisistTrackPullConfigs = await _trackPullConfigRepository.GetListAsync(a => a.TrackTemplateId == input.Id); + if (isExisistTrackPullConfigs.Any()) + { + //throw new BusinessException(message: _stringLocalizer["IsExistTrackPullConfig"]); + throw new BusinessException(message: "璇ユā鏉垮瓨鍦ㄦ槧灏勶紝绂佹鍒犻櫎"); + } + //杞ㄨ抗鎺ㄩ侀噷鐪嬬湅鏄惁琚崰鐢 + var isExisistTrackPushConfigs = await _trackPushConfigRepository.GetListAsync(a => a.TrackTemplateId.Contains(input.Id.ToString())); + if (isExisistTrackPushConfigs.Any()) + { + throw new BusinessException(message: "璇ユā鏉垮瓨鍦ㄦ槧灏勶紝绂佹鍒犻櫎"); + } + + #endregion 涓氬姟鏍￠獙 + + var isTrue = await _trackTemplateRepository.SoftDeleteAsync(x => x.Id == input.Id); + + return new UnifyResultDto("200", "鍒犻櫎鎴愬姛", isTrue); + } + + #endregion 绉佹湁鏂规硶 + + /// + /// 杞ㄨ抗妯℃澘鍐呭鍒楄〃 + /// + /// + /// + [HttpPost("GetContentPage")] + public async Task> GetContentPageAsync( + [FromBody] GetTrackTemplateContentPageInputVO input) + { + return await _trackTemplateRepository.GetContentPageAsync(input); + } + + /// + /// 杞ㄨ抗妯℃澘鍐呭璇︽儏 + /// + /// + /// + [HttpGet("GetContentDetail")] + public async Task GetContentDetailAsync(int id) + { + return await _trackTemplateRepository.GetContentDetailAsync(id); + } + + /// + /// 杞ㄨ抗妯℃澘鍐呭涓嬫媺妗 + /// + /// + /// + [HttpPost("GetContentDropDownList")] + public async Task> GetContentDropDownListAsync([FromBody] GetTrackTemplateContentDropDownListVO input) + { + return await _trackTemplateRepository.GetContentDropDownListAsync(input); + } + + /// + /// 杞ㄨ抗妯℃澘鍐呭缂栬緫 + /// + /// + /// + [HttpPost("EditContent")] + public async Task EditContentAsync([FromBody] EditTrackTemplateContentInput input) + { + if (input.Options != OptionTypeNoNull.鍒犻櫎) + { + Expression> isContentAnyExp = x => + x.TrackTemplateId == input.TrackTemplateId && x.TrackContentId == input.TrackContentId; + if (input.Options == OptionTypeNoNull.淇敼) isContentAnyExp = isContentAnyExp.And(x => x.Id != input.Id); + + if (await _trackTemplateRepository.IsContentAnyAsync(isContentAnyExp)) + throw new BusinessException(message: _stringLocalizer["IsTrackTemplateContentAny"]); + } + + switch (input.Options) + { + case OptionTypeNoNull.鏂板: + { + int maxSort = await _trackTemplateRepository.ContentMaxAsync(x => x.Sort, x => x.TrackTemplateId == input.TrackTemplateId); + + var entity = ObjectMapper.Map(input); + entity.Sort = maxSort + 1; + + await _trackTemplateRepository.InsertContentAsync(entity); + + break; + } + + case OptionTypeNoNull.淇敼: + { + var entity = await _trackTemplateRepository.GetContentByIdAsync(input.Id!.Value) ?? + throw new BusinessException(message: _stringLocalizer["NotFindData"]); + + ObjectMapper.Map(input, entity); + + await _trackTemplateRepository.UpdateContentAsync(entity); + + break; + } + + case OptionTypeNoNull.鍒犻櫎: + { + var entity = await _trackTemplateRepository.GetContentByIdAsync(input.Id!.Value) ?? + throw new BusinessException(message: _stringLocalizer["NotFindData"]); + + using (var ts = TransactionScopeHelper.Create()) + { + await _trackTemplateRepository.SoftDeleteContentAsync(input.Id!.Value); + + await _trackTemplateRepository.UpdateContentAsync(x => x.Sort == x.Sort - 1, x => x.TrackTemplateId == entity.TrackTemplateId && x.Sort > entity.Sort); + + ts.Complete(); + } + + break; + } + + default: + throw new BusinessException(message: _stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum, + nameof(EditTrackTemplateContentInput.Options)]); + } + + return true; + } + + /// + /// 杞ㄨ抗妯℃澘鍐呭鎺掑簭 + /// + /// + /// + [HttpPost("SortContent")] + public async Task SortContentAsync([FromBody] SortTrackTemplateContentInput input) + { + List ids = input.SortInfo.Select(x => int.Parse(x.Key)).ToList(); + + var trackTemplateContentEntities = await _trackTemplateRepository.GetContentListAsync(x => ids.Contains(x.Id)); + + trackTemplateContentEntities.ForEach(item => + { + item.Sort = input.SortInfo.Single(x => x.Key == item.Id.ToString()).Value; + }); + + await _trackTemplateRepository.UpdateContentRangeAsync(trackTemplateContentEntities); + + return true; + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs b/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs new file mode 100644 index 00000000..ba706085 --- /dev/null +++ b/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs @@ -0,0 +1,127 @@ +锘縰sing System.Text.Json; +using DotNetCore.CAP; +using Microsoft.Extensions.Configuration; +using SJZY.Expand.ABP.Core.Localization; +using SJZY.Expand.ABP.Core.Logger; +using SJZY.Expand.ABP.Core.PublicMethords; +using SJZY.InterfaceRelay.Application.Contracts; +using SJZY.Track.Application.Contract; +using SJZY.Track.Application.Localization; +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; + +namespace SJZY.Track.Application +{ + [DependsOn( + typeof(AbpAutoMapperModule), + typeof(AbpFluentValidationModule), + typeof(AbpLocalizationModule), + typeof(AbpVirtualFileSystemModule), + typeof(AbpHttpClientModule), + typeof(SjzyUserCenterHttpApiModule), + typeof(SJZYInterfaceRelayApplicationContractsModule), + typeof(SjzyTrackDomainModule), + typeof(SjzyTrackApplicationContractModule) + )] + public class SjzyTrackApplicationModule : AbpModule + { + public override void ConfigureServices(ServiceConfigurationContext context) + { + var configuration = context.Services.GetConfiguration(); + Configure(options => { options.AddMaps(true); }); + + Configure(options => + { + options.ConventionalControllers.Create(typeof(SjzyTrackApplicationModule).Assembly); //鍒涘缓鍔ㄦ乤pi + }); + + //娣诲姞铏氭嫙鏂囦欢绯荤粺 + 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.AddHttpClient("InterfaceForward").AddHttpMessageHandler(); + context.Services.AddHttpClientProxy( + remoteServiceConfigurationName: "InterfaceForward", + asDefaultService: false + ); + + //CAP + context.Services.AddCapTableNameService(); + context.Services.AddCap(options => + { + options.UseMySql(configuration["ConnectionStrings:DefaultConnection"]!); + options.UseRabbitMQ(configure => + { + configure.HostName = configuration["RabbitMQ:HostName"]!; + configure.UserName = configuration["RabbitMQ:UserName"]!; + configure.Password = configuration["RabbitMQ:Password"]!; + configure.Port = configuration.GetValue("RabbitMQ:Port"); + }); + options.FailedRetryInterval = 60; + options.FailedRetryCount = 10; + options.UseDashboard(dashboardOptions => + { + dashboardOptions.PathBase = System.Diagnostics.Debugger.IsAttached + ? "" + : configuration["Swagger:JsonUrlPrefix"]; + }); + options.FailedThresholdCallback = faileCalback => + { + try + { + LogHelper.Error($@" + |-CAP澶辫触鍥炶皟浜嬩欢锛 + |-澶勭悊绫诲瀷锛歿(faileCalback.MessageType == DotNetCore.CAP.Messages.MessageType.Subscribe ? "娑堣垂娑堟伅杈惧埌鏈澶ч噸璇曟鏁帮紝闇瑕佸紑鍙戜汉鍛樹粙鍏" : "鐢熶骇娑堟伅鎺ㄩ佸け璐")} + |-澶撮儴淇℃伅锛歿faileCalback?.Message?.Headers?.ToJson()} + |-娑堟伅鍐呭锛歿((JsonElement)faileCalback?.Message?.Value).GetRawText()}"); + } + catch (Exception ex) + { + LogHelper.Error("銆愪弗閲嶃慍AP澶辫触鍥炶皟浜嬩欢鍙戠敓鏈鐞嗗紓甯" + ex); + } + }; + }); + } + + public override void PreConfigureServices(ServiceConfigurationContext context) + { + PreConfigure(options => + { + options.ProxyClientActions.Add((_, _, httpClient) => + { + //濡傛灉璁剧疆Token锛屽墠绔渶瑕佷紶鍏oken 鍚﹀垯寮曞彂寮傚父 + httpClient.SetTokenHeader(); + httpClient.Timeout = TimeSpan.FromMinutes(3); + }); + }); + } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Validations/Demo/SimpleValidateInputValidation.cs b/src/SJZY.Track.Application/Validations/Demo/SimpleValidateInputValidation.cs deleted file mode 100644 index db26be85..00000000 --- a/src/SJZY.Track.Application/Validations/Demo/SimpleValidateInputValidation.cs +++ /dev/null @@ -1,68 +0,0 @@ -锘縰sing FluentValidation; -using SJZY.Track.Application.Dtos.Demo; - -namespace SJZY.Track.Application.Validations.Demo -{ - - public class SimpleValidateInputValidation : AbstractValidator, IValidationEnabled - { - public SimpleValidateInputValidation() - { - /* - 闈炵┖鏍￠獙 - NotNull 鍜 NotEmpty 鐨勫尯鍒紵 - NotNull锛氳姹備腑娌℃壘鍒版寚瀹氬弬鏁 - NotEmpty锛氳姹備腑娌℃壘鍒版寚瀹氬弬鏁 鎴 鍙傛暟鍊间负鍒濆鍊硷紙0/""锛 - 鍏充簬瀛楃涓茬殑鏈浣冲疄璺碉細 - 鍙傛暟瀹氫箟鎴愬彲绌哄瓧绗︿覆 string锛燂紝鏍￠獙瑙勫垯鍙敤isempty - - */ - RuleFor(x => x.PassWord).NotNull().WithMessage("鎿嶄綔瀵嗙爜涓哄繀濉弬鏁帮紒").NotEmpty().WithMessage("鎿嶄綔瀵嗙爜涓嶈兘涓虹┖锛"); - - //闆姳id - RuleFor(x => x.SnowId).NotNull().WithMessage("闆姳ID涓哄繀濉弬鏁帮紒").NotEmpty().WithMessage("闆姳ID涓嶈兘涓虹┖锛"); - - //鏋氫妇鏍￠獙 - RuleFor(x => x.Option).IsInEnum().WithMessage("鎿嶄綔绫诲瀷涓嶅湪鍙夎寖鍥达紒"); - - //瀛楃涓查暱搴︽牎楠,闀垮害涓嶅垎涓枃銆佸瓧绗︺佹暟鍊 - RuleFor(x => x.LoginName).Length(6, 10).WithMessage("鐧诲綍璐﹀彿蹇呴』鍦6-10浣嶄箣闂达紒"); - RuleFor(x => x.LoginName).MaximumLength(10).WithMessage("鐧诲綍璐﹀彿涓嶈兘瓒呰繃10涓瓧绗︼紒"); - RuleFor(x => x.LoginName).MinimumLength(6).WithMessage("鐧诲綍璐﹀彿涓嶈兘灏忎簬6涓瓧绗︼紒"); - - //姝ｅ垯琛ㄨ揪寮 - RuleFor(x => x.PassWord).Matches("^(?=.*[0-9])(?=.*[a-zA-Z])(?=.*[!@#$\\%\\^\\&\\*\\(\\)])[0-9a-zA-Z!@#$\\%\\^\\&\\*\\(\\)]{6,10}") - .WithMessage("瀵嗙爜蹇呴』鍚屾椂鍖呭惈鏁板瓧銆佽嫳鏂囧瓧姣嶃佺壒娈婂瓧绗︼紝涓旈暱搴﹀繀椤诲湪6-10浣嶄箣闂"); - - //鑷畾涔夋牎楠岃鍒欙紝娉ㄦ剰杩欓噷鐨勬牎楠屼粎闄愪簬妯″瀷鍙傛暟绾х殑鏍￠獙锛屾洿澶嶆潅鐨勪笟鍔℃牎楠屽簲鍦ㄤ笟鍔″眰瀹屾垚 - RuleFor(x => x.PassWordAgain).Must((data, context) => - { - return data.PassWord == data.PassWordAgain; - }).WithMessage("涓ゆ杈撳叆瀵嗙爜涓嶄竴鑷!"); - - //鏁板瓧绫诲瀷鏍￠獙 - RuleFor(x => x.MiniCount).LessThan(100).WithMessage("鏈灏忔暟閲忓繀椤诲皬浜100"); - RuleFor(x => x.MiniCount).LessThanOrEqualTo(100).WithMessage("鏈灏忔暟閲忓繀椤诲皬浜庢垨绛変簬100"); - RuleFor(x => x.MaxCount).GreaterThan(100).WithMessage("鏈澶ф暟閲忓繀椤诲ぇ浜100"); - RuleFor(x => x.MaxCount).GreaterThanOrEqualTo(100).WithMessage("鏈澶ф暟閲忓繀椤诲ぇ浜庢垨绛変簬100"); - - //灏忔暟绫诲瀷鏍￠獙,10.56 - RuleFor(x => x.TotalQuota).ScalePrecision(2, 4, true).WithMessage("鏈澶ч搴﹂噾棰濄愭暣鏁颁綅+灏忔暟浣嶃戜笉鑳借秴杩4浣,涓斿皬鏁颁綅涓嶈兘瓒呰繃2浣"); - - //鏉′欢鍒嗘敮 - When(x => x.Option == OptionType.淇敼 || x.Option == OptionType.鍒犻櫎, () => - { - RuleFor(x => x.Id).NotNull().WithMessage("淇敼鎴栧垹闄ゆ椂Id涓哄繀濉弬鏁帮紒").GreaterThan(0).WithMessage("淇敼鎴栧垹闄ゆ椂Id蹇呴』澶т簬0!"); - }); - - //鍗曚釜瀹炰綋鏍￠獙 - RuleFor(x => x.UserInfoInput).NotNull().WithMessage("鐢ㄦ埛淇℃伅涓哄繀濉弬鏁帮紒").SetValidator(new UserInfoInputValidation()); - - //闆嗗悎鏍￠獙 - RuleForEach(x => x.UserRoleInputList).SetValidator(new UserRoleInputValidation()); - } - - } - - -} diff --git a/src/SJZY.Track.Application/Validations/Demo/UserInfoInputValidation.cs b/src/SJZY.Track.Application/Validations/Demo/UserInfoInputValidation.cs deleted file mode 100644 index b8e5268f..00000000 --- a/src/SJZY.Track.Application/Validations/Demo/UserInfoInputValidation.cs +++ /dev/null @@ -1,15 +0,0 @@ -锘縰sing FluentValidation; -using SJZY.Track.Application.Dtos.Demo; - - -namespace SJZY.Track.Application.Validations.Demo -{ - public class UserInfoInputValidation : AbstractValidator, IValidationEnabled - { - public UserInfoInputValidation() - { - RuleFor(x => x.QQ).NotNull().WithMessage("QQ鍙风爜涓嶈兘涓虹┖"); - } - - } -} diff --git a/src/SJZY.Track.Application/Validations/Demo/UserRoleInputValidation.cs b/src/SJZY.Track.Application/Validations/Demo/UserRoleInputValidation.cs deleted file mode 100644 index fa0307a2..00000000 --- a/src/SJZY.Track.Application/Validations/Demo/UserRoleInputValidation.cs +++ /dev/null @@ -1,13 +0,0 @@ -锘縰sing FluentValidation; -using SJZY.Track.Application.Dtos.Demo; - -namespace SJZY.Track.Application.Validations.Demo -{ - public class UserRoleInputValidation : AbstractValidator, IValidationEnabled - { - public UserRoleInputValidation() - { - RuleFor(m => m.Id).GreaterThan(0).WithMessage("瑙掕壊ID蹇呴』澶т簬0锛"); - } - } -} diff --git a/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentInputValidation.cs b/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentInputValidation.cs new file mode 100644 index 00000000..af97fc37 --- /dev/null +++ b/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentInputValidation.cs @@ -0,0 +1,26 @@ +锘縰sing FluentValidation; +using SJZY.Track.Application.Contract.Dtos.TrackContents; + +namespace SJZY.Track.Application.Validations.TrackContents +{ + public class EditTrackContentInputValidation : AbstractValidator, IValidationEnabled + { + public EditTrackContentInputValidation() + { + //鏉′欢鍒嗘敮 + When(x => x.Options == OptionType.淇敼 || x.Options == OptionType.鍒犻櫎, + () => { RuleFor(x => x.Id).GreaterThan(0).WithMessage("淇敼鎴栧垹闄ゆ椂Id蹇呴』澶т簬0!"); }); + + When(x => x.Options == OptionType.鏂板, () => { RuleFor(x => x.Id).Equal(0).WithMessage("鏂板鏃禝d蹇呴』绛変簬0!"); }); + + When(x => x.Options == OptionType.淇敼 || x.Options == OptionType.鏂板, () => + { + RuleFor(x => x.SubSystemId).GreaterThan(0).WithMessage("瀛愮郴缁熺殑id蹇呴』澶т簬0!"); + RuleFor(x => x.TrackStatusId).GreaterThan(0).WithMessage("鎵灞炵姸鎬佺殑id蹇呴』澶т簬0!"); + RuleFor(x => x.Code).NotNull().WithMessage("杞ㄨ抗鍐呭浠ｇ爜蹇呭～锛").NotEmpty().WithMessage("杞ㄨ抗鍐呭浠ｇ爜涓嶈兘涓虹┖锛"); + RuleFor(x => x.Content).NotNull().WithMessage("杞ㄨ抗鍐呭蹇呭～锛").NotEmpty().WithMessage("杞ㄨ抗鍐呭涓嶈兘涓虹┖锛"); + RuleFor(x => x.EnContent).NotNull().WithMessage("杞ㄨ抗鍐呭鑻辨枃蹇呭～锛").NotEmpty().WithMessage("杞ㄨ抗鍐呭鑻辨枃涓嶈兘涓虹┖锛"); + }); + } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentMapInputValidation.cs b/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentMapInputValidation.cs new file mode 100644 index 00000000..b4cf3ed8 --- /dev/null +++ b/src/SJZY.Track.Application/Validations/TrackContents/EditTrackContentMapInputValidation.cs @@ -0,0 +1,45 @@ +锘縰sing FluentValidation; +using Microsoft.Extensions.Localization; +using SJZY.Expand.ABP.Core.Localization; +using SJZY.Track.Application.Contract.Dtos.TrackContents; +using SJZY.Track.Application.Localization; + +namespace SJZY.Track.Application.Validations.TrackContents; + +public class EditTrackContentMapInputValidation : AbstractValidator, IValidationEnabled +{ + public EditTrackContentMapInputValidation(IStringLocalizer stringLocalizer) + { + RuleFor(x => x.Options).IsInEnum().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum, nameof(EditTrackContentMapInput.Options)]); + + RuleFor(x => x.Id).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackContentMapInput.Id), 0]); + + RuleFor(x => x.MapSubSystemId).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackContentMapInput.MapSubSystemId), 0]); + + RuleFor(x => x.MapTrackContentId).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackContentMapInput.MapTrackContentId), 0]); + + RuleFor(x => x.SubSystemId).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackContentMapInput.SubSystemId), 0]); + + RuleFor(x => x.TrackContentId).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackContentMapInput.TrackContentId), 0]); + + When(x => x.Options != OptionTypeNoNull.鏂板, () => + { + RuleFor(x => x.Id).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackContentMapInput.Id)]); + }); + + When(x => x.Options != OptionTypeNoNull.鍒犻櫎, () => + { + RuleFor(x => x.MapSubSystemId).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackContentMapInput.MapSubSystemId)]); + + RuleFor(x => x.MapTrackContentCode).NotEmpty().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackContentMapInput.MapTrackContentCode)]); + + RuleFor(x => x.MapTrackContentId).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackContentMapInput.MapTrackContentId)]); + + RuleFor(x => x.SubSystemId).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackContentMapInput.SubSystemId)]); + + RuleFor(x => x.TrackContentCode).NotEmpty().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackContentMapInput.TrackContentCode)]); + + RuleFor(x => x.TrackContentId).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackContentMapInput.TrackContentId)]); + }); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Validations/TrackFlags/EditTrackFlagInputValidation.cs b/src/SJZY.Track.Application/Validations/TrackFlags/EditTrackFlagInputValidation.cs new file mode 100644 index 00000000..6a06da65 --- /dev/null +++ b/src/SJZY.Track.Application/Validations/TrackFlags/EditTrackFlagInputValidation.cs @@ -0,0 +1,24 @@ +锘縰sing FluentValidation; +using SJZY.Track.Application.Contract.Dtos.TrackFlags; + +namespace SJZY.Track.Application.Validations.TrackFlags +{ + public class EditTrackFlagInputValidation : AbstractValidator, IValidationEnabled + { + public EditTrackFlagInputValidation() + { + //鏉′欢鍒嗘敮 + When(x => x.Options == OptionType.淇敼 || x.Options == OptionType.鍒犻櫎, + () => { RuleFor(x => x.Id).GreaterThan(0).WithMessage("淇敼鎴栧垹闄ゆ椂Id蹇呴』澶т簬0!"); }); + + When(x => x.Options == OptionType.鏂板, () => { RuleFor(x => x.Id).Equal(0).WithMessage("鏂板鏃禝d蹇呴』绛変簬0!"); }); + + When(x => x.Options == OptionType.淇敼 || x.Options == OptionType.鏂板, () => + { + RuleFor(x => x.SubSystemId).GreaterThan(0).WithMessage("瀛愮郴缁熺殑id蹇呴』澶т簬0!"); + RuleFor(x => x.Code).NotNull().WithMessage("杞ㄨ抗鏍囪浠ｇ爜蹇呭～锛").NotEmpty().WithMessage("杞ㄨ抗鏍囪浠ｇ爜涓嶈兘涓虹┖锛"); + RuleFor(x => x.Flag).NotNull().WithMessage("杞ㄨ抗鏍囪蹇呭～锛").NotEmpty().WithMessage("杞ㄨ抗鏍囪涓嶈兘涓虹┖锛"); + }); + } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Validations/TrackPull/EditTrackPullConfigInputValidation.cs b/src/SJZY.Track.Application/Validations/TrackPull/EditTrackPullConfigInputValidation.cs new file mode 100644 index 00000000..9b0a4503 --- /dev/null +++ b/src/SJZY.Track.Application/Validations/TrackPull/EditTrackPullConfigInputValidation.cs @@ -0,0 +1,65 @@ +锘縰sing FluentValidation; +using Microsoft.Extensions.Localization; +using SJZY.Expand.ABP.Core.Localization; +using SJZY.Track.Application.Contract.Dtos.TrackPull; +using SJZY.Track.Application.Localization; + +namespace SJZY.Track.Application.Validations.TrackPull; + +public class EditTrackPullConfigInputValidation : AbstractValidator, IValidationEnabled +{ + public EditTrackPullConfigInputValidation(IStringLocalizer stringLocalizer) + { + RuleFor(x => x.Options).IsInEnum().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum, nameof(EditTrackPullConfigInput.Options)]); + + RuleFor(x => x.Id).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackPullConfigInput.Id), 0]); + + RuleFor(x => x.ParseMethod).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackPullConfigInput.ParseMethod), 0]); + + RuleFor(x => x.PullInterval) + .GreaterThanOrEqualTo(30).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThanOrEqualTo, nameof(EditTrackPullConfigInput.PullInterval), 30]); + + RuleFor(x => x.SubSystemId).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackPullConfigInput.SubSystemId), 0]); + + RuleFor(x => x.ServiceProviderId).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackPullConfigInput.ServiceProviderId), 0]); + + RuleFor(x => x.SubSystemId).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackPullConfigInput.SubSystemId), 0]); + + RuleFor(x => x.TrackTemplateId).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackPullConfigInput.TrackTemplateId), 0]); + + When(x => x.Options != OptionTypeNoNull.鏂板, () => + { + RuleFor(x => x.Id).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackPullConfigInput.Id)]); + }); + + When(x => x.Options != OptionTypeNoNull.鍒犻櫎, () => + { + RuleFor(x => x.SubSystemId).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackPullConfigInput.SubSystemId)]); + + RuleFor(x => x.ServiceProviderId).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackPullConfigInput.ServiceProviderId)]); + + RuleFor(x => x.TrackTemplateId).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackPullConfigInput.TrackTemplateId)]); + + RuleFor(x => x.PullInterval).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackPullConfigInput.PullInterval)]); + + RuleFor(x => x.ParseMethod).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackPullConfigInput.ParseMethod)]); + + RuleFor(x => x.OrderNoName).NotEmpty().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.OrderNoName)]); + + When(x => x.ParseMethod == 1, () => + { + RuleFor(x => x.TackTimeZoneName).NotEmpty().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.TackTimeZoneName)]); + + RuleFor(x => x.TrackContentCodeName).NotEmpty().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.TrackContentCodeName)]); + + RuleFor(x => x.TrackContentName).NotEmpty().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.TrackContentName)]); + + RuleFor(x => x.TrackPlaceName).NotEmpty().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.TrackPlaceName)]); + + RuleFor(x => x.TrackStatusName).NotEmpty().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.TrackStatusName)]); + + RuleFor(x => x.TrackTimeName).NotEmpty().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotEmpty, nameof(EditTrackPullConfigInput.TrackTimeName)]); + }); + }); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Validations/TrackStatus/EditTrackStatusInputValidation.cs b/src/SJZY.Track.Application/Validations/TrackStatus/EditTrackStatusInputValidation.cs new file mode 100644 index 00000000..e492a542 --- /dev/null +++ b/src/SJZY.Track.Application/Validations/TrackStatus/EditTrackStatusInputValidation.cs @@ -0,0 +1,26 @@ +锘縰sing FluentValidation; +using SJZY.Track.Application.Contract.Dtos.TrackStatus; + +namespace SJZY.Track.Application.Validations.TrackStatus +{ + public class EditTrackStatusInputValidation : AbstractValidator, IValidationEnabled + { + public EditTrackStatusInputValidation() + { + //鏉′欢鍒嗘敮 + When(x => x.Options == OptionType.淇敼 || x.Options == OptionType.鍒犻櫎, + () => { RuleFor(x => x.Id).GreaterThan(0).WithMessage("淇敼鎴栧垹闄ゆ椂Id蹇呴』澶т簬0!"); }); + + When(x => x.Options == OptionType.鏂板, () => { RuleFor(x => x.Id).Equal(0).WithMessage("鏂板鏃禝d蹇呴』绛変簬0!"); }); + + When(x => x.Options == OptionType.淇敼 || x.Options == OptionType.鏂板, () => + { + RuleFor(x => x.SubSystemId).GreaterThan(0).WithMessage("瀛愮郴缁熺殑id蹇呴』澶т簬0!"); + RuleFor(x => x.NodeId).GreaterThan(0).WithMessage("鎵灞炶妭鐐圭殑id蹇呴』澶т簬0!"); + RuleFor(x => x.Code).NotNull().WithMessage("杞ㄨ抗鐘舵佷唬鐮佸繀濉紒").NotEmpty().WithMessage("杞ㄨ抗鐘舵佷唬鐮佷笉鑳戒负绌猴紒"); + RuleFor(x => x.TrackStatus).NotNull().WithMessage("杞ㄨ抗鐘舵佸繀濉紒").NotEmpty().WithMessage("杞ㄨ抗鐘舵佷笉鑳戒负绌猴紒"); + RuleFor(x => x.EntrackStatus).NotNull().WithMessage("杞ㄨ抗鐘舵佽嫳鏂囧繀濉紒").NotEmpty().WithMessage("杞ㄨ抗鐘舵佽嫳鏂囦笉鑳戒负绌猴紒"); + }); + } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateContentInputValidation.cs b/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateContentInputValidation.cs new file mode 100644 index 00000000..c23984d4 --- /dev/null +++ b/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateContentInputValidation.cs @@ -0,0 +1,37 @@ +锘縰sing FluentValidation; +using Microsoft.Extensions.Localization; +using SJZY.Expand.ABP.Core.Localization; +using SJZY.Track.Application.Contract.Dtos.TrackTemplates; +using SJZY.Track.Application.Localization; + +namespace SJZY.Track.Application.Validations.TrackTemplates; + +public class EditTrackTemplateContentInputValidation : AbstractValidator, IValidationEnabled +{ + public EditTrackTemplateContentInputValidation(IStringLocalizer stringLocalizer) + { + RuleFor(x => x.Options).IsInEnum().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum, nameof(EditTrackTemplateContentInput.Options)]); + + RuleFor(x => x.Id).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackTemplateContentInput.Id), 0]); + + RuleFor(x => x.TrackContentId).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackTemplateContentInput.TrackContentId), 0]); + + RuleFor(x => x.TrackTemplateId).GreaterThan(0).WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_GreaterThan, nameof(EditTrackTemplateContentInput.TrackTemplateId), 0]); + + When(x => x.Options != OptionTypeNoNull.鏂板, () => + { + RuleFor(x => x.Id).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackTemplateContentInput.Id)]); + }); + + When(x => x.Options != OptionTypeNoNull.鍒犻櫎, () => + { + RuleFor(x => x.IsCanDelete).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackTemplateContentInput.IsCanDelete)]); + + RuleFor(x => x.IsExternal).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackTemplateContentInput.IsExternal)]); + + RuleFor(x => x.TrackContentId).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackTemplateContentInput.TrackContentId)]); + + RuleFor(x => x.TrackTemplateId).NotNull().WithMessage(stringLocalizer[SjzyBasicLocalization.Validation_NotNull, nameof(EditTrackTemplateContentInput.TrackTemplateId)]); + }); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateInputValidation.cs b/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateInputValidation.cs new file mode 100644 index 00000000..aa4bdad8 --- /dev/null +++ b/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateInputValidation.cs @@ -0,0 +1,27 @@ +锘縰sing FluentValidation; +using SJZY.Track.Application.Contract.Dtos.TrackTemplates; + +namespace SJZY.Track.Application.Validations.TrackTemplates +{ + /// + /// 杞ㄨ抗妯＄増缂栬緫鏍￠獙 + /// + public class EditTrackTemplateInputValidation : AbstractValidator, IValidationEnabled + { + public EditTrackTemplateInputValidation() + { + //鏉′欢鍒嗘敮 + When(x => x.Options == OptionType.淇敼 || x.Options == OptionType.鍒犻櫎, + () => { RuleFor(x => x.Id).GreaterThan(0).WithMessage("淇敼鎴栧垹闄ゆ椂Id蹇呴』澶т簬0!"); }); + + When(x => x.Options == OptionType.鏂板, () => { RuleFor(x => x.Id).Equal(0).WithMessage("鏂板鏃禝d蹇呴』绛変簬0!"); }); + + When(x => x.Options == OptionType.淇敼 || x.Options == OptionType.鏂板, () => + { + RuleFor(x => x.SubSystemId).GreaterThan(0).WithMessage("瀛愮郴缁熺殑id蹇呴』澶т簬0!"); + RuleFor(x => x.Name).NotNull().WithMessage("妯＄増鍚嶇О蹇呭～锛").NotEmpty().WithMessage("妯＄増鍚嶇О涓嶈兘涓虹┖锛"); + RuleFor(x => x.Code).NotNull().WithMessage("妯＄増浠ｇ爜蹇呭～锛").NotEmpty().WithMessage("妯＄増浠ｇ爜涓嶈兘涓虹┖锛"); + }); + } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/DemoAggregate/DemoDetailEntity.cs b/src/SJZY.Track.Domain/Aggregates/DemoAggregate/DemoDetailEntity.cs new file mode 100644 index 00000000..65734437 --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/DemoAggregate/DemoDetailEntity.cs @@ -0,0 +1,23 @@ +锘縩amespace SJZY.Track.Domain.Aggregates.DemoAggregate; + +[SugarTable("t_demo_detail")] +public class DemoDetailEntity : IEntity +{ + /// + /// Id + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true)] + public long Id { get; set; } + + /// + /// t_demo.id + /// + [SugarColumn(ColumnName = "DemoId")] + public long DemoId { get; set; } + + /// + /// 涓浜涜鏄.. + /// + [SugarColumn(ColumnName = "OtherInfo")] + public string OtherInfo { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/DemoAggregate/DemoEntity.cs b/src/SJZY.Track.Domain/Aggregates/DemoAggregate/DemoEntity.cs new file mode 100644 index 00000000..44d7d6eb --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/DemoAggregate/DemoEntity.cs @@ -0,0 +1,36 @@ +锘縩amespace SJZY.Track.Domain.Aggregates.DemoAggregate; + +/// +/// 娴嬭瘯琛 +/// +[SugarTable("t_demo")] +public class DemoEntity : IFullAuditedBasicEntitys, IAggregateRoot +{ + /// + /// Id + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + + /// + /// 濮撳悕 + /// + [SugarColumn(ColumnName = "Name")] + public string Name { get; set; } + + /// + /// 骞撮緞 + /// + [SugarColumn(ColumnName = "Age")] + public int Age { get; set; } + + /// + /// 鎻忚堪 + /// + [SugarColumn(ColumnName = "Description")] + public string Description { get; set; } + + + [Navigate(NavigateType.OneToMany, nameof(DemoDetailEntity.DemoId))] + public List DemoDetailList { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/Demo/Services/IDemoRepository.cs b/src/SJZY.Track.Domain/Aggregates/DemoAggregate/IDemoRepository.cs similarity index 85% rename from src/SJZY.Track.Repository/Demo/Services/IDemoRepository.cs rename to src/SJZY.Track.Domain/Aggregates/DemoAggregate/IDemoRepository.cs index bf3a2083..207cc3b3 100644 --- a/src/SJZY.Track.Repository/Demo/Services/IDemoRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/DemoAggregate/IDemoRepository.cs @@ -1,7 +1,6 @@ -锘縰sing SJZY.Track.Repository.Demo.Entitys; -using SJZY.Track.Repository.Demo.ValueObjects; +锘縰sing SJZY.Track.Domain.Dtos.Demo; -namespace SJZY.Track.Repository.Demo.Services +namespace SJZY.Track.Domain.Aggregates.DemoAggregate { public interface IDemoRepository { diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs new file mode 100644 index 00000000..9e8d59eb --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs @@ -0,0 +1,68 @@ +锘縰sing SJZY.Track.Domain.Dtos.Order; + +namespace SJZY.Track.Domain.Aggregates.OrderAggregate; + +public interface IOrderRepository : IBasicRepository +{ + /// + /// 鍒涘缓璁㈠崟 + /// + /// + /// + Task CreateOrderAsync(OrderEntity order); + + /// + /// 鑾峰彇鍒嗛〉鐨勮建杩硅鍗 + /// + /// + /// + Task> GetPageTrackOrder(GetPageTrackOrderInputVO input); + + /// + /// 鏇存柊璁㈠崟 + /// + /// + /// + Task UpdateOrderAsync(OrderEntity order); + + /// + /// 鍒犻櫎璁㈠崟 + /// + /// + /// + Task DeleteOrderAsync(int orderId); + + + #region 璁㈠崟鍏宠仈 + + /// + /// 鏍规嵁璁㈠崟id锛岃幏鍙栧叧鑱旂殑璁㈠崟闆嗗悎 + /// + /// + /// + Task> GetLinkedOrdersAsync(int orderId); + + /// + /// 鍏宠仈璁㈠崟 + /// + /// + /// + Task LinkOrderAsync(List orderLinkEntities); + + /// + /// 瑙ｉ櫎璁㈠崟鍏宠仈鍏崇郴 + /// + /// + /// + Task UnLinkByIdsAsync(List linkIds); + + #endregion + + + /// + /// 鑾峰彇璁㈠崟妯℃澘鍒楄〃 + /// + /// + /// + Task> GetOrderTemplatesAsync(List orderNos); +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs new file mode 100644 index 00000000..04432d30 --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs @@ -0,0 +1,121 @@ +锘縩amespace SJZY.Track.Domain.Aggregates.OrderAggregate; + +/// +/// 杞ㄨ抗璁㈠崟涓昏〃 +/// +[SugarTable("t_order")] +public class OrderEntity : IFullAuditedBasicEntitys, IAggregateRoot +{ + /// + /// 鑷涓婚敭 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 璁㈠崟鍙 + /// + [SugarColumn(ColumnName = "OrderNo")] + public string OrderNo { get; set; } = null!; + + /// + /// 璁㈠崟绫诲瀷锛堜富鏁版嵁鏋氫妇TrackOrderType锛 + /// + [SugarColumn(ColumnName = "OrderType")] + public int OrderType { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + [SugarColumn(ColumnName = "SubSystemId")] + public int SubSystemId { get; set; } + + /// + /// 瀹㈡埛id锛堝閮ㄤ富浣搃d锛 + /// + [SugarColumn(ColumnName = "CustomId")] + public int CustomId { get; set; } + + /// + /// 璁㈠崟鏄惁瀹岀粨锛堝紓姝ョ淮鎶わ級 + /// + [SugarColumn(ColumnName = "IsCompleted")] + public bool IsCompleted { get; set; } + + /// + /// 璁㈠崟鏄惁鎺ㄩ佸畬鎴愶紙寮傛缁存姢锛 + /// + [SugarColumn(ColumnName = "IsPushCompleted")] + public bool IsPushCompleted { get; set; } + + /// + /// 鏈鏂拌建杩瑰唴瀹癸紙寮傛缁存姢锛 + /// + [SugarColumn(ColumnName = "LatestTrackContent")] + public string? LatestTrackContent { get; set; } + + /// + /// 鏈鏂拌建杩瑰唴瀹硅嫳鏂囷紙寮傛缁存姢锛 + /// + [SugarColumn(ColumnName = "LatestTrackEnContent")] + public string? LatestTrackEnContent { get; set; } + + /// + /// 鏈鏂拌建杩规椂闂达紙寮傛缁存姢锛 + /// + [SugarColumn(ColumnName = "LatestTrackTime")] + public DateTime? LatestTrackTime { get; set; } + + /// + /// 鏈鏂拌建杩规椂鍖猴紙寮傛缁存姢锛 + /// + [SugarColumn(ColumnName = "LatestTrackTimeZone")] + public float? LatestTrackTimeZone { get; set; } + + /// + /// 鏈鏂拌建杩瑰彂鐢熷湴锛堝紓姝ョ淮鎶わ級 + /// + [SugarColumn(ColumnName = "LatestTrackPlace")] + public string? LatestTrackPlace { get; set; } + + /// + /// 鐩殑鍩庡競 + /// + [SugarColumn(ColumnName = "ArrivalCity")] + public string ArrivalCity { get; set; } = null!; + + /// + /// 鐩殑鍥藉 + /// + [SugarColumn(ColumnName = "ArrivalCountry")] + public string ArrivalCountry { get; set; } = null!; + + /// + /// 鐩殑娓彛 + /// + [SugarColumn(ColumnName = "ArrivalPort")] + public string? ArrivalPort { get; set; } + + /// + /// 璧疯繍鍩庡競 + /// + [SugarColumn(ColumnName = "LeaveCity")] + public string LeaveCity { get; set; } = null!; + + /// + /// 璧疯繍鍥藉 + /// + [SugarColumn(ColumnName = "LeaveCountry")] + public string LeaveCountry { get; set; } = null!; + + /// + /// 璧疯繍娓彛 + /// + [SugarColumn(ColumnName = "LeavePort")] + public string? LeavePort { get; set; } + + [SugarColumn(IsIgnore = true)] + public List OrderFlights { get; set; } + [SugarColumn(IsIgnore = true)] + public List OrderTemplates { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs new file mode 100644 index 00000000..4e5f2017 --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs @@ -0,0 +1,50 @@ +锘縩amespace SJZY.Track.Domain.Aggregates.OrderAggregate; + +/// +/// 璁㈠崟鑸彮琛紙1锛歂锛 +/// +[SugarTable("t_order_flight")] +public class OrderFlightEntity : ICreateBaicEntity, ISoftDeleteBasicEntity, IEntity +{ + /// + /// 鑷涓婚敭 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 鐝湡 + /// + [SugarColumn(ColumnName = "FlightDate")] + public DateTime FlightDate { get; set; } + + /// + /// 鑸彮鍙 + /// + [SugarColumn(ColumnName = "FlightNo")] + public string FlightNo { get; set; } = null!; + + /// + /// 璁㈠崟id + /// + [SugarColumn(ColumnName = "OrderId")] + public int OrderId { get; set; } + + /// + /// 鍒涘缓浜 + /// + [SugarColumn(ColumnName = "CreateUserId")] + public int CreateUserId { get; set; } + + /// + /// 鍒涘缓鏃堕棿 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + + /// + /// 鏄惁鍒犻櫎 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool IsDeleted { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs new file mode 100644 index 00000000..71231e99 --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs @@ -0,0 +1,69 @@ +锘縩amespace SJZY.Track.Domain.Aggregates.OrderAggregate; + +/// +/// 杞ㄨ抗璁㈠崟鍏宠仈琛紙1锛歂锛 +/// +[SugarTable("t_order_link")] +public class OrderLinkEntity : ICreateBaicEntity, ISoftDeleteBasicEntity, IEntity +{ + /// + /// 鑷涓婚敭 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 璁㈠崟id + /// + [SugarColumn(ColumnName = "OrderId")] + public int OrderId { get; set; } + + /// + /// 鍏宠仈鐨勮鍗昳d + /// + [SugarColumn(ColumnName = "LinkOrderId")] + public int LinkOrderId { get; set; } + + /// + /// 璁㈠崟绫诲瀷 + /// + [SugarColumn(ColumnName = "OrderType")] + public int OrderType { get; set; } + + /// + /// 璁㈠崟鍙 + /// + [SugarColumn(ColumnName = "OrderNo")] + public string OrderNo { get; set; } = null!; + + + /// + /// 鍏宠仈鐨勮鍗曠被鍨 + /// + [SugarColumn(ColumnName = "LinkOrderType")] + public int LinkOrderType { get; set; } + + /// + /// 鍏宠仈鐨勮鍗曞彿 + /// + [SugarColumn(ColumnName = "LinkOrderNo")] + public string LinkOrderNo { get; set; } = null!; + + /// + /// 鍒涘缓浜 + /// + [SugarColumn(ColumnName = "CreateUserId")] + public int CreateUserId { get; set; } + + /// + /// 鍒涘缓鏃堕棿 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + + /// + /// 鏄惁鍒犻櫎 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool IsDeleted { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderTemplateEntity.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderTemplateEntity.cs new file mode 100644 index 00000000..88559ae6 --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderTemplateEntity.cs @@ -0,0 +1,50 @@ +锘縩amespace SJZY.Track.Domain.Aggregates.OrderAggregate; + +/// +/// 杞ㄨ抗璁㈠崟妯℃澘琛紙1锛歂锛 +/// +[SugarTable("t_order_template")] +public class OrderTemplateEntity : ICreateBaicEntity, ISoftDeleteBasicEntity, IEntity +{ + /// + /// 鑷涓婚敭 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 璁㈠崟id + /// + [SugarColumn(ColumnName = "OrderId")] + public int OrderId { get; set; } + + /// + /// 鏈嶅姟鍟唅d + /// + [SugarColumn(ColumnName = "ServiceProviderId")] + public int ServiceProviderId { get; set; } + + /// + /// 妯℃澘id + /// + [SugarColumn(ColumnName = "TrackTemplateId")] + public int TrackTemplateId { get; set; } + + /// + /// 鍒涘缓浜 + /// + [SugarColumn(ColumnName = "CreateUserId")] + public int CreateUserId { get; set; } + + /// + /// 鍒涘缓鏃堕棿 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + + /// + /// 鏄惁鍒犻櫎 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool IsDeleted { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/ITrackContentRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/ITrackContentRepository.cs new file mode 100644 index 00000000..400b7363 --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/ITrackContentRepository.cs @@ -0,0 +1,29 @@ +锘縰sing SJZY.Track.Domain.Dtos.TrackContents; +using SJZY.Track.Domain.Dtos.TrackTemplate; + +namespace SJZY.Track.Domain.Aggregates.TrackContentAggregate; + +public interface ITrackContentRepository : IBasicRepository +{ + Task GetDetailAsync(int id); + + Task> GetPageTrackContent(GetPageTrackContentVO input); + + Task> GetMapPageAsync(GetTrackContentMapPageInputVO input); + + Task GetMapDetailAsync(int id); + + Task IsMapAnyAsync(Expression> whereExpression); + + Task InsertMapAsync(TrackContentMapEntity insertObj); + + Task GetMapByIdAsync(int id); + + Task UpdateMapAsync(TrackContentMapEntity updateObj); + + Task SoftDeleteMapAsync(Expression> whereExpression); + + Task UpdateMapAsync(Expression> columns, Expression> whereExpression); + Task GetTemplateIsExist(int trackContentId); + Task> GetTrackContentAttributeValue(GetTemplateContentAttributeValueInputVO input); +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs new file mode 100644 index 00000000..44d00b9d --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs @@ -0,0 +1,56 @@ +锘縩amespace SJZY.Track.Domain.Aggregates.TrackContentAggregate; + +/// +/// 杞ㄨ抗鍐呭 +/// +[SugarTable("t_track_content")] +public class TrackContentEntity : IFullAuditedBasicEntitys, IAggregateRoot +{ + /// + /// 鑷涓婚敭 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 杞ㄨ抗鍐呭浠ｇ爜 + /// + [SugarColumn(ColumnName = "Code")] + public string Code { get; set; } = null!; + + /// + /// 杞ㄨ抗鍐呭 + /// + [SugarColumn(ColumnName = "Content")] + public string Content { get; set; } = null!; + + /// + /// 杞ㄨ抗鍐呭鑻辨枃 + /// + [SugarColumn(ColumnName = "EnContent")] + public string EnContent { get; set; } = null!; + + /// + /// 瀛愮郴缁焛d + /// + [SugarColumn(ColumnName = "SubSystemId")] + public int SubSystemId { get; set; } + + /// + /// 杞ㄨ抗鏍囪id + /// + [SugarColumn(ColumnName = "TrackFlagId")] + public int TrackFlagId { get; set; } + + /// + /// 鎵灞炶建杩圭姸鎬乮d + /// + [SugarColumn(ColumnName = "TrackStatusId")] + public int TrackStatusId { get; set; } + + /// + /// 鏄惁瀹岀粨 + /// + [SugarColumn(ColumnName = "IsCompleted")] + public bool IsCompleted { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentMapEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentMapEntity.cs new file mode 100644 index 00000000..1c20048f --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentMapEntity.cs @@ -0,0 +1,50 @@ +锘縩amespace SJZY.Track.Domain.Aggregates.TrackContentAggregate; + +/// +/// 杞ㄨ抗鍐呭鏄犲皠琛 +/// +[SugarTable("t_track_content_map")] +public class TrackContentMapEntity : IFullAuditedBasicEntitys, IEntity +{ + /// + /// 鑷涓婚敭 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 婧愬瓙绯荤粺id + /// + [SugarColumn(ColumnName = "SubSystemId")] + public int SubSystemId { get; set; } + + /// + /// 婧愯建杩瑰唴瀹筰d + /// + [SugarColumn(ColumnName = "TrackContentId")] + public int TrackContentId { get; set; } + + /// + /// 婧愯建杩瑰唴瀹筩ode + /// + [SugarColumn(ColumnName = "TrackContentCode")] + public string TrackContentCode { get; set; } = null!; + + /// + /// 鏄犲皠瀛愮郴缁焛d + /// + [SugarColumn(ColumnName = "MapSubSystemId")] + public int MapSubSystemId { get; set; } + + /// + /// 鏄犲皠杞ㄨ抗鍐呭id + /// + [SugarColumn(ColumnName = "MapTrackContentId")] + public int MapTrackContentId { get; set; } + + /// + /// 鏄犲皠杞ㄨ抗鍐呭code + /// + [SugarColumn(ColumnName = "MapTrackContentCode")] + public string MapTrackContentCode { get; set; } = null!; +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsRepository.cs new file mode 100644 index 00000000..f6578023 --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsRepository.cs @@ -0,0 +1,24 @@ +using SJZY.Track.Domain.Dtos.TrackDetails; + +namespace SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; + +public interface ITrackDetailsRepository +{ + Task GetFirstOrDefaultAsync(int orderId, string trackCode); + + Task UpsertAsync(TrackDetailsIndex index); + + Task> GetListAsync(int orderType, List orderNos); + + Task<(List list, long total)> GetListAsync(TrackDetailsQueryInput input); + Task?> GetListAsync(int orderId); + + /// + /// 鍒犻櫎杞ㄨ抗 + /// + /// + /// + /// + Task DeleteTrackAsync(int orderId, List trackCodes); + Task?> GetListAsync(List orderIds); +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs new file mode 100644 index 00000000..d4f5c9e1 --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs @@ -0,0 +1,93 @@ +using Nest; +using SJZY.Expand.ElasticSearch; + +namespace SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; + +[ElasticsearchType(RelationName = GlobalConst.TrackIndex)] +public class TrackDetailsIndex : IdBaseIndex +{ + /// + /// 璁㈠崟Id + /// + public int OrderId { get; set; } + + /// + /// 璁㈠崟鍙 + /// + public string OrderNo { get; set; } = null!; + + /// + /// 绱㈠紩鍚嶇О + /// + public string IndexName { get; set; } = null!; + + /// + /// 璁㈠崟绫诲瀷锛堜富鏁版嵁鏋氫妇TrackOrderType锛 + /// + public int OrderType { get; set; } + + /// + /// 杞ㄨ抗鐘舵 + /// + public string TrackStatus { get; set; } = null!; + + /// + /// 鍘熻建杩圭姸鎬 + /// + public string? OriginTrackStatus { get; set; } + + /// + /// 杞ㄨ抗鍐呭浠ｇ爜 + /// + public string TrackCode { get; set; } = null!; + + /// + /// 杞ㄨ抗鍐呭 + /// + public string TrackContent { get; set; } = null!; + + /// + /// 鍘熻建杩瑰唴瀹 + /// + public string? OriginTrackContent { get; set; } + + /// + /// 鍘熻建杩规姤鏂 + /// + public string? OriginTrackData { get; set; } + + /// + /// 杞ㄨ抗鍐呭鑻辨枃 + /// + public string TrackEnContent { get; set; } = null!; + + /// + /// 杞ㄨ抗鍙戠敓鍦 + /// + public string TrackPlace { get; set; } = null!; + + /// + /// 杞ㄨ抗鍙戠敓鏃堕棿 + /// + public DateTime TrackTime { get; set; } + + /// + /// 杞ㄨ抗鍙戠敓鏃跺尯 + /// + public float TrackTimeZone { get; set; } + + /// 鏄惁鍙垹 + public bool IsCanDelete { get; set; } + + /// 鍒涘缓浜 + public string? CreateUser { get; set; } + + /// 鍒涘缓鏃堕棿 + public DateTime CreateTime { get; set; } + + /// 淇敼浜 + public string? UpdateUser { get; set; } + + /// 淇敼鏃堕棿 + public DateTime? UpdateTime { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/ITrackFlagRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/ITrackFlagRepository.cs new file mode 100644 index 00000000..12ba3bc6 --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/ITrackFlagRepository.cs @@ -0,0 +1,9 @@ +锘縰sing SJZY.Track.Domain.Dtos.TrackFlags; + +namespace SJZY.Track.Domain.Aggregates.TrackFlagAggregate; + +public interface ITrackFlagRepository : IBasicRepository +{ + Task GetDetailAsync(int id); + Task> GetPageTrackFlag(GetPageTrackFlagVO input); +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs new file mode 100644 index 00000000..225c8f85 --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs @@ -0,0 +1,38 @@ +锘縩amespace SJZY.Track.Domain.Aggregates.TrackFlagAggregate; + +/// +/// 杞ㄨ抗鏍囪琛 +/// +[SugarTable("t_track_flag")] +public class TrackFlagEntity : IFullAuditedBasicEntitys, IAggregateRoot +{ + /// + /// 鑷涓婚敭 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 鏍囪浠ｇ爜 + /// + [SugarColumn(ColumnName = "Code")] + public string Code { get; set; } + + /// + /// 鏍囪鍚嶇О + /// + [SugarColumn(ColumnName = "Name")] + public string Name { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + [SugarColumn(ColumnName = "SubSystemId")] + public int SubSystemId { get; set; } + + ///// + ///// 鏄惁瀹岀粨 + ///// + //[SugarColumn(ColumnName = "IsCompleted")] + //public bool IsCompleted { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs new file mode 100644 index 00000000..7b7dec1f --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs @@ -0,0 +1,53 @@ +锘縰sing SJZY.Track.Domain.Dtos.Common; +using SJZY.Track.Domain.Dtos.TrackPull; + +namespace SJZY.Track.Domain.Aggregates.TrackPullAggregate; + +public interface ITrackPullConfigRepository : IBasicRepository +{ + /// + /// 杞ㄨ抗鎷夊彇閰嶇疆鍒楄〃 + /// + /// + /// + Task> GetPageAsync(KeywordsInputVO input); + + /// + /// 杞ㄨ抗鎷夊彇閰嶇疆鍐呭鍒楄〃 + /// + /// + /// + Task> GetContentPageAsync(GetTrackPullContentPageInputVO input); + + /// + /// 杞ㄨ抗鎷夊彇閰嶇疆璇︽儏 + /// + /// + /// + Task GetDetailAsync(int id); + + /// + /// 杞ㄨ抗鎷夊彇閰嶇疆鍐呭璇︽儏 + /// + /// + /// + Task GetContentDetailAsync(int id); + + Task InsertParamsAsync(TrackPushPullParamsConfigEntity insertObj); + + Task InsertContentRangeAsync(List insertObjs); + + Task GetParamsSingleAsync(Expression> whereExpression); + + Task UpdateParamsAsync(TrackPushPullParamsConfigEntity updateObj); + + Task SoftDeleteContentAsync(Expression> whereExpression); + + Task SoftDeleteParamsAsync(Expression> whereExpression); + + Task GetContentByIdAsync(int id); + + Task UpdateContentAsync(TrackPullContentConfigEntity updateObj); + + Task IsContentAnyAsync(Expression> whereExpression); +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs new file mode 100644 index 00000000..1a672799 --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs @@ -0,0 +1,44 @@ +锘縩amespace SJZY.Track.Domain.Aggregates.TrackPullAggregate; + +/// +/// 杞ㄨ抗鎷夊彇閰嶇疆琛 +/// +[SugarTable("t_track_pull_config")] +public class TrackPullConfigEntity : IFullAuditedBasicEntitys, IAggregateRoot +{ + /// + /// 鑷涓婚敭 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 瑙ｆ瀽鏂瑰紡锛1鍙栨帴鍙ｉ氳繑鍙傛槧灏勫悗鐨勶紝2鍙栨湇鍔″晢鍘熻繑鍙 + /// + [SugarColumn(ColumnName = "ParseMethod")] + public int ParseMethod { get; set; } + + /// + /// 鏈嶅姟鍟嗘媺鍙栭鐜囷紙鍒嗛挓锛 + /// + [SugarColumn(ColumnName = "PullInterval")] + public int PullInterval { get; set; } + + /// + /// 鏈嶅姟鍟唅d + /// + [SugarColumn(ColumnName = "ServiceProviderId")] + public int ServiceProviderId { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + [SugarColumn(ColumnName = "SubSystemId")] + public int SubSystemId { get; set; } + + /// + /// 妯℃澘id + /// + [SugarColumn(ColumnName = "TrackTemplateId")] + public int TrackTemplateId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs new file mode 100644 index 00000000..13d74a83 --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs @@ -0,0 +1,68 @@ +锘縩amespace SJZY.Track.Domain.Aggregates.TrackPullAggregate; + +/// +/// 杞ㄨ抗鎷夊彇鍐呭閰嶇疆琛 +/// +[SugarTable("t_track_pull_content_config")] +public class TrackPullContentConfigEntity : IFullAuditedBasicEntitys, IEntity +{ + /// + /// 鑷涓婚敭 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 鏈嶅姟鍟嗚建杩逛唬鐮佸弬鏁板 + /// + [SugarColumn(ColumnName = "TrackContentCodeValue")] + public string? TrackContentCodeValue { get; set; } + + /// + /// 杞ㄨ抗鍐呭id + /// + [SugarColumn(ColumnName = "TrackContentId")] + public int TrackContentId { get; set; } + + /// + /// 鏈嶅姟鍟嗚建杩瑰唴瀹瑰弬鏁板 + /// + [SugarColumn(ColumnName = "TrackContentValue")] + public string? TrackContentValue { get; set; } + + /// + /// 杞ㄨ抗鍏抽敭璇嶏紙姝ｅ悜锛夛紝澶氫釜閫楀垎闅 + /// + [SugarColumn(ColumnName = "TrackKeyword")] + public string? TrackKeyword { get; set; } + + /// + /// 杞ㄨ抗鍏抽敭璇嶏紙鍙嶅悜锛夛紝澶氫釜閫楀垎闅 + /// + [SugarColumn(ColumnName = "TrackKeywordReverse")] + public string? TrackKeywordReverse { get; set; } + + /// + /// 杞ㄨ抗鍙戠敓鍦板弬鏁板(涓绘暟鎹灇涓) + /// + [SugarColumn(ColumnName = "TrackPlaceValue")] + public int? TrackPlaceValue { get; set; } + + /// + /// 杞ㄨ抗鎷夊彇閰嶇疆id + /// + [SugarColumn(ColumnName = "TrackPullConfigId")] + public int TrackPullConfigId { get; set; } + + /// + /// 鏈嶅姟鍟嗚建杩圭姸鎬佸弬鏁板 + /// + [SugarColumn(ColumnName = "TrackStatusValue")] + public string? TrackStatusValue { get; set; } + + /// + /// 杞ㄨ抗鏃跺尯GMT + /// + [SugarColumn(ColumnName = "TrackTimeZone")] + public float? TrackTimeZone { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPushPullParamsConfigEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPushPullParamsConfigEntity.cs new file mode 100644 index 00000000..8187c651 --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPushPullParamsConfigEntity.cs @@ -0,0 +1,80 @@ +锘縩amespace SJZY.Track.Domain.Aggregates.TrackPullAggregate; + +/// +/// 杞ㄨ抗鎷夊彇/鎺ㄩ佸弬鏁伴厤缃 +/// +[SugarTable("t_track_push_pull_params_config")] +public class TrackPushPullParamsConfigEntity : IFullAuditedBasicEntitys, IEntity +{ + /// + /// 鑷涓婚敭 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 鎵╁睍瀛楁鍙傛暟鍚 + /// + [SugarColumn(ColumnName = "ExpandFieldsName")] + public string ExpandFieldsName { get; set; } + + /// + /// 鎺ㄦ媺妯″紡锛0鎷夊彇锛1鎺ㄩ + /// + [SugarColumn(ColumnName = "IsPush")] + public bool IsPush { get; set; } + + /// + /// 鍗曞彿鍙傛暟鍚 + /// + [SugarColumn(ColumnName = "OrderNoName")] + public string OrderNoName { get; set; } + + /// + /// 鎺ㄦ媺閰嶇疆id + /// + [SugarColumn(ColumnName = "PullOrPushConfigId")] + public int PullOrPushConfigId { get; set; } + + /// + /// 杞ㄨ抗鏃跺尯鍙傛暟鍚 + /// + [SugarColumn(ColumnName = "TackTimeZoneName")] + public string TackTimeZoneName { get; set; } + + /// + /// 杞ㄨ抗浠ｇ爜鍙傛暟鍚 + /// + [SugarColumn(ColumnName = "TrackContentCodeName")] + public string TrackContentCodeName { get; set; } + + /// + /// 杞ㄨ抗鍐呭鍙傛暟鍚 + /// + [SugarColumn(ColumnName = "TrackContentName")] + public string TrackContentName { get; set; } + + /// + /// 杞ㄨ抗鍐呭鑻辨枃鍙傛暟鍚 + /// + [SugarColumn(ColumnName = "TrackEnContentName")] + public string TrackEnContentName { get; set; } + + /// + /// 杞ㄨ抗鍙戠敓鍦板弬鏁板悕 + /// + [SugarColumn(ColumnName = "TrackPlaceName")] + public string TrackPlaceName { get; set; } + + /// + /// 杞ㄨ抗鐘舵佸弬鏁板悕 + /// + [SugarColumn(ColumnName = "TrackStatusName")] + public string TrackStatusName { get; set; } + + /// + /// 杞ㄨ抗鍙戠敓鏃堕棿鍙傛暟鍚 + /// + [SugarColumn(ColumnName = "TrackTimeName")] + public string TrackTimeName { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushConfigRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushConfigRepository.cs new file mode 100644 index 00000000..80013967 --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushConfigRepository.cs @@ -0,0 +1,33 @@ +锘縰sing SJZY.Track.Domain.Dtos.Common; +using SJZY.Track.Domain.Dtos.TrackPush; + +namespace SJZY.Track.Domain.Aggregates.TrackPushAggregate; + +public interface ITrackPushConfigRepository : IBasicRepository +{ + Task> GetPageAsync(KeywordsInputVO input); + + Task> GetContentPageAsync(GetTrackPushContentPageInputVO input); + + Task GetDetailAsync(int id); + + Task GetContentDetailAsync(int id); + + Task SoftDeleteContentAsync(Expression> whereExpression); + + Task IsContentAnyAsync(Expression> whereExpression); + + Task InsertContentAsync(TrackPushContentConfigEntity insertObj); + + Task GetContentByIdAsync(int id); + + Task UpdateContentAsync(TrackPushContentConfigEntity updateObj); + + Task> GetContentListAsync(Expression> whereExpression); + + Task UpdateContentRangeAsync(List updateObjs); + + Task ContentMaxAsync(Expression> columns, Expression> whereExpression); + + Task UpdateContentAsync(Expression> columns, Expression> whereExpression); +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs new file mode 100644 index 00000000..00088ccd --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs @@ -0,0 +1,44 @@ +锘縩amespace SJZY.Track.Domain.Aggregates.TrackPushAggregate; + +/// +/// 杞ㄨ抗鎺ㄩ侀厤缃〃 +/// +[SugarTable("t_track_push_config")] +public class TrackPushConfigEntity : IFullAuditedBasicEntitys, IAggregateRoot +{ + /// + /// 鑷涓婚敭 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 瀹㈡埛id锛堝閮ㄤ富浣搃d锛 + /// + [SugarColumn(ColumnName = "CustomId")] + public int CustomId { get; set; } + + /// + /// 鏄惁鑷姩鎺ㄩ + /// + [SugarColumn(ColumnName = "IsAutoPush")] + public bool IsAutoPush { get; set; } + + /// + /// 鏈嶅姟鍟唅d锛堝鎴:鏈嶅姟鍟 1:1锛 + /// + [SugarColumn(ColumnName = "ServiceProviderId")] + public int ServiceProviderId { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + [SugarColumn(ColumnName = "SubSystemId")] + public int SubSystemId { get; set; } + + /// + /// 妯℃澘id锛堝涓箣闂磋嫳鏂囬楀彿鍒嗛殧锛 + /// + [SugarColumn(ColumnName = "TrackTemplateId")] + public string TrackTemplateId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs new file mode 100644 index 00000000..1c392d52 --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs @@ -0,0 +1,74 @@ +锘縩amespace SJZY.Track.Domain.Aggregates.TrackPushAggregate; + +/// +/// 杞ㄨ抗鎺ㄩ佸唴瀹归厤缃〃 +/// +[SugarTable("t_track_push_content_config")] +public class TrackPushContentConfigEntity : IFullAuditedBasicEntitys, IEntity +{ + /// + /// 鑷涓婚敭 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 鎵╁睍瀛楁鍙傛暟鍊 + /// + [SugarColumn(ColumnName = "ExpandFieldsValue")] + public string ExpandFieldsValue { get; set; } + + /// + /// 鎺ㄩ佸崟鍙风被鍨(涓绘暟鎹灇涓綯rackOrderType) + /// + [SugarColumn(ColumnName = "OrderNoType")] + public int OrderNoType { get; set; } + + /// + /// 鎺ㄩ佽建杩规帓搴 + /// + [SugarColumn(ColumnName = "Sort")] + public int Sort { get; set; } + + /// + /// 杞ㄨ抗浠ｇ爜鍙傛暟鍊 + /// + [SugarColumn(ColumnName = "TrackContentCodeValue")] + public string TrackContentCodeValue { get; set; } + + /// + /// 杞ㄨ抗鍐呭id + /// + [SugarColumn(ColumnName = "TrackContentId")] + public int TrackContentId { get; set; } + + /// + /// 杞ㄨ抗鍐呭鍙傛暟鍊 + /// + [SugarColumn(ColumnName = "TrackContentValue")] + public string TrackContentValue { get; set; } + + /// + /// 杞ㄨ抗鍐呭鑻辨枃鍙傛暟鍊 + /// + [SugarColumn(ColumnName = "TrackEnContentValue")] + public string TrackEnContentValue { get; set; } + + /// + /// 杞ㄨ抗鎺ㄩ侀厤缃甶d + /// + [SugarColumn(ColumnName = "TrackPushConfigId")] + public int TrackPushConfigId { get; set; } + + /// + /// 杞ㄨ抗鐘舵佸弬鏁板 + /// + [SugarColumn(ColumnName = "TrackStatusValue")] + public string TrackStatusValue { get; set; } + + /// + /// 杞ㄨ抗鏃跺尯GMT + /// + [SugarColumn(ColumnName = "TrackTimeZone")] + public double? TrackTimeZone { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/ITrackStatusRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/ITrackStatusRepository.cs new file mode 100644 index 00000000..5123bd2b --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/ITrackStatusRepository.cs @@ -0,0 +1,9 @@ +using SJZY.Track.Domain.Dtos.TrackStatus; + +namespace SJZY.Track.Domain.Aggregates.TrackStatusAggregate; + +public interface ITrackStatusRepository : IBasicRepository +{ + Task GetDetailAsync(int id); + Task> GetPageTrackStatus(GetPageTrackStatusVO input); +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs new file mode 100644 index 00000000..dd98a21d --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs @@ -0,0 +1,44 @@ +锘縩amespace SJZY.Track.Domain.Aggregates.TrackStatusAggregate; + +/// +/// 杞ㄨ抗鐘舵佽〃 +/// +[SugarTable("t_track_status")] +public class TrackStatusEntity : IFullAuditedBasicEntitys, IAggregateRoot +{ + /// + /// 鑷涓婚敭 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 杞ㄨ抗鐘舵佷唬鐮 + /// + [SugarColumn(ColumnName = "Code")] + public string Code { get; set; } = null!; + + /// + /// 杞ㄨ抗鐘舵佽嫳鏂 + /// + [SugarColumn(ColumnName = "EnStatus")] + public string EnStatus { get; set; } = null!; + + /// + /// 鎵灞炶妭鐐癸紙涓绘暟鎹灇涓維erviceNode锛 + /// + [SugarColumn(ColumnName = "Node")] + public int Node { get; set; } + + /// + /// 杞ㄨ抗鐘舵 + /// + [SugarColumn(ColumnName = "Status")] + public string Status { get; set; } = null!; + + /// + /// 瀛愮郴缁焛d + /// + [SugarColumn(ColumnName = "SubSystemId")] + public int SubSystemId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/ITrackTemplateRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/ITrackTemplateRepository.cs new file mode 100644 index 00000000..e6ab4b0b --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/ITrackTemplateRepository.cs @@ -0,0 +1,47 @@ +锘縰sing SJZY.Expand.ABP.Core.PublicMethords; +using SJZY.Track.Domain.Dtos.TrackTemplate; + +namespace SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; + +public interface ITrackTemplateRepository : IBasicRepository +{ + Task GetDetailAsync(int id); + + Task> GetPageTrackTemplate(GetPageTrackTemplateVO input); + + /// + /// 杞ㄨ抗妯℃澘鍐呭鍒楄〃 + /// + /// + /// + Task> GetContentPageAsync( + GetTrackTemplateContentPageInputVO input); + + /// + /// 杞ㄨ抗妯℃澘鍐呭璇︽儏 + /// + /// + /// + Task GetContentDetailAsync(int id); + + Task IsContentAnyAsync(Expression> whereExpression); + + Task InsertContentAsync(TrackTemplateContentEntity insertObj); + + Task GetContentByIdAsync(int id); + + Task UpdateContentAsync(TrackTemplateContentEntity updateObj); + + Task SoftDeleteContentAsync(int id); + + Task> GetContentListAsync( + Expression> whereExpression); + + Task UpdateContentRangeAsync(List updateObjs); + + Task> GetContentDropDownListAsync(GetTrackTemplateContentDropDownListVO input); + + Task ContentMaxAsync(Expression> columns, Expression> whereExpression); + + Task UpdateContentAsync(Expression> columns, Expression> whereExpression); +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateContentEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateContentEntity.cs new file mode 100644 index 00000000..3d8ba38a --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateContentEntity.cs @@ -0,0 +1,44 @@ +锘縩amespace SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; + +/// +/// 杞ㄨ抗妯℃澘鍐呭琛紙1锛歂锛 +/// +[SugarTable("t_track_template_content")] +public class TrackTemplateContentEntity : IFullAuditedBasicEntitys, IEntity +{ + /// + /// 鑷涓婚敭 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 鏄惁鍙垹 + /// + [SugarColumn(ColumnName = "IsCanDelete")] + public bool IsCanDelete { get; set; } + + /// + /// 鏄惁瀵瑰 + /// + [SugarColumn(ColumnName = "IsExternal")] + public bool IsExternal { get; set; } + + /// + /// 鎺掑簭 + /// + [SugarColumn(ColumnName = "Sort")] + public int Sort { get; set; } + + /// + /// 杞ㄨ抗鍐呭id + /// + [SugarColumn(ColumnName = "TrackContentId")] + public int TrackContentId { get; set; } + + /// + /// 妯℃澘id + /// + [SugarColumn(ColumnName = "TrackTemplateId")] + public int TrackTemplateId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateEntity.cs new file mode 100644 index 00000000..ce861050 --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/TrackTemplateEntity.cs @@ -0,0 +1,32 @@ +锘縩amespace SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; + +/// +/// 杞ㄨ抗妯℃澘琛 +/// +[SugarTable("t_track_template")] +public class TrackTemplateEntity : IFullAuditedBasicEntitys, IAggregateRoot +{ + /// + /// 鑷涓婚敭 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 妯℃澘浠ｇ爜 + /// + [SugarColumn(ColumnName = "Code")] + public string Code { get; set; } + + /// + /// 妯℃澘鍚嶇О + /// + [SugarColumn(ColumnName = "Name")] + public string Name { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + [SugarColumn(ColumnName = "SubSystemId")] + public int SubSystemId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/Common/KeywordsInputVO.cs b/src/SJZY.Track.Domain/Dtos/Common/KeywordsInputVO.cs new file mode 100644 index 00000000..8cbe4413 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/Common/KeywordsInputVO.cs @@ -0,0 +1,19 @@ +锘縩amespace SJZY.Track.Domain.Dtos.Common; + +public class KeywordsInputVO : PageInfoInput +{ + /// + /// 瀛愮郴缁焛d + /// + public int? SubSystemId { get; set; } + + /// + /// 鍏抽敭瀛 + /// + public string? Keywords { get; set; } + + /// + /// 閫変腑椤 + /// + public List? SelectedIds { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/Demo/DemoValueObject.cs b/src/SJZY.Track.Domain/Dtos/Demo/DemoValueObject.cs new file mode 100644 index 00000000..aa5db1e2 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/Demo/DemoValueObject.cs @@ -0,0 +1,16 @@ +锘縩amespace SJZY.Track.Domain.Dtos.Demo; + +public class DemoValueObject +{ + public string Name { get; set; } + + /// + /// 褰撳墠椤电爜 + /// + public int PageIndex { get; set; } + + /// + /// 姣忛〉澶у皬 + /// + public int PageSize { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetOrderDetailsInputVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetOrderDetailsInputVO.cs new file mode 100644 index 00000000..082b245a --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/Order/GetOrderDetailsInputVO.cs @@ -0,0 +1,18 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SJZY.Track.Domain.Dtos.Order +{ + public class GetOrderDetailsInputVO + { + + } + + public class TrackOrderDetailVO + { + + } +} diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs new file mode 100644 index 00000000..c1b97cc5 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs @@ -0,0 +1,128 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SJZY.Track.Domain.Dtos.Order +{ + public class GetPageTrackOrderInputVO : PageInfoInput + { + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + ///// + ///// 鍗曞彿 + ///// + //public List? OrderNos { get; set; } + + + /// + /// 鍗曞彿 + /// + public string? OrderNos { get; set; } + + /// + /// 鍒涘缓鏃堕棿寮濮 + /// + public DateTime? CreateTimeStart { get; set; } + + /// + /// 鍒涘缓鏃堕棿鎴 + /// + public DateTime? CreateTimeEnd { get; set; } + } + + /// + /// 杞ㄨ抗璁㈠崟VO + /// + public class TrackOrderVO + { + /// + /// 杞ㄨ抗璁㈠崟id + /// + public int Id { get; set; } + + /// + /// 璁㈠崟绫诲瀷id + /// + public int OrderType { get; set; } + + /// + /// 璁㈠崟鍚嶇О + /// + public string OrderTypeName { get; set; } + + /// + /// 璁㈠崟鍙 + /// + public string? OrderNumber { get; set; } + + /// + /// 杞ㄨ抗妯＄増 + /// + public string? TrackTemplateNames { get; set; } + + /// + /// 瀹㈡埛绠绉 + /// + public string? CustomerShortName { get; set; } + + /// + /// 瀹㈡埛浠ｇ爜 + /// + public string? CustomerCode { get; set; } + + ///// + ///// 璁㈠崟鏄庣粏锛坖son锛 + ///// + //public string? OrderDetails { get; set; } + + /// + /// 鏈鏂拌建杩瑰唴瀹 + /// + public string? NewestTrackContent { get; set; } + + /// + /// 鏈鏂拌建杩瑰唴瀹硅嫳鏂 + /// + public string? NewestTrackEnContent { get; set; } + + /// + /// 鏈鏂拌建杩瑰彂鐢熷湴 + /// + public string? NewestTrackPlace { get; set; } + + /// + /// 鏈鏂拌建杩规椂闂 + /// + public DateTime? NewestTrackTime { get; set; } + + /// + /// 鏄惁瀹岀粨 + /// + public bool IsFinish { get; set; } + + /// + /// 鍒涘缓鏃堕棿 + /// + public DateTime? CreateTime { get; set; } + + /// + /// 瀛愮郴缁 + /// + public string SubSystem { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 杞ㄨ抗妯℃澘Id鏁扮粍 + /// + public List? TrackTemplateIds { get; set; } + } +} diff --git a/src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs b/src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs new file mode 100644 index 00000000..c0344880 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs @@ -0,0 +1,34 @@ +锘縩amespace SJZY.Track.Domain.Dtos.Order; + +public class LinkedOrderVO +{ + /// + /// 鍏宠仈璁㈠崟id + /// + public int OrderId { get; set; } + + /// + /// 璁㈠崟鍙 + /// + public string OrderNo { get; set; } = null!; + + /// + /// 璁㈠崟绫诲瀷锛堜富鏁版嵁鏋氫妇TrackOrderType锛 + /// + public int OrderType { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 璁㈠崟鏄惁鎺ㄩ佸畬鎴愶紙寮傛缁存姢锛 + /// + public bool IsPushCompleted { get; set; } + + /// + /// 瀹㈡埛id + /// + public int CustomId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/Order/OrderIdentifier.cs b/src/SJZY.Track.Domain/Dtos/Order/OrderIdentifier.cs new file mode 100644 index 00000000..248ec7e9 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/Order/OrderIdentifier.cs @@ -0,0 +1,23 @@ +锘縩amespace SJZY.Track.Domain.Dtos.Order; + +/// +/// 璁㈠崟鏍囪瘑绗 +/// +public readonly struct OrderIdentifier +{ + public OrderIdentifier(int orderType, string orderNo) + { + OrderType = orderType; + OrderNo = orderNo; + } + + /// + /// 璁㈠崟绫诲瀷 + /// + public int OrderType { get; } + + /// + /// 璁㈠崟鍙 + /// + public string OrderNo { get; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/Order/OrderTemplateLinkDto.cs b/src/SJZY.Track.Domain/Dtos/Order/OrderTemplateLinkDto.cs new file mode 100644 index 00000000..6ca82ed3 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/Order/OrderTemplateLinkDto.cs @@ -0,0 +1,14 @@ +namespace SJZY.Track.Domain.Dtos.Order; + +public class OrderTemplateLinkDto +{ + /// + /// 璁㈠崟鍙 + /// + public string OrderNo { get; set; } = null!; + + /// + /// 妯℃澘id + /// + public int TemplateId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/Order/OrderTemplateVO.cs b/src/SJZY.Track.Domain/Dtos/Order/OrderTemplateVO.cs new file mode 100644 index 00000000..9360db40 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/Order/OrderTemplateVO.cs @@ -0,0 +1,15 @@ +锘縩amespace SJZY.Track.Domain.Dtos.Order; + +public class OrderTemplateVO +{ + public string OrderNo { get; set; } = null!; + + /// + /// 璁㈠崟绫诲瀷锛堜富鏁版嵁鏋氫妇TrackOrderType锛 + /// + public int OrderType { get; set; } + + public int TemplateId { get; set; } + + public int ServiceProviderId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/Order/TrackPullContentConfigVO.cs b/src/SJZY.Track.Domain/Dtos/Order/TrackPullContentConfigVO.cs new file mode 100644 index 00000000..1f82cbe6 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/Order/TrackPullContentConfigVO.cs @@ -0,0 +1,44 @@ +锘縩amespace SJZY.Track.Domain.Dtos.Order; + +public class TrackPullContentConfigVO +{ + /// + /// 杞ㄨ抗鍐呭id + /// + public int TrackContentId { get; set; } + + /// + /// 鏈嶅姟鍟嗚建杩逛唬鐮佸弬鏁板 + /// + public string? TrackContentCodeValue { get; set; } + + /// + /// 鏈嶅姟鍟嗚建杩瑰唴瀹瑰弬鏁板 + /// + public string? TrackContentValue { get; set; } + + /// + /// 杞ㄨ抗鍏抽敭璇嶏紙姝ｅ悜锛夛紝澶氫釜閫楀垎闅 + /// + public string? TrackKeyword { get; set; } + + /// + /// 杞ㄨ抗鍏抽敭璇嶏紙鍙嶅悜锛夛紝澶氫釜閫楀垎闅 + /// + public string? TrackKeywordReverse { get; set; } + + /// + /// 杞ㄨ抗鍙戠敓鍦板弬鏁板(涓绘暟鎹灇涓) + /// + public int? TrackPlaceValue { get; set; } + + /// + /// 鏈嶅姟鍟嗚建杩圭姸鎬佸弬鏁板 + /// + public string? TrackStatusValue { get; set; } + + /// + /// 杞ㄨ抗鏃跺尯GMT + /// + public double? TrackTimeZone { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs b/src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs new file mode 100644 index 00000000..4fff79ed --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs @@ -0,0 +1,99 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SJZY.Track.Domain.Dtos.TrackContents +{ + public class GetPageTrackContentVO : PageInfoInput + { + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 鍏抽敭瀛 + /// + public string? Keywords { get; set; } + + /// + /// 杞ㄨ抗鐘舵乮d + /// + public int TrackStatusId { get; set; } + + /// + /// 閫変腑鐨勮建杩瑰唴瀹筰d + /// + public List? SelectIds { get; set; } + } + + public class GetTrackContentListVO + { + /// + /// Id + /// + public int Id { get; set; } + + /// + /// 瀛愮郴缁 + /// + public string SubSystem { get; set; } + + /// + /// 杞ㄨ抗鍐呭浠ｇ爜 + /// + public string Code { get; set; } + + /// + /// 杞ㄨ抗鍐呭 + /// + public string Content { get; set; } + + /// + /// 杞ㄨ抗鍐呭鑻辨枃 + /// + public string EnContent { get; set; } + + /// + /// 鎵灞炵姸鎬 + /// + public string TrackStatus { get; set; } + + /// + /// 鎵灞炶妭鐐 + /// + public string Node { get; set; } + + /// + /// 杞ㄨ抗鏍囪 + /// + public string TrackFlag { get; set; } + + /// + /// 鍒涘缓鏃堕棿 + /// + public DateTime? CreateTime { get; set; } + + /// + /// 鍒涘缓浜 + /// + public string CreateUser { get; set; } + + /// + /// 淇敼鏃堕棿 + /// + public DateTime? UpdateTime { get; set; } + + /// + /// 淇敼浜 + /// + public string UpdateUser { get; set; } + + /// + /// 鏄惁瀹岀粨 + /// + public bool IsFinish { get; set; } + } +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs new file mode 100644 index 00000000..eb5a22b9 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs @@ -0,0 +1,66 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SJZY.Track.Domain.Dtos.TrackContents +{ + public class GetTrackContentDetailVO + { + /// + /// Id + /// + public int Id { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 瀛愮郴缁 + /// + public string SubSystem { get; set; } + + /// + /// 鎵灞炶建杩圭姸鎬乮d + /// + public int TrackStatusId { get; set; } + + /// + /// 鎵灞炶建杩圭姸鎬 + /// + public string TrackStatus { get; set; } + + /// + /// 杞ㄨ抗鍐呭浠ｇ爜 + /// + public string Code { get; set; } + + /// + /// 杞ㄨ抗鍐呭 + /// + public string Content { get; set; } + + /// + /// 杞ㄨ抗鍐呭鑻辨枃 + /// + public string EnContent { get; set; } + + /// + /// 杞ㄨ抗鏍囪id + /// + public int TrackFlagId { get; set; } + + /// + /// 杞ㄨ抗鏍囪 + /// + public string TrackFlag { get; set; } + + /// + /// 鏄惁瀹岀粨 + /// + public bool IsFinish { get; set; } + } +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapDetailOutputVO.cs new file mode 100644 index 00000000..dce4eff9 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapDetailOutputVO.cs @@ -0,0 +1,56 @@ +锘縩amespace SJZY.Track.Domain.Dtos.TrackContents; + +public class GetTrackContentMapDetailOutputVO +{ + public int Id { get; set; } + + /// + /// 鏄犲皠瀛愮郴缁 + /// + public string MapSubSystem { get; set; } + + /// + /// 鏄犲皠瀛愮郴缁焛d + /// + public int MapSubSystemId { get; set; } + + /// + /// 鏄犲皠杞ㄨ抗鍐呭 + /// + public string MapTrackContent { get; set; } + + /// + /// 鏄犲皠杞ㄨ抗鍐呭id + /// + public int MapTrackContentId { get; set; } + + /// + /// 瀛愮郴缁 + /// + public string SubSystem { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 婧愯建杩瑰唴瀹 + /// + public string TrackContent { get; set; } + + /// + /// 婧愯建杩瑰唴瀹筰d + /// + public int TrackContentId { get; set; } + + /// + /// 婧愯建杩瑰唴瀹逛唬鐮 + /// + public string TrackContentCode { get; set; } + + /// + /// 鏄犲皠杞ㄨ抗鍐呭浠ｇ爜 + /// + public string MapTrackContentCode { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageInputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageInputVO.cs new file mode 100644 index 00000000..e6cd19e6 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageInputVO.cs @@ -0,0 +1,11 @@ +锘縰sing SJZY.Track.Domain.Dtos.Common; + +namespace SJZY.Track.Domain.Dtos.TrackContents; + +public class GetTrackContentMapPageInputVO : KeywordsInputVO +{ + /// + /// 鏄犲皠瀛愮郴缁焛d + /// + public int? MapSubSystemId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageOutputVO.cs new file mode 100644 index 00000000..e291b71f --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentMapPageOutputVO.cs @@ -0,0 +1,56 @@ +锘縩amespace SJZY.Track.Domain.Dtos.TrackContents; + +public class GetTrackContentMapPageOutputVO +{ + /// + /// 杞ㄨ抗鍐呭浠ｇ爜 + /// + public string Code { get; set; } + + /// + /// 杞ㄨ抗鍐呭 + /// + public string Content { get; set; } + + /// + /// 杞ㄨ抗鍐呭鑻辨枃 + /// + public string EnContent { get; set; } + + public int Id { get; set; } + + /// + /// 鏄犲皠杞ㄨ抗鍐呭浠ｇ爜 + /// + public string MapCode { get; set; } + + /// + /// 鏄犲皠鍐呭 + /// + public string MapContent { get; set; } + + /// + /// 鏄犲皠鍐呭鑻辨枃 + /// + public string MapEnContent { get; set; } + + /// + /// 鏄犲皠瀛愮郴缁 + /// + public string MapSubSystem { get; set; } + + /// + /// 鏄犲皠杞ㄨ抗鐘舵 + /// + public string MapTrackStatus { get; set; } + + /// + /// 瀛愮郴缁 + /// + public string SubSystem { get; set; } + + /// + /// 杞ㄨ抗鐘舵 + /// + public string TrackStatus { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackDetails/MatchTrackContentDto.cs b/src/SJZY.Track.Domain/Dtos/TrackDetails/MatchTrackContentDto.cs new file mode 100644 index 00000000..adb51944 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackDetails/MatchTrackContentDto.cs @@ -0,0 +1,29 @@ +锘縩amespace SJZY.Track.Domain.Dtos.TrackDetails; + +public class MatchTrackContentDto +{ + /// + /// 杞ㄨ抗鍐呭 + /// + public string Content { get; set; } = null!; + + /// + /// 杞ㄨ抗鍐呭鑻辨枃 + /// + public string EnContent { get; set; } = null!; + + /// + /// 杞ㄨ抗鐘舵 + /// + public string Status { get; set; } = null!; + + /// + /// 鏄惁鎰忓懗鐫瀹屾垚 + /// + public bool IsCompleted { get; set; } + + /// + /// 鏄惁鍙垹 + /// + public bool IsCanDelete { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackDetails/MatchTrackContentsDto.cs b/src/SJZY.Track.Domain/Dtos/TrackDetails/MatchTrackContentsDto.cs new file mode 100644 index 00000000..14441bc6 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackDetails/MatchTrackContentsDto.cs @@ -0,0 +1,14 @@ +锘縩amespace SJZY.Track.Domain.Dtos.TrackDetails; + +public class MatchTrackContentsDto +{ + /// + /// 杞ㄨ抗浠ｇ爜 + /// + public string TrackCode { get; set; } = null!; + + /// + /// 鏄惁鏀寔鍒犻櫎 + /// + public bool IsCanDelete { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackDetails/TrackDetailsQueryInput.cs b/src/SJZY.Track.Domain/Dtos/TrackDetails/TrackDetailsQueryInput.cs new file mode 100644 index 00000000..3a7b4d0d --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackDetails/TrackDetailsQueryInput.cs @@ -0,0 +1,9 @@ +namespace SJZY.Track.Domain.Dtos.TrackDetails; + +public class TrackDetailsQueryInput : PageInfoInput +{ + /// + /// 鍗曞彿 + /// + public List OrderNos { get; set; } = new(); +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs b/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs new file mode 100644 index 00000000..adbf1a5d --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs @@ -0,0 +1,74 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SJZY.Track.Domain.Dtos.TrackFlags +{ + public class GetPageTrackFlagVO : PageInfoInput + { + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 閫変腑鐨勮建杩规爣璁癷d + /// + public List? SelectIds { get; set; } + + ///// + ///// 鍏抽敭瀛 + ///// + //public string Keywords { get; set; } + } + + public class GetTrackFlagListVO + { + /// + /// Id + /// + public int Id { get; set; } + + /// + /// 瀛愮郴缁 + /// + public string SubSystem { get; set; } + + /// + /// 浠ｇ爜 + /// + public string Code { get; set; } + + /// + /// 鏍囪 + /// + public string Flag { get; set; } + + ///// + ///// 鏄惁瀹岀粨 + ///// + //public bool IsFinish { get; set; } + + /// + /// 鍒涘缓鏃堕棿 + /// + public DateTime? CreateTime { get; set; } + + /// + /// 鍒涘缓浜 + /// + public string CreateUser { get; set; } + + /// + /// 淇敼鏃堕棿 + /// + public DateTime? UpdateTime { get; set; } + + /// + /// 淇敼浜 + /// + public string UpdateUser { get; set; } + } +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs b/src/SJZY.Track.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs new file mode 100644 index 00000000..d2984d4a --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs @@ -0,0 +1,41 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SJZY.Track.Domain.Dtos.TrackFlags +{ + public class GetTrackFlagDetailVO + { + /// + /// Id + /// + public int Id { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 瀛愮郴缁 + /// + public string SubSystem { get; set; } + + /// + /// 浠ｇ爜 + /// + public string Code { get; set; } + + /// + /// + /// + public string Flag { get; set; } + + ///// + ///// 鏄惁瀹岀粨 + ///// + //public bool IsFinish { get; set; } + } +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs new file mode 100644 index 00000000..c424e5a6 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs @@ -0,0 +1,81 @@ +锘縩amespace SJZY.Track.Domain.Dtos.TrackPull; + +public class GetTrackPullConfigDetailOutputVO +{ + public int Id { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗璁㈠崟鍙 + /// + public string OrderNoName { get; set; } + + /// + /// 杩斿弬瑙ｆ瀽瀵硅薄 + /// + public int ParseMethod { get; set; } + + /// + /// 瀹氭椂浠诲姟锛堝垎閽燂級 + /// + public int PullInterval { get; set; } + + /// + /// 鏈嶅姟鍟 + /// + public string ServiceProvider { get; set; } + + /// + /// 鏈嶅姟鍟唅d + /// + public int ServiceProviderId { get; set; } + + /// + /// 瀛愮郴缁 + /// + public string SubSystem { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鏃跺尯 + /// + public string TackTimeZoneName { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鍐呭浠ｇ爜 + /// + public string TrackContentCodeName { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鍐呭 + /// + public string TrackContentName { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鍙戠敓鍦 + /// + public string TrackPlaceName { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鐘舵 + /// + public string TrackStatusName { get; set; } + + /// + /// 杞ㄨ抗妯℃澘 + /// + public string TrackTemplate { get; set; } + + /// + /// 杞ㄨ抗妯℃澘id + /// + public int TrackTemplateId { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鍙戠敓鏃堕棿 + /// + public string TrackTimeName { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigPageOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigPageOutputVO.cs new file mode 100644 index 00000000..15d25401 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigPageOutputVO.cs @@ -0,0 +1,26 @@ +锘縩amespace SJZY.Track.Domain.Dtos.TrackPull; + +public class GetTrackPullConfigPageOutputVO +{ + /// + /// 鍒涘缓鏃堕棿 + /// + public DateTime? CreateTime { get; set; } + + public int Id { get; set; } + + /// + /// 鏈嶅姟鍟嗗悕绉 + /// + public string ServiceProvider { get; set; } + + /// + /// 瀛愮郴缁熷悕绉 + /// + public string SubSystem { get; set; } + + /// + /// 妯℃澘鍚嶇О + /// + public string TrackTemplate { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs new file mode 100644 index 00000000..f9bbdaba --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs @@ -0,0 +1,66 @@ +锘縩amespace SJZY.Track.Domain.Dtos.TrackPull; + +public class GetTrackPullContentDetailOutputVO +{ + /// + /// 杞ㄨ抗鍐呭浠ｇ爜 + /// + public string Code { get; set; } + + public int Id { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鍐呭浠ｇ爜 + /// + public string TrackContentCodeValue { get; set; } + + /// + /// 杞ㄨ抗鍐呭id + /// + public int TrackContentId { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鍐呭 + /// + public string TrackContentValue { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鍏抽敭瀛楋紙姝ｅ悜锛 + /// + public string TrackKeyword { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鍏抽敭瀛楋紙姝ｅ悜锛 + /// + public List? TrackKeywords { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鍏抽敭瀛楋紙鍙嶅悜锛 + /// + public string TrackKeywordReverse { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鍏抽敭瀛楋紙鍙嶅悜锛 + /// + public List? TrackKeywordReverses { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鍙戠敓鍦 + /// + public int? TrackPlaceValue { get; set; } + + /// + /// 杞ㄨ抗鎷夊彇閰嶇疆id + /// + public int TrackPullConfigId { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鐘舵 + /// + public string TrackStatusValue { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鏃跺尯 + /// + public double? TrackTimeZone { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageInputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageInputVO.cs new file mode 100644 index 00000000..ca31153a --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageInputVO.cs @@ -0,0 +1,9 @@ +锘縩amespace SJZY.Track.Domain.Dtos.TrackPull; + +public class GetTrackPullContentPageInputVO : PageInfoInput +{ + /// + /// 杞ㄨ抗鎷夊彇閰嶇疆id + /// + public int TrackPullConfigId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageOutputVO.cs new file mode 100644 index 00000000..a1c52026 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageOutputVO.cs @@ -0,0 +1,51 @@ +锘縩amespace SJZY.Track.Domain.Dtos.TrackPull; + +public class GetTrackPullContentPageOutputVO +{ + /// + /// 杞ㄨ抗鍐呭浠ｇ爜 + /// + public string Code { get; set; } + + /// + /// 杞ㄨ抗鍐呭 + /// + public string Content { get; set; } + + /// + /// 杞ㄨ抗鍐呭鑻辨枃 + /// + public string EnContent { get; set; } + + public int? Id { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鍐呭浠ｇ爜 + /// + public string? TrackContentCodeValue { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鍐呭 + /// + public string? TrackContentValue { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鍏抽敭瀛楋紙姝ｅ悜锛 + /// + public string? TrackKeyword { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鍏抽敭瀛楋紙鍙嶅悜锛 + /// + public string? TrackKeywordReverse { get; set; } + + /// + /// 杞ㄨ抗鍙戠敓鍦 + /// + public string? TrackPlaceValue { get; set; } + + /// + /// 鎷夊彇杞ㄨ抗鐘舵 + /// + public string? TrackStatusValue { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs new file mode 100644 index 00000000..ced23f75 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs @@ -0,0 +1,103 @@ +锘縰sing SJZY.Expand.ABP.Core.PublicMethords; + +namespace SJZY.Track.Domain.Dtos.TrackPush; + +public class GetTrackPushConfigDetailOutputVO +{ + /// + /// 瀹㈡埛id + /// + public int CustomId { get; set; } + + /// + /// 瀹㈡埛 + /// + public string CustomName { get; set; } + + /// + /// 鎺ㄩ佹墿灞曞瓧娈 + /// + public string ExpandFieldsName { get; set; } + + public int Id { get; set; } + + /// + /// 鏄惁鑷姩鎺ㄩ + /// + public bool IsAutoPush { get; set; } + + /// + /// 鎺ㄩ佽建杩硅鍗曞彿 + /// + public string OrderNoName { get; set; } + + /// + /// 鏈嶅姟鍟 + /// + public string ServiceProvider { get; set; } + + /// + /// 鏈嶅姟鍟唅d + /// + public int ServiceProviderId { get; set; } + + /// + /// 瀛愮郴缁 + /// + public string SubSystem { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 鎺ㄩ佽建杩规椂鍖 + /// + public string TackTimeZoneName { get; set; } + + /// + /// 鎺ㄩ佽建杩瑰唴瀹逛唬鐮 + /// + public string TrackContentCodeName { get; set; } + + /// + /// 鎺ㄩ佽建杩瑰唴瀹 + /// + public string TrackContentName { get; set; } + + /// + /// 鎺ㄩ佽建杩瑰唴瀹硅嫳鏂 + /// + public string TrackEnContentName { get; set; } + + /// + /// 鎺ㄩ佽建杩瑰彂鐢熷湴 + /// + public string TrackPlaceName { get; set; } + + /// + /// 鎺ㄩ佽建杩圭姸鎬 + /// + public string TrackStatusName { get; set; } + + /// + /// 杞ㄨ抗妯℃澘 + /// + public List TrackTemplate { get; set; } + + /// + /// 杞ㄨ抗妯℃澘id + /// + public string TrackTemplateId { get; set; } + + /// + /// 杞ㄨ抗妯℃澘ids + /// + public List TrackTemplateIds { get; set; } + + /// + /// 鎺ㄩ佽建杩瑰彂鐢熸椂闂 + /// + public string TrackTimeName { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigPageOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigPageOutputVO.cs new file mode 100644 index 00000000..e0095b23 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigPageOutputVO.cs @@ -0,0 +1,36 @@ +锘縩amespace SJZY.Track.Domain.Dtos.TrackPush; + +public class GetTrackPushConfigPageOutputVO +{ + /// + /// 鍒涘缓鏃堕棿 + /// + public DateTime? CreateTime { get; set; } + + /// + /// 瀹㈡埛鍚嶇О + /// + public string CustomName { get; set; } + + public int Id { get; set; } + + /// + /// 瀛愮郴缁熷悕绉 + /// + public string SubSystem { get; set; } + + /// + /// 妯℃澘鍚嶇О + /// + public string TrackTemplate { get; set; } + + /// + /// 杞ㄨ抗妯℃澘id + /// + public string TrackTemplateId { get; set; } + + /// + /// 杞ㄨ抗妯℃澘ids + /// + public List TrackTemplateIds { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs new file mode 100644 index 00000000..ace2b3df --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs @@ -0,0 +1,61 @@ +锘縩amespace SJZY.Track.Domain.Dtos.TrackPush; + +public class GetTrackPushContentDetailOutputVO +{ + /// + /// 杞ㄨ抗鍐呭浠ｇ爜 + /// + public string Code { get; set; } + + /// + /// 鎺ㄩ佹墿灞曞瓧娈 + /// + public string ExpandFieldsValue { get; set; } + + public int Id { get; set; } + + /// + /// 鎺ㄩ佸崟鍙风被鍨 + /// + public int OrderNoType { get; set; } + + /// + /// 鎺ㄩ佽建杩规帓搴 + /// + public int Sort { get; set; } + + /// + /// 鎺ㄩ佽建杩瑰唴瀹逛唬鐮 + /// + public string TrackContentCodeValue { get; set; } + + /// + /// 杞ㄨ抗鍐呭id + /// + public int TrackContentId { get; set; } + + /// + /// 鎺ㄩ佽建杩瑰唴瀹 + /// + public string TrackContentValue { get; set; } + + /// + /// 鎺ㄩ佽建杩瑰唴瀹硅嫳鏂 + /// + public string TrackEnContentValue { get; set; } + + /// + /// 杞ㄨ抗鎺ㄩ侀厤缃甶d + /// + public int TrackPushConfigId { get; set; } + + /// + /// 鎺ㄩ佽建杩圭姸鎬 + /// + public string TrackStatusValue { get; set; } + + /// + /// 鎺ㄩ佽建杩规椂鍖 + /// + public double? TrackTimeZone { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageInputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageInputVO.cs new file mode 100644 index 00000000..f0558e95 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageInputVO.cs @@ -0,0 +1,9 @@ +锘縩amespace SJZY.Track.Domain.Dtos.TrackPush; + +public class GetTrackPushContentPageInputVO : PageInfoInput +{ + /// + /// 杞ㄨ抗鎺ㄩ侀厤缃甶d + /// + public int TrackPushConfigId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs new file mode 100644 index 00000000..b3ae2d3f --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs @@ -0,0 +1,56 @@ +锘縩amespace SJZY.Track.Domain.Dtos.TrackPush; + +public class GetTrackPushContentPageOutputVO +{ + /// + /// 杞ㄨ抗鍐呭浠ｇ爜 + /// + public string Code { get; set; } + + /// + /// 杞ㄨ抗鍐呭 + /// + public string Content { get; set; } + + /// + /// 杞ㄨ抗鍐呭鑻辨枃 + /// + public string EnContent { get; set; } + + /// + /// 鎺ㄩ佹墿灞曞瓧娈 + /// + public string ExpandFieldsValue { get; set; } + + public int Id { get; set; } + + /// + /// 鎺ㄩ佸崟鍙风被鍨 + /// + public string OrderNoType { get; set; } + + /// + /// 鎺ㄩ佹帓搴 + /// + public int Sort { get; set; } + + /// + /// 鎺ㄩ佽建杩瑰唴瀹逛唬鐮 + /// + public string TrackContentCodeValue { get; set; } + + /// + /// 鎺ㄩ佽建杩瑰唴瀹 + /// + public string TrackContentValue { get; set; } + + /// + /// 鎺ㄩ佽建杩瑰唴瀹硅嫳鏂 + /// + public string TrackEnContentValue { get; set; } + + /// + /// 鎺ㄩ佽建杩圭姸鎬 + /// + public string TrackStatusValue { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs new file mode 100644 index 00000000..f19fb8c5 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs @@ -0,0 +1,19 @@ +锘縩amespace SJZY.Track.Domain.Dtos.TrackStatus; + +public class GetPageTrackStatusVO : PageInfoInput +{ + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 鍏抽敭瀛 + /// + public string? Keywords { get; set; } + + /// + /// 閫変腑鐨勮建杩圭姸鎬乮d + /// + public List? SelectIds { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs new file mode 100644 index 00000000..66de23a9 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs @@ -0,0 +1,39 @@ +锘縩amespace SJZY.Track.Domain.Dtos.TrackStatus; + +public class GetTrackStatusDetailVO +{ + /// + /// Id + /// + public int Id { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 瀛愮郴缁 + /// + public string SubSystem { get; set; } + + /// + /// 鑺傜偣id + /// + public int NodeId { get; set; } + + /// + /// 鎵灞炶建杩圭姸鎬 + /// + public string TrackStatus { get; set; } + + /// + /// 杞ㄨ抗鐘舵佷唬鐮 + /// + public string Code { get; set; } + + /// + /// 杞ㄨ抗鍐呭鑻辨枃 + /// + public string EntrackStatus { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs new file mode 100644 index 00000000..ff570fc0 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs @@ -0,0 +1,67 @@ +锘縰sing SJZY.Expand.ABP.Core.PublicMethords; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SJZY.Track.Domain.Dtos.TrackStatus +{ + public class GetTrackStatusListVO + { + /// + /// Id + /// + public int Id { get; set; } + + /// + /// 瀛愮郴缁 + /// + public string SubSystem { get; set; } + + /// + /// 鑺傜偣id + /// + public int NodeId { get; set; } + + /// + /// 鎵灞炶妭鐐 + /// + public string Node { get; set; } + + /// + /// 鎵灞炶建杩圭姸鎬 + /// + public string TrackStatus { get; set; } + + /// + /// 杞ㄨ抗鐘舵佷唬鐮 + /// + public string Code { get; set; } + + /// + /// 杞ㄨ抗鍐呭鑻辨枃 + /// + public string EntrackStatus { get; set; } + + /// + /// 鍒涘缓浜 + /// + public string CreateUser { get; set; } + + /// + /// 鍒涘缓鏃堕棿 + /// + public DateTime? CreateTime { get; set; } + + /// + /// 淇敼浜 + /// + public string UpdateUser { get; set; } + + /// + /// 淇敼鏃堕棿 + /// + public DateTime? UpdateTime { get; set; } + } +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateVO.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateVO.cs new file mode 100644 index 00000000..35c4fe8a --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateVO.cs @@ -0,0 +1,18 @@ +锘縩amespace SJZY.Track.Domain.Dtos.TrackTemplate; + +public class GetPageTrackTemplateVO : PageInfoInput +{ + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 鍏抽敭瀛 + /// + public string? Keywords { get; set; } + + /// 閫変腑鐨勮建杩规ā鐗坕d + /// + public List? SelectIds { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTemplateContentAttributeValueInputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTemplateContentAttributeValueInputVO.cs new file mode 100644 index 00000000..d8b295a9 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTemplateContentAttributeValueInputVO.cs @@ -0,0 +1,64 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SJZY.Track.Domain.Dtos.TrackTemplate +{ + public class GetTemplateContentAttributeValueInputVO + { + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 杞ㄨ抗浠ｇ爜 + /// + public List? TrackCodes { get; set; } + + /// + /// 杞ㄨ抗妯℃澘Id + /// + public List? TrackTemplateIds { get; set; } + + ///// + ///// 璁㈠崟id + ///// + //public int OrderId { get; set; } + } + + public class GetTemplateContentAttributeValueVO + { + /// + /// 杞ㄨ抗鍐呭id + /// + public int TrackContenId { get; set; } + + /// + /// 妯＄増id + /// + public int TrackTemplateId { get; set; } + + /// + /// 杞ㄨ抗鍐呭浠ｇ爜 + /// + public string TrackCode { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 鏄惁鍙垹 + /// + public bool IsCanDelete { get; set; } + + /// + /// 鏄惁瀵瑰 + /// + public bool IsExternal { get; set; } + } +} diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentDetailOutputVO.cs new file mode 100644 index 00000000..c4474ba2 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentDetailOutputVO.cs @@ -0,0 +1,46 @@ +锘縩amespace SJZY.Track.Domain.Dtos.TrackTemplate; + +public class GetTrackTemplateContentDetailOutputVO +{ + public int Id { get; set; } + + /// + /// 鏄惁鍙垹 + /// + public bool IsCanDelete { get; set; } + + /// + /// 鏄惁瀵瑰 + /// + public bool IsExternal { get; set; } + + /// + /// 鎺掑簭 + /// + public int Sort { get; set; } + + /// + /// 杞ㄨ抗鍐呭 + /// + public string TrackContent { get; set; } + + /// + /// 杞ㄨ抗鍐呭id + /// + public int TrackContentId { get; set; } + + /// + /// 杞ㄨ抗鐘舵 + /// + public string TrackStatus { get; set; } + + /// + /// 杞ㄨ抗鐘舵乮d + /// + public int TrackStatusId { get; set; } + + /// + /// 杞ㄨ抗妯℃澘id + /// + public int TrackTemplateId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentDropDownListVO.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentDropDownListVO.cs new file mode 100644 index 00000000..ab4a6f8c --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentDropDownListVO.cs @@ -0,0 +1,14 @@ +锘縩amespace SJZY.Track.Domain.Dtos.TrackTemplate; + +public class GetTrackTemplateContentDropDownListVO : PageInfoInput +{ + /// + /// 杞ㄨ抗妯℃澘id + /// + public List TrackTemplateIds { get; set; } + + /// + /// 閫変腑椤 + /// + public List? SelectedIds { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageInputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageInputVO.cs new file mode 100644 index 00000000..09e8f51f --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageInputVO.cs @@ -0,0 +1,9 @@ +锘縩amespace SJZY.Track.Domain.Dtos.TrackTemplate; + +public class GetTrackTemplateContentPageInputVO : PageInfoInput +{ + /// + /// 杞ㄨ抗妯℃澘id + /// + public List TrackTemplateIds { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs new file mode 100644 index 00000000..b6d43291 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs @@ -0,0 +1,76 @@ +锘縩amespace SJZY.Track.Domain.Dtos.TrackTemplate; + +public class GetTrackTemplateContentPageOutputVO +{ + /// + /// 杞ㄨ抗鍐呭浠ｇ爜 + /// + public string Code { get; set; } + + /// + /// 杞ㄨ抗鍐呭 + /// + public string Content { get; set; } + + /// + /// 鍒涘缓鏃堕棿 + /// + public DateTime? CreateTime { get; set; } + + /// + /// 鍒涘缓浜 + /// + public string CreateUser { get; set; } + + /// + /// 杞ㄨ抗鍐呭鑻辨枃 + /// + public string EnContent { get; set; } + + public int Id { get; set; } + + /// + /// 鏄惁鍙垹 + /// + public bool IsCanDelete { get; set; } + + /// + /// 鏄惁瀵瑰 + /// + public bool IsExternal { get; set; } + + /// + /// 鎵灞炶妭鐐 + /// + public string Node { get; set; } + + /// + /// 鎺掑簭 + /// + public int Sort { get; set; } + + /// + /// 杞ㄨ抗鏍囪 + /// + public string TrackFlag { get; set; } + + /// + /// 鎵灞炵姸鎬 + /// + public string TrackStatus { get; set; } + + /// + /// 淇敼鏃堕棿 + /// + public DateTime? UpdateTime { get; set; } + + /// + /// 淇敼浜 + /// + public string UpdateUser { get; set; } + + /// + /// 杞ㄨ抗鍐呭id + /// + public int TrackContentId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs new file mode 100644 index 00000000..46677e0e --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs @@ -0,0 +1,68 @@ +锘縩amespace SJZY.Track.Domain.Dtos.TrackTemplate; + +/// +/// 鑾峰彇杞ㄨ抗妯＄増鏄庣粏 +/// +public class GetTrackTemplateDetailVO +{ + /// + /// Id + /// + public int Id { get; set; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { get; set; } + + /// + /// 瀛愮郴缁 + /// + public string SubSystem { get; set; } + + /// + /// 妯＄増鍚嶇О + /// + public string Name { get; set; } + + /// + /// 妯＄増浠ｇ爜 + /// + public string Code { get; set; } +} + +/// +/// 鑾峰彇杞ㄨ抗妯＄増鍒楄〃 +/// +public class GetTrackTemplateListVO +{ + /// + /// 杞ㄨ抗妯＄増id + /// + public int Id { get; set; } + + /// + /// 妯℃澘鍚嶇О + /// + public string Name { set; get; } + + /// + /// 妯＄増浠ｇ爜 + /// + public string Code { get; set; } + + /// + /// 鎵灞炲瓙绯荤粺 + /// + public string SubSystem { set; get; } + + /// + /// 瀛愮郴缁焛d + /// + public int SubSystemId { set; get; } + + /// + /// 鍒涘缓鏃堕棿 + /// + public DateTime? CreateTime { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/OrderedTrackCodeDto.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/OrderedTrackCodeDto.cs new file mode 100644 index 00000000..cb31744d --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/OrderedTrackCodeDto.cs @@ -0,0 +1,19 @@ +namespace SJZY.Track.Domain.Dtos.TrackTemplate; + +public class OrderedTrackCodeDto +{ + /// + /// 妯℃澘id + /// + public int TemplateId { get; set; } + + /// + /// 杞ㄨ抗鍐呭浠ｇ爜 + /// + public string Code { get; set; } = null!; + + /// + /// 鏄惁瀵瑰 + /// + public bool IsExternal { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Enums/EnumPropertyEnums.cs b/src/SJZY.Track.Domain/Enums/EnumPropertyEnums.cs new file mode 100644 index 00000000..a0b74b22 --- /dev/null +++ b/src/SJZY.Track.Domain/Enums/EnumPropertyEnums.cs @@ -0,0 +1,19 @@ +锘縰sing System.ComponentModel; + +namespace SJZY.Track.Domain.Enums; + +/// +/// 鏋氫妇灞炴 +/// +public enum EnumPropertyEnums +{ + /// + /// 鑺傜偣 + /// + [Description("ServiceNode")] 鑺傜偣, + + /// + /// 鍗曞彿绫诲瀷 + /// + [Description("TrackOrderType")] 鍗曞彿绫诲瀷 +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/GlobalConst.cs b/src/SJZY.Track.Domain/GlobalConst.cs new file mode 100644 index 00000000..92545ea9 --- /dev/null +++ b/src/SJZY.Track.Domain/GlobalConst.cs @@ -0,0 +1,34 @@ +锘縩amespace SJZY.Track.Domain; + +public class GlobalConst +{ + /// + /// 杞ㄨ抗鏄庣粏 es绱㈠紩鍚嶇О + /// + public const string TrackIndex = "sjzy_track_details"; + + /// + /// 杞ㄨ抗鏂板/鏇存柊 mq璁㈤槄鍚嶇О + /// + public const string TrackUpsertSubscribe = "SJZY.Track.TrackUpsert"; + + /// + /// 杞ㄨ抗鍒犻櫎 mq璁㈤槄鍚嶇О + /// + public const string TrackDeleteSubscribe = "SJZY.Track.TrackDelete"; + + /// + /// 鎺ュ彛閫氭壒閲忚建杩瑰埛鏂拌闃 + /// + public const string InterfaceRelayTrackRefreshSubscribe = "SJZY.Track.TrackRefresh"; + + /// + /// 杞ㄨ抗鏂板/鏇存柊鍚庤Е鍙戞洿鏂拌鍗曡建杩 mq璁㈤槄鍚嶇О + /// + public const string UpdateOrderTrackSubscribe = "SJZY.Track.UpdateOrderTrack"; + + /// + /// 杞ㄨ抗瑕佹帹閫佺殑瀹㈡埛redis key鍓嶇紑 + /// + public const string TrackPushKeyPrefix = "TrackPush:"; +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/GlobalUsings.cs b/src/SJZY.Track.Domain/GlobalUsings.cs new file mode 100644 index 00000000..deaf0047 --- /dev/null +++ b/src/SJZY.Track.Domain/GlobalUsings.cs @@ -0,0 +1,10 @@ +// Global using directives + +global using SJZY.Expand.ABP.Core.Common.Dto; +global using SJZY.Expand.ABP.Core.SqlSugar.Entitys; +global using SqlSugar; +global using System; +global using System.Collections.Generic; +global using System.Linq.Expressions; +global using System.Threading.Tasks; +global using SJZY.Track.Domain.SeedWork; \ No newline at end of file diff --git a/src/SJZY.Track.Domain/IBasicRepository.cs b/src/SJZY.Track.Domain/IBasicRepository.cs new file mode 100644 index 00000000..3824c2eb --- /dev/null +++ b/src/SJZY.Track.Domain/IBasicRepository.cs @@ -0,0 +1,67 @@ +锘縰sing SJZY.Track.Domain.Queries; + +namespace SJZY.Track.Domain; + +public interface IBasicRepository : IBasicQuery where T : IAggregateRoot +{ + /// + /// update + /// + /// + /// 瑕佸拷鐣ユ洿鏂扮殑鍒 + /// + Task UpdateAsync(T entity, Expression>? ignoreColumns); + + /// + /// update + /// + /// + /// 瑕佹洿鏂扮殑鍒 + /// + Task UpdateColumnAsync(T entity, Expression>? updateColumns); + + /// + /// update + /// + /// + /// 涓嶆洿鏂皀ull鍊煎垪 + /// 涓嶆洿鏂伴粯璁ゅ煎垪 + /// + Task UpdateAsync(T entity, bool ignoreAllNullColumns = false, bool ignoreAllDefaultValue = false); + + /// + /// 鎵归噺鏇存柊 + /// + /// + /// 瑕佹洿鏂扮殑鍒 + /// + Task UpdateRangeAsync(List entities, Expression>? updateColumns = null); + + /// + /// 杞垹 + /// + /// + /// + Task SoftDeleteAsync(Expression> where); + + /// + /// insert + /// + /// + /// + Task InsertAsync(T insertObj); + + /// + /// 鏂板杩斿洖id + /// + /// + /// + Task InsertReturnIdentityAsync(T insertObj); + + /// + /// 鎵归噺insert + /// + /// + /// + Task InsertRangeAsync(List entities); +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Queries/IBasicQuery.cs b/src/SJZY.Track.Domain/Queries/IBasicQuery.cs new file mode 100644 index 00000000..894e72a9 --- /dev/null +++ b/src/SJZY.Track.Domain/Queries/IBasicQuery.cs @@ -0,0 +1,38 @@ +namespace SJZY.Track.Domain.Queries; + +public interface IBasicQuery where T : IEntity +{ + /// + /// top 1 + /// + /// + /// + Task GetFirstAsync(Expression> whereExpression); + + Task GetFirstAsync(Expression> whereExpression, + Expression> resultExpression); + + /// + /// get list + /// + /// + /// + Task> GetListAsync(Expression> whereExpression); + + Task> GetListAsync(Expression> whereExpression, + Expression> resultExpression); + + /// + /// count + /// + /// + /// + Task CountAsync(Expression> exp); + + /// + /// exists + /// + /// + /// + Task IsAnyAsync(Expression> exp); +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Queries/IProvideQueries.cs b/src/SJZY.Track.Domain/Queries/IProvideQueries.cs new file mode 100644 index 00000000..9c17d1d4 --- /dev/null +++ b/src/SJZY.Track.Domain/Queries/IProvideQueries.cs @@ -0,0 +1,59 @@ +using SJZY.Track.Domain.Aggregates.TrackPullAggregate; +using SJZY.Track.Domain.Dtos.Order; +using SJZY.Track.Domain.Dtos.TrackDetails; +using SJZY.Track.Domain.Dtos.TrackTemplate; + +namespace SJZY.Track.Domain.Queries; + +/// +/// 鎻愪緵鎺ュ彛涓撶敤鏌ヨ +/// +public interface IProvideQueries +{ + /// + /// 鏍规嵁璁㈠崟鍙凤紝鑾峰彇璁㈠崟妯℃澘 + /// + /// 璁㈠崟绫诲瀷 + /// 璁㈠崟鍙 + /// + Task> GetOrderTemplateLinksAsync(int orderType, List orderNumbers); + + /// + /// 鏍规嵁璁㈠崟妯℃澘锛岃幏鍙栨湁搴忕殑杞ㄨ抗code + /// + /// 妯℃澘id + /// + Task> GetOrderedTrackCodesAsync(List templateIds); + + /// + /// 鏍规嵁璁㈠崟id鎵惧埌璁㈠崟妯℃澘锛屽尮閰嶆ā鏉垮懡涓殑杞ㄨ抗鍐呭 + /// + /// 璁㈠崟id + /// 杞ㄨ抗浠ｇ爜 + /// + Task MatchTrackContentAsync(int orderId, string code); + + /// + /// 鑾峰彇鍙垹闄ょ殑璁㈠崟杞ㄨ抗浠ｇ爜 + /// + /// + /// + /// + Task> GetCanDeleteTrackCodesAsync(int orderId, List trackCodes); + + /// + /// 鏍规嵁瀛愮郴缁熷唴瀹规槧灏勶紝寰楀埌鏄犲皠鍚庣殑杞ㄨ抗code + /// + /// + /// + /// + /// + Task> MapTrackCodesAsync(int upSubSystemId, int subSystemId, params string[] trackCodes); + + /// + /// 鑾峰彇鏈嶅姟鍟嗘ā鏉块厤缃 + /// + /// + /// + Task> GetPullContentConfigsAsync(int serviceProviderId); +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/SJZY.Track.Domain.csproj b/src/SJZY.Track.Domain/SJZY.Track.Domain.csproj new file mode 100644 index 00000000..b1f4dc63 --- /dev/null +++ b/src/SJZY.Track.Domain/SJZY.Track.Domain.csproj @@ -0,0 +1,14 @@ +锘 + + + + + net7.0 + + + + + + + + diff --git a/src/SJZY.Track.Domain/SJZYTrackDomainModule.cs b/src/SJZY.Track.Domain/SJZYTrackDomainModule.cs new file mode 100644 index 00000000..792e7844 --- /dev/null +++ b/src/SJZY.Track.Domain/SJZYTrackDomainModule.cs @@ -0,0 +1,7 @@ +锘縰sing Volo.Abp.Modularity; + +namespace SJZY.Track.Domain; + +public class SjzyTrackDomainModule : AbpModule +{ +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/SeedWork/IAggregateRoot.cs b/src/SJZY.Track.Domain/SeedWork/IAggregateRoot.cs new file mode 100644 index 00000000..613c8055 --- /dev/null +++ b/src/SJZY.Track.Domain/SeedWork/IAggregateRoot.cs @@ -0,0 +1,5 @@ +锘縩amespace SJZY.Track.Domain.SeedWork; + +public interface IAggregateRoot : IEntity +{ +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/SeedWork/IEntity.cs b/src/SJZY.Track.Domain/SeedWork/IEntity.cs new file mode 100644 index 00000000..06cf92fc --- /dev/null +++ b/src/SJZY.Track.Domain/SeedWork/IEntity.cs @@ -0,0 +1,5 @@ +锘縩amespace SJZY.Track.Domain.SeedWork; + +public interface IEntity +{ +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/TransactionHelper.cs b/src/SJZY.Track.Domain/TransactionHelper.cs new file mode 100644 index 00000000..fa8baac4 --- /dev/null +++ b/src/SJZY.Track.Domain/TransactionHelper.cs @@ -0,0 +1,17 @@ +锘縰sing System.Transactions; + +namespace SJZY.Track.Domain; + +public class TransactionHelper +{ + /// + /// 鑾峰彇璇诲凡鎻愪氦绾у埆鐨勪簨鍔★紝璁板緱瑕侀噴鏀 + /// + /// + public static TransactionScope GetReadCommitted() + { + return new TransactionScope(TransactionScopeOption.Required, + new TransactionOptions { IsolationLevel = IsolationLevel.ReadCommitted }, + TransactionScopeAsyncFlowOption.Enabled); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/VEntities/VEnumValueInfo.cs b/src/SJZY.Track.Domain/VEntities/VEnumValueInfo.cs new file mode 100644 index 00000000..cfefa5c6 --- /dev/null +++ b/src/SJZY.Track.Domain/VEntities/VEnumValueInfo.cs @@ -0,0 +1,50 @@ +锘縩amespace SJZY.Track.Domain.VEntities; + +/// +/// 涓绘暟鎹灇涓 +/// +[SugarTable("v_enum_value_info")] +public class VEnumValueInfoEntity : IFullAuditedBasicEntitys +{ + /// + /// + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// '灞炴 寮鍙戜汉鍛樿瀹氾紝绂佹鐢ㄦ埛淇敼' + /// + [SugarColumn(ColumnName = "Property")] + public string Property { get; set; } + + /// + /// '鍏抽敭瀛楋紱澶栭儴浣跨敤锛氱郴缁熻嚜鍔ㄧ敓鎴 鍚屼竴涓狿roperty鐨凟numkey 鑷姩鎺掑簭閫掑 鍐呴儴浣跨敤锛氬紑鍙戜汉鍛樿瀹' + /// + [SugarColumn(ColumnName = "Enumkey")] + public int Enumkey { get; set; } + + /// + /// 鎻忚堪 + /// + [SugarColumn(ColumnName = "Disp")] + public string Disp { get; set; } + + /// + /// 鎻忚堪鑻辨枃鍚 + /// + [SugarColumn(ColumnName = "EnDisp")] + public string EnDisp { get; set; } + + /// + /// 鏄惁鍐呴儴浣跨敤, 1鏄 0涓嶆槸,澶栭儴浣跨敤,鏃犻渶璁剧疆姝ゅ. + /// + [SugarColumn(ColumnName = "IsInside")] + public int IsInside { get; set; } + + /// + /// 澶囨敞 + /// + [SugarColumn(ColumnName = "Remark")] + public string Remark { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/VEntities/VExternalSubjectEntity.cs b/src/SJZY.Track.Domain/VEntities/VExternalSubjectEntity.cs new file mode 100644 index 00000000..51bea216 --- /dev/null +++ b/src/SJZY.Track.Domain/VEntities/VExternalSubjectEntity.cs @@ -0,0 +1,128 @@ +锘縩amespace SJZY.Track.Repository.VData.Entitys; + +/// +/// 澶栭儴涓讳綋 +/// +[SugarTable("v_external_subject")] +public class VExternalSubjectEntity : IFullAuditedBasicEntitys +{ + /// + /// + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 鍏徃绠绉 + /// + [SugarColumn(ColumnName = "Abbreviation")] + public string Abbreviation { get; set; } + + /// + /// 鎵灞炵綉缁(涓绘暟鎹灇涓捐〃 (灞炴=AffiliatedNetwork)WCA,WEB,Atlas,CCA,CTN,CLN,GLN,PCN,SCN,WPA,EGLN,Other) + /// + [SugarColumn(ColumnName = "AffiliatedNetwork")] + public int? AffiliatedNetwork { get; set; } + + /// + /// 鍏徃浠ｇ爜 + /// + [SugarColumn(ColumnName = "Code")] + public string Code { get; set; } + + /// + /// (涓绘暟鎹灇涓捐〃 (灞炴=CustomerQuality)鍥藉唴鍚岃锛屽浗澶栧悓琛岋紝鍥藉唴鐩村锛屽浗澶栫洿瀹紝娴峰浠ｇ悊锛屽浗鍐呰锤鏄撳叕鍙革紝鍥藉璐告槗鍏徃锛屼粎渚涘簲鍟嗭紝鍐呴儴瀛愬叕鍙革紝涓汉锛屽唴閮ㄥ瓙閮ㄩ棬) + /// + [SugarColumn(ColumnName = "CooperationNature")] + public int? CooperationNature { get; set; } + + /// + /// 鍏徃鑻辨枃鍚 + /// + [SugarColumn(ColumnName = "EnName")] + public string EnName { get; set; } + + /// + /// 鏄惁鏍稿噯 + /// + [SugarColumn(ColumnName = "IsApprove")] + public bool IsApprove { get; set; } + + /// + /// 鏄惁榛戝悕鍗 + /// + [SugarColumn(ColumnName = "IsBlacklist")] + public bool IsBlacklist { get; set; } + + /// + /// 鏄惁璁㈤娓 + /// + [SugarColumn(ColumnName = "IsBookingHongKong")] + public bool? IsBookingHongKong { get; set; } + + /// + /// 鏄惁娴峰浠ｇ悊 + /// + [SugarColumn(ColumnName = "IsOverseasAgent")] + public bool IsOverseasAgent { get; set; } + + /// + /// 鏄惁鑷缁撶畻 + /// + [SugarColumn(ColumnName = "IsSelfSettlement")] + public bool IsSelfSettlement { get; set; } + + /// + /// 鏄惁缁撶畻涓讳綋 + /// + [SugarColumn(ColumnName = "IsSettlementSubject")] + public bool IsSettlementSubject { get; set; } + + /// + /// 涓荤綉缁滐紝浠庡閫夌殑鎵灞炵綉缁滀腑閫夊叾涓竴涓 + /// + [SugarColumn(ColumnName = "MainNetwork")] + public int? MainNetwork { get; set; } + + /// + /// 鍏徃鍚嶇О + /// + [SugarColumn(ColumnName = "Name")] + public string Name { get; set; } + + /// + /// 鎬ц川锛宼_enum_value_info琛≒roperty="CompanyQuality锛1 鍥芥湁浼佷笟锛2 鍥芥湁鎺ц偂浼佷笟锛3 澶栬祫浼佷笟锛4 鍚堣祫浼佷笟锛5 鑲′唤浼佷笟锛6 绉佽惀浼佷笟锛7 涓綋鎴 + /// + [SugarColumn(ColumnName = "Nature")] + public int? Nature { get; set; } + + /// + /// 鍐呴儴缁勭粐id + /// + [SugarColumn(ColumnName = "OrgId")] + public int? OrgId { get; set; } + + /// + /// 姣嶅叕鍙竔d + /// + [SugarColumn(ColumnName = "ParentId")] + public int? ParentId { get; set; } + + /// + /// 澶囨敞 + /// + [SugarColumn(ColumnName = "Remark")] + public string Remark { get; set; } + + /// + /// 绫诲瀷锛屼綅杩愮畻瀛樺偍锛泃_enum_value_info琛≒roperty="SubjectType锛1瀹㈡埛锛2渚涘簲鍟嗭紝4鍐呴儴瀛愬叕鍙 + /// + [SugarColumn(ColumnName = "Type")] + public int Type { get; set; } + + /// + /// 宸查獙璇佸叕鍙稿悕绉 + /// + [SugarColumn(ColumnName = "VerifiedName")] + public string VerifiedName { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/VEntities/VServiceProviderEntity.cs b/src/SJZY.Track.Domain/VEntities/VServiceProviderEntity.cs new file mode 100644 index 00000000..737fbb0f --- /dev/null +++ b/src/SJZY.Track.Domain/VEntities/VServiceProviderEntity.cs @@ -0,0 +1,74 @@ +锘縩amespace SJZY.Track.Domain.VEntities; + +/// +/// 鏈嶅姟鍟嗕富琛 +/// +[SugarTable("v_service_provider")] +public class VServiceProviderEntity : IFullAuditedBasicEntitys +{ + /// + /// 鑷涓婚敭 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 鎺堟潈鎺ュ彛Code + /// + [SugarColumn(ColumnName = "AuthInterfaceCode")] + public string AuthInterfaceCode { get; set; } + + /// + /// 鏈嶅姟鍟嗕唬鐮 + /// + [SugarColumn(ColumnName = "Code")] + public string Code { get; set; } + + /// + /// 鎻忚堪 + /// + [SugarColumn(ColumnName = "Description")] + public string Description { get; set; } + + /// + /// 娴佺▼浠ｇ爜 + /// + [SugarColumn(ColumnName = "FlowCode")] + public string FlowCode { get; set; } + + /// + /// 鏄惁绂佺敤璐︽埛楠岃瘉 + /// + [SugarColumn(ColumnName = "IsDisableAuth")] + public bool IsDisableAuth { get; set; } + + /// + /// 鏈嶅姟鍟嗗悕绉 + /// + [SugarColumn(ColumnName = "Name")] + public string Name { get; set; } + + /// + /// 璇锋眰瓒呮椂锛坰锛 + /// + [SugarColumn(ColumnName = "Timeout")] + public int? Timeout { get; set; } + + /// + /// 杞ㄨ抗鏃跺尯 + /// + [SugarColumn(ColumnName = "TraceTimeZone")] + public string TraceTimeZone { get; set; } + + /// + /// 鏈嶅姟鍟嗙被鍨嬶紙寮冪敤锛 + /// + [SugarColumn(ColumnName = "Type")] + public int Type { get; set; } + + /// + /// 鏈嶅姟鍟嗙被鍨嬶紙澶氶夛級 + /// + [SugarColumn(ColumnName = "Types")] + public string Types { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/VEntities/VSystemEntity.cs b/src/SJZY.Track.Domain/VEntities/VSystemEntity.cs new file mode 100644 index 00000000..eb0030be --- /dev/null +++ b/src/SJZY.Track.Domain/VEntities/VSystemEntity.cs @@ -0,0 +1,152 @@ +锘縩amespace SJZY.Track.Domain.VEntities; + +/// +/// +/// +[SugarTable("v_system")] +public class VSystemEntity : IFullAuditedBasicEntitys +{ + /// + /// 瀛愮郴缁焛d + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 鍏宠仈鐨勫唴閮ㄥ瓙绯荤粺 + /// + [SugarColumn(ColumnName = "AssociatedInternalSubsystem")] + public int? AssociatedInternalSubsystem { get; set; } + + /// + /// 瀛愮郴缁熸巿鏉冪被鍨嬶紙1.鏍囧噯 2.鍥犵礌锛 + /// + [SugarColumn(ColumnName = "AuthType")] + public bool AuthType { get; set; } + + /// + /// 涓枃鍚 + /// + [SugarColumn(ColumnName = "CnName")] + public string CnName { get; set; } + + /// + /// 澶囨敞 + /// + [SugarColumn(ColumnName = "Comment")] + public string Comment { get; set; } + + /// + /// 瀹夎鍖呬笅杞介摼鎺ワ紝褰撶被鍨嬩负瀹夎鍖呮椂锛屽繀濉 + /// + [SugarColumn(ColumnName = "DownloadUrl")] + public string DownloadUrl { get; set; } + + /// + /// 鑻辨枃鍚 + /// + [SugarColumn(ColumnName = "EnName")] + public string EnName { get; set; } + + /// + /// 椋炰功搴旂敤ID + /// + [SugarColumn(ColumnName = "FsAppId")] + public string FsAppId { get; set; } + + /// + /// 娆犺垂鍏佽涓嬪崟(榛樿涓烘槸) + /// + [SugarColumn(ColumnName = "IsAllowPlaceOrder")] + public bool? IsAllowPlaceOrder { get; set; } + + /// + /// 鏄惁寮閫氭巿淇 + /// + [SugarColumn(ColumnName = "IsCredit")] + public bool? IsCredit { get; set; } + + /// + /// 鏄惁鍚敤 + /// + [SugarColumn(ColumnName = "IsEnable")] + public bool IsEnable { get; set; } + + /// + /// 鏄惁鍚敤涓氬姟涓讳綋(鍒ゆ柇鐧诲綍鏄惁閫夋嫨涓氬姟涓讳綋锛 + /// + [SugarColumn(ColumnName = "IsEnableBusiness")] + public bool? IsEnableBusiness { get; set; } + + /// + /// 鏄惁缁撴潫鍒濆鍖 + /// + [SugarColumn(ColumnName = "IsEndInit")] + public bool IsEndInit { get; set; } + + /// + /// 鏄惁寮閫氫綑棰 + /// + [SugarColumn(ColumnName = "IsOpenBalance")] + public bool IsOpenBalance { get; set; } + + /// + /// 瀛愮郴缁熷敮涓鍊 + /// + [SugarColumn(ColumnName = "Key")] + public string Key { get; set; } + + /// + /// 瀛愮郴缁烲ogo鍥炬爣 + /// + [SugarColumn(ColumnName = "LogoIcon")] + public string LogoIcon { get; set; } + + /// + /// 涓昏处鍙稩d + /// + [SugarColumn(ColumnName = "MainUserId")] + public int? MainUserId { get; set; } + + /// + /// 绉诲姩绔摼鎺 + /// + [SugarColumn(ColumnName = "MobileUrl")] + public string MobileUrl { get; set; } + + /// + /// 杩愯惀涓讳綋 + /// + [SugarColumn(ColumnName = "OperatingSubject")] + public int? OperatingSubject { get; set; } + + /// + /// 鎺掑簭鍊 + /// + [SugarColumn(ColumnName = "Sort")] + public int? Sort { get; set; } + + /// + /// 璺ㄥ鐢靛晢鐗╂祦1 骞茬嚎鐗╂祦2 鍥藉唴浠ｇ悊璐告槗3 闈炰笟鍔＄被4 + /// + [SugarColumn(ColumnName = "SysBusinessType")] + public int? SysBusinessType { get; set; } + + /// + /// 绯荤粺鎵灞1:鍐呴儴 2:澶栭儴 + /// + [SugarColumn(ColumnName = "SystemProperty")] + public int SystemProperty { get; set; } + + /// + /// 瀛愮郴缁熺被鍨嬶細1-Web銆2-瀹夎鍖卐xe + /// + [SugarColumn(ColumnName = "SystemType")] + public int? SystemType { get; set; } + + /// + /// 瀛愮郴缁焧oken + /// + [SugarColumn(ColumnName = "Token")] + public string Token { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/VEntities/VUserEntity.cs b/src/SJZY.Track.Domain/VEntities/VUserEntity.cs new file mode 100644 index 00000000..71a52664 --- /dev/null +++ b/src/SJZY.Track.Domain/VEntities/VUserEntity.cs @@ -0,0 +1,104 @@ +锘縩amespace SJZY.Track.Domain.VEntities; + +/// +/// 鐢ㄦ埛淇℃伅琛 +/// +[SugarTable("v_user")] +public class VUserEntity : IFullAuditedBasicEntitys +{ + /// + /// 鐢ㄦ埛id + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 璐﹀彿 + /// + [SugarColumn(ColumnName = "Account")] + public string Account { get; set; } + + /// + /// 鍏徃Id + /// + [SugarColumn(ColumnName = "CompanyId")] + public int? CompanyId { get; set; } + + /// + /// 鍥介檯鍖哄彿 + /// + [SugarColumn(ColumnName = "CountryCode")] + public string CountryCode { get; set; } + + /// + /// 榛樿璇█鏋氫妇 + /// + [SugarColumn(ColumnName = "DefaultLang")] + public bool? DefaultLang { get; set; } + + /// + /// 閮ㄩ棬Id + /// + [SugarColumn(ColumnName = "DeptId")] + public int? DeptId { get; set; } + + /// + /// 鍛樺伐id + /// + [SugarColumn(ColumnName = "EmployeeId")] + public int? EmployeeId { get; set; } + + /// + /// 鑻辨枃鍚 + /// + [SugarColumn(ColumnName = "EnName")] + public string EnName { get; set; } + + /// + /// 鏄惁涓氬姟鍛 + /// + [SugarColumn(ColumnName = "IsBusiness")] + public bool? IsBusiness { get; set; } + + /// + /// 鏄惁鍚敤 + /// + [SugarColumn(ColumnName = "IsEnable")] + public bool IsEnable { get; set; } + + /// + /// 鍥哄畾鐢佃瘽锛堝骇鏈哄彿鐮侊級 + /// + [SugarColumn(ColumnName = "LandlinePhone")] + public string LandlinePhone { get; set; } + + /// + /// 濮撳悕 + /// + [SugarColumn(ColumnName = "Name")] + public string Name { get; set; } + + /// + /// 鐢ㄦ埛鐩存帴缁勭粐鑺傜偣Id + /// + [SugarColumn(ColumnName = "OrgId")] + public int? OrgId { get; set; } + + /// + /// 瀵嗙爜 + /// + [SugarColumn(ColumnName = "PassWord")] + public string PassWord { get; set; } + + /// + /// 缁戝畾鎵嬫満鍙 + /// + [SugarColumn(ColumnName = "TelPhone")] + public string TelPhone { get; set; } + + /// + /// 鐢ㄦ埛鏉ユ簮锛1.鍛樺伐鍏ヨ亴 2.鎵嬪姩娣诲姞 3.鍏朵粬锛 + /// + [SugarColumn(ColumnName = "UserOrigin")] + public bool? UserOrigin { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.HttpApi/Dtos/RemoteDemoInput.cs b/src/SJZY.Track.HttpApi/Dtos/RemoteDemoInput.cs deleted file mode 100644 index b010b6bd..00000000 --- a/src/SJZY.Track.HttpApi/Dtos/RemoteDemoInput.cs +++ /dev/null @@ -1,10 +0,0 @@ -锘縩amespace SJZY.Track.HttpApi.Dtos -{ - public class RemoteDemoInput - { - /// - /// 褰撳墠鏃堕棿 - /// - public DateTime CurrentTime { get; set; } - } -} diff --git a/src/SJZY.Track.HttpApi/Dtos/RemoteDemoOutput.cs b/src/SJZY.Track.HttpApi/Dtos/RemoteDemoOutput.cs deleted file mode 100644 index 44cd1f41..00000000 --- a/src/SJZY.Track.HttpApi/Dtos/RemoteDemoOutput.cs +++ /dev/null @@ -1,7 +0,0 @@ -锘縩amespace SJZY.Track.HttpApi.Dtos -{ - public class RemoteDemoOutput - { - public string Context { get; set; } - } -} diff --git a/src/SJZY.Track.HttpApi/Services/IRemoteDemoService.cs b/src/SJZY.Track.HttpApi/Services/IRemoteDemoService.cs deleted file mode 100644 index 6ea693bf..00000000 --- a/src/SJZY.Track.HttpApi/Services/IRemoteDemoService.cs +++ /dev/null @@ -1,15 +0,0 @@ -锘縰sing SJZY.Expand.ABP.Core.Common.Dto; -using SJZY.Track.HttpApi.Dtos; -using Volo.Abp; -using Volo.Abp.DependencyInjection; - -namespace SJZY.Track.HttpApi.Services -{ - /// - /// 瀹㈡埛绔繛鎺ユ祴璇曟帴鍙 - /// - public interface IRemoteDemoService : IRemoteService, IScopedDependency - { - Task> ConnectionTest(RemoteDemoInput input); - } -} diff --git a/src/SJZY.Track.HttpApi/TrackHttpApiModule.cs b/src/SJZY.Track.HttpApi/TrackHttpApiModule.cs deleted file mode 100644 index 522c4cf8..00000000 --- a/src/SJZY.Track.HttpApi/TrackHttpApiModule.cs +++ /dev/null @@ -1,12 +0,0 @@ -锘縰sing Volo.Abp.Modularity; - -namespace SJZY.Track.HttpApi -{ - public class TrackHttpApiModule : AbpModule - { - public override void PreConfigureServices(ServiceConfigurationContext context) - { - - } - } -} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/BasicRepository.cs b/src/SJZY.Track.Repository/BasicRepository.cs deleted file mode 100644 index 380b3256..00000000 --- a/src/SJZY.Track.Repository/BasicRepository.cs +++ /dev/null @@ -1,15 +0,0 @@ -锘#pragma warning disable 1591 -namespace SJZY.Track.Repository -{ - /// - /// 浠撳偍鍩虹被 - /// - /// - public class BasicRepository : SimpleClient where T : class, new() - { - public BasicRepository() - { - Context = SqlsugarScopeBasic.GetContextSafely("default"); - } - } -} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/DataBaseContext.cs b/src/SJZY.Track.Repository/DataBaseContext.cs index b9712ab1..88539836 100644 --- a/src/SJZY.Track.Repository/DataBaseContext.cs +++ b/src/SJZY.Track.Repository/DataBaseContext.cs @@ -1,53 +1,77 @@ -锘#pragma warning disable 1591 -namespace SJZY.Track.Repository +锘縰sing SJZY.UserCenter.HttpApi.Services; + +#pragma warning disable 1591 + +namespace SJZY.Track.Repository; + +/// +/// Sqlsugar 涓婁笅鏂囧璞 +/// +public class DataBaseContext { - /// - /// 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("闈炴硶鐨勬搷浣滐紝涓嶅厑璁哥紪杈戞槧灏勮〃"); - #region 瀹¤灞炴ц嚜鍔ㄨ祴鍊 - - public static void OnExcutingAction(object oldValue, DataFilterModel entityInfo) + //鏂板 + if (entityInfo.OperationType == DataFilterType.InsertByObject) { - //杩囨护鎺 "v_" 寮澶寸殑琛 - if (entityInfo.EntityColumnInfo.DbTableName.StartsWith("v_", StringComparison.OrdinalIgnoreCase)) - throw new Exception("闈炴硶鐨勬搷浣滐紝涓嶅厑璁哥紪杈戞槧灏勮〃"); - - //鏂板 - if (entityInfo.OperationType == DataFilterType.InsertByObject) + if (entityInfo.PropertyName == nameof(ICreateBaicEntity.CreateTime)) + entityInfo.SetValue(DateTime.Now); + if (entityInfo.PropertyName == nameof(ICreateBaicEntity.CreateUserId)) { - if (entityInfo.PropertyName == nameof(ICreateBaicEntity.CreateTime)) - entityInfo.SetValue(DateTime.Now); - if (entityInfo.PropertyName == nameof(ICreateBaicEntity.CreateUserId)) + if (oldValue == null || (int)oldValue == 0) { - //entityInfo.SetValue(CurrentUserRequest.CurrentUser.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) + try { - //currentType.GetProperty(nameof(IDeleteBasicEntity.DeleteUserId))?.SetValue(entityInfo.EntityValue, 5); - currentType.GetProperty(nameof(IDeleteBasicEntity.DeleteTime))?.SetValue(entityInfo.EntityValue, DateTime.Now); + entityInfo.SetValue(CurrentUserRequest.CurrentUser?.UserId); } + catch + { + } + } + //entityInfo.SetValue(CurrentUserRequest.CurrentUser.UserId); + } + } + //淇敼 + else if (entityInfo.OperationType == DataFilterType.UpdateByObject) + { + if (entityInfo.PropertyName == nameof(IUpdateBasicEntity.UpdateTime)) + entityInfo.SetValue(DateTime.Now); + else if (entityInfo.PropertyName == nameof(IUpdateBasicEntity.UpdateUserId)) + { + if (oldValue == null || (int)oldValue == 1) + { + try + { + entityInfo.SetValue(CurrentUserRequest.CurrentUser.UserId); + } + catch + { + } + } + //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 瀹¤灞炴ц嚜鍔ㄨ祴鍊 } + + #endregion 瀹¤灞炴ц嚜鍔ㄨ祴鍊 } \ No newline at end of file diff --git a/src/SJZY.Track.Repository/Demo/Entitys/DemoDetailEntity.cs b/src/SJZY.Track.Repository/Demo/Entitys/DemoDetailEntity.cs deleted file mode 100644 index a0f865f9..00000000 --- a/src/SJZY.Track.Repository/Demo/Entitys/DemoDetailEntity.cs +++ /dev/null @@ -1,24 +0,0 @@ -锘縩amespace SJZY.Track.Repository.Demo.Entitys -{ - [SugarTable("t_demo_detail")] - public class DemoDetailEntity - { - /// - /// Id - /// - [SugarColumn(ColumnName = "id", IsPrimaryKey = true)] - public long Id { get; set; } - - /// - /// t_demo.id - /// - [SugarColumn(ColumnName = "DemoId")] - public long DemoId { get; set; } - - /// - /// 涓浜涜鏄.. - /// - [SugarColumn(ColumnName = "OtherInfo")] - public string OtherInfo { get; set; } - } -} diff --git a/src/SJZY.Track.Repository/Demo/Entitys/DemoEntity.cs b/src/SJZY.Track.Repository/Demo/Entitys/DemoEntity.cs deleted file mode 100644 index c82bd5cb..00000000 --- a/src/SJZY.Track.Repository/Demo/Entitys/DemoEntity.cs +++ /dev/null @@ -1,40 +0,0 @@ -锘縩amespace SJZY.Track.Repository.Demo.Entitys -{ - - /// - /// 娴嬭瘯琛 - /// - [SugarTable("t_demo")] - public class DemoEntity : IFullAuditedBasicEntitys - { - /// - /// Id - /// - [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] - public long Id { get; set; } - - /// - /// 濮撳悕 - /// - [SugarColumn(ColumnName = "Name")] - public string Name { get; set; } - - /// - /// 骞撮緞 - /// - [SugarColumn(ColumnName = "Age")] - public int Age { get; set; } - - /// - /// 鎻忚堪 - /// - [SugarColumn(ColumnName = "Description")] - public string Description { get; set; } - - - [Navigate(NavigateType.OneToMany, nameof(DemoDetailEntity.DemoId))] - public List DemoDetailList { get; set; } - - } - -} diff --git a/src/SJZY.Track.Repository/Demo/Services/DemoRepository.cs b/src/SJZY.Track.Repository/Demo/Services/DemoRepository.cs deleted file mode 100644 index 4bb01002..00000000 --- a/src/SJZY.Track.Repository/Demo/Services/DemoRepository.cs +++ /dev/null @@ -1,198 +0,0 @@ -锘縰sing SJZY.Track.Repository.Demo.Entitys; -using SJZY.Track.Repository.Demo.ValueObjects; -using System.Transactions; - -namespace SJZY.Track.Repository.Demo.Services -{ - public class DemoRepository : BasicRepository, IDemoRepository, IScopedDependency - { - /* - 涓鑸儏鍐典笅甯歌鐨勫鍒犳敼鏂规硶涓嶉渶瑕佽嚜宸卞疄鐜帮紝鍙渶瑕佹寜鐓 BasicRepository 涓殑鏍煎紡鍘熷皝涓嶅姩鐨勬毚闇插嚭鍘诲嵆鍙紝 - 姣斿杩欓噷鎺ュ彛 鍙０鏄庝簡 UpdateAsync 鍜 InsertReturnIdentityAsync 鎺ュ彛鐨勫畾涔夛紝浣嗘槸杩欎袱涓柟娉曠殑瀹炵幇鎴戜滑涓嶇敤鍐欙紝鐩存帴浜ょ粰鐖剁被瀹炵幇鍗冲彲 - */ - - #region 鏍规嵁涓婚敭鑾峰彇鍗曟潯鏁版嵁 - - /// - /// 鏍规嵁涓婚敭鑾峰彇鍗曟潯鏁版嵁 - /// - /// - /// - public Task GetById1(int id) - { - /* - - //浠ヤ笅涓ょ鏂规硶閮戒笉浼氬洜涓烘病鎵惧埌鏁版嵁鑰屾姏寮傚父 - var model1 = base.GetFirst(m => m.Id == 0); - var model = base.GetSingle(m => m.Id == 0); - - - - //鍚屾牱鐨勫啓娉曞湪linq涓嬶紝濡傛灉涓嶅姞 OrDefault 涓瀹氫細鎶ラ敊 - var model = base.GetList().Single(m => m.Id == 0); - var model1 = base.GetList().First(m => m.Id == 0); - - */ - return base.GetSingleAsync(it => it.Id == id); - } - - #endregion - - #region 鍒嗛〉鑾峰彇 - - /// - /// 鍒嗛〉鑾峰彇 - /// - /// - /// - public async Task> GetListByPage(int pageSize, int pageindex, string name) - { - var list = await AsQueryable() - .WhereIF(!string.IsNullOrEmpty(name), a => a.Name.Contains(name)) - .ToPagedListAsync(pageindex, pageSize); - - return list; - } - #endregion - - #region 鍙傛暟涓哄疄浣 - - /// - /// 鍙傛暟寰堝鐨勬椂鍊欙紝瀹氫箟妯″瀷鎺ュ彈鍙傛暟 - /// - /// - /// - public async Task> InputToValueObject(DemoValueObject obj) - { - var list = await AsQueryable().ToListAsync(); - return list; - } - #endregion - - #region 鎵ц鍘熺敓sql璇彞 - /// - /// 鎵ц鍘熺敓sql璇彞 - /// - /// - /// - public async Task> OriginalSql(DemoValueObject obj) - { - var parameters = new List(); - var sql = @$" - select - a.id, - a.Name, - a.Age, - a.Description - from t_demo a - where 1=1 - {" and a.Name like @Name ".WhereIF(!string.IsNullOrEmpty(obj.Name), obj.Name, ref parameters)} - order by a.id desc "; - - var list = await Context.SqlQueryable(sql) - .AddParameters(parameters) - .ToPagedListAsync(obj.PageIndex, obj.PageSize); - - return list; - } - - #endregion - - #region 绠鍗曚簨鍔 - public async Task Transaction() - { - - using (var ts = new TransactionScope()) - { - - await base.InsertAsync(new DemoEntity { Name = "1111" }); - await base.InsertAsync(new DemoEntity { Name = "222" }); - await base.InsertAsync(new DemoEntity { Name = "3333" }); - - //throw new BusinessException("E05632","鎵嬪姩鎶涘紓甯"); - await base.InsertAsync(new DemoEntity { Name = "4444" }); - - ts.Complete(); - } - } - #endregion - - #region 澶告柟娉曚簨鍔 - public async Task MultipleMethodTrans1() - { - await base.InsertAsync(new DemoEntity { Name = "---" }); - await base.InsertAsync(new DemoEntity { Name = "+++" }); - } - - public async Task MultipleMethodTrans2() - { - - //throw new BusinessException(message: "鎵嬪姩鎶涘嚭寮傚父"); - await base.InsertAsync(new DemoEntity { Name = "xxx" }); - } - #endregion - - #region 浜嬪姟宓屽 - public async Task InternalTrans() - { - using (var ts = new TransactionScope()) - { - await Transaction(); - await MultipleMethodTrans1(); - //throw new BusinessException(message: "鎵嬪姩鎶涘嚭寮傚父"); - await base.InsertAsync(new DemoEntity { Name = "xxx" }); - - ts.Complete(); - } - } - #endregion - - #region 灞閮ㄦ洿鏂 - public async Task UpdatePartColumns(DemoEntity entity) - { - Context.Updateable(entity).UpdateColumns(m => new { m.Description, m.Name }).ExecuteCommand(); - // UPDATE `test` SET `Name`= 'string',`Description`= 'string' WHERE `id`= 5 - - Context.Updateable(entity).IgnoreColumns(m => new { m.CreateUserId, m.Age }).ExecuteCommand(); - // UPDATE `test` SET`IsDeleted`= 0,`Name`= 'string',`Description`= 'string',`EnabledMark`= 0,`DeleteUserId`= 0,`DeleteTime`= '2022/8/13 23:42:36',`CreateTime`= '2015/5/12 0:00:00',`UpdateUserId`= 0,`UpdateTime`= '2022/8/13 23:55:27' WHERE `id`= 5 - } - #endregion - - #region 瀵艰埅灞炴 - /// - /// 瀵艰埅灞炴 - /// - /// - /// - /// - public async Task EntityRelationSave(DemoEntity entity) - { - var res = await Context.InsertNav(entity).Include(m => m.DemoDetailList).ExecuteCommandAsync(); - return res; - } - #endregion - - #region 缂撳瓨 - /// - /// 鑾峰彇鏁版嵁鍖呭惈缂撳瓨 - /// - /// - /// - public async Task GetDataCache(int id) - { - var redisKey = $"Demo:Endity:{id}"; - var demo = await RedisHelper.Client.GetAsync(redisKey); - if (demo != null) - return demo; - - var aa = Context.Ado.Connection; - demo = await base.GetSingleAsync(m => m.Id == id); - - await RedisHelper.Client.SetAsync(redisKey, demo, 60 * 20); - - return demo; - } - #endregion - - } -} diff --git a/src/SJZY.Track.Repository/Demo/ValueObjects/DemoValueObject.cs b/src/SJZY.Track.Repository/Demo/ValueObjects/DemoValueObject.cs deleted file mode 100644 index 782554e1..00000000 --- a/src/SJZY.Track.Repository/Demo/ValueObjects/DemoValueObject.cs +++ /dev/null @@ -1,18 +0,0 @@ -锘縩amespace SJZY.Track.Repository.Demo.ValueObjects -{ - public class DemoValueObject - { - - public string Name { get; set; } - - /// - /// 褰撳墠椤电爜 - /// - public int PageIndex { get; set; } - - /// - /// 姣忛〉澶у皬 - /// - public int PageSize { get; set; } - } -} diff --git a/src/SJZY.Track.Repository/GlobalUsing.cs b/src/SJZY.Track.Repository/GlobalUsing.cs index dc581267..bb8c080a 100644 --- a/src/SJZY.Track.Repository/GlobalUsing.cs +++ b/src/SJZY.Track.Repository/GlobalUsing.cs @@ -4,4 +4,4 @@ global using SJZY.Expand.ABP.Core.SqlSugar; global using SJZY.Expand.ABP.Core.SqlSugar.Entitys; global using SJZY.Expand.ABP.Core.SqlSugar.Tools; global using SqlSugar; -global using Volo.Abp.DependencyInjection; +global using Volo.Abp.DependencyInjection; \ No newline at end of file diff --git a/src/SJZY.Track.Repository/Queries/BasicQuery.cs b/src/SJZY.Track.Repository/Queries/BasicQuery.cs new file mode 100644 index 00000000..60a234ef --- /dev/null +++ b/src/SJZY.Track.Repository/Queries/BasicQuery.cs @@ -0,0 +1,27 @@ +锘縰sing System.Linq.Expressions; +using SJZY.Track.Domain.Queries; +using SJZY.Track.Domain.SeedWork; + +namespace SJZY.Track.Repository.Queries; + +#pragma warning disable CS8613 +public class BasicQuery : SimpleClient, IBasicQuery where T : class, IEntity, new() +#pragma warning restore CS8613 +{ + 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(); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/Queries/ProvideQueries.cs b/src/SJZY.Track.Repository/Queries/ProvideQueries.cs new file mode 100644 index 00000000..526d5e3d --- /dev/null +++ b/src/SJZY.Track.Repository/Queries/ProvideQueries.cs @@ -0,0 +1,121 @@ +using SJZY.Track.Domain.Aggregates.OrderAggregate; +using SJZY.Track.Domain.Aggregates.TrackContentAggregate; +using SJZY.Track.Domain.Aggregates.TrackPullAggregate; +using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; +using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; +using SJZY.Track.Domain.Dtos.Order; +using SJZY.Track.Domain.Dtos.TrackDetails; +using SJZY.Track.Domain.Dtos.TrackTemplate; +using SJZY.Track.Domain.Queries; + +namespace SJZY.Track.Repository.Queries; + +public class ProvideQueries : ISugarRepository, IProvideQueries, + ITransientDependency +{ + public ISqlSugarClient Context { get; set; } + + public ProvideQueries() + { + Context = SqlsugarScopeBasic.GetContextSafely("default"); + } + + public async Task> GetOrderTemplateLinksAsync(int orderType, + params string[] orderNumbers) + { + return await Context.Queryable() + .LeftJoin((a, b) => a.Id == b.OrderId) + .Where(a => a.OrderType == orderType && orderNumbers.Contains(a.OrderNo)) + .Select((a, b) => new OrderTemplateLinkDto + { + OrderNo = a.OrderNo, + TemplateId = b.TrackTemplateId + }) + .ToListAsync(); + } + + public async Task> GetOrderTemplateLinksAsync(int orderType, List orderNumbers) + { + return await Context.Queryable() + .LeftJoin((a, b) => a.Id == b.OrderId) + .Where(a => a.OrderType == orderType && orderNumbers.Contains(a.OrderNo)) + .Select((a, b) => new OrderTemplateLinkDto + { + OrderNo = a.OrderNo, + TemplateId = b.TrackTemplateId + }) + .ToListAsync(); + } + + public async Task> GetOrderedTrackCodesAsync(List templateIds) + { + return await Context.Queryable() + .LeftJoin((a, b) => a.TrackContentId == b.Id) + .Where(a => templateIds.Contains(a.TrackTemplateId)) + .OrderBy(a => a.Sort) + .Select((a, b) => new OrderedTrackCodeDto + { + TemplateId = a.TrackTemplateId, + Code = b.Code, + IsExternal = a.IsExternal + }) + .ToListAsync(); + } + + public async Task MatchTrackContentAsync(int orderId, string code) + { + return await Context.Queryable() + .LeftJoin((x, a) => x.TrackTemplateId == a.TrackTemplateId) + .LeftJoin((x, a, b) => a.TrackContentId == b.Id) + .LeftJoin((x, a, b, c) => b.TrackStatusId == c.Id) + .Where((x, a, b) => x.OrderId == orderId && b.Code == code) + .Select((x, a, b, c) => new MatchTrackContentDto + { + Content = b.Content, + EnContent = b.EnContent, + Status = c.Status, + IsCompleted = b.IsCompleted, + IsCanDelete = a.IsCanDelete + }) + .FirstAsync(); + } + + public async Task> GetCanDeleteTrackCodesAsync(int orderId, List trackCodes) + { + return await Context.Queryable() + .LeftJoin((x, a) => x.TrackTemplateId == a.TrackTemplateId && a.IsCanDelete) + .LeftJoin((x, a, b) => a.TrackContentId == b.Id) + .Where((x, a, b) => x.OrderId == orderId + && trackCodes.Contains(b.Code) && a.IsCanDelete) + .Select((x, a, b) => b.Code) + .ToListAsync(); + } + + public async Task> MapTrackCodesAsync(int upSubSystemId, int subSystemId, params string[] trackCodes) + { + // 鏍规嵁涓婃父code寰楀埌涓嬫父code + return await Context.Queryable() + .Where(x => x.SubSystemId == subSystemId && x.MapSubSystemId == upSubSystemId && + trackCodes.Contains(x.MapTrackContentCode)) + .Select(x => x.TrackContentCode) + .ToListAsync(); + } + + public async Task> GetPullContentConfigsAsync(int serviceProviderId) + { + return await Context.Queryable() + .LeftJoin((a, b) => a.Id == b.TrackPullConfigId) + .Where(a => a.ServiceProviderId == serviceProviderId) + .Select(x => new TrackPullContentConfigVO + { + TrackContentId = 0, + TrackContentCodeValue = null, + TrackContentValue = null, + TrackKeyword = null, + TrackKeywordReverse = null, + TrackPlaceValue = null, + TrackStatusValue = null, + TrackTimeZone = null + }).ToListAsync(); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/Repositories/BasicRepository.cs b/src/SJZY.Track.Repository/Repositories/BasicRepository.cs new file mode 100644 index 00000000..965bd5d7 --- /dev/null +++ b/src/SJZY.Track.Repository/Repositories/BasicRepository.cs @@ -0,0 +1,55 @@ +锘縰sing System.Linq.Expressions; +using SJZY.Track.Domain; +using SJZY.Track.Domain.SeedWork; +using SJZY.Track.Repository.Queries; +using Volo.Abp; + +namespace SJZY.Track.Repository.Repositories; + +/// +/// 浠撳偍鍩虹被瀹炵幇 +/// +/// +public class BasicRepository : BasicQuery, IBasicRepository where T : class, IAggregateRoot, new() +{ + public async Task UpdateAsync(T entity, Expression>? ignoreColumns) + { + return await Context.Updateable(entity) + .IgnoreColumnsIF(ignoreColumns != null, ignoreColumns) + .ExecuteCommandHasChangeAsync(); + } + + public async Task UpdateColumnAsync(T entity, Expression>? updateColumns) + { + return await Context.Updateable(entity) + .UpdateColumnsIF(updateColumns != null, updateColumns) + .ExecuteCommandHasChangeAsync(); + } + + public async Task UpdateAsync(T entity, bool ignoreAllNullColumns = false, bool ignoreAllDefaultValue = false) + { + return await Context.Updateable(entity) + .IgnoreColumns(ignoreAllNullColumns: ignoreAllNullColumns, ignoreAllDefaultValue: ignoreAllDefaultValue) + .ExecuteCommandHasChangeAsync(); + } + + public async Task UpdateRangeAsync(List entities, Expression>? columns = null) + { + return await Context.Updateable(entities) + .UpdateColumnsIF(columns != null, columns) + .ExecuteCommandHasChangeAsync(); + } + + // tips: required where + public async Task SoftDeleteAsync(Expression> where) + { + if (!typeof(T).IsAssignableTo()) + throw new BusinessException( + message: $"瀹炰綋娌℃湁瀹炵幇{nameof(ISoftDeleteBasicEntity)}涓嶈兘璋冪敤{nameof(SoftDeleteAsync)}"); + + return await Context.Updateable() + .Where(where) + .SetColumns(nameof(ISoftDeleteBasicEntity.IsDeleted), 1) + .ExecuteCommandHasChangeAsync(); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/Repositories/DemoRepository.cs b/src/SJZY.Track.Repository/Repositories/DemoRepository.cs new file mode 100644 index 00000000..8334ea44 --- /dev/null +++ b/src/SJZY.Track.Repository/Repositories/DemoRepository.cs @@ -0,0 +1,208 @@ +锘縰sing System.Transactions; +using SJZY.Track.Domain.Aggregates.DemoAggregate; +using SJZY.Track.Domain.Dtos.Demo; + +namespace SJZY.Track.Repository.Repositories; + +public class DemoRepository : BasicRepository, IDemoRepository, IScopedDependency +{ + /* + 涓鑸儏鍐典笅甯歌鐨勫鍒犳敼鏂规硶涓嶉渶瑕佽嚜宸卞疄鐜帮紝鍙渶瑕佹寜鐓 BasicRepository 涓殑鏍煎紡鍘熷皝涓嶅姩鐨勬毚闇插嚭鍘诲嵆鍙紝 + 姣斿杩欓噷鎺ュ彛 鍙０鏄庝簡 UpdateAsync 鍜 InsertReturnIdentityAsync 鎺ュ彛鐨勫畾涔夛紝浣嗘槸杩欎袱涓柟娉曠殑瀹炵幇鎴戜滑涓嶇敤鍐欙紝鐩存帴浜ょ粰鐖剁被瀹炵幇鍗冲彲 + */ + + #region 鏍规嵁涓婚敭鑾峰彇鍗曟潯鏁版嵁 + + /// + /// 鏍规嵁涓婚敭鑾峰彇鍗曟潯鏁版嵁 + /// + /// + /// + public Task GetById1(int id) + { + /* + + //浠ヤ笅涓ょ鏂规硶閮戒笉浼氬洜涓烘病鎵惧埌鏁版嵁鑰屾姏寮傚父 + var model1 = base.GetFirst(m => m.Id == 0); + var model = base.GetSingle(m => m.Id == 0); + + + + //鍚屾牱鐨勫啓娉曞湪linq涓嬶紝濡傛灉涓嶅姞 OrDefault 涓瀹氫細鎶ラ敊 + var model = base.GetList().Single(m => m.Id == 0); + var model1 = base.GetList().First(m => m.Id == 0); + + */ + return base.GetSingleAsync(it => it.Id == id); + } + + #endregion + + #region 鍒嗛〉鑾峰彇 + + /// + /// 鍒嗛〉鑾峰彇 + /// + /// + /// + public async Task> GetListByPage(int pageSize, int pageindex, string name) + { + var list = await AsQueryable() + .WhereIF(!string.IsNullOrEmpty(name), a => a.Name.Contains(name)) + .ToPagedListAsync(pageindex, pageSize); + + return list; + } + + #endregion + + #region 鍙傛暟涓哄疄浣 + + /// + /// 鍙傛暟寰堝鐨勬椂鍊欙紝瀹氫箟妯″瀷鎺ュ彈鍙傛暟 + /// + /// + /// + public async Task> InputToValueObject(DemoValueObject obj) + { + var list = await AsQueryable().ToListAsync(); + return list; + } + + #endregion + + #region 鎵ц鍘熺敓sql璇彞 + + /// + /// 鎵ц鍘熺敓sql璇彞 + /// + /// + /// + public async Task> OriginalSql(DemoValueObject obj) + { + var parameters = new List(); + var sql = @$" + select + a.id, + a.Name, + a.Age, + a.Description + from t_demo a + where 1=1 + {" and a.Name like @Name ".WhereIF(!string.IsNullOrEmpty(obj.Name), obj.Name, ref parameters)} + order by a.id desc "; + + var list = await Context.SqlQueryable(sql) + .AddParameters(parameters) + .ToPagedListAsync(obj.PageIndex, obj.PageSize); + + return list; + } + + #endregion + + #region 绠鍗曚簨鍔 + + public async Task Transaction() + { + using (var ts = new TransactionScope()) + { + await base.InsertAsync(new DemoEntity { Name = "1111" }); + await base.InsertAsync(new DemoEntity { Name = "222" }); + await base.InsertAsync(new DemoEntity { Name = "3333" }); + + //throw new BusinessException("E05632","鎵嬪姩鎶涘紓甯"); + await base.InsertAsync(new DemoEntity { Name = "4444" }); + + ts.Complete(); + } + } + + #endregion + + #region 澶告柟娉曚簨鍔 + + public async Task MultipleMethodTrans1() + { + await base.InsertAsync(new DemoEntity { Name = "---" }); + await base.InsertAsync(new DemoEntity { Name = "+++" }); + } + + public async Task MultipleMethodTrans2() + { + //throw new BusinessException(message: "鎵嬪姩鎶涘嚭寮傚父"); + await base.InsertAsync(new DemoEntity { Name = "xxx" }); + } + + #endregion + + #region 浜嬪姟宓屽 + + public async Task InternalTrans() + { + using (var ts = new TransactionScope()) + { + await Transaction(); + await MultipleMethodTrans1(); + //throw new BusinessException(message: "鎵嬪姩鎶涘嚭寮傚父"); + await base.InsertAsync(new DemoEntity { Name = "xxx" }); + + ts.Complete(); + } + } + + #endregion + + #region 灞閮ㄦ洿鏂 + + public async Task UpdatePartColumns(DemoEntity entity) + { + Context.Updateable(entity).UpdateColumns(m => new { m.Description, m.Name }).ExecuteCommand(); + // UPDATE `test` SET `Name`= 'string',`Description`= 'string' WHERE `id`= 5 + + Context.Updateable(entity).IgnoreColumns(m => new { m.CreateUserId, m.Age }).ExecuteCommand(); + // UPDATE `test` SET`IsDeleted`= 0,`Name`= 'string',`Description`= 'string',`EnabledMark`= 0,`DeleteUserId`= 0,`DeleteTime`= '2022/8/13 23:42:36',`CreateTime`= '2015/5/12 0:00:00',`UpdateUserId`= 0,`UpdateTime`= '2022/8/13 23:55:27' WHERE `id`= 5 + } + + #endregion + + #region 瀵艰埅灞炴 + + /// + /// 瀵艰埅灞炴 + /// + /// + /// + /// + public async Task EntityRelationSave(DemoEntity entity) + { + var res = await Context.InsertNav(entity).Include(m => m.DemoDetailList).ExecuteCommandAsync(); + return res; + } + + #endregion + + #region 缂撳瓨 + + /// + /// 鑾峰彇鏁版嵁鍖呭惈缂撳瓨 + /// + /// + /// + public async Task GetDataCache(int id) + { + var redisKey = $"Demo:Endity:{id}"; + var demo = await RedisHelper.Client.GetAsync(redisKey); + if (demo != null) + return demo; + + var aa = Context.Ado.Connection; + demo = await base.GetSingleAsync(m => m.Id == id); + + await RedisHelper.Client.SetAsync(redisKey, demo, 60 * 20); + + return demo; + } + + #endregion +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs new file mode 100644 index 00000000..481a5c87 --- /dev/null +++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs @@ -0,0 +1,256 @@ +锘縰sing SJZY.Track.Domain; +using SJZY.Track.Domain.Aggregates.OrderAggregate; +using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; +using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; +using SJZY.Track.Domain.Dtos.Order; +using SJZY.Track.Domain.VEntities; +using SJZY.Track.Repository.VData.Entitys; + +namespace SJZY.Track.Repository.Repositories; + +public class OrderRepository : BasicRepository, IOrderRepository, ITransientDependency +{ + private readonly ITrackDetailsRepository _trackDetailsRepository; + + public OrderRepository( + ITrackDetailsRepository trackDetailsRepository + ) + { + this._trackDetailsRepository=trackDetailsRepository; + } + + public async Task CreateOrderAsync(OrderEntity order) + { + using var tran = TransactionHelper.GetReadCommitted(); + + var orderId = await InsertReturnIdentityAsync(order); + order.OrderTemplates.ForEach(x => x.OrderId = orderId); + await Context.Insertable(order.OrderTemplates).ExecuteCommandAsync(); + order.OrderFlights.ForEach(x => x.OrderId = orderId); + await Context.Insertable(order.OrderFlights).ExecuteCommandAsync(); + + tran.Complete(); + } + + public async Task UpdateOrderAsync(OrderEntity order) + { + using var tran = TransactionHelper.GetReadCommitted(); + + // 鏇存柊璁㈠崟涓昏〃 + await UpdateAsync(order, x => new { x.CustomId, x.SubSystemId }); + + // 鏇存柊璁㈠崟妯℃澘 + await Context.Deleteable().Where(x => x.OrderId == order.Id).ExecuteCommandAsync(); + order.OrderTemplates.ForEach(x => x.OrderId = order.Id); + await Context.Insertable(order.OrderTemplates).ExecuteCommandAsync(); + + // 鏇存柊璁㈠崟鑸彮 + await Context.Deleteable().Where(x => x.OrderId == order.Id).ExecuteCommandAsync(); + order.OrderFlights.ForEach(x => x.OrderId = order.Id); + await Context.Insertable(order.OrderFlights).ExecuteCommandAsync(); + + tran.Complete(); + } + + public async Task DeleteOrderAsync(int orderId) + { + using var tran = TransactionHelper.GetReadCommitted(); + + // 杞垹璁㈠崟涓昏〃 + await SoftDeleteAsync(x => x.Id == orderId); + + // 杞垹璁㈠崟妯℃澘 + // 杞垹璁㈠崟鑸彮 + // 杞垹璁㈠崟鍏宠仈鍏崇郴 + + tran.Complete(); + } + + #region 璁㈠崟鍏宠仈 + + public async Task> GetLinkedOrdersAsync(int orderId) + { + return await Context.Queryable() + .LeftJoin((a, b) => a.LinkOrderId == b.Id) + .Where(a => a.OrderId == orderId) + .Select((a, b) => new LinkedOrderVO + { + OrderId = b.Id, + OrderType = b.OrderType, + OrderNo = b.OrderNo, + SubSystemId = b.SubSystemId, + IsPushCompleted = b.IsPushCompleted, + CustomId = b.CustomId + }) + .ToListAsync(); + } + + public async Task LinkOrderAsync(List orderLinkEntities) + { + await Context.Insertable(orderLinkEntities).ExecuteCommandAsync(); + } + + public async Task UnLinkByIdsAsync(List linkIds) + { + await Context.Deleteable(linkIds).ExecuteCommandAsync(); + } + + #endregion + + #region 杞ㄨ抗璁㈠崟鏄庣粏 + + ///// + ///// 鏍规嵁杞ㄨ抗璁㈠崟id鑾峰彇杞ㄨ抗鏄庣粏鍒楄〃 + ///// + ///// + ///// + //public async Task> GetOrderDetails(GetOrderDetailsInputVO input) + //{ + // return null; + //} + + #endregion + + #region 杞ㄨ抗璁㈠崟鍒嗛〉 + + /// + /// 鑾峰彇鍒嗛〉鐨勮建杩硅鍗 + /// + /// + /// + public async Task> GetPageTrackOrder(GetPageTrackOrderInputVO input) + { + List orderNoList = new List(); + if (!input.OrderNos.IsNullOrWhiteSpace()) + { + orderNoList = input.OrderNos.Split(new char[] { ',', '锛', ':', '锛' }).ToList(); + } + + var pageList = await Context.Queryable() + .LeftJoin((a, b) => a.CustomId == b.Id && b.IsDeleted == false) + .LeftJoin((a, b, c) => a.SubSystemId == c.Id && c.IsDeleted == false) + .WhereIF(input.SubSystemId > 0, (a, b, c) => a.SubSystemId == input.SubSystemId) + .WhereIF(!orderNoList.IsNullOrEmpty(), (a, b, c) => orderNoList.Contains(a.OrderNo)) + .WhereIF(input.CreateTimeStart.HasValue && input.CreateTimeEnd.HasValue, + (a, b, c) => a.CreateTime >= input.CreateTimeStart && a.CreateTime <= input.CreateTimeEnd) + .WhereIF(input.CreateTimeStart.HasValue && (!input.CreateTimeEnd.HasValue), + (a, b, c) => a.CreateTime >= input.CreateTimeStart) + .WhereIF((!input.CreateTimeStart.HasValue) && input.CreateTimeEnd.HasValue, + (a, b, c) => a.CreateTime <= input.CreateTimeEnd) + .OrderByDescending((a, b, c) => a.CreateTime) + .Select((a, b, c) => new TrackOrderVO + { + Id = a.Id, + OrderNumber = a.OrderNo, + OrderType = a.OrderType, + OrderTypeName = SqlFunc.IF(a.OrderType == 1).Return("骞茬嚎鎻愬崟").ElseIF(a.OrderType == 2).Return("灏忓寘杩愬崟") + .ElseIF(a.OrderType == 3) + .Return("绠/琚嬪崟").ElseIF(a.OrderType == 4).Return("FBA璁㈠崟").End(""), + CustomerShortName = b.Abbreviation, + CustomerCode = b.Code, + //TrackTemplateNames = SqlFunc.Subqueryable() + // .LeftJoin((aa, bb) => aa.TrackTemplateId == bb.Id) + // .Where((aa, bb) => a.Id == aa.OrderId).SelectStringJoin((aa, bb) => bb.Name, ","), + + //TrackTemplateIds = SqlFunc.Subqueryable() + // .LeftJoin((aa, bb) => aa.TrackTemplateId == bb.Id) + // .Where((aa, bb) => a.Id == aa.OrderId).SelectStringJoin((aa, bb) => bb.Id, ","), + NewestTrackContent = a.LatestTrackContent, + NewestTrackEnContent = a.LatestTrackEnContent, + NewestTrackPlace = a.LatestTrackPlace, + NewestTrackTime = a.LatestTrackTime, + IsFinish = a.IsCompleted, + CreateTime = a.CreateTime, + SubSystem = c.CnName, + SubSystemId = c.Id + }) + .ToPagedListAsync(input.PageIndex, input.PageSize); + + if (pageList.List.Any()) + { + //鏌ヨ涔熼渶瑕佹渶鏂扮殑杞ㄨ抗 + var orderIds = pageList.List.Select(a => a.Id).ToList(); + //鏌ヨ杞ㄨ抗妯＄増 + var trackTemplateList = await Context.Queryable() + .LeftJoin((a, b) => a.TrackTemplateId==b.Id) + .Where((a, b) => orderIds.Contains(a.OrderId)) + .Select((a, b) => new { OrderId = a.OrderId, Name = b.Name, TemplateId = b.Id }) + .ToListAsync(); + var esTrackDetails = await _trackDetailsRepository.GetListAsync(orderIds); + pageList.List.ForEach(a => + { + var esDetails = esTrackDetails?.Where(b => b.OrderId== a.Id).OrderByDescending(b => b.TrackTime); + var trackDetail = esDetails?.FirstOrDefault(); + if (trackDetail!=null) + { + if (trackDetail.TrackContent!=a.NewestTrackContent) + { + a.NewestTrackContent=trackDetail.TrackContent; + } + if (trackDetail.TrackEnContent!=a.NewestTrackEnContent) + { + a.NewestTrackEnContent=trackDetail.TrackEnContent; + } + if (trackDetail.TrackPlace!=a.NewestTrackPlace) + { + a.NewestTrackPlace=trackDetail.TrackPlace; + } + if (trackDetail.TrackTime!= a.NewestTrackTime) + { + a.NewestTrackTime=trackDetail.TrackTime; + } + } + + a.TrackTemplateNames =trackTemplateList.Where(b => b.OrderId== a.Id).Select(a => a.Name).JoinAsString(","); + a.TrackTemplateIds = trackTemplateList.Where(b => b.OrderId== a.Id).Select(a => a.TemplateId).ToList(); + }); + + } + + + + + #region 鏆傛椂娉ㄩ噴 + + //if (pageList.List.Any()) + //{ + // var orderIds = pageList.List.Select(a => a.Id); + // //鏌ヨ杞ㄨ抗妯＄増 + + + // var trackTemplateList = await Context.Queryable() + // .LeftJoin((a, b) => a.TrackTemplateId==b.Id) + // .Where((a, b) => orderIds.Contains(a.OrderId)) + // .Select((a, b) => new { OrderId = a.OrderId, Name = b.Name }) + // .ToListAsync(); + + // pageList.List.ForEach(a => + // { + // var templateListOfOrderId = trackTemplateList.Where(b => b.OrderId== a.Id); + // a.TrackTemplateNames = templateListOfOrderId.Select(c => c.Name).JoinAsString(","); + // }); + //} + + #endregion + + return pageList; + } + + #endregion + + + public async Task> GetOrderTemplatesAsync(List orderNos) + { + return await Context.Queryable() + .LeftJoin((a, b) => a.Id == b.OrderId) + .Where(a => orderNos.Contains(a.OrderNo)) + .Select((a, b) => new OrderTemplateVO + { + OrderNo = a.OrderNo, + OrderType = a.OrderType, + TemplateId = b.TrackTemplateId, + ServiceProviderId = b.ServiceProviderId + }) + .ToListAsync(); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs new file mode 100644 index 00000000..7609c5a6 --- /dev/null +++ b/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs @@ -0,0 +1,234 @@ +锘縰sing 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.Dtos.TrackTemplate; +using SJZY.Track.Domain.VEntities; +using System.Linq; +using System.Linq.Expressions; + +namespace SJZY.Track.Repository.Repositories; + +public class TrackContentRepository : BasicRepository, ITrackContentRepository, IScopedDependency +{ + public TrackContentRepository() + { + } + + /// + /// 鑾峰彇杞ㄨ抗鍐呭鏄庣粏 + /// + /// + /// + public async Task GetDetailAsync(int id) + { + var detail = await Context.Queryable() + .LeftJoin((a, b) => a.TrackStatusId == b.Id && b.IsDeleted == false) + .LeftJoin((a, b, c) => a.TrackFlagId == c.Id && c.IsDeleted == false) + .LeftJoin((a, b, c, d) => a.SubSystemId == d.Id && d.IsDeleted == false) + .Where((a, b, c, d) => a.Id == id) + .Select((a, b, c, d) => new GetTrackContentDetailVO + { + Id = a.Id, + SubSystemId = a.SubSystemId, + SubSystem = d.CnName, + TrackStatusId = a.TrackStatusId, + TrackStatus = b.Status, + Code = a.Code, + Content = a.Content, + EnContent = a.EnContent, + TrackFlagId = a.TrackFlagId, + TrackFlag = c.Name, + IsFinish = a.IsCompleted + }) + .FirstAsync(); + return detail; + } + + /// + /// 鍒嗛〉鑾峰彇杞ㄨ抗鍐呭 + /// + /// + /// + public async Task> GetPageTrackContent(GetPageTrackContentVO input) + { + UnifyPageResultDto pagedList = new UnifyPageResultDto(); + pagedList = await Context.Queryable() + .LeftJoin((a, b) => a.TrackStatusId == b.Id && b.IsDeleted == false) + .LeftJoin((a, b, c) => a.TrackFlagId == c.Id && c.IsDeleted == false) + .LeftJoin((a, b, c, d) => a.SubSystemId == d.Id && d.IsDeleted == false) + .LeftJoin((a, b, c, d, e) => a.CreateUserId == e.Id && e.IsDeleted == false) + .LeftJoin((a, b, c, d, e, f) => a.UpdateUserId == f.Id && f.IsDeleted == false) + .WhereIF(input.SubSystemId > 0, (a, b, c, d, e, f) => a.SubSystemId == input.SubSystemId) + .WhereIF(!input.Keywords.IsNullOrWhiteSpace(), + (a, b, c, d, e, f) => a.Code.Contains(input.Keywords) || a.Content.Contains(input.Keywords) + || a.EnContent.Contains(input.Keywords)) + .WhereIF(input.TrackStatusId > 0, (a, b, c, d, e, f) => a.TrackStatusId == input.TrackStatusId) + .OrderByIF(input.SelectIds.IsNullOrEmpty(), (a, b, c, d, e, f) => a.CreateTime, OrderByType.Desc) + .OrderByIF(!input.SelectIds.IsNullOrEmpty(), (a, b, c, d, e, f) => SqlFunc.IIF(input.SelectIds.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), a.CreateTime), OrderByType.Desc) + .Select((a, b, c, d, e, f) => new GetTrackContentListVO + { + Id = a.Id, + SubSystem = d.CnName, + Code = a.Code, + Content = a.Content, + EnContent = a.EnContent, + TrackStatus = b.Status, + Node = SqlFunc.IF(b.Node == 1).Return("鎻芥敹").ElseIF(b.Node == 2).Return("娓呭叧").ElseIF(b.Node == 3).Return("骞茬嚎") + .ElseIF(b.Node == 4).Return("娲鹃").ElseIF(b.Node == 5).Return("鍏朵粬") + .End(""), + TrackFlag = c.Name, + CreateTime = a.CreateTime, + CreateUser = e.Name, + UpdateTime = a.UpdateTime, + UpdateUser = f.Name, + IsFinish= a.IsCompleted + }) + .ToPagedListAsync(input.PageIndex, input.PageSize); + + return pagedList; + } + + /// + /// 鑾峰彇杞ㄨ抗鍐呭灞炴у + /// + /// + public async Task> GetTrackContentAttributeValue(GetTemplateContentAttributeValueInputVO input) + { + var list = await Context.Queryable() + .LeftJoin((a, b) => a.Id==b.TrackContentId&& b.TrackTemplateId>0 && b.IsDeleted==false) + .LeftJoin((a, b, c) => b.TrackTemplateId==c.Id&& c.IsDeleted==false) + .WhereIF(!input.TrackCodes.IsNullOrEmpty(), (a, b, c) => input.TrackCodes.Contains(a.Code)) + .WhereIF(input.SubSystemId>0, (a, b, c) => a.SubSystemId==input.SubSystemId) + .WhereIF(!input.TrackTemplateIds.IsNullOrEmpty(), (a, b, c) => input.TrackTemplateIds.Contains(c.Id)) + .Where((a, b, c) => c.Id>0) + //.OrderByIF(!input.TrackTemplateIds.IsNullOrEmpty(), (a, b, c) => SqlFunc.IIF(input.TrackTemplateIds.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), c.CreateTime), OrderByType.Desc) + .Select((a, b, c) => new GetTemplateContentAttributeValueVO + { + IsCanDelete=b.IsCanDelete, + IsExternal=b.IsExternal, + SubSystemId= a.SubSystemId, + TrackCode= a.Code, + TrackContenId= a.Id, + TrackTemplateId=c.Id + }).ToListAsync(); + + return list; + } + + /// + /// 鑾峰彇杞ㄨ抗妯＄増鏄惁瀛樺湪 + /// + /// + /// + public async Task GetTemplateIsExist(int trackContentId) + { + //var trackTemplateContents = await _trackTemplateContentBasicQuery.GetListAsync(a => a.TrackContentId == input.Id); + var trackContentEntities = await Context.Queryable().LeftJoin((a, b) => a.Id==b.TrackContentId && b.IsDeleted==false) + .LeftJoin((a, b, c) => b.TrackTemplateId==c.Id&& c.IsDeleted==false) + .Where((a, b, c) => a.Id==trackContentId) + .Select((a, b, c) => new + { + TrackContentId = a.Id, + TemplateId = c.Id + }) + .ToListAsync(); + + if (trackContentEntities.Any(a => a.TemplateId>0)) + { + return true; + } + + return false; + } + + + + public async Task> GetMapPageAsync(GetTrackContentMapPageInputVO input) + { + return await Context.Queryable() + .InnerJoin((contentMap, sourceContent) => contentMap.TrackContentId == sourceContent.Id && !sourceContent.IsDeleted) + .InnerJoin((contentMap, sourceContent, targetContent) => contentMap.MapTrackContentId == targetContent.Id && !targetContent.IsDeleted) + .LeftJoin((contentMap, sourceContent, targetContent, sourceSystem) => contentMap.SubSystemId == sourceSystem.Id && !sourceSystem.IsDeleted) + .LeftJoin((contentMap, sourceContent, targetContent, sourceSystem, targetSystem) => contentMap.MapSubSystemId == targetSystem.Id && !targetSystem.IsDeleted) + .LeftJoin((contentMap, sourceContent, targetContent, sourceSystem, targetSystem, sourceStatus) => sourceContent.TrackStatusId == sourceStatus.Id && !sourceStatus.IsDeleted) + .LeftJoin((contentMap, sourceContent, targetContent, sourceSystem, targetSystem, sourceStatus, targetStatus) => targetContent.TrackStatusId == targetStatus.Id && !targetStatus.IsDeleted) + .Filter(null, true) + .Where(contentMap => !contentMap.IsDeleted) + .WhereIF(input.SubSystemId.HasValue, contentMap => contentMap.SubSystemId == input.SubSystemId) + .WhereIF(input.MapSubSystemId.HasValue, contentMap => contentMap.MapSubSystemId == input.MapSubSystemId) + .WhereIF(!input.Keywords.IsNullOrWhiteSpace(), (contentMap, sourceContent) => sourceContent.Code.Contains(input.Keywords) || sourceContent.Content.Contains(input.Keywords) || sourceContent.EnContent.Contains(input.Keywords)) + .OrderByDescending(contentMap => contentMap.CreateTime) + .Select((contentMap, sourceContent, targetContent, sourceSystem, targetSystem, sourceStatus, targetStatus) => new GetTrackContentMapPageOutputVO + { + Id = contentMap.Id, + SubSystem = sourceSystem.CnName, + Code = contentMap.TrackContentCode, + TrackStatus = sourceStatus.Status, + Content = sourceContent.Content, + EnContent = sourceContent.EnContent, + MapSubSystem = targetSystem.CnName, + MapCode = contentMap.MapTrackContentCode, + MapTrackStatus = targetStatus.Status, + MapContent = targetContent.Content, + MapEnContent = targetContent.EnContent + }) + .ToPagedListAsync(input.PageIndex, input.PageSize); + } + + public async Task GetMapDetailAsync(int id) + { + return await Context.Queryable() + .InnerJoin((contentMap, sourceContent) => contentMap.TrackContentId == sourceContent.Id && !sourceContent.IsDeleted) + .InnerJoin((contentMap, sourceContent, targetContent) => contentMap.MapTrackContentId == targetContent.Id && !targetContent.IsDeleted) + .LeftJoin((contentMap, sourceContent, targetContent, sourceSystem) => contentMap.SubSystemId == sourceSystem.Id && !sourceSystem.IsDeleted) + .LeftJoin((contentMap, sourceContent, targetContent, sourceSystem, targetSystem) => contentMap.MapSubSystemId == targetSystem.Id && !targetSystem.IsDeleted) + .Filter(null, true) + .Where(contentMap => contentMap.Id == id && !contentMap.IsDeleted) + .Select((contentMap, sourceContent, targetContent, sourceSystem, targetSystem) => new GetTrackContentMapDetailOutputVO + { + Id = contentMap.Id, + SubSystemId = contentMap.SubSystemId, + SubSystem = sourceSystem.CnName, + TrackContent = contentMap.TrackContentCode + "-" + sourceContent.Content, + MapSubSystem = targetSystem.CnName, + MapTrackContent = contentMap.MapTrackContentCode + "-" + targetContent.Content + }, true) + .SingleAsync(); + } + + public async Task IsMapAnyAsync(Expression> whereExpression) + { + return await Context.Queryable().Where(whereExpression).AnyAsync(); + } + + public async Task InsertMapAsync(TrackContentMapEntity insertObj) + { + return await Context.Insertable(insertObj).ExecuteCommandAsync() > 0; + } + + public async Task GetMapByIdAsync(int id) + { + return await Context.Queryable().InSingleAsync(id); + } + + public async Task UpdateMapAsync(TrackContentMapEntity updateObj) + { + return await Context.Updateable(updateObj).ExecuteCommandHasChangeAsync(); + } + + public async Task SoftDeleteMapAsync(Expression> whereExpression) + { + return await Context.Updateable() + .Where(whereExpression) + .SetColumns(nameof(ISoftDeleteBasicEntity.IsDeleted), true) + .ExecuteCommandHasChangeAsync(); + } + + public async Task UpdateMapAsync(Expression> columns, Expression> whereExpression) + { + return await Context.Updateable().SetColumns(columns).Where(whereExpression) + .ExecuteCommandAsync() > 0; + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs new file mode 100644 index 00000000..70f62f7e --- /dev/null +++ b/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs @@ -0,0 +1,147 @@ +using Nest; +using SJZY.Expand.ABP.Core.Logger; +using SJZY.Expand.ElasticSearch.Services; +using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; +using SJZY.Track.Domain.Dtos.TrackDetails; + +namespace SJZY.Track.Repository.Repositories; + +internal class TrackDetailsRepository : ElasticSearchContextAbstract, ITrackDetailsRepository, + ITransientDependency +{ + public TrackDetailsRepository(ConnectionFactory connectionFactory) : base(connectionFactory) + { + } + + public async Task GetFirstOrDefaultAsync(int orderId, string trackCode) + { + var r = await Context.SearchAsync(s => s + .Source() + .Query(q => + q.Term(f => f.OrderId, orderId) + && q.Term(f => f.TrackCode.Suffix("keyword"), trackCode) + ) + ); + + var res = r.Documents.FirstOrDefault(); + if (res != default && r.Hits.FirstOrDefault() != default) + { + res.Id = r.Hits.FirstOrDefault()!.Id; + } + + return res; + } + + public async Task UpsertAsync(TrackDetailsIndex index) + { + if (index.Id.IsNullOrWhiteSpace()) + { + // 鎸夊ぉ鍐欏叆es + var r = await Context.IndexAsync(index, request => request + .Index(index.IndexName) + ); + + if (!r.IsValid) + { + LogHelper.Error($"杞ㄨ抗鏂板澶辫触锛屽師鍥狅細{r.DebugInformation}銆"); + } + } + else + { + var r = await Context.UpdateAsync(index.Id, u => u + .Index(index.IndexName) + .Doc(index) + //.Refresh(Refresh.True) // 鍙夛細绔嬪嵆鍒锋柊绱㈠紩浣挎洿鏀圭珛鍗冲彲瑙 + ); + + if (!r.IsValid) + { + LogHelper.Error($"杞ㄨ抗鏇存柊澶辫触锛屽師鍥狅細{r.DebugInformation}銆"); + } + } + } + + public async Task> GetListAsync(int orderType, List orderNos) + { + if (orderNos.Count < 1) return new List(); + + var data = await Context.SearchAsync(x => x + .Source(s => s.Includes(fd => fd + .Field(f => f.OrderNo) + .Field(f => f.TrackStatus) + .Field(f => f.TrackCode) + .Field(f => f.TrackContent) + .Field(f => f.TrackPlace) + .Field(f => f.TrackTime) + .Field(f => f.TrackTimeZone) + )) + .Query(q => + q.Terms(t => t + .Field(f => f.OrderNo.Suffix("keyword")) + .Terms(orderNos)) + && q.Term(f => f.OrderType, orderType) + ) + ); + + return data.Documents.ToList(); + } + + public async Task?> GetListAsync(int orderId) + { + var data = await Context.SearchAsync(x => x + .Query(q => + q.Term(t => t.OrderId, orderId) + ) + .Size(1000) + .Sort(s => s.Field(f => f.TrackTime, SortOrder.Descending))); + + return data?.Documents?.ToList(); + } + + public async Task?> GetListAsync(List orderIds) + { + var data = await Context.SearchAsync(x => x.Query(q => + q.Terms(t => t.Field(g => g.OrderId).Terms(orderIds)) + ) + .Size(10000) + .Sort(s => s.Field(c => c.TrackTime, SortOrder.Descending)) + ); + return data?.Documents?.ToList(); + } + + public async Task DeleteTrackAsync(int orderId, List trackCodes) + { + var r = await Context.DeleteByQueryAsync(x => x + .Query( + q => + q.Term(t => t.OrderId, orderId) + && q.Term(t => t.IsCanDelete, true) + && q.Terms(t => t.Field(f => f.TrackCode.Suffix("keyword")).Terms(trackCodes))) + ); + + if (!r.IsValid) + throw new Exception($"杞ㄨ抗鏁版嵁鍒犻櫎澶辫触锛屽師鍥狅細{r.DebugInformation}"); + } + + public async Task<(List list, long total)> GetListAsync(TrackDetailsQueryInput input) + { + if (input.OrderNos.Count < 1) return default; + + var distinctOrderNumbers = input.OrderNos.Distinct(); + var finalSize = input.PageSize > 500 ? 500 : input.PageSize; + + var data = await Context.SearchAsync(x => x + .Query(q => + q.Terms(t => t + .Field(f => f.OrderNo) + .Terms(distinctOrderNumbers)) + ) + .Sort(s => s.Field(f => f.CreateTime, SortOrder.Descending)) + .From((input.PageIndex - 1) * input.PageSize) + .Size(finalSize) + .TrackTotalHits() // todo: 鑱氬悎鑾峰彇鍖归厤鏌ヨ鏉′欢鐨勬枃妗ｆ绘暟锛岃屼笉鍙"index.max_result_window"鐨勯檺鍒 + ); + + return (data.Documents.ToList(), data.Total); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs new file mode 100644 index 00000000..d2227924 --- /dev/null +++ b/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs @@ -0,0 +1,67 @@ +锘縰sing SJZY.Track.Domain.Aggregates.TrackFlagAggregate; +using SJZY.Track.Domain.Dtos.TrackFlags; +using SJZY.Track.Domain.VEntities; + +namespace SJZY.Track.Repository.Repositories; + +public class TrackFlagRepository : BasicRepository, ITrackFlagRepository, IScopedDependency +{ + public TrackFlagRepository() + { + } + + /// + /// 鑾峰彇杞ㄨ抗鏍囪鏄庣粏 + /// + /// + /// + 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 GetTrackFlagDetailVO + { + Id = a.Id, + SubSystemId = a.SubSystemId, + SubSystem = b.CnName, + Code = a.Code, + Flag = a.Name + //,IsFinish=a.IsCompleted + }) + .FirstAsync(); + return detail; + } + + /// + /// 鍒嗛〉鑾峰彇杞ㄨ抗鏍囪 + /// + /// + /// + public async Task> GetPageTrackFlag(GetPageTrackFlagVO input) + { + UnifyPageResultDto pagedList = new UnifyPageResultDto(); + 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) + .WhereIF(input.SubSystemId > 0, (a, b, c, d) => a.SubSystemId == input.SubSystemId) + .OrderByIF(input.SelectIds.IsNullOrEmpty(), (a, b, c, 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.CreateTime), OrderByType.Desc) + .Select((a, b, c, d) => new GetTrackFlagListVO + { + Id = a.Id, + SubSystem = b.CnName, + Code = a.Code, + Flag = a.Name, + //IsFinish=a.IsCompleted, + CreateTime = a.CreateTime, + CreateUser = c.Name, + UpdateTime = a.UpdateTime, + UpdateUser = d.Name + }) + .ToPagedListAsync(input.PageIndex, input.PageSize); + + return pagedList; + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/Repositories/TrackPullConfigRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackPullConfigRepository.cs new file mode 100644 index 00000000..3a381a0f --- /dev/null +++ b/src/SJZY.Track.Repository/Repositories/TrackPullConfigRepository.cs @@ -0,0 +1,138 @@ +锘縰sing System.Linq.Expressions; +using SJZY.Track.Domain.Aggregates.TrackContentAggregate; +using SJZY.Track.Domain.Aggregates.TrackPullAggregate; +using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; +using SJZY.Track.Domain.Dtos.Common; +using SJZY.Track.Domain.Dtos.TrackPull; +using SJZY.Track.Domain.VEntities; + +namespace SJZY.Track.Repository.Repositories; + +public class TrackPullConfigRepository : BasicRepository, ITrackPullConfigRepository, + IScopedDependency +{ + public async Task> GetPageAsync(KeywordsInputVO input) + { + return await AsQueryable() + .LeftJoin((trackPull, system) => trackPull.SubSystemId == system.Id && !system.IsDeleted) + .LeftJoin((trackPull, system, service) => trackPull.ServiceProviderId == service.Id && !service.IsDeleted) + .LeftJoin((trackPull, system, service, template) => trackPull.TrackTemplateId == template.Id && !template.IsDeleted) + .Filter(null, true) + .Where(trackPull => !trackPull.IsDeleted) + .WhereIF(input.SubSystemId.HasValue, trackPull => trackPull.SubSystemId == input.SubSystemId) + .WhereIF(!input.Keywords.IsNullOrWhiteSpace(), (trackPull, system, service, template) => service.Name.Contains(input.Keywords) || template.Name.Contains(input.Keywords)) + .OrderByDescending(trackPull => trackPull.CreateTime) + .Select((trackPull, system, service, template) => new GetTrackPullConfigPageOutputVO + { + Id = trackPull.Id, + SubSystem = system.CnName, + ServiceProvider = service.Name, + TrackTemplate = template.Name, + CreateTime = trackPull.CreateTime + }) + .ToPagedListAsync(input.PageIndex, input.PageSize); + } + + public async Task> GetContentPageAsync(GetTrackPullContentPageInputVO input) + { + return await Context.Queryable() + .InnerJoin((pullContent, trackContent) => pullContent.TrackContentId == trackContent.Id) + .InnerJoin((pullContent, trackContent, trackPull) => pullContent.TrackPullConfigId == trackPull.Id) + .InnerJoin((pullContent, trackContent, trackPull, templateContent) => trackPull.TrackTemplateId == templateContent.TrackTemplateId && pullContent.TrackContentId == templateContent.TrackContentId) + .Where(pullContent => pullContent.TrackPullConfigId == input.TrackPullConfigId) + .OrderBy((pullContent, trackContent, trackPull, templateContent) => templateContent.Sort) + .Select((pullContent, trackContent, trackPull, templateContent) => new GetTrackPullContentPageOutputVO + { + Id = pullContent.Id + }, true) + .ToPagedListAsync(input.PageIndex, input.PageSize); + } + + public async Task GetDetailAsync(int id) + { + return await AsQueryable() + .LeftJoin((trackPull, system) => trackPull.SubSystemId == system.Id && !system.IsDeleted) + .LeftJoin((trackPull, system, service) => trackPull.ServiceProviderId == service.Id && !service.IsDeleted) + .LeftJoin((trackPull, system, service, template) => trackPull.TrackTemplateId == template.Id && !template.IsDeleted) + .InnerJoin((trackPull, system, service, template, paramsConfig) => trackPull.Id == paramsConfig.PullOrPushConfigId && !paramsConfig.IsPush && !paramsConfig.IsDeleted) + .Filter(null, true) + .Where(trackPull => trackPull.Id == id && !trackPull.IsDeleted) + .Select((trackPull, system, service, template, paramsConfig) => new GetTrackPullConfigDetailOutputVO + { + Id = trackPull.Id, + SubSystem = system.CnName, + ServiceProvider = service.Name, + TrackTemplate = template.Name + }, true) + .SingleAsync(); + } + + public async Task GetContentDetailAsync(int id) + { + return await Context.Queryable() + .InnerJoin((pullContent, trackContent) => pullContent.TrackContentId == trackContent.Id) + .Where(pullContent => pullContent.Id == id) + .Select((pullContent, trackContent) => new GetTrackPullContentDetailOutputVO + { + Id = pullContent.Id, + Code = trackContent.Code + "-" + trackContent.Content, + }, true) + .Mapper(x => + { + x.TrackKeywords = x.TrackKeyword?.Split(',').ToList(); + x.TrackKeywordReverses = x.TrackKeywordReverse?.Split(',').ToList(); + }) + .SingleAsync(); + } + + public async Task InsertParamsAsync(TrackPushPullParamsConfigEntity insertObj) + { + return await Context.Insertable(insertObj).ExecuteCommandAsync() > 0; + } + + public async Task InsertContentRangeAsync(List insertObjs) + { + return await Context.Insertable(insertObjs).ExecuteCommandAsync() > 0; + } + + public async Task GetParamsSingleAsync(Expression> whereExpression) + { + return await Context.Queryable().SingleAsync(whereExpression); + } + + public async Task UpdateParamsAsync(TrackPushPullParamsConfigEntity updateObj) + { + return await Context.Updateable(updateObj).ExecuteCommandHasChangeAsync(); + } + + public async Task SoftDeleteContentAsync(Expression> whereExpression) + { + return await Context.Updateable() + .Where(whereExpression) + .SetColumns(nameof(ISoftDeleteBasicEntity.IsDeleted), true) + .ExecuteCommandHasChangeAsync(); + } + + public async Task SoftDeleteParamsAsync(Expression> whereExpression) + { + return await Context.Updateable() + .Where(whereExpression) + .SetColumns(nameof(ISoftDeleteBasicEntity.IsDeleted), true) + .ExecuteCommandHasChangeAsync(); + } + + public async Task GetContentByIdAsync(int id) + { + return await Context.Queryable().InSingleAsync(id); + } + + public async Task UpdateContentAsync(TrackPullContentConfigEntity updateObj) + { + return await Context.Updateable(updateObj).ExecuteCommandHasChangeAsync(); + } + + public async Task IsContentAnyAsync(Expression> whereExpression) + { + return await Context.Queryable().Where(whereExpression).AnyAsync(); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs new file mode 100644 index 00000000..f6a325fd --- /dev/null +++ b/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs @@ -0,0 +1,141 @@ +锘縰sing SJZY.Expand.ABP.Core.PublicMethords; +using SJZY.Track.Domain.Aggregates.TrackContentAggregate; +using SJZY.Track.Domain.Aggregates.TrackPullAggregate; +using SJZY.Track.Domain.Aggregates.TrackPushAggregate; +using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; +using SJZY.Track.Domain.Dtos.Common; +using SJZY.Track.Domain.Dtos.TrackPush; +using SJZY.Track.Domain.Enums; +using SJZY.Track.Domain.VEntities; +using SJZY.Track.Repository.VData.Entitys; +using System.Linq.Expressions; + +namespace SJZY.Track.Repository.Repositories; + +public class TrackPushConfigRepository : BasicRepository, ITrackPushConfigRepository, + IScopedDependency +{ + public async Task> GetPageAsync(KeywordsInputVO input) + { + return await AsQueryable() + .LeftJoin((trackPush, system) => trackPush.SubSystemId == system.Id && !system.IsDeleted) + .LeftJoin((trackPush, system, externalSubject) => trackPush.CustomId == externalSubject.Id && !externalSubject.IsDeleted) + .LeftJoin((trackPush, system, externalSubject, template) => SqlFunc.SplitIn(trackPush.TrackTemplateId, template.Id.ToString()) && !template.IsDeleted) + .Filter(null, true) + .Where(trackPush => !trackPush.IsDeleted) + .WhereIF(input.SubSystemId.HasValue, trackPush => trackPush.SubSystemId == input.SubSystemId) + .WhereIF(!input.Keywords.IsNullOrWhiteSpace(), (trackPush, system, externalSubject, template) => externalSubject.Abbreviation.Contains(input.Keywords) || externalSubject.Name.Contains(input.Keywords) || template.Name.Contains(input.Keywords)) + .OrderByDescending(trackPush => trackPush.CreateTime) + .Select((trackPush, system, externalSubject, template) => new GetTrackPushConfigPageOutputVO + { + Id = trackPush.Id, + SubSystem = system.CnName, + CustomName = externalSubject.Abbreviation, + TrackTemplate = SqlFunc.Subqueryable() + .Where(template => SqlFunc.SplitIn(trackPush.TrackTemplateId, template.Id.ToString()) && !template.IsDeleted) + .SelectStringJoin(template => template.Name, ","), + TrackTemplateId = trackPush.TrackTemplateId, + CreateTime = trackPush.CreateTime + }) + .Distinct() + .Mapper(x => { x.TrackTemplateIds = x.TrackTemplateId.Split(',').Select(int.Parse).ToList(); }) + .ToPagedListAsync(input.PageIndex, input.PageSize); + } + + public async Task> GetContentPageAsync(GetTrackPushContentPageInputVO input) + { + return await Context.Queryable() + .InnerJoin((pushContent, trackContent) => pushContent.TrackContentId == trackContent.Id) + .LeftJoin((pushContent, trackContent, enumValue) => enumValue.Property == EnumPropertyEnums.鍗曞彿绫诲瀷.GetDescription() && pushContent.OrderNoType == enumValue.Enumkey && !enumValue.IsDeleted) + .Where(pushContent => pushContent.TrackPushConfigId == input.TrackPushConfigId) + .OrderBy(pushContent => pushContent.Sort) + .Select((pushContent, trackContent, enumValue) => new GetTrackPushContentPageOutputVO + { + Id = pushContent.Id, + Sort = pushContent.Sort, + OrderNoType = enumValue.Disp + }, true) + .ToPagedListAsync(input.PageIndex, input.PageSize); + } + + public async Task GetDetailAsync(int id) + { + return await AsQueryable() + .LeftJoin((trackPush, system) => trackPush.SubSystemId == system.Id && !system.IsDeleted) + .LeftJoin((trackPush, system, externalSubject) => trackPush.CustomId == externalSubject.Id && !externalSubject.IsDeleted) + .LeftJoin((trackPush, system, externalSubject, service) => trackPush.ServiceProviderId == service.Id && !service.IsDeleted) + .InnerJoin((trackPush, system, externalSubject, service, paramsConfig) => trackPush.Id == paramsConfig.PullOrPushConfigId && paramsConfig.IsPush && !paramsConfig.IsDeleted) + .Filter(null, true) + .Where(trackPush => trackPush.Id == id && !trackPush.IsDeleted) + .Select((trackPush, system, externalSubject, service, paramsConfig) => new GetTrackPushConfigDetailOutputVO + { + Id = trackPush.Id, + SubSystem = system.CnName, + CustomName = externalSubject.Abbreviation, + ServiceProvider = service.Name, + }, true) + .Mapper(x => { x.TrackTemplateIds = x.TrackTemplateId.Split(',').Select(int.Parse).ToList(); }) + .SingleAsync(); + } + + public async Task GetContentDetailAsync(int id) + { + return await Context.Queryable() + .InnerJoin((pushContent, trackContent) => pushContent.TrackContentId == trackContent.Id) + .Where(pushContent => pushContent.Id == id) + .Select((pushContent, trackContent) => new GetTrackPushContentDetailOutputVO + { + Id = pushContent.Id, + Code = trackContent.Code + "-" + trackContent.Content, + }, true) + .SingleAsync(); + } + + public async Task SoftDeleteContentAsync(Expression> whereExpression) + { + return await Context.Updateable() + .Where(whereExpression) + .SetColumns(nameof(ISoftDeleteBasicEntity.IsDeleted), true) + .ExecuteCommandHasChangeAsync(); + } + + public async Task IsContentAnyAsync(Expression> whereExpression) + { + return await Context.Queryable().Where(whereExpression).AnyAsync(); + } + + public async Task InsertContentAsync(TrackPushContentConfigEntity insertObj) + { + return await Context.Insertable(insertObj).ExecuteCommandAsync() > 0; + } + + public async Task GetContentByIdAsync(int id) + { + return await Context.Queryable().InSingleAsync(id); + } + + public async Task UpdateContentAsync(TrackPushContentConfigEntity updateObj) + { + return await Context.Updateable(updateObj).ExecuteCommandHasChangeAsync(); + } + + public async Task> GetContentListAsync(Expression> whereExpression) + { + return await Context.Queryable().Where(whereExpression).ToListAsync(); + } + + public async Task UpdateContentRangeAsync(List updateObjs) + { + return await Context.Updateable(updateObjs).ExecuteCommandHasChangeAsync(); + } + + public async Task ContentMaxAsync(Expression> columns, Expression> whereExpression) + { + return await Context.Queryable().Where(whereExpression).MaxAsync(columns); + } + + public async Task UpdateContentAsync(Expression> columns, Expression> whereExpression) + { + return await Context.Updateable().SetColumns(columns).Where(whereExpression).ExecuteCommandHasChangeAsync(); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs new file mode 100644 index 00000000..a4abd5b5 --- /dev/null +++ b/src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs @@ -0,0 +1,69 @@ +using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; +using SJZY.Track.Domain.Dtos.TrackStatus; +using SJZY.Track.Domain.VEntities; + +namespace SJZY.Track.Repository.Repositories; + +public class TrackStatusRepository : BasicRepository, ITrackStatusRepository, IScopedDependency +{ + /// + /// 鑾峰彇杞ㄨ抗鐘舵佹槑缁 + /// + /// + /// + 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 GetTrackStatusDetailVO + { + Id = a.Id, + SubSystemId = a.SubSystemId, + SubSystem = b.CnName, + Code = a.Code, + EntrackStatus = a.EnStatus, + NodeId = a.Node, + TrackStatus = a.Status + }) + .FirstAsync(); + return detail; + } + + /// + /// 鍒嗛〉鑾峰彇杞ㄨ抗鐘舵 + /// + /// + /// + public async Task> GetPageTrackStatus(GetPageTrackStatusVO input) + { + UnifyPageResultDto 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) + .WhereIF(input.SubSystemId > 0, (a, b, c, 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) + .OrderByIF(!input.SelectIds.IsNullOrEmpty(), (a, b, c, d) => SqlFunc.IIF(input.SelectIds.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), a.CreateTime), OrderByType.Desc) + .Select((a, b, c, d) => new GetTrackStatusListVO + { + Id = a.Id, + Code = a.Code, + EntrackStatus = a.EnStatus, + TrackStatus = a.Status, + NodeId = a.Node, + Node = SqlFunc.IF(a.Node == 1).Return("鎻芥敹").ElseIF(a.Node == 2).Return("娓呭叧").ElseIF(a.Node == 3) + .Return("骞茬嚎").ElseIF(a.Node == 4).Return("娲鹃").ElseIF(a.Node == 5).Return("鍏朵粬").End(""), + CreateTime = a.CreateTime, + CreateUser = c.Name, + UpdateTime = a.UpdateTime, + UpdateUser = d.Name, + SubSystem = b.CnName + }) + .ToPagedListAsync(input.PageIndex, input.PageSize); + + return pagedList; + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs new file mode 100644 index 00000000..21b72d53 --- /dev/null +++ b/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs @@ -0,0 +1,204 @@ +锘縰sing 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.TrackStatusAggregate; +using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; +using SJZY.Track.Domain.Dtos.TrackTemplate; +using SJZY.Track.Domain.Enums; +using SJZY.Track.Domain.VEntities; + +namespace SJZY.Track.Repository.Repositories; + +public class TrackTemplateRepository : BasicRepository, ITrackTemplateRepository, IScopedDependency +{ + /// + /// 鑾峰彇杞ㄨ抗妯＄増鏄庣粏 + /// + /// + /// + 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 + { + Id = a.Id, + Code = a.Code, + Name = a.Name, + SubSystemId = a.SubSystemId, + SubSystem = b.CnName + }).FirstAsync(); + + return detail; + } + + /// + /// 鍒嗛〉鑾峰彇杞ㄨ抗妯＄増 + /// + /// + /// + public async Task> GetPageTrackTemplate(GetPageTrackTemplateVO input) + { + UnifyPageResultDto 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.Keywords.IsNullOrWhiteSpace(), + (a, b) => a.Name.Contains(input.Keywords) || a.Code.Contains(input.Keywords)) + .OrderByIF(input.SelectIds.IsNullOrEmpty(), (a, b) => a.CreateTime, OrderByType.Desc) + .OrderByIF(!input.SelectIds.IsNullOrEmpty(), (a, b) => SqlFunc.IIF(input.SelectIds.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), a.CreateTime), OrderByType.Desc) + .Select((a, b) => new GetTrackTemplateListVO + { + Id = a.Id, + Code = a.Code, + CreateTime = a.CreateTime, + Name = a.Name, + SubSystem = b.CnName, + SubSystemId = b.Id + }) + .ToPagedListAsync(input.PageIndex, input.PageSize); + //.OrderByIF(input.TrackTemplateId > 0, + // (a, b) => SqlFunc.IIF(a.Id == input.TrackTemplateId, SqlFunc.DateAdd(SqlFunc.GetDate(), 1), + //a.CreateTime), OrderByType.Desc) + return pagedList; + } + + /// + /// 鑾峰彇杞ㄨ抗鍐呭灞炴у + /// + /// + public async Task GetTrackContentAttributeValue(GetTemplateContentAttributeValueInputVO input) + { + + + return null; + } + + /// + public async Task> GetContentPageAsync( + GetTrackTemplateContentPageInputVO input) + { + return await Context.Queryable() + .InnerJoin((templateContent, trackContent) => + templateContent.TrackContentId == trackContent.Id && !trackContent.IsDeleted) + .LeftJoin((templateContent, trackContent, trackStatus) => + trackContent.TrackStatusId == trackStatus.Id && !trackStatus.IsDeleted) + .LeftJoin((templateContent, trackContent, trackStatus, enumValue) => + enumValue.Property == EnumPropertyEnums.鑺傜偣.GetDescription() && trackStatus.Node == enumValue.Enumkey && + !enumValue.IsDeleted) + .LeftJoin((templateContent, trackContent, trackStatus, enumValue, trackFlag) => + trackContent.TrackFlagId == trackFlag.Id && !trackFlag.IsDeleted) + .LeftJoin((templateContent, trackContent, trackStatus, enumValue, trackFlag, createUser) => + templateContent.CreateUserId == createUser.Id && !createUser.IsDeleted) + .LeftJoin( + (templateContent, trackContent, trackStatus, enumValue, trackFlag, createUser, updateUser) => + templateContent.UpdateUserId == updateUser.Id && !updateUser.IsDeleted) + .Filter(null, true) + .Where(templateContent => input.TrackTemplateIds.Contains(templateContent.TrackTemplateId) && !templateContent.IsDeleted) + .Select((templateContent, trackContent, trackStatus, enumValue, trackFlag, createUser, updateUser) => + new GetTrackTemplateContentPageOutputVO + { + Id = templateContent.Id, + TrackStatus = trackStatus.Status, + Node = enumValue.Disp, + TrackFlag = trackFlag.Name, + CreateTime = templateContent.CreateTime, + CreateUser = createUser.Name, + UpdateTime = templateContent.UpdateTime, + UpdateUser = updateUser.Name + }, true) + .OrderBy(templateContent => templateContent.Sort) + .ToPagedListAsync(input.PageIndex, input.PageSize); + } + + /// + public async Task GetContentDetailAsync(int id) + { + return await Context.Queryable() + .InnerJoin((templateContent, trackContent) => + templateContent.TrackContentId == trackContent.Id && !trackContent.IsDeleted) + .LeftJoin((templateContent, trackContent, trackStatus) => + trackContent.TrackStatusId == trackStatus.Id && !trackStatus.IsDeleted) + .Filter(null, true) + .Where(templateContent => templateContent.Id == id && !templateContent.IsDeleted) + .Select((templateContent, trackContent, trackStatus) => new GetTrackTemplateContentDetailOutputVO + { + Id = templateContent.Id, + TrackContent = trackContent.Code + "-" + trackContent.Content, + TrackStatus = trackStatus.Status + }, true) + .SingleAsync(); + } + + /// + public async Task IsContentAnyAsync(Expression> whereExpression) + { + return await Context.Queryable().Where(whereExpression).AnyAsync(); + } + + /// + public async Task InsertContentAsync(TrackTemplateContentEntity insertObj) + { + return await Context.Insertable(insertObj).ExecuteCommandAsync() > 0; + } + + /// + public async Task GetContentByIdAsync(int id) + { + return await Context.Queryable().InSingleAsync(id); + } + + /// + public async Task UpdateContentAsync(TrackTemplateContentEntity updateObj) + { + return await Context.Updateable(updateObj).ExecuteCommandHasChangeAsync(); + } + + /// + public async Task SoftDeleteContentAsync(int id) + { + return await Context.Updateable() + .Where(x => x.Id == id) + .SetColumns(nameof(ISoftDeleteBasicEntity.IsDeleted), true) + .ExecuteCommandHasChangeAsync(); + } + + public async Task> GetContentListAsync( + Expression> whereExpression) + { + return await Context.Queryable().Where(whereExpression).ToListAsync(); + } + + public async Task UpdateContentRangeAsync(List updateObjs) + { + return await Context.Updateable(updateObjs).ExecuteCommandHasChangeAsync(); + } + + public async Task> GetContentDropDownListAsync(GetTrackTemplateContentDropDownListVO input) + { + return await Context.Queryable() + .InnerJoin((templateContent, trackContent) => templateContent.TrackContentId == trackContent.Id) + .Where(templateContent => input.TrackTemplateIds.Contains(templateContent.TrackTemplateId)) + .OrderByIF(input.SelectedIds.IsNullOrEmpty(), templateContent => templateContent.CreateTime, OrderByType.Desc) + .OrderByIF(!input.SelectedIds.IsNullOrEmpty(), templateContent => SqlFunc.IIF(input.SelectedIds.Contains(templateContent.TrackContentId), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), templateContent.CreateTime), OrderByType.Desc) + .Select((templateContent, trackContent) => new DropdownListDataDto + { + Value = templateContent.TrackContentId, + Key = trackContent.Code + "-" + trackContent.Content + }) + .Distinct() + .ToPagedListAsync(input.PageIndex, input.PageSize); + } + + public async Task ContentMaxAsync(Expression> columns, Expression> whereExpression) + { + return await Context.Queryable().Where(whereExpression).MaxAsync(columns); + } + + public async Task UpdateContentAsync(Expression> columns, Expression> whereExpression) + { + return await Context.Updateable().SetColumns(columns).Where(whereExpression).ExecuteCommandHasChangeAsync(); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/RepositoryModule.cs b/src/SJZY.Track.Repository/RepositoryModule.cs deleted file mode 100644 index e4a336b9..00000000 --- a/src/SJZY.Track.Repository/RepositoryModule.cs +++ /dev/null @@ -1,33 +0,0 @@ -锘縰sing Microsoft.Extensions.DependencyInjection; -using SJZY.Expand.ABP.Core.SqlSugar.Options; -using Volo.Abp.Autofac; -using Volo.Abp.Modularity; - -namespace SJZY.Track.Repository -{ - /// - /// 浠撳偍妯″潡 - /// - [DependsOn(typeof(AbpAutofacModule))] - public class RepositoryModule : AbpModule - { - public override void PreConfigureServices(ServiceConfigurationContext context) - { - var configuration = context.Services.GetConfiguration(); - - context.Services.AddSqlsugar(options => - { - options.AddRange(new List { - new SqlsugarOptions() - { - ConnectionString = configuration["ConnectionStrings:DefaultConnection"], - DbType = DbType.MySql, - IsAutoCloseConnection = true, - ConfigId = "default" - } - } - ); - }, DataBaseContext.OnExcutingAction, "SJZY.Track.Repository"); - } - } -} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/SJZY.Track.Repository.csproj b/src/SJZY.Track.Repository/SJZY.Track.Repository.csproj index d4c60ce9..b2285e0b 100644 --- a/src/SJZY.Track.Repository/SJZY.Track.Repository.csproj +++ b/src/SJZY.Track.Repository/SJZY.Track.Repository.csproj @@ -1,23 +1,20 @@ 锘 + + + net7.0 + True + preview + - - net7.0 - enable - enable - True - + + + + + + - - - - - - - - - - - - + + + diff --git a/src/SJZY.Track.Repository/SjzyTrackRepositoryModule.cs b/src/SJZY.Track.Repository/SjzyTrackRepositoryModule.cs new file mode 100644 index 00000000..e7ca3b6b --- /dev/null +++ b/src/SJZY.Track.Repository/SjzyTrackRepositoryModule.cs @@ -0,0 +1,59 @@ +锘縰sing 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<>)); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/TrackPushRecord/Entitys/TrackPushRecordEntity.cs b/src/SJZY.Track.Repository/TrackPushRecord/Entitys/TrackPushRecordEntity.cs new file mode 100644 index 00000000..b3c2ff5b --- /dev/null +++ b/src/SJZY.Track.Repository/TrackPushRecord/Entitys/TrackPushRecordEntity.cs @@ -0,0 +1,59 @@ +锘縰sing SJZY.Track.Domain.SeedWork; + +namespace SJZY.Track.Repository.TrackPushRecord.Entitys +{ + /// + /// 杞ㄨ抗鎺ㄩ佽褰 + /// + [SugarTable("t_track_push_record")] + public class TrackPushRecordEntity : IAggregateRoot + { + /// + /// 鑷涓婚敭 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 鍒涘缓鏃堕棿锛堟帹閫佹椂闂达級 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime CreateTime { get; set; } + + /// + /// 鍒涘缓浜猴紙鎺ㄩ佷汉锛 + /// + [SugarColumn(ColumnName = "CreateUserId")] + public int CreateUserId { get; set; } + + /// + /// 鏄惁鑷姩鎺ㄩ + /// + [SugarColumn(ColumnName = "IsAutoPush")] + public bool IsAutoPush { get; set; } + + /// + /// 鎺ㄩ佸唴瀹 + /// + [SugarColumn(ColumnName = "PushContent")] + public string PushContent { get; set; } = null!; + + /// + /// 鎺ュ彛閫氳姹俰d + /// + [SugarColumn(ColumnName = "RequestId")] + public string RequestId { get; set; } = null!; + + /// + /// 鏈嶅姟鍟唅d + /// + [SugarColumn(ColumnName = "ServiceProviderId")] + public int ServiceProviderId { get; set; } + + /// + /// 鎺ㄩ佽建杩规绘暟 + /// + [SugarColumn(ColumnName = "TrackTotal")] + public int TrackTotal { get; set; } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/TrackPushRecord/Services/ITrackPushRecordRepository.cs b/src/SJZY.Track.Repository/TrackPushRecord/Services/ITrackPushRecordRepository.cs new file mode 100644 index 00000000..686a3402 --- /dev/null +++ b/src/SJZY.Track.Repository/TrackPushRecord/Services/ITrackPushRecordRepository.cs @@ -0,0 +1,8 @@ +锘縰sing SJZY.Track.Repository.TrackPushRecord.Entitys; + +namespace SJZY.Track.Repository.TrackPushRecord.Services +{ + public interface ITrackPushRecordRepository : ISimpleClient + { + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/TrackPushRecord/Services/TrackPushRecordRepository.cs b/src/SJZY.Track.Repository/TrackPushRecord/Services/TrackPushRecordRepository.cs new file mode 100644 index 00000000..e8e16ab9 --- /dev/null +++ b/src/SJZY.Track.Repository/TrackPushRecord/Services/TrackPushRecordRepository.cs @@ -0,0 +1,10 @@ +锘縰sing SJZY.Track.Repository.Repositories; +using SJZY.Track.Repository.TrackPushRecord.Entitys; + +namespace SJZY.Track.Repository.TrackPushRecord.Services +{ + public class TrackPushRecordRepository : BasicRepository, ITrackPushRecordRepository, IScopedDependency + { + + } +} diff --git a/src/SJZY.Track.Repository/TrackPushRecordDetails/Entitys/TrackPushRecordDetailsEntity.cs b/src/SJZY.Track.Repository/TrackPushRecordDetails/Entitys/TrackPushRecordDetailsEntity.cs new file mode 100644 index 00000000..64208102 --- /dev/null +++ b/src/SJZY.Track.Repository/TrackPushRecordDetails/Entitys/TrackPushRecordDetailsEntity.cs @@ -0,0 +1,47 @@ +锘縰sing SJZY.Track.Domain.SeedWork; + +namespace SJZY.Track.Repository.TrackPushRecordDetails.Entitys +{ + /// + /// 杞ㄨ抗鎺ㄩ佹槑缁嗚〃 + /// + [SugarTable("t_track_push_record_details")] + public class TrackPushRecordDetailsEntity : IAggregateRoot + { + /// + /// 鑷涓婚敭 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 鍒涘缓鏃堕棿锛堟秷璐瑰畬鎴愭椂闂达級 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime CreateTime { get; set; } + + /// + /// 寮傚父淇℃伅 + /// + [SugarColumn(ColumnName = "ErrorMessage")] + public string ErrorMessage { get; set; } + + /// + /// 鏄惁鎴愬姛 + /// + [SugarColumn(ColumnName = "IsSuccess")] + public bool IsSuccess { get; set; } + + /// + /// 璁㈠崟id + /// + [SugarColumn(ColumnName = "OrderId")] + public int OrderId { get; set; } + + /// + /// 鎺ㄩ佽褰昳d + /// + [SugarColumn(ColumnName = "PushRecordId")] + public int PushRecordId { get; set; } + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/TrackPushRecordDetails/Services/ITrackPushRecordDetailsRepository.cs b/src/SJZY.Track.Repository/TrackPushRecordDetails/Services/ITrackPushRecordDetailsRepository.cs new file mode 100644 index 00000000..f84fafa7 --- /dev/null +++ b/src/SJZY.Track.Repository/TrackPushRecordDetails/Services/ITrackPushRecordDetailsRepository.cs @@ -0,0 +1,8 @@ +锘縰sing SJZY.Track.Repository.TrackPushRecordDetails.Entitys; + +namespace SJZY.Track.Repository.TrackPushRecordDetails.Services +{ + public interface ITrackPushRecordDetailsRepository : ISimpleClient + { + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/TrackPushRecordDetails/Services/TrackPushRecordDetailsRepository.cs b/src/SJZY.Track.Repository/TrackPushRecordDetails/Services/TrackPushRecordDetailsRepository.cs new file mode 100644 index 00000000..3a8c025b --- /dev/null +++ b/src/SJZY.Track.Repository/TrackPushRecordDetails/Services/TrackPushRecordDetailsRepository.cs @@ -0,0 +1,10 @@ +锘縰sing SJZY.Track.Repository.Repositories; +using SJZY.Track.Repository.TrackPushRecordDetails.Entitys; + +namespace SJZY.Track.Repository.TrackPushRecordDetails.Services +{ + public class TrackPushRecordDetailsRepository : BasicRepository, ITrackPushRecordDetailsRepository, IScopedDependency + { + + } +} diff --git a/test/SJZY.OpenApi.Test/Demo/DemoTest.cs b/test/SJZY.OpenApi.Test/Demo/DemoTest.cs deleted file mode 100644 index c8479c89..00000000 --- a/test/SJZY.OpenApi.Test/Demo/DemoTest.cs +++ /dev/null @@ -1,27 +0,0 @@ -锘縰sing SJZY.OpenApi.Application.Dtos.Demo; -using SJZY.OpenApi.Application.Services.Demo; - -namespace SJZY.OpenApi.Test.Demo -{ - public class DemoTest : TestModuleTestBase - { - #region 鏋勯犲嚱鏁 - private InterFaceDemoService _interFaceDemoService; - public DemoTest() - { - _interFaceDemoService = GetRequiredService(); - } - #endregion - - [Fact] - public async Task Test() - { - var data = new DemoInput(); - - var res = await _interFaceDemoService.Edit(data); - - Assert.NotNull(res); - } - - } -} diff --git a/test/SJZY.OpenApi.Test/ProblemTypeService/ProblemTypeServiceTest.cs b/test/SJZY.OpenApi.Test/ProblemTypeService/ProblemTypeServiceTest.cs deleted file mode 100644 index ce783b3f..00000000 --- a/test/SJZY.OpenApi.Test/ProblemTypeService/ProblemTypeServiceTest.cs +++ /dev/null @@ -1,7 +0,0 @@ -锘縩amespace SJZY.OpenApi.Test.ProblemTypeServiceTest -{ - public class ProblemTypeServiceTest : TestModuleTestBase - { - - } -} \ No newline at end of file diff --git a/test/SJZY.OpenApi.Test/TestModule.cs b/test/SJZY.OpenApi.Test/TestModule.cs deleted file mode 100644 index f0567c60..00000000 --- a/test/SJZY.OpenApi.Test/TestModule.cs +++ /dev/null @@ -1,67 +0,0 @@ -锘縰sing Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.DependencyInjection; -using SJZY.OpenApi.Api; -using SJZY.OpenApi.Application; -using SJZY.OpenApi.Repository; -using Volo.Abp; -using Volo.Abp.AspNetCore.TestBase; -using Volo.Abp.Authorization; -using Volo.Abp.Autofac; -using Volo.Abp.Data; -using Volo.Abp.Http.Client; -using Volo.Abp.Modularity; -using Volo.Abp.Threading; - -[assembly: HostingStartup(typeof(SJZY.Expand.ABP.Core.HostingStartup))] -namespace SJZY.OpenApi.Test -{ - [DependsOn( - typeof(AbpAspNetCoreTestBaseModule), - typeof(AbpAutofacModule), - typeof(AbpAuthorizationModule), - typeof(RepositoryModule), - typeof(ApplicationModule), - typeof(ApiModule), - typeof(AbpHttpClientModule) //娣诲姞abp鐨刪ttp浠ｇ悊妯″潡 - )] - - [assembly: HostingStartup(typeof(Expand.ABP.Core.HostingStartup))] - public class TestModule : AbpModule - { - - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.AddAlwaysAllowAuthorization(); - //娣诲姞鍐呯綉鏈嶅姟 - //context.Services.AddHttpClientProxies(typeof(LoggerCenterHttpApiModule).Assembly, "LoggerCenter", false); - } - - public override void OnApplicationInitialization(ApplicationInitializationContext context) - { - SeedTestData(context); - } - - public override void OnApplicationShutdown(ApplicationShutdownContext context) - { - //鏍规嵁涓氬姟鍦烘櫙鍐冲畾锛屾槸鍚﹂渶瑕佸垹闄ゆ祴璇曟暟鎹 - } - - /// - /// 鐢熸垚绉嶅瓙娴嬭瘯鏁版嵁 - /// - /// - private static void SeedTestData(ApplicationInitializationContext context) - { - AsyncHelper.RunSync(async () => - { - using (var scope = context.ServiceProvider.CreateScope()) - { - await scope.ServiceProvider - .GetRequiredService() - .SeedAsync(); - } - }); - } - } - -} diff --git a/test/SJZY.OpenApi.Test/SJZY.OpenApi.Test.csproj b/test/SJZY.Track.Test/SJZY - Backup.Track.Test.csproj similarity index 93% rename from test/SJZY.OpenApi.Test/SJZY.OpenApi.Test.csproj rename to test/SJZY.Track.Test/SJZY - Backup.Track.Test.csproj index 1969e8f8..c2b5048f 100644 --- a/test/SJZY.OpenApi.Test/SJZY.OpenApi.Test.csproj +++ b/test/SJZY.Track.Test/SJZY - Backup.Track.Test.csproj @@ -39,7 +39,7 @@ - + diff --git a/test/SJZY.Track.Test/SJZY.Track.Test.csproj b/test/SJZY.Track.Test/SJZY.Track.Test.csproj new file mode 100644 index 00000000..c2b5048f --- /dev/null +++ b/test/SJZY.Track.Test/SJZY.Track.Test.csproj @@ -0,0 +1,45 @@ +锘 + + + net7.0 + enable + enable + + false + + + + + + + + + PreserveNewest + true + PreserveNewest + + + + + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + diff --git a/test/SJZY.OpenApi.Test/Startup.cs b/test/SJZY.Track.Test/Startup.cs similarity index 95% rename from test/SJZY.OpenApi.Test/Startup.cs rename to test/SJZY.Track.Test/Startup.cs index eee65d21..27397eb3 100644 --- a/test/SJZY.OpenApi.Test/Startup.cs +++ b/test/SJZY.Track.Test/Startup.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; +using SJZY.Track.Test; namespace SJZY.OpenApi.Test { diff --git a/test/SJZY.Track.Test/TestModule.cs b/test/SJZY.Track.Test/TestModule.cs new file mode 100644 index 00000000..aa5f8d90 --- /dev/null +++ b/test/SJZY.Track.Test/TestModule.cs @@ -0,0 +1,64 @@ +锘縰sing Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.DependencyInjection; +using SJZY.Track.Api; +using SJZY.Track.Application; +using SJZY.Track.Repository; +using Volo.Abp; +using Volo.Abp.AspNetCore.TestBase; +using Volo.Abp.Authorization; +using Volo.Abp.Autofac; +using Volo.Abp.Data; +using Volo.Abp.Http.Client; +using Volo.Abp.Modularity; +using Volo.Abp.Threading; + +[assembly: HostingStartup(typeof(SJZY.Expand.ABP.Core.HostingStartup))] + +namespace SJZY.Track.Test; + +[DependsOn( + typeof(AbpAspNetCoreTestBaseModule), + typeof(AbpAutofacModule), + typeof(AbpAuthorizationModule), + typeof(SjzyTrackRepositoryModule), + typeof(SjzyTrackApplicationModule), + typeof(SjzyTrackApiModule), + typeof(AbpHttpClientModule) //娣诲姞abp鐨刪ttp浠ｇ悊妯″潡 +)] +[assembly: HostingStartup(typeof(Expand.ABP.Core.HostingStartup))] +public class TestModule : AbpModule +{ + public override void ConfigureServices(ServiceConfigurationContext context) + { + context.Services.AddAlwaysAllowAuthorization(); + //娣诲姞鍐呯綉鏈嶅姟 + //context.Services.AddHttpClientProxies(typeof(LoggerCenterHttpApiModule).Assembly, "LoggerCenter", false); + } + + public override void OnApplicationInitialization(ApplicationInitializationContext context) + { + SeedTestData(context); + } + + public override void OnApplicationShutdown(ApplicationShutdownContext context) + { + //鏍规嵁涓氬姟鍦烘櫙鍐冲畾锛屾槸鍚﹂渶瑕佸垹闄ゆ祴璇曟暟鎹 + } + + /// + /// 鐢熸垚绉嶅瓙娴嬭瘯鏁版嵁 + /// + /// + private static void SeedTestData(ApplicationInitializationContext context) + { + AsyncHelper.RunSync(async () => + { + using (var scope = context.ServiceProvider.CreateScope()) + { + await scope.ServiceProvider + .GetRequiredService() + .SeedAsync(); + } + }); + } +} \ No newline at end of file diff --git a/test/SJZY.OpenApi.Test/TestModuleTestBase.cs b/test/SJZY.Track.Test/TestModuleTestBase.cs similarity index 100% rename from test/SJZY.OpenApi.Test/TestModuleTestBase.cs rename to test/SJZY.Track.Test/TestModuleTestBase.cs diff --git a/test/SJZY.OpenApi.Test/Usings.cs b/test/SJZY.Track.Test/Usings.cs similarity index 100% rename from test/SJZY.OpenApi.Test/Usings.cs rename to test/SJZY.Track.Test/Usings.cs diff --git a/test/SJZY.OpenApi.Test/appsettings.json b/test/SJZY.Track.Test/appsettings.json similarity index 100% rename from test/SJZY.OpenApi.Test/appsettings.json rename to test/SJZY.Track.Test/appsettings.json