From 25298dc4943220270721243de94d9bb6c31263bc Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Tue, 4 Mar 2025 14:19:34 +0800 Subject: [PATCH] =?UTF-8?q?sync-namespace:=E5=90=8C=E6=AD=A5=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E7=A9=BA=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Complete/CompleteWarningDetailsDto.cs | 158 ++++++------- .../Complete/CompleteWarningRuleItemDto.cs | 6 +- .../EditCompleteWarningRuleItemInput.cs | 77 +++--- .../GetCompleteWarningRuleItemInput.cs | 4 +- .../GetPageCompleteWarningDetailsInput.cs | 4 +- .../DataAnnotations/IdRequiredAttribute.cs | 12 +- .../Dtos/Warning/GetWarningRuleInput.cs | 2 +- .../Dtos/Warning/NotifyUserDto.cs | 24 +- .../Return/EditReturnWarningRuleItemInput.cs | 61 +++-- .../GetPageReturnWarningDetailsInput.cs | 4 +- .../Return/GetReturnMessageRecordInput.cs | 6 +- .../Return/GetReturnWarningRuleItemInput.cs | 4 +- .../Warning/Return/ReturnMessageRecordDto.cs | 4 +- .../Warning/Return/ReturnWarningDetailsDto.cs | 6 +- .../Return/ReturnWarningRuleItemDto.cs | 4 +- .../EditTransportWarningSceneRuleItemInput.cs | 91 ++++--- .../GetPageTransportWarningDetailsInput.cs | 8 +- .../GetTransportWarningSceneInput.cs | 14 +- .../GetTransportWarningSceneRuleItemInput.cs | 24 +- .../Transport/TransportWarningDetailsDto.cs | 222 +++++++++--------- .../Transport/TransportWarningSceneDto.cs | 2 +- .../TransportWarningSceneRuleItemDto.cs | 4 +- .../UpsertTransportWarningSceneInput.cs | 5 +- .../Dtos/Warning/UpsertWarningRuleInput.cs | 62 ++--- .../Dtos/Warning/WarningRuleDto.cs | 4 +- .../Services/ProvideServices/TrackService.cs | 14 +- .../Warning/CompleteWarningService.cs | 74 +++--- .../Services/Warning/ReturnWarningService.cs | 90 ++++--- .../Warning/TransportWarningService.cs | 6 +- .../Services/Warning/WarningService.cs | 8 +- .../ITrackDetailsEsRepository.cs | 3 + test/SJZY.Track.Test/Startup.cs | 3 +- test/SJZY.Track.Test/TestModuleTestBase.cs | 2 +- 33 files changed, 498 insertions(+), 514 deletions(-) diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs index 352e6f0c..0bd2961d 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs @@ -1,106 +1,106 @@ -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning.Complete; +namespace SJZY.Track.Application.Contract.Dtos.Warning.Complete; /// /// 完整预警 /// public class CompleteWarningDetailsDto // todo:需要根据状态排序 { - /// - /// 预警明细唯一id - /// - public string EsId { get; set; } + /// + /// 预警明细唯一id + /// + public string EsId { get; set; } - /// - /// 子系统id - /// - public int SubSystemId { get; set; } + /// + /// 子系统id + /// + public int SubSystemId { get; set; } - /// - /// 子系统名称 - /// - public string SubSystemName { get; set; } // todo:id换名称 + /// + /// 子系统名称 + /// + public string SubSystemName { get; set; } // todo:id换名称 - /// - /// 订单类型 - /// - public int OrderType { get; set; } + /// + /// 订单类型 + /// + public int OrderType { get; set; } - /// - /// 订单类型名称 - /// - public string OrderTypeName { get; set; } // todo:type换名称 + /// + /// 订单类型名称 + /// + public string OrderTypeName { get; set; } // todo:type换名称 - /// - /// 订单id - /// - public int OrderId { get; set; } + /// + /// 订单id + /// + public int OrderId { get; set; } - /// - /// 订单号 - /// - public string OrderNo { get; set; } + /// + /// 订单号 + /// + public string OrderNo { get; set; } - /// - /// 状态 （待处理样式标红） - /// 1：待处理，2：已处理，3：已关闭 - /// - public int Status { get; set; } + /// + /// 状态 （待处理样式标红） + /// 1：待处理，2：已处理，3：已关闭 + /// + public int Status { get; set; } - /// - /// 客户id - /// - public int CustomId { get; set; } + /// + /// 客户id + /// + public int CustomId { get; set; } - /// - /// 客户简称 - /// - public int CustomName { get; set; } // todo:id换名称 + /// + /// 客户简称 + /// + public int CustomName { get; set; } // todo:id换名称 - /// - /// 缺失轨迹状态 - /// - public string MissingTrackStatus { get; set; } // todo:id换名称 + /// + /// 缺失轨迹状态 + /// + public string MissingTrackStatus { get; set; } // todo:id换名称 - //视图属性 todo:可以从订单主表拿到 + //视图属性 todo:可以从订单主表拿到 - /// - /// 最新轨迹状态 - /// - public string LatestTrackStatus { get; set; } + /// + /// 最新轨迹状态 + /// + public string LatestTrackStatus { get; set; } - /// - /// 最新轨迹内容 - /// - public string LatestTrackContent { get; set; } + /// + /// 最新轨迹内容 + /// + public string LatestTrackContent { get; set; } - /// - /// 最新轨迹发生地 - /// - public string LatestTrackPlace { get; set; } + /// + /// 最新轨迹发生地 + /// + public string LatestTrackPlace { get; set; } - /// - /// 最新轨迹发生时间 - /// - public DateTime LatestTrackTime { get; set; } + /// + /// 最新轨迹发生时间 + /// + public DateTime LatestTrackTime { get; set; } - /// - /// 最新轨迹发生时区 - /// - public float LatestTrackTimeZone { get; set; } + /// + /// 最新轨迹发生时区 + /// + public float LatestTrackTimeZone { get; set; } - /// - /// 通知对象 - /// - public string NotifyUserNames { get; set; } + /// + /// 通知对象 + /// + public string NotifyUserNames { get; set; } - /// - /// 预警创建时间 - /// - public DateTime CreateTime { get; set; } + /// + /// 预警创建时间 + /// + public DateTime CreateTime { get; set; } - /// - /// 预警处理时间 - /// - public DateTime? ProcessedTime { get; set; } + /// + /// 预警处理时间 + /// + public DateTime? ProcessedTime { get; set; } } diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningRuleItemDto.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningRuleItemDto.cs index 37a7a04b..2e4e0335 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningRuleItemDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningRuleItemDto.cs @@ -1,7 +1,7 @@ -using Track.Warning.VNext.Application.Contract.Dtos.Common; -using Track.Warning.VNext.Application.Contract.Dtos.Warning.Return; +using SJZY.Track.Application.Contract.Dtos.Warning; +using SJZY.Track.Application.Contract.Dtos.Warning.Return; -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning.Complete; +namespace SJZY.Track.Application.Contract.Dtos.Warning.Complete; /// /// 完整预警规则配置条目 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/EditCompleteWarningRuleItemInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/EditCompleteWarningRuleItemInput.cs index b3e4063d..80ab9829 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/EditCompleteWarningRuleItemInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/EditCompleteWarningRuleItemInput.cs @@ -1,24 +1,23 @@ using System.ComponentModel.DataAnnotations; -using Track.Warning.VNext.Application.Contract.DataAnnotations; -using Track.Warning.VNext.Application.Contract.Dtos.Common; +using SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning.Complete; +namespace SJZY.Track.Application.Contract.Dtos.Warning.Complete; /// /// 编辑完整预警配置 /// public class EditCompleteWarningRuleItemInput { - /// - /// 预警规主体id - /// - [IdRequired] - public int WarningId { get; set; } + /// + /// 预警规主体id + /// + [IdRequired] + public int WarningId { get; set; } - /// - /// 预警规则配置项目（列表内容传递） - /// - public List Items { get; set; } = new(); + /// + /// 预警规则配置项目（列表内容传递） + /// + public List Items { get; set; } = new(); } /// @@ -26,35 +25,35 @@ public class EditCompleteWarningRuleItemInput /// public class EditCompleteWarningRuleItemDto { - /// - /// 规则项目唯一id（传0视为新增） - /// - public int Id { get; set; } + /// + /// 规则项目唯一id（传0视为新增） + /// + public int Id { get; set; } - /// - /// 订单类型集合(,分割) e.g. 1,2,3 - /// - [Required] - public string OrderTypes { get; set; } + /// + /// 订单类型集合(,分割) e.g. 1,2,3 + /// + [Required] + public string OrderTypes { get; set; } - /// - /// 检查点轨迹状态id - /// - [IdRequired] - public int CheckPointTrackStatusId { get; set; } + /// + /// 检查点轨迹状态id + /// + [IdRequired] + public int CheckPointTrackStatusId { get; set; } - /// - /// 要求的轨迹状态id集合 e.g. [[1,3],[5,7]] - /// required: 集合元素(子集合)不要有交集! - /// - [Required] - [MinLength(1, ErrorMessage = "要求的轨迹状态id集合不能为空")] - public List> RequireTrackStatus { get; set; } + /// + /// 要求的轨迹状态id集合 e.g. [[1,3],[5,7]] + /// required: 集合元素(子集合)不要有交集! + /// + [Required] + [MinLength(1, ErrorMessage = "要求的轨迹状态id集合不能为空")] + public List> RequireTrackStatus { get; set; } - /// - /// 通知对象用户集合 - /// - [Required] - [MinLength(1, ErrorMessage = "通知对象用户集合不能为空")] - public List NotifyUsers { get; set; } = new(); + /// + /// 通知对象用户集合 + /// + [Required] + [MinLength(1, ErrorMessage = "通知对象用户集合不能为空")] + public List NotifyUsers { get; set; } = new(); } diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/GetCompleteWarningRuleItemInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/GetCompleteWarningRuleItemInput.cs index 7cd44790..4929c83d 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/GetCompleteWarningRuleItemInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/GetCompleteWarningRuleItemInput.cs @@ -1,6 +1,6 @@ -using Track.Warning.VNext.Application.Contract.DataAnnotations; +using SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning.Complete; +namespace SJZY.Track.Application.Contract.Dtos.Warning.Complete; /// /// 获取完整预警规则条目列表 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs index 978e607a..23bd3cf6 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs @@ -1,6 +1,4 @@ -using Track.Warning.VNext.Application.Contract.Dtos.Common; - -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning.Complete; +namespace SJZY.Track.Application.Contract.Dtos.Warning.Complete; /// /// 分页获取完成预警详情 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/DataAnnotations/IdRequiredAttribute.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/DataAnnotations/IdRequiredAttribute.cs index 262de8ba..199ba7e8 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/DataAnnotations/IdRequiredAttribute.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/DataAnnotations/IdRequiredAttribute.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Track.Warning.VNext.Application.Contract.DataAnnotations; +namespace SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; /// /// 要求id存在并且大于0 @@ -8,9 +8,9 @@ namespace Track.Warning.VNext.Application.Contract.DataAnnotations; [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)] public sealed class IdRequiredAttribute : RangeAttribute { - public IdRequiredAttribute() - : base(1, int.MaxValue) - { - ErrorMessage = "{0} is required and must be greater than 0"; - } + public IdRequiredAttribute() + : base(1, int.MaxValue) + { + ErrorMessage = "{0} is required and must be greater than 0"; + } } diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/GetWarningRuleInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/GetWarningRuleInput.cs index 2b9b9d87..df031b41 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/GetWarningRuleInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/GetWarningRuleInput.cs @@ -1,4 +1,4 @@ -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning; +namespace SJZY.Track.Application.Contract.Dtos.Warning; /// /// 获取预警规则主体 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/NotifyUserDto.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/NotifyUserDto.cs index 214d1e71..55548ac7 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/NotifyUserDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/NotifyUserDto.cs @@ -1,19 +1,19 @@ using System.ComponentModel.DataAnnotations; -using Track.Warning.VNext.Application.Contract.DataAnnotations; +using SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; -namespace Track.Warning.VNext.Application.Contract.Dtos.Common; +namespace SJZY.Track.Application.Contract.Dtos.Warning; public sealed class NotifyUserDto { - /// - /// 用户id - /// - [IdRequired] - public int UserId { get; set; } + /// + /// 用户id + /// + [IdRequired] + public int UserId { get; set; } - /// - /// 用户名 - /// - [Required] - public string UserName { get; set; } + /// + /// 用户名 + /// + [Required] + public string UserName { get; set; } } diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/EditReturnWarningRuleItemInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/EditReturnWarningRuleItemInput.cs index 99524d30..16e34ed7 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/EditReturnWarningRuleItemInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/EditReturnWarningRuleItemInput.cs @@ -1,24 +1,23 @@ using System.ComponentModel.DataAnnotations; -using Track.Warning.VNext.Application.Contract.DataAnnotations; -using Track.Warning.VNext.Application.Contract.Dtos.Common; +using SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning.Return; +namespace SJZY.Track.Application.Contract.Dtos.Warning.Return; /// /// 编辑回传时效配置 /// public class EditReturnWarningRuleItemInput { - /// - /// 预警规主体id - /// - [IdRequired] - public int WarningId { get; set; } + /// + /// 预警规主体id + /// + [IdRequired] + public int WarningId { get; set; } - /// - /// 预警规则配置项目（列表内容传递） - /// - public List Items { get; set; } = new(); + /// + /// 预警规则配置项目（列表内容传递） + /// + public List Items { get; set; } = new(); } /// @@ -26,26 +25,26 @@ public class EditReturnWarningRuleItemInput /// public class EditReturnWarningRuleItemDto { - /// - /// 唯一id(传0视为新增) - /// - public int Id { get; set; } + /// + /// 唯一id(传0视为新增) + /// + public int Id { get; set; } - /// - /// 轨迹状态Id集合(,分割) - /// - [Required] - public string TrackStatusIds { get; set; } + /// + /// 轨迹状态Id集合(,分割) + /// + [Required] + public string TrackStatusIds { get; set; } - /// - /// 时效（单位h） - /// - [Range(0.1, float.MaxValue, ErrorMessage = "时效必须大于0.1")] - public float ReturnTimeSpan { get; set; } + /// + /// 时效（单位h） + /// + [Range(0.1, float.MaxValue, ErrorMessage = "时效必须大于0.1")] + public float ReturnTimeSpan { get; set; } - /// - /// 通知对象用户集合 - /// - [MinLength(1, ErrorMessage = "通知对象用户集合不能为空")] - public List NotifyUsers { get; set; } = new(); + /// + /// 通知对象用户集合 + /// + [MinLength(1, ErrorMessage = "通知对象用户集合不能为空")] + public List NotifyUsers { get; set; } = new(); } diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs index ad207d97..a21ad23f 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs @@ -1,6 +1,4 @@ -using Track.Warning.VNext.Application.Contract.Dtos.Common; - -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning.Return; +namespace SJZY.Track.Application.Contract.Dtos.Warning.Return; /// /// 分页获取回传预警明细输入 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetReturnMessageRecordInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetReturnMessageRecordInput.cs index a8249907..890c262c 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetReturnMessageRecordInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetReturnMessageRecordInput.cs @@ -1,6 +1,6 @@ -using Track.Warning.VNext.Application.Contract.DataAnnotations; +using System.ComponentModel.DataAnnotations; -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning.Return; +namespace SJZY.Track.Application.Contract.Dtos.Warning.Return; /// /// 获取回传报文日志 @@ -10,6 +10,6 @@ public class GetReturnMessageRecordInput /// /// 回传预警明细id /// - [IdRequired] + [Required] public string WarningDetailsId { get; set; } } diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetReturnWarningRuleItemInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetReturnWarningRuleItemInput.cs index cf33c4bd..72258044 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetReturnWarningRuleItemInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/GetReturnWarningRuleItemInput.cs @@ -1,6 +1,6 @@ -using Track.Warning.VNext.Application.Contract.DataAnnotations; +using SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning.Return; +namespace SJZY.Track.Application.Contract.Dtos.Warning.Return; /// /// 获取回传预警规则项目列表 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnMessageRecordDto.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnMessageRecordDto.cs index 325d5067..350e3f78 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnMessageRecordDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnMessageRecordDto.cs @@ -1,4 +1,4 @@ -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning.Return; +namespace SJZY.Track.Application.Contract.Dtos.Warning.Return; /// /// 回传报文日志 @@ -23,7 +23,7 @@ public sealed class ReturnMessageRecordDto /// /// 报文内容 Json字符串 /// - public string Message { get; set; } + public string Message { get; set; } /// /// 报文创建时间 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs index cda6d349..1165d6b9 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs @@ -1,4 +1,4 @@ -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning.Return; +namespace SJZY.Track.Application.Contract.Dtos.Warning.Return; /// /// 回传预警明细 @@ -45,7 +45,7 @@ public sealed class ReturnWarningDetailsDto /// 状态 1：人工介入 2：重试中 3：推送完成 4：已关闭 /// public int Status { get; set; } - + /// /// 客户id /// @@ -59,7 +59,7 @@ public sealed class ReturnWarningDetailsDto /// /// 轨迹状态 /// - public string TrackStatus { get; set; } + public string TrackStatus { get; set; } /// /// 轨迹代码 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningRuleItemDto.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningRuleItemDto.cs index 8bc133f8..d223cb51 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningRuleItemDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningRuleItemDto.cs @@ -1,6 +1,4 @@ -using Track.Warning.VNext.Application.Contract.Dtos.Common; - -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning.Return; +namespace SJZY.Track.Application.Contract.Dtos.Warning.Return; public class ReturnWarningRuleItemDto { diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/EditTransportWarningSceneRuleItemInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/EditTransportWarningSceneRuleItemInput.cs index 5d6c5267..5471b64c 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/EditTransportWarningSceneRuleItemInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/EditTransportWarningSceneRuleItemInput.cs @@ -1,27 +1,26 @@ using System.ComponentModel.DataAnnotations; -using Track.Warning.VNext.Application.Contract.DataAnnotations; -using Track.Warning.VNext.Application.Contract.Dtos.Common; +using SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning.Transport; +namespace SJZY.Track.Application.Contract.Dtos.Warning.Transport; public class EditTransportWarningSceneRuleItemInput { - /// - /// 预警规主体id - /// - [IdRequired] - public int WarningId { get; set; } + /// + /// 预警规主体id + /// + [IdRequired] + public int WarningId { get; set; } - /// - /// 运输预警场景id - /// - [IdRequired] - public int SceneId { get; set; } + /// + /// 运输预警场景id + /// + [IdRequired] + public int SceneId { get; set; } - /// - /// 预警规则配置项目（列表内容传递） - /// - public List Items { get; set; } = new(); + /// + /// 预警规则配置项目（列表内容传递） + /// + public List Items { get; set; } = new(); } /// @@ -29,38 +28,38 @@ public class EditTransportWarningSceneRuleItemInput /// public class EditTransportWarningSceneRuleItemDto { - /// - /// 规则项目id（传0视为新增） - /// - public int Id { get; set; } + /// + /// 规则项目id（传0视为新增） + /// + public int Id { get; set; } - /// - /// 起始轨迹状态Id - /// - [IdRequired] - public int StartTrackStatusId { get; set; } + /// + /// 起始轨迹状态Id + /// + [IdRequired] + public int StartTrackStatusId { get; set; } - /// - /// 截止轨迹状态Id - /// - [IdRequired] - public int EndTrackStatusId { get; set; } + /// + /// 截止轨迹状态Id + /// + [IdRequired] + public int EndTrackStatusId { get; set; } - /// - /// 时效 (单位h) - /// - [Range(0.1, float.MaxValue, ErrorMessage = "时效必须大于0.1")] - public float TransportTimeSpan { get; set; } + /// + /// 时效 (单位h) + /// + [Range(0.1, float.MaxValue, ErrorMessage = "时效必须大于0.1")] + public float TransportTimeSpan { get; set; } - /// - /// 起始轨迹生成预警时间 (单位h) - /// - [Range(0.1, float.MaxValue, ErrorMessage = "起始轨迹生成预警时间必须大于0.1")] - public float StartTrackWarningTimeSpan { get; set; } + /// + /// 起始轨迹生成预警时间 (单位h) + /// + [Range(0.1, float.MaxValue, ErrorMessage = "起始轨迹生成预警时间必须大于0.1")] + public float StartTrackWarningTimeSpan { get; set; } - /// - /// 通知对象用户集合 - /// - [MinLength(1, ErrorMessage = "通知对象用户集合不能为空")] - public List NotifyUsers { get; set; } = new(); + /// + /// 通知对象用户集合 + /// + [MinLength(1, ErrorMessage = "通知对象用户集合不能为空")] + public List NotifyUsers { get; set; } = new(); } diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs index 518695c3..b8568d70 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs @@ -1,6 +1,4 @@ -using Track.Warning.VNext.Application.Contract.Dtos.Common; - -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning.Transport; +namespace SJZY.Track.Application.Contract.Dtos.Warning.Transport; /// /// 分页获取运输预警明细 @@ -33,7 +31,7 @@ public class GetPageTransportWarningDetailsInput : PageInfoInput public int? CustomId { get; set; } /// - /// 预警名称 + /// 预警名称 /// public string? WarningName { get; set; } @@ -51,4 +49,4 @@ public class GetPageTransportWarningDetailsInput : PageInfoInput /// 创建时间截止 /// public DateTime? CreateTimeEnd { get; set; } -} \ No newline at end of file +} diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneInput.cs index c4b95b18..0b9bcebe 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneInput.cs @@ -1,15 +1,15 @@ -using Track.Warning.VNext.Application.Contract.DataAnnotations; +using SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning.Transport; +namespace SJZY.Track.Application.Contract.Dtos.Warning.Transport; /// /// 获取运输时效预警规则场景 /// public class GetTransportWarningSceneInput { - /// - /// 预警主体id - /// - [IdRequired] - public int WarningId { get; set; } + /// + /// 预警主体id + /// + [IdRequired] + public int WarningId { get; set; } } diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneRuleItemInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneRuleItemInput.cs index 9636bcf0..f1c7f56a 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneRuleItemInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/GetTransportWarningSceneRuleItemInput.cs @@ -1,21 +1,21 @@ -using Track.Warning.VNext.Application.Contract.DataAnnotations; +using SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning.Transport; +namespace SJZY.Track.Application.Contract.Dtos.Warning.Transport; /// /// 获取运输时效预警场景规则条目列表 /// public class GetTransportWarningSceneRuleItemInput { - /// - /// 预警主体id - /// - [IdRequired] - public int WarningId { get; set; } + /// + /// 预警主体id + /// + [IdRequired] + public int WarningId { get; set; } - /// - /// 运输预警场景id - /// - [IdRequired] - public int SceneId { get; set; } + /// + /// 运输预警场景id + /// + [IdRequired] + public int SceneId { get; set; } } diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningDetailsDto.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningDetailsDto.cs index 39e17621..4b4e01b8 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningDetailsDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningDetailsDto.cs @@ -1,149 +1,149 @@ -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning.Transport; +namespace SJZY.Track.Application.Contract.Dtos.Warning.Transport; /// /// 运输时效预警明细 /// public sealed class TransportWarningDetailsDto // todo：需要根据状态排序 { - /// - /// 预警明细唯一id - /// - public string EsId { get; set; } + /// + /// 预警明细唯一id + /// + public string EsId { get; set; } - /// - /// 子系统id - /// - public int SubSystemId { get; set; } + /// + /// 子系统id + /// + public int SubSystemId { get; set; } - /// - /// 子系统名称 - /// - public string SubSystemName { get; set; } // todo:id换名称 + /// + /// 子系统名称 + /// + public string SubSystemName { get; set; } // todo:id换名称 - /// - /// 客户id - /// - public int CustomId { get; set; } + /// + /// 客户id + /// + public int CustomId { get; set; } - /// - /// 客户简称 - /// - public string CustomName { get; set; } // todo:id换名称 + /// + /// 客户简称 + /// + public string CustomName { get; set; } // todo:id换名称 - /// - /// 订单id - /// - public int OrderId { get; set; } + /// + /// 订单id + /// + public int OrderId { get; set; } - /// - /// 订单号 - /// - public string OrderNo { get; set; } + /// + /// 订单号 + /// + public string OrderNo { get; set; } - /// - /// 订单类型 - /// - public int OrderType { get; set; } + /// + /// 订单类型 + /// + public int OrderType { get; set; } - /// - /// 订单类型名称 - /// - public string OrderTypeName { get; set; } // todo:type换名称 + /// + /// 订单类型名称 + /// + public string OrderTypeName { get; set; } // todo:type换名称 - // 实时属性 todo:从订单查询 + // 实时属性 todo:从订单查询 - /// - /// 最新轨迹内容 - /// - public string LatestTrackContent { get; set; } + /// + /// 最新轨迹内容 + /// + public string LatestTrackContent { get; set; } - /// - /// 最新轨迹时间 - /// - public DateTime LatestTrackTime { get; set; } + /// + /// 最新轨迹时间 + /// + public DateTime LatestTrackTime { get; set; } - /// - /// 最新轨迹发生时区 - /// - public float LatestTrackTimeZone { get; set; } + /// + /// 最新轨迹发生时区 + /// + public float LatestTrackTimeZone { get; set; } - /// - /// 最新轨迹发生地 - /// - public string LatestTrackPlace { get; set; } + /// + /// 最新轨迹发生地 + /// + public string LatestTrackPlace { get; set; } - /// - /// 通知对象 - /// - public string NotifyUserNames { get; set; } + /// + /// 通知对象 + /// + public string NotifyUserNames { get; set; } - /// - /// 起始轨迹状态 - /// - public string StartTrackStatus { get; set; } + /// + /// 起始轨迹状态 + /// + public string StartTrackStatus { get; set; } - /// - /// 起始轨迹内容 - /// - public string StartTrackContent { get; set; } + /// + /// 起始轨迹内容 + /// + public string StartTrackContent { get; set; } - /// - /// 起始轨迹发生时间 - /// - public DateTime StartTrackTime { get; set; } + /// + /// 起始轨迹发生时间 + /// + public DateTime StartTrackTime { get; set; } - /// - /// 起始轨迹时区 - /// - public float StartTrackTimeZone { get; set; } + /// + /// 起始轨迹时区 + /// + public float StartTrackTimeZone { get; set; } - /// - /// 截止轨迹状态 - /// - public string EndTrackStatus { get; set; } + /// + /// 截止轨迹状态 + /// + public string EndTrackStatus { get; set; } - /// - /// 截止轨迹内容 - /// - public string? EndTrackContent { get; set; } + /// + /// 截止轨迹内容 + /// + public string? EndTrackContent { get; set; } - /// - /// 截止轨迹发生时间 - /// - public DateTime? EndTrackTime { get; set; } + /// + /// 截止轨迹发生时间 + /// + public DateTime? EndTrackTime { get; set; } - /// - /// 截止轨迹时区 - /// - public float? EndTrackTimeZone { get; set; } + /// + /// 截止轨迹时区 + /// + public float? EndTrackTimeZone { get; set; } - /// - /// 预警名称 (预警主体名称 如字节全程时效) - /// - public string WarningName { get; set; } + /// + /// 预警名称 (预警主体名称 如字节全程时效) + /// + public string WarningName { get; set; } - /// - /// 预警规则描述（用于tooltip展示） - /// - public string WarningRuleDescription { get; set; } + /// + /// 预警规则描述（用于tooltip展示） + /// + public string WarningRuleDescription { get; set; } - /// - /// 累计运输时间 - /// - public string CumulativeTimeSpan { get; set; } // todo:需要转换为某个格式 + /// + /// 累计运输时间 + /// + public string CumulativeTimeSpan { get; set; } // todo:需要转换为某个格式 - /// - /// 预警状态 （根据key展示对应名称，即将超时需要标红） - /// 1：即将超时 2：已超时 3：已完成 4：超时完成 5：已关闭，初始为【即将超时】 - /// - public int Status { get; set; } + /// + /// 预警状态 （根据key展示对应名称，即将超时需要标红） + /// 1：即将超时 2：已超时 3：已完成 4：超时完成 5：已关闭，初始为【即将超时】 + /// + public int Status { get; set; } - /// - /// 预警创建时间 - /// - public DateTime CreateTime { get; set; } + /// + /// 预警创建时间 + /// + public DateTime CreateTime { get; set; } } diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneDto.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneDto.cs index 6254ab91..4aaf36ec 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneDto.cs @@ -1,4 +1,4 @@ -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning.Transport; +namespace SJZY.Track.Application.Contract.Dtos.Warning.Transport; /// /// 预警规则场景 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneRuleItemDto.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneRuleItemDto.cs index 55bc7f7c..b5d84089 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneRuleItemDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneRuleItemDto.cs @@ -1,6 +1,6 @@ -using Track.Warning.VNext.Application.Contract.Dtos.Common; +using SJZY.Track.Application.Contract.Dtos.Warning; -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning.Transport; +namespace SJZY.Track.Application.Contract.Dtos.Warning.Transport; /// /// 运输时效场景规则项目 diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/UpsertTransportWarningSceneInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/UpsertTransportWarningSceneInput.cs index 3a5b55a7..cc27b52a 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/UpsertTransportWarningSceneInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/UpsertTransportWarningSceneInput.cs @@ -1,6 +1,5 @@ -using Track.Warning.VNext.Application.Contract.DataAnnotations; - -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning.Transport; +using SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; +namespace SJZY.Track.Application.Contract.Dtos.Warning.Transport; public class UpsertTransportWarningSceneInput { diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/UpsertWarningRuleInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/UpsertWarningRuleInput.cs index 0ed4597c..2c5d8f87 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/UpsertWarningRuleInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/UpsertWarningRuleInput.cs @@ -1,45 +1,45 @@ using System.ComponentModel.DataAnnotations; -using Track.Warning.VNext.Application.Contract.DataAnnotations; +using SJZY.Track.Application.Contract.Dtos.Warning.DataAnnotations; -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning; +namespace SJZY.Track.Application.Contract.Dtos.Warning; /// /// 更新或者新增预警规则主体 /// public class UpsertWarningRuleInput { - /// - /// 唯一id（传0视为新增） - /// - public int Id { get; set; } + /// + /// 唯一id（传0视为新增） + /// + public int Id { get; set; } - /// - /// 子系统id - /// - [IdRequired] - public int SubSystemId { get; set; } //子系统id + /// + /// 子系统id + /// + [IdRequired] + public int SubSystemId { get; set; } //子系统id - /// - /// 客户id - /// - [IdRequired] - public int CustomId { get; set; } //客户id + /// + /// 客户id + /// + [IdRequired] + public int CustomId { get; set; } //客户id - /// - /// 预警规则名称 - /// - [Required] - public string Name { get; set; } + /// + /// 预警规则名称 + /// + [Required] + public string Name { get; set; } - /// - /// 是否启用 - /// - [Required] - public bool IsEnabled { get; set; } + /// + /// 是否启用 + /// + [Required] + public bool IsEnabled { get; set; } - /// - /// 预警类型，1:运输时效，2：回传时效，3：完整预警 - /// - [Range(1, 3, ErrorMessage = "预警类型只能选取以下值，1:运输时效，2：回传时效，3：完整预警")] - public int WarningType { get; set; } + /// + /// 预警类型，1:运输时效，2：回传时效，3：完整预警 + /// + [Range(1, 3, ErrorMessage = "预警类型只能选取以下值，1:运输时效，2：回传时效，3：完整预警")] + public int WarningType { get; set; } } diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/WarningRuleDto.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/WarningRuleDto.cs index 889d6885..57ea30fe 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/WarningRuleDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/WarningRuleDto.cs @@ -1,4 +1,4 @@ -namespace Track.Warning.VNext.Application.Contract.Dtos.Warning; +namespace SJZY.Track.Application.Contract.Dtos.Warning; /// /// 预警规则主体 @@ -29,7 +29,7 @@ public sealed class WarningRuleDto /// 客户简称 /// public int CustomName { get; set; } // todo:id换name - + /// /// 预警规则名称 /// diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs index b7b9e305..d6e268a8 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs @@ -557,24 +557,24 @@ public partial class TrackService : ApplicationService, ITrackService //查询并按比较字段过滤轨迹，当比较字段为空时则使用轨迹发生时间过滤 //tips:后续进行投影缩参优化 - private async Task> QueryAndFilterAsync(int orderId1, string trackCode1, DateTime trackTime1, string? extra1, string? compareFields1) + private async Task> QueryAndFilterAsync(int orderId, string trackCode, DateTime trackTime, string? extra, string? compareFields) { - var tracks1 = await _trackDetailsEsRepository.GetListAsync(new[] { orderId1 }, trackCode1, true); + var tracks = await _trackDetailsEsRepository.GetListAsync(new[] { orderId }, trackCode, true); //无比较字段时使用轨迹时间参与过滤（兼容老版本） - if (string.IsNullOrWhiteSpace(compareFields1)) + if (string.IsNullOrWhiteSpace(compareFields)) { - return tracks1.Where(x => x.TrackTime == trackTime1).ToList(); + return tracks.Where(x => x.TrackTime == trackTime).ToList(); } - return tracks1.Where(x => + return tracks.Where(x => { if (string.IsNullOrWhiteSpace(x.Extra)) throw new BusinessException(message: "轨迹extra为空无法使用比较字段比较，请检查轨迹"); var extraJsonElement = TextJsonHelper.DeserializeToJsonElement(x.Extra); - var inputExtraJsonElement = TextJsonHelper.DeserializeToJsonElement(extra1); + var inputExtraJsonElement = TextJsonHelper.DeserializeToJsonElement(extra); - return TextJsonHelper.EqByJsonElementField(extraJsonElement, inputExtraJsonElement, compareFields1); + return TextJsonHelper.EqByJsonElementField(extraJsonElement, inputExtraJsonElement, compareFields); }) .ToList(); } diff --git a/src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs b/src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs index f2483db9..dbdb41d9 100644 --- a/src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs +++ b/src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs @@ -1,48 +1,46 @@ -using Microsoft.AspNetCore.Mvc; -using Track.Warning.VNext.Application.Contract.Dtos.Common; -using Track.Warning.VNext.Application.Contract.Dtos.Warning.Complete; +using SJZY.Track.Application.Contract.Dtos.Warning.Complete; -namespace Track.Warning.VNext.Controllers.Warning; +namespace SJZY.Track.Application.Services.Warning; /// /// 完整预警服务 /// -[ApiController] +[ApiExplorerSettings(GroupName = "预警服务")] [Route("Warning/Complete")] -public class CompleteWarningService : ControllerBase +public class CompleteWarningService : ApplicationService { - /// - /// 编辑完整预警规则列表 - /// - /// - /// - [HttpPost("EditCompleteWarningRuleItem")] - public Task EditCompleteWarningRuleItem(EditCompleteWarningRuleItemInput input) - { - return Task.FromResult(new UnifyResultDto()); - } + /// + /// 编辑完整预警规则列表 + /// + /// + /// + [HttpPost("EditCompleteWarningRuleItem")] + public Task EditCompleteWarningRuleItem(EditCompleteWarningRuleItemInput input) + { + return Task.FromResult(new UnifyResultDto()); + } - /// - /// 获取完整预警规则列表 - /// - /// - /// - [HttpPost("GetCompleteWarningRuleItem")] - public Task>> - GetCompleteWarningRuleItem(GetCompleteWarningRuleItemInput input) - { - return Task.FromResult(new UnifyResultDto>()); - } + /// + /// 获取完整预警规则列表 + /// + /// + /// + [HttpPost("GetCompleteWarningRuleItem")] + public Task>> + GetCompleteWarningRuleItem(GetCompleteWarningRuleItemInput input) + { + return Task.FromResult(new UnifyResultDto>()); + } - /// - /// 分页获取完整预警详情 - /// - /// - /// - [HttpPost("GetPageCompleteWarningDetails")] - public Task> - GetPageCompleteWarningDetails(GetPageCompleteWarningDetailsInput input) - { - return Task.FromResult(new UnifyPageResultDto()); - } + /// + /// 分页获取完整预警详情 + /// + /// + /// + [HttpPost("GetPageCompleteWarningDetails")] + public Task> + GetPageCompleteWarningDetails(GetPageCompleteWarningDetailsInput input) + { + return Task.FromResult(new UnifyPageResultDto()); + } } diff --git a/src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs b/src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs index 35900558..a687a53a 100644 --- a/src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs +++ b/src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs @@ -1,58 +1,54 @@ -using Microsoft.AspNetCore.Mvc; -using Track.Warning.VNext.Application.Contract.Dtos.Common; -using Track.Warning.VNext.Application.Contract.Dtos.Warning.Return; +using SJZY.Track.Application.Contract.Dtos.Warning.Return; -namespace Track.Warning.VNext.Controllers.Warning; +namespace SJZY.Track.Application.Services.Warning; /// /// 回传预警服务 /// -[ApiController] +[ApiExplorerSettings(GroupName = "预警服务")] [Route("Warning/Return")] -public class ReturnWarningService : ControllerBase +public class ReturnWarningService : ApplicationService { - /// - /// 编辑回传预警规则列表 - /// - /// - /// - [HttpPost("EditReturnWarningRuleItem")] - public Task EditReturnWarningRuleItem(EditReturnWarningRuleItemInput input) - { - return Task.FromResult(new UnifyResultDto()); - } + /// + /// 编辑回传预警规则列表 + /// + /// + /// + [HttpPost("EditReturnWarningRuleItem")] + public Task EditReturnWarningRuleItem(EditReturnWarningRuleItemInput input) + { + return Task.FromResult(new UnifyResultDto()); + } - /// - /// 分页获取回传预警明细 - /// - /// - /// - [HttpPost("GetPageReturnWarningDetails")] - public Task> - GetPageReturnWarningDetails(GetPageReturnWarningDetailsInput input) - { - return Task.FromResult(new UnifyPageResultDto()); - } + /// + /// 分页获取回传预警明细 + /// + /// + /// + [HttpPost("GetPageReturnWarningDetails")] + public Task> GetPageReturnWarningDetails(GetPageReturnWarningDetailsInput input) + { + return Task.FromResult(new UnifyPageResultDto()); + } - /// - /// 获取回传报文日志 - /// - [HttpPost("GetReturnMessageRecord")] - public Task>> - GetReturnMessageRecord(GetReturnMessageRecordInput input) - { - return Task.FromResult(new UnifyResultDto>()); - } + /// + /// 获取回传报文日志 + /// + [HttpPost("GetReturnMessageRecord")] + public Task>> GetReturnMessageRecord(GetReturnMessageRecordInput input) + { + return Task.FromResult(new UnifyResultDto>()); + } - /// - /// 获取回传预警规则列表 - /// - /// - /// - [HttpPost("GetReturnWarningRuleItem")] - public Task>> - GetReturnWarningRuleItem(GetReturnWarningRuleItemInput input) - { - return Task.FromResult(new UnifyResultDto>()); - } + /// + /// 获取回传预警规则列表 + /// + /// + /// + [HttpPost("GetReturnWarningRuleItem")] + public Task>> + GetReturnWarningRuleItem(GetReturnWarningRuleItemInput input) + { + return Task.FromResult(new UnifyResultDto>()); + } } diff --git a/src/SJZY.Track.Application/Services/Warning/TransportWarningService.cs b/src/SJZY.Track.Application/Services/Warning/TransportWarningService.cs index c2c0c829..c9881318 100644 --- a/src/SJZY.Track.Application/Services/Warning/TransportWarningService.cs +++ b/src/SJZY.Track.Application/Services/Warning/TransportWarningService.cs @@ -1,11 +1,11 @@ -using Track.Warning.VNext.Application.Contract.Dtos.Warning.Transport; +using SJZY.Track.Application.Contract.Dtos.Warning.Transport; /// /// 运输时效预警服务 /// -[ApiController] +[ApiExplorerSettings(GroupName = "预警服务")] [Route("Warning/Transport")] -public class TransportWarningService : ControllerBase +public class TransportWarningService : ApplicationService { /// diff --git a/src/SJZY.Track.Application/Services/Warning/WarningService.cs b/src/SJZY.Track.Application/Services/Warning/WarningService.cs index d5d0a64e..a0be7481 100644 --- a/src/SJZY.Track.Application/Services/Warning/WarningService.cs +++ b/src/SJZY.Track.Application/Services/Warning/WarningService.cs @@ -1,13 +1,13 @@ -using Track.Warning.VNext.Application.Contract.Dtos.Warning; +using SJZY.Track.Application.Contract.Dtos.Warning; -namespace Track.Warning.VNext.Controllers.Warning; +namespace SJZY.Track.Application.Services.Warning; /// /// 预警规则主体 /// -[ApiController] +[ApiExplorerSettings(GroupName = "预警服务")] [Route("Warning")] -public class WarningService : ControllerBase +public class WarningService : ApplicationService { /// /// 新增/修改预警规则主体 diff --git a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsEsRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsEsRepository.cs index 48eac8cb..ecd623be 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsEsRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsEsRepository.cs @@ -8,6 +8,9 @@ public interface ITrackDetailsEsRepository : IElasticsearchClientService> GetListAsync(int[] orderIds, string trackCode, bool forUpsert = false); + // todo:s07 获取这些订单的最新一条轨迹 + // Task> GetLatestListAsync(HashSet eventOrderIds); + Task> GetLatestListAsync(int[] eventOrderIds, List trackCodes); Task> GetListAsync(int subSystemId, int orderType, List orderNos, List? trackCodes = null); diff --git a/test/SJZY.Track.Test/Startup.cs b/test/SJZY.Track.Test/Startup.cs index 73fe7c3a..b18b5cd5 100644 --- a/test/SJZY.Track.Test/Startup.cs +++ b/test/SJZY.Track.Test/Startup.cs @@ -2,9 +2,8 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using SJZY.Track.Test; -namespace SJZY.OpenApi.Test; +namespace SJZY.Track.Test; public class Startup { diff --git a/test/SJZY.Track.Test/TestModuleTestBase.cs b/test/SJZY.Track.Test/TestModuleTestBase.cs index 9c025b6e..4be0763d 100644 --- a/test/SJZY.Track.Test/TestModuleTestBase.cs +++ b/test/SJZY.Track.Test/TestModuleTestBase.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Volo.Abp.AspNetCore.TestBase; -namespace SJZY.OpenApi.Test; +namespace SJZY.Track.Test; public class TestModuleTestBase : AbpAspNetCoreIntegratedTestBase {