From 28381c6441efe58ccc5fe5c9dac47965a437c549 Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Thu, 20 Mar 2025 15:08:24 +0800 Subject: [PATCH] =?UTF-8?q?perf:=E6=9F=A5=E8=AF=A2=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=A8=A1=E5=9E=8B=E5=85=A5=E5=8F=82=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=20=20-=20=E8=AE=A2=E5=8D=95=E5=8F=B7=E8=BD=AC?= =?UTF-8?q?=E5=8C=96=E4=B8=BA=E6=95=B0=E7=BB=84=EF=BC=8C=E9=99=90=E5=88=B6?= =?UTF-8?q?=E6=9C=80=E5=A4=A7=E9=95=BF=E5=BA=A61000?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Complete/GetPageCompleteWarningDetailsInput.cs | 7 +++++-- .../Return/GetPageReturnWarningDetailsInput.cs | 7 +++++-- .../Transport/GetPageTransportWarningDetailsInput.cs | 7 +++++-- .../Warning/GetPageCompleteWarningDetailsInputVO.cs | 4 ++-- .../Warning/GetPageReturnWarningDetailsInputVO.cs | 4 ++-- .../Warning/GetPageTransportWarningDetailsInputVO.cs | 4 ++-- .../Repositories/WarningDetailsEsRepository.cs | 12 +++--------- 7 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs index 23bd3cf6..8498b37d 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs @@ -1,3 +1,5 @@ +using System.ComponentModel.DataAnnotations; + namespace SJZY.Track.Application.Contract.Dtos.Warning.Complete; /// @@ -11,9 +13,10 @@ public class GetPageCompleteWarningDetailsInput : PageInfoInput public int? SubSystemId { get; set; } /// - /// 订单号,多个订单号(,分割) + /// 订单号，限制1000个 /// - public string? OrderNos { get; set; } + [MaxLength(1000)] + public List? OrderNos { get; set; } /// /// 订单类型 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs index a21ad23f..7ea8aa9c 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs @@ -1,3 +1,5 @@ +using System.ComponentModel.DataAnnotations; + namespace SJZY.Track.Application.Contract.Dtos.Warning.Return; /// @@ -11,9 +13,10 @@ public class GetPageReturnWarningDetailsInput : PageInfoInput public int? SubSystemId { get; set; } /// - /// 订单号,多个订单号(,分割) + /// 订单号，限制1000个 /// - public string? OrderNos { get; set; } + [MaxLength(1000)] + public List? OrderNos { get; set; } /// /// 订单类型 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs index b8568d70..d335700e 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs @@ -1,3 +1,5 @@ +using System.ComponentModel.DataAnnotations; + namespace SJZY.Track.Application.Contract.Dtos.Warning.Transport; /// @@ -11,9 +13,10 @@ public class GetPageTransportWarningDetailsInput : PageInfoInput public int? SubSystemId { get; set; } /// - /// 订单号,多个订单号(,分割) + /// 订单号，限制1000个 /// - public string? OrderNos { get; set; } + [MaxLength(1000)] + public List? OrderNos { get; set; } /// /// 订单类型 diff --git a/src/SJZY.Track.Domain/Dtos/Warning/GetPageCompleteWarningDetailsInputVO.cs b/src/SJZY.Track.Domain/Dtos/Warning/GetPageCompleteWarningDetailsInputVO.cs index 2f0682f0..294b17b8 100644 --- a/src/SJZY.Track.Domain/Dtos/Warning/GetPageCompleteWarningDetailsInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Warning/GetPageCompleteWarningDetailsInputVO.cs @@ -8,9 +8,9 @@ public class GetPageCompleteWarningDetailsInputVO : PageInfoInput public int? SubSystemId { get; set; } /// - /// 订单号,多个订单号(,分割) + /// 订单号 /// - public string? OrderNos { get; set; } + public List? OrderNos { get; set; } /// /// 订单类型 diff --git a/src/SJZY.Track.Domain/Dtos/Warning/GetPageReturnWarningDetailsInputVO.cs b/src/SJZY.Track.Domain/Dtos/Warning/GetPageReturnWarningDetailsInputVO.cs index aceaacf1..2f54b823 100644 --- a/src/SJZY.Track.Domain/Dtos/Warning/GetPageReturnWarningDetailsInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Warning/GetPageReturnWarningDetailsInputVO.cs @@ -11,9 +11,9 @@ public class GetPageReturnWarningDetailsInputVO : PageInfoInput public int? SubSystemId { get; set; } /// - /// 订单号,多个订单号(,分割) + /// 订单号 /// - public string? OrderNos { get; set; } + public List? OrderNos { get; set; } /// /// 订单类型 diff --git a/src/SJZY.Track.Domain/Dtos/Warning/GetPageTransportWarningDetailsInputVO.cs b/src/SJZY.Track.Domain/Dtos/Warning/GetPageTransportWarningDetailsInputVO.cs index 6fecc8aa..738fabc0 100644 --- a/src/SJZY.Track.Domain/Dtos/Warning/GetPageTransportWarningDetailsInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Warning/GetPageTransportWarningDetailsInputVO.cs @@ -11,9 +11,9 @@ public class GetPageTransportWarningDetailsInputVO : PageInfoInput public int? SubSystemId { get; set; } /// - /// 订单号,多个订单号(,分割) + /// 订单号 /// - public string? OrderNos { get; set; } + public List? OrderNos { get; set; } /// /// 订单类型 diff --git a/src/SJZY.Track.Repository/Repositories/WarningDetailsEsRepository.cs b/src/SJZY.Track.Repository/Repositories/WarningDetailsEsRepository.cs index 0d6afd1c..556a025d 100644 --- a/src/SJZY.Track.Repository/Repositories/WarningDetailsEsRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/WarningDetailsEsRepository.cs @@ -28,11 +28,9 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien { var musts = ListWrapperFactory.CreateListWrapper(input); - var orderNos = input.OrderNos?.Split(','); - // 精确匹配 musts.AddIf(x => x.CustomId > 0, c => c.Term(f => f.CustomId, input.CustomId)); - musts.AddIf(_ => orderNos?.Length > 0, c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(orderNos))); + musts.AddIf(x => x.OrderNos?.Count > 0, c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(input.OrderNos))); musts.AddIf(x => x.OrderType > 0, c => c.Term(f => f.OrderType, input.OrderType)); musts.AddIf(x => x.Status > 0, c => c.Term(f => f.Status, input.Status)); musts.AddIf(x => x.SubSystemId > 0, c => c.Term(f => f.SubSystemId, input.SubSystemId)); @@ -313,11 +311,9 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien { var musts = ListWrapperFactory.CreateListWrapper(input); - var orderNos = input.OrderNos?.Split(','); - // 精确匹配 musts.AddIf(x => x.SubSystemId > 0, c => c.Term(f => f.SubSystemId, input.SubSystemId)); - musts.AddIf(_ => orderNos?.Length > 0, c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(orderNos))); + musts.AddIf(x => x.OrderNos?.Count > 0, c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(input.OrderNos))); musts.AddIf(x => x.OrderType > 0, c => c.Term(f => f.OrderType, input.OrderType)); musts.AddIf(x => x.Status > 0, c => c.Term(f => f.Status, input.Status)); musts.AddIf(x => x.CustomId > 0, c => c.Term(f => f.CustomId, input.CustomId)); @@ -706,10 +702,8 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien { var musts = ListWrapperFactory.CreateListWrapper(input); - var orderNos = input.OrderNos?.Split(','); - musts.AddIf(x => x.SubSystemId > 0, c => c.Term(f => f.SubSystemId, input.SubSystemId)); - musts.AddIf(_ => orderNos?.Length > 0, c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(orderNos))); + musts.AddIf(x => x.OrderNos?.Count > 0, c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(input.OrderNos))); musts.AddIf(x => x.OrderType > 0, c => c.Term(f => f.OrderType, input.OrderType)); musts.AddIf(x => x.Status > 0, c => c.Term(f => f.Status, input.Status)); musts.AddIf(x => x.CustomId > 0, c => c.Term(f => f.CustomId, input.CustomId));