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.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.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;
}
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.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 @@
-
+
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,