fix:修复按状态查询运输时效预警明细反参异常
- 由于已超时状态不实时维护，则需要查出即将超时的数据然后计算状态后在过滤
This commit is contained in:
hardstylewyl
parent
9281d7b482
commit
a56319d8b6
@ -3,147 +3,147 @@ namespace SJZY.Track.Application.Contract.Dtos.Warning.Transport;
|
||||
/// <summary>
|
||||
/// 运输时效预警明细
|
||||
/// </summary>
|
||||
public sealed class TransportWarningDetailsDto // todo：需要根据状态排序
|
||||
public sealed class TransportWarningDetailsDto
|
||||
{
|
||||
/// <summary>
|
||||
/// 预警明细唯一id
|
||||
/// </summary>
|
||||
public string EsId { get; set; }
|
||||
/// <summary>
|
||||
/// 预警明细唯一id
|
||||
/// </summary>
|
||||
public string EsId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 子系统id
|
||||
/// </summary>
|
||||
public int SubSystemId { get; set; }
|
||||
/// <summary>
|
||||
/// 子系统id
|
||||
/// </summary>
|
||||
public int SubSystemId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 子系统名称
|
||||
/// </summary>
|
||||
public string SubSystemName { get; set; } // todo:id换名称
|
||||
/// <summary>
|
||||
/// 子系统名称
|
||||
/// </summary>
|
||||
public string SubSystemName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 客户id
|
||||
/// </summary>
|
||||
public int CustomId { get; set; }
|
||||
/// <summary>
|
||||
/// 客户id
|
||||
/// </summary>
|
||||
public int CustomId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 客户简称
|
||||
/// </summary>
|
||||
public string CustomName { get; set; } // todo:id换名称
|
||||
/// <summary>
|
||||
/// 客户简称
|
||||
/// </summary>
|
||||
public string CustomName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 订单id
|
||||
/// </summary>
|
||||
public int OrderId { get; set; }
|
||||
/// <summary>
|
||||
/// 订单id
|
||||
/// </summary>
|
||||
public int OrderId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 订单号
|
||||
/// </summary>
|
||||
public string OrderNo { get; set; }
|
||||
/// <summary>
|
||||
/// 订单号
|
||||
/// </summary>
|
||||
public string OrderNo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 订单类型
|
||||
/// </summary>
|
||||
public int OrderType { get; set; }
|
||||
/// <summary>
|
||||
/// 订单类型
|
||||
/// </summary>
|
||||
public int OrderType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 订单类型名称
|
||||
/// </summary>
|
||||
public string OrderTypeName { get; set; } // todo:type换名称
|
||||
/// <summary>
|
||||
/// 订单类型名称
|
||||
/// </summary>
|
||||
public string OrderTypeName { get; set; }
|
||||
|
||||
|
||||
// 实时属性 todo:从es查询
|
||||
// 实时属性 tips:从es查询
|
||||
|
||||
/// <summary>
|
||||
/// 最新轨迹内容
|
||||
/// </summary>
|
||||
public string? LatestTrackContent { get; set; }
|
||||
/// <summary>
|
||||
/// 最新轨迹内容
|
||||
/// </summary>
|
||||
public string? LatestTrackContent { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 最新轨迹时间
|
||||
/// </summary>
|
||||
public DateTime? LatestTrackTime { get; set; }
|
||||
/// <summary>
|
||||
/// 最新轨迹时间
|
||||
/// </summary>
|
||||
public DateTime? LatestTrackTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 最新轨迹发生时区
|
||||
/// </summary>
|
||||
public float? LatestTrackTimeZone { get; set; }
|
||||
/// <summary>
|
||||
/// 最新轨迹发生时区
|
||||
/// </summary>
|
||||
public float? LatestTrackTimeZone { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 最新轨迹发生地
|
||||
/// </summary>
|
||||
public string? LatestTrackPlace { get; set; }
|
||||
/// <summary>
|
||||
/// 最新轨迹发生地
|
||||
/// </summary>
|
||||
public string? LatestTrackPlace { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 通知对象
|
||||
/// </summary>
|
||||
public string NotifyUserNames { get; set; }
|
||||
/// <summary>
|
||||
/// 通知对象
|
||||
/// </summary>
|
||||
public string NotifyUserNames { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 起始轨迹状态
|
||||
/// </summary>
|
||||
public string StartTrackStatus { get; set; }
|
||||
/// <summary>
|
||||
/// 起始轨迹状态
|
||||
/// </summary>
|
||||
public string StartTrackStatus { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 起始轨迹内容
|
||||
/// </summary>
|
||||
public string StartTrackContent { get; set; }
|
||||
/// <summary>
|
||||
/// 起始轨迹内容
|
||||
/// </summary>
|
||||
public string StartTrackContent { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 起始轨迹发生时间
|
||||
/// </summary>
|
||||
public DateTime StartTrackTime { get; set; }
|
||||
/// <summary>
|
||||
/// 起始轨迹发生时间
|
||||
/// </summary>
|
||||
public DateTime StartTrackTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 起始轨迹时区
|
||||
/// </summary>
|
||||
public float StartTrackTimeZone { get; set; }
|
||||
/// <summary>
|
||||
/// 起始轨迹时区
|
||||
/// </summary>
|
||||
public float StartTrackTimeZone { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 截止轨迹状态
|
||||
/// </summary>
|
||||
public string EndTrackStatus { get; set; }
|
||||
/// <summary>
|
||||
/// 截止轨迹状态
|
||||
/// </summary>
|
||||
public string EndTrackStatus { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 截止轨迹内容
|
||||
/// </summary>
|
||||
public string? EndTrackContent { get; set; }
|
||||
/// <summary>
|
||||
/// 截止轨迹内容
|
||||
/// </summary>
|
||||
public string? EndTrackContent { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 截止轨迹发生时间
|
||||
/// </summary>
|
||||
public DateTime? EndTrackTime { get; set; }
|
||||
/// <summary>
|
||||
/// 截止轨迹发生时间
|
||||
/// </summary>
|
||||
public DateTime? EndTrackTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 截止轨迹时区
|
||||
/// </summary>
|
||||
public float? EndTrackTimeZone { get; set; }
|
||||
/// <summary>
|
||||
/// 截止轨迹时区
|
||||
/// </summary>
|
||||
public float? EndTrackTimeZone { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 预警名称 (预警主体名称 如字节全程时效)
|
||||
/// </summary>
|
||||
public string WarningName { get; set; }
|
||||
/// <summary>
|
||||
/// 预警名称 (预警主体名称 如字节全程时效)
|
||||
/// </summary>
|
||||
public string WarningName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 预警规则描述（用于tooltip展示）
|
||||
/// </summary>
|
||||
public string WarningRuleDescription { get; set; }
|
||||
/// <summary>
|
||||
/// 预警规则描述（用于tooltip展示）
|
||||
/// </summary>
|
||||
public string WarningRuleDescription { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 累计运输时间
|
||||
/// </summary>
|
||||
public string CumulativeTimeSpan { get; set; } // todo:需要转换为某个格式
|
||||
/// <summary>
|
||||
/// 累计运输时间
|
||||
/// </summary>
|
||||
public string CumulativeTimeSpan { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 预警状态 （根据key展示对应名称，即将超时需要标红）
|
||||
/// 1：即将超时 2：已超时 3：已完成 4：超时完成 5：已关闭，初始为【即将超时】
|
||||
/// </summary>
|
||||
public int Status { get; set; }
|
||||
/// <summary>
|
||||
/// 预警状态 （根据key展示对应名称，即将超时需要标红）
|
||||
/// 1：即将超时 2：已超时 3：已完成 4：超时完成 5：已关闭，初始为【即将超时】
|
||||
/// </summary>
|
||||
public int Status { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 预警创建时间
|
||||
/// </summary>
|
||||
public DateTime CreateTime { get; set; }
|
||||
/// <summary>
|
||||
/// 预警创建时间
|
||||
/// </summary>
|
||||
public DateTime CreateTime { get; set; }
|
||||
}
|
||||
|
||||
@ -1235,8 +1235,6 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen
|
||||
CreateTime = DateTime.Now,
|
||||
};
|
||||
|
||||
// 一开始创建预警就可能为已超时的状态
|
||||
detail.Status = detail.CalcStatus();
|
||||
return detail;
|
||||
}
|
||||
|
||||
|
||||
@ -171,6 +171,9 @@ public class TransportWarningService : ApplicationService
|
||||
public async Task<UnifyPageResultDto<TransportWarningDetailsDto>> GetPageTransportWarningDetails(GetPageTransportWarningDetailsInput input)
|
||||
{
|
||||
var vo = ObjectMapper.Map<GetPageTransportWarningDetailsInput, GetPageTransportWarningDetailsInputVO>(input);
|
||||
// 存储只存即将超时，对于已超时的则是查出计算后过滤
|
||||
if (input.Status == (int) TransportWarningStatus.已超时)
|
||||
vo.Status = (int) TransportWarningStatus.即将超时;
|
||||
var result = await _warningDetailsEsRepository.GetPageTransportWarningDetailsAsync(vo);
|
||||
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;
|
||||
// 其他按创建时间从早到晚
|
||||
return DateTimeHelper.ConvertToUnixTimestamp(x.CreateTime);
|
||||
});
|
||||
}).ToList();
|
||||
|
||||
return new UnifyPageResultDto<TransportWarningDetailsDto>(
|
||||
sorted.ToList(),
|
||||
sorted,
|
||||
result.Pagination.PageIndex,
|
||||
result.Pagination.PageSize,
|
||||
result.Pagination.Total);
|
||||
sorted.Count);
|
||||
|
||||
// 通知用户提取用户名称
|
||||
string ToUserNames(string notifyUsers)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user