From f78d463a681958baa5f08e08793de499653fd125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com> Date: Wed, 17 Apr 2024 14:51:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?opt=EF=BC=9A=E5=8D=87=E7=BA=A7core=207.7.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/SJZY.Track.Domain/SJZY.Track.Domain.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SJZY.Track.Domain/SJZY.Track.Domain.csproj b/src/SJZY.Track.Domain/SJZY.Track.Domain.csproj index cb0a715f..3c38d62a 100644 --- a/src/SJZY.Track.Domain/SJZY.Track.Domain.csproj +++ b/src/SJZY.Track.Domain/SJZY.Track.Domain.csproj @@ -8,7 +8,7 @@ - + From 954654ede60cf5993e949cea53feaebce9a1bdac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com> Date: Mon, 22 Apr 2024 09:06:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?change=EF=BC=9Acap=E4=B8=8D=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E8=B6=85=E6=97=B6=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.idea.SJZY.Track.Api/.idea/.gitignore | 13 +++++++++++ .../EventHandlers/CAPFilter.cs | 22 +++++++++---------- 2 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 .idea/.idea.SJZY.Track.Api/.idea/.gitignore diff --git a/.idea/.idea.SJZY.Track.Api/.idea/.gitignore b/.idea/.idea.SJZY.Track.Api/.idea/.gitignore new file mode 100644 index 00000000..d6752705 --- /dev/null +++ b/.idea/.idea.SJZY.Track.Api/.idea/.gitignore @@ -0,0 +1,13 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Rider ignored files +/projectSettingsUpdater.xml +/.idea.SJZY.Track.Api.iml +/modules.xml +/contentModel.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/src/SJZY.Track.Application/EventHandlers/CAPFilter.cs b/src/SJZY.Track.Application/EventHandlers/CAPFilter.cs index 94cbc37d..4c0014c6 100644 --- a/src/SJZY.Track.Application/EventHandlers/CAPFilter.cs +++ b/src/SJZY.Track.Application/EventHandlers/CAPFilter.cs @@ -57,12 +57,12 @@ public class CapFilter : SubscribeFilter /// public override Task OnSubscribeExecutedAsync(ExecutedContext context) { - context.DeliverMessage.Headers.TryGetValue("sjzy-receive-time", out var receiveTime); - context.DeliverMessage.Headers.TryGetValue("cap-msg-name", out var receiveName); - context.DeliverMessage.Headers.TryGetValue("sjzy-arguments", out var arguments); - context.DeliverMessage.Headers.TryGetValue("cap-msg-id", out var messageId); - - BuildLog(receiveTime!, receiveName!, arguments!, false, messageId!); + // context.DeliverMessage.Headers.TryGetValue("sjzy-receive-time", out var receiveTime); + // context.DeliverMessage.Headers.TryGetValue("cap-msg-name", out var receiveName); + // context.DeliverMessage.Headers.TryGetValue("sjzy-arguments", out var arguments); + // context.DeliverMessage.Headers.TryGetValue("cap-msg-id", out var messageId); + // + // BuildLog(receiveTime!, receiveName!, arguments!, false, messageId!); return Task.CompletedTask; } @@ -86,11 +86,11 @@ public class CapFilter : SubscribeFilter LogHelper.Error($"cap-msg-id：{messageId}\n{context.Exception}"); - context.DeliverMessage.Headers.TryGetValue("sjzy-receive-time", out var receiveTime); - context.DeliverMessage.Headers.TryGetValue("cap-msg-name", out var receiveName); - context.DeliverMessage.Headers.TryGetValue("sjzy-arguments", out var arguments); - - BuildLog(receiveTime!, receiveName!, arguments, true, messageId!); + // context.DeliverMessage.Headers.TryGetValue("sjzy-receive-time", out var receiveTime); + // context.DeliverMessage.Headers.TryGetValue("cap-msg-name", out var receiveName); + // context.DeliverMessage.Headers.TryGetValue("sjzy-arguments", out var arguments); + // + // BuildLog(receiveTime!, receiveName!, arguments, true, messageId!); return Task.CompletedTask; } From d95bcb70c029421e5ec65c9a81090fcac0305f8b Mon Sep 17 00:00:00 2001 From: moyongzhen <2534173414@qq.com> Date: Mon, 22 Apr 2024 14:42:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=EF=BC=9A=E8=BD=A8=E8=BF=B9=E6=A0=87?= =?UTF-8?q?=E8=AE=B0=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?code=E6=A8=A1=E7=B3=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dtos/TrackFlags/GetTrackFlagListDto.cs | 10 +++++----- .../Dtos/TrackFlags/GetPageTrackFlagVO.cs | 8 ++++---- .../Repositories/TrackFlagRepository.cs | 3 ++- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs index 3964caea..505536e1 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs @@ -58,11 +58,11 @@ /// /// 选中的轨迹标记id /// - public List? SelectIds { get; set; } + public List? SelectIds { get; set; } - ///// - ///// 关键字 - ///// - //public string Keywords { get; set; } + /// + /// 关键字 + /// + public string? Keywords { get; set; } } } \ 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 index adbf1a5d..f838b37d 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs @@ -18,10 +18,10 @@ namespace SJZY.Track.Domain.Dtos.TrackFlags /// public List? SelectIds { get; set; } - ///// - ///// 关键字 - ///// - //public string Keywords { get; set; } + /// + /// 关键字 + /// + public string? Keywords { get; set; } } public class GetTrackFlagListVO diff --git a/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs index d2227924..ed92d283 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs @@ -46,8 +46,9 @@ public class TrackFlagRepository : BasicRepository, ITrackFlagR .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) => SqlFunc.Contains(a.Code, 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) + .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,