ideship/track
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'S07' into test

Browse Source
This commit is contained in:
hardstylewyl 2025-04-01 16:24:45 +08:00
commit d2ea3e94ff
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/SJZY.Track.Api/SjzyTrackApiModule.cs
View File

@ -86,6 +86,7 @@ public class SjzyTrackApiModule : AbpModule
app.UsePrometheus(); app.UsePrometheus();
app.UseHangfireDashboard("/hangfire", new DashboardOptions app.UseHangfireDashboard("/hangfire", new DashboardOptions
{ {
DisplayStorageConnectionString = false,
IgnoreAntiforgeryToken = true, IgnoreAntiforgeryToken = true,
AppPath = configuration["Swagger:JsonUrlPrefix"]! + "/", AppPath = configuration["Swagger:JsonUrlPrefix"]! + "/",
PrefixPath = System.Diagnostics.Debugger.IsAttached PrefixPath = System.Diagnostics.Debugger.IsAttached

3
src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs
View File

@ -1,4 +1,3 @@
using System.Collections.Immutable;
using System.Text; using System.Text;
using Nest; using Nest;
using SJZY.Expand.ElasticSearch; using SJZY.Expand.ElasticSearch;
@ -112,7 +111,7 @@ public sealed class TransportWarningDetailsIndex : IdBaseIndex
var cumulativeTimeSpan = CalcCumulativeTimeSpan(startStatusTrack, endStatusTrack); var cumulativeTimeSpan = CalcCumulativeTimeSpan(startStatusTrack, endStatusTrack);
//时效>累计运输时间>=预警时效 状态调整为【即将超时】 //时效>累计运输时间>=预警时效 状态调整为【即将超时】
if (transportTimeSpan > cumulativeTimeSpan && cumulativeTimeSpan >= startTrackWarningTimeSpan) if (transportTimeSpan >= cumulativeTimeSpan && cumulativeTimeSpan >= startTrackWarningTimeSpan)
{ {
return Status = isEnd return Status = isEnd
? (int) TransportWarningStatus.已完成 ? (int) TransportWarningStatus.已完成