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

fix:修复按状态查询运输时效预警明细反参异常

Browse Source 
- 由于已超时状态不实时维护，则需要查出即将超时的数据然后计算状态后在过滤
This commit is contained in:
hardstylewyl 2025-03-24 09:23:49 +08:00
parent 9281d7b482
commit a56319d8b6
3 changed files with 122 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

222
src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningDetailsDto.cs
View File

@ -3,147 +3,147 @@ namespace SJZY.Track.Application.Contract.Dtos.Warning.Transport;
/// <summary> /// <summary>
/// 运输时效预警明细 /// 运输时效预警明细
/// </summary> /// </summary>
public sealed class TransportWarningDetailsDto // todo：需要根据状态排序 public sealed class TransportWarningDetailsDto
{ {
/// <summary> /// <summary>
/// 预警明细唯一id /// 预警明细唯一id
/// </summary> /// </summary>
public string EsId { get; set; } public string EsId { get; set; }
/// <summary> /// <summary>
/// 子系统id /// 子系统id
/// </summary> /// </summary>
public int SubSystemId { get; set; } public int SubSystemId { get; set; }
/// <summary> /// <summary>
/// 子系统名称 /// 子系统名称
/// </summary> /// </summary>
public string SubSystemName { get; set; } // todo:id换名称 public string SubSystemName { get; set; }
/// <summary> /// <summary>
/// 客户id /// 客户id
/// </summary> /// </summary>
public int CustomId { get; set; } public int CustomId { get; set; }
/// <summary> /// <summary>
/// 客户简称 /// 客户简称
/// </summary> /// </summary>
public string CustomName { get; set; } // todo:id换名称 public string CustomName { get; set; }
/// <summary> /// <summary>
/// 订单id /// 订单id
/// </summary> /// </summary>
public int OrderId { get; set; } public int OrderId { get; set; }
/// <summary> /// <summary>
/// 订单号 /// 订单号
/// </summary> /// </summary>
public string OrderNo { get; set; } public string OrderNo { get; set; }
/// <summary> /// <summary>
/// 订单类型 /// 订单类型
/// </summary> /// </summary>
public int OrderType { get; set; } public int OrderType { get; set; }
/// <summary> /// <summary>
/// 订单类型名称 /// 订单类型名称
/// </summary> /// </summary>
public string OrderTypeName { get; set; } // todo:type换名称 public string OrderTypeName { get; set; }
// 实时属性 todo:从es查询 // 实时属性 tips:从es查询
/// <summary> /// <summary>
/// 最新轨迹内容 /// 最新轨迹内容
/// </summary> /// </summary>
public string? LatestTrackContent { get; set; } public string? LatestTrackContent { get; set; }
/// <summary> /// <summary>
/// 最新轨迹时间 /// 最新轨迹时间
/// </summary> /// </summary>
public DateTime? LatestTrackTime { get; set; } public DateTime? LatestTrackTime { get; set; }
/// <summary> /// <summary>
/// 最新轨迹发生时区 /// 最新轨迹发生时区
/// </summary> /// </summary>
public float? LatestTrackTimeZone { get; set; } public float? LatestTrackTimeZone { get; set; }
/// <summary> /// <summary>
/// 最新轨迹发生地 /// 最新轨迹发生地
/// </summary> /// </summary>
public string? LatestTrackPlace { get; set; } public string? LatestTrackPlace { get; set; }
/// <summary> /// <summary>
/// 通知对象 /// 通知对象
/// </summary> /// </summary>
public string NotifyUserNames { get; set; } public string NotifyUserNames { get; set; }
/// <summary> /// <summary>
/// 起始轨迹状态 /// 起始轨迹状态
/// </summary> /// </summary>
public string StartTrackStatus { get; set; } public string StartTrackStatus { get; set; }
/// <summary> /// <summary>
/// 起始轨迹内容 /// 起始轨迹内容
/// </summary> /// </summary>
public string StartTrackContent { get; set; } public string StartTrackContent { get; set; }
/// <summary> /// <summary>
/// 起始轨迹发生时间 /// 起始轨迹发生时间
/// </summary> /// </summary>
public DateTime StartTrackTime { get; set; } public DateTime StartTrackTime { get; set; }
/// <summary> /// <summary>
/// 起始轨迹时区 /// 起始轨迹时区
/// </summary> /// </summary>
public float StartTrackTimeZone { get; set; } public float StartTrackTimeZone { get; set; }
/// <summary> /// <summary>
/// 截止轨迹状态 /// 截止轨迹状态
/// </summary> /// </summary>
public string EndTrackStatus { get; set; } public string EndTrackStatus { get; set; }
/// <summary> /// <summary>
/// 截止轨迹内容 /// 截止轨迹内容
/// </summary> /// </summary>
public string? EndTrackContent { get; set; } public string? EndTrackContent { get; set; }
/// <summary> /// <summary>
/// 截止轨迹发生时间 /// 截止轨迹发生时间
/// </summary> /// </summary>
public DateTime? EndTrackTime { get; set; } public DateTime? EndTrackTime { get; set; }
/// <summary> /// <summary>
/// 截止轨迹时区 /// 截止轨迹时区
/// </summary> /// </summary>
public float? EndTrackTimeZone { get; set; } public float? EndTrackTimeZone { get; set; }
/// <summary> /// <summary>
/// 预警名称 (预警主体名称 如字节全程时效) /// 预警名称 (预警主体名称 如字节全程时效)
/// </summary> /// </summary>
public string WarningName { get; set; } public string WarningName { get; set; }
/// <summary> /// <summary>
/// 预警规则描述（用于tooltip展示） /// 预警规则描述（用于tooltip展示）
/// </summary> /// </summary>
public string WarningRuleDescription { get; set; } public string WarningRuleDescription { get; set; }
/// <summary> /// <summary>
/// 累计运输时间 /// 累计运输时间
/// </summary> /// </summary>
public string CumulativeTimeSpan { get; set; } // todo:需要转换为某个格式 public string CumulativeTimeSpan { get; set; }
/// <summary> /// <summary>
/// 预警状态 （根据key展示对应名称，即将超时需要标红） /// 预警状态 （根据key展示对应名称，即将超时需要标红）
/// 1：即将超时 2：已超时 3：已完成 4：超时完成 5：已关闭，初始为【即将超时】 /// 1：即将超时 2：已超时 3：已完成 4：超时完成 5：已关闭，初始为【即将超时】
/// </summary> /// </summary>
public int Status { get; set; } public int Status { get; set; }
/// <summary> /// <summary>
/// 预警创建时间 /// 预警创建时间
/// </summary> /// </summary>
public DateTime CreateTime { get; set; } public DateTime CreateTime { get; set; }
} }

2
src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs
View File

@ -1235,8 +1235,6 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen
CreateTime = DateTime.Now, CreateTime = DateTime.Now,
}; };
// 一开始创建预警就可能为已超时的状态
detail.Status = detail.CalcStatus();
return detail; return detail;
} }

15
src/SJZY.Track.Application/Services/Warning/TransportWarningService.cs
View File

@ -171,6 +171,9 @@ public class TransportWarningService : ApplicationService
public async Task<UnifyPageResultDto<TransportWarningDetailsDto>> GetPageTransportWarningDetails(GetPageTransportWarningDetailsInput input) public async Task<UnifyPageResultDto<TransportWarningDetailsDto>> GetPageTransportWarningDetails(GetPageTransportWarningDetailsInput input)
{ {
var vo = ObjectMapper.Map<GetPageTransportWarningDetailsInput, GetPageTransportWarningDetailsInputVO>(input); var vo = ObjectMapper.Map<GetPageTransportWarningDetailsInput, GetPageTransportWarningDetailsInputVO>(input);
// 存储只存即将超时，对于已超时的则是查出计算后过滤
if (input.Status == (int) TransportWarningStatus.已超时)
vo.Status = (int) TransportWarningStatus.即将超时;
var result = await _warningDetailsEsRepository.GetPageTransportWarningDetailsAsync(vo); var result = await _warningDetailsEsRepository.GetPageTransportWarningDetailsAsync(vo);
if (result.List.Count == 0) if (result.List.Count == 0)
{ {
@ -247,19 +250,23 @@ public class TransportWarningService : ApplicationService
}; };
}); });
var sorted = map.OrderBy(x => // 计算后的状态过滤
var filtered = map.WhereIf(input.Status > 0, x => x.Status == input.Status);
// 按状态排序
var sorted = filtered.OrderBy(x =>
{ {
// 即将超时，已超时置顶 // 即将超时，已超时置顶
if (x.Status is 1 or 2) return x.Status; if (x.Status is 1 or 2) return x.Status;
// 其他按创建时间从早到晚 // 其他按创建时间从早到晚
return DateTimeHelper.ConvertToUnixTimestamp(x.CreateTime); return DateTimeHelper.ConvertToUnixTimestamp(x.CreateTime);
}); }).ToList();
return new UnifyPageResultDto<TransportWarningDetailsDto>( return new UnifyPageResultDto<TransportWarningDetailsDto>(
sorted.ToList(), sorted,
result.Pagination.PageIndex, result.Pagination.PageIndex,
result.Pagination.PageSize, result.Pagination.PageSize,
result.Pagination.Total); sorted.Count);
// 通知用户提取用户名称 // 通知用户提取用户名称
string ToUserNames(string notifyUsers) string ToUserNames(string notifyUsers)