diff --git a/src/SJZY.Track.Application/Helpers/ForewarningFactorHelper.cs b/src/SJZY.Track.Application/Helpers/ForewarningFactorHelper.cs
index 5490aea1..e3a1f4c9 100644
--- a/src/SJZY.Track.Application/Helpers/ForewarningFactorHelper.cs
+++ b/src/SJZY.Track.Application/Helpers/ForewarningFactorHelper.cs
@@ -9,6 +9,11 @@ public class ForewarningFactorHelper
{
var total = Factorial(ruleFactors);
var ruleCollect = AllocateFactor(total, ruleFactors.RuleId);
+ Assignment(ruleCollect, total, ruleFactors.Tracks, (item, value) =>
+ {
+ item.TrackEnd = value.End;
+ item.TrackStart = value.Start;
+ });
Assignment(ruleCollect, total, ruleFactors.CargoTypes, (item, value) => item.CargoType = value);
Assignment(ruleCollect, total, ruleFactors.Months, (item, value) => item.Month = value);
Assignment(ruleCollect, total, ruleFactors.Areas, (item, value) => item.Area = value);
@@ -54,7 +59,7 @@ public class ForewarningFactorHelper
internal static int Factorial(RuleFactorEntity ruleFactors)
{
- return ruleFactors.CargoTypes.Count * ruleFactors.Months.Count * ruleFactors.Areas.Count *
+ return ruleFactors.Tracks.Count* ruleFactors.CargoTypes.Count * ruleFactors.Months.Count * ruleFactors.Areas.Count *
ruleFactors.IsTransit.Count * ruleFactors.DeparturePorts.Count * ruleFactors.ProductCodes.Count;
}
}
\ No newline at end of file
diff --git a/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningService.cs b/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningService.cs
index b9544324..11532104 100644
--- a/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningService.cs
+++ b/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningService.cs
@@ -9,9 +9,9 @@ namespace SJZY.Track.Application.Services.ForewarningServices;
public class ForewarningService : ApplicationService
{
readonly IRuleRepository _ruleRepository;
- IRuleFactorRepository _ruleFactorRepository;
- private IRuleItemRepository _ruleItemRepository;
-
+ readonly IRuleFactorRepository _ruleFactorRepository;
+ private readonly IRuleItemRepository _ruleItemRepository;
+
public ForewarningService(IRuleRepository ruleRepository
, IRuleFactorRepository ruleFactorRepository
, IRuleItemRepository ruleItemRepository)
diff --git a/src/SJZY.Track.Application/Services/ForewarningServices/KpiAreaService.cs b/src/SJZY.Track.Application/Services/ForewarningServices/KpiAreaService.cs
index 3fc7c3ac..593467ef 100644
--- a/src/SJZY.Track.Application/Services/ForewarningServices/KpiAreaService.cs
+++ b/src/SJZY.Track.Application/Services/ForewarningServices/KpiAreaService.cs
@@ -95,7 +95,6 @@ public class KpiAreaService : ApplicationService
if (input.Id <= 0)
return new UnifyResultDto(false, "id不能为空");
- //todo 测试不存在id的情况
var areaInfo = await _ruleAreaRepository.GetAreaInfoById(input.Id);
if (areaInfo == null)
return new UnifyResultDto(false, "未找到该区域信息");
diff --git a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/RuleTrackStateModel.cs b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/RuleTrackStateModel.cs
index 554d1e2c..a4605dcb 100644
--- a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/RuleTrackStateModel.cs
+++ b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/RuleTrackStateModel.cs
@@ -16,9 +16,5 @@ public class RuleTrackStateModel
/// Gets or sets the user to notify.
///
public string NotifyUser { get; set; }
-
- ///
- /// Gets or sets the notification template.
- ///
- public string NotifyTemplate { get; set; }
+
}
\ No newline at end of file
diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/AddRuleAreaInfoRequest.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/AddRuleAreaInfoRequest.cs
index 789dd29f..08616063 100644
--- a/src/SJZY.Track.Domain/Dtos/Forewarning/AddRuleAreaInfoRequest.cs
+++ b/src/SJZY.Track.Domain/Dtos/Forewarning/AddRuleAreaInfoRequest.cs
@@ -4,17 +4,35 @@ namespace SJZY.Track.Domain.Dtos.Forewarning;
public class AddRuleAreaInfoRequest
{
+ ///
+ /// 国家名称,必填项。
+ ///
[Required]
public string Country { get; set; }
-
+
+ ///
+ /// 省份名称,可为空。
+ ///
public string? Province { get; set; }
-
+
+ ///
+ /// 城市名称,可为空。
+ ///
public string? City { get; set; }
-
+
+ ///
+ /// 左侧邮政编码,可为空。
+ ///
public string? LeftPostCode { get; set; }
-
+
+ ///
+ /// 右侧邮政编码,可为空。
+ ///
public string? RightPostCode { get; set; }
-
+
+ ///
+ /// 区域ID,必填项。
+ ///
[Required]
public int AreaId { get; set; }
}
\ No newline at end of file
diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/ModifyTimelinessRequest.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/ModifyTimelinessRequest.cs
index 8b023cac..841292f7 100644
--- a/src/SJZY.Track.Domain/Dtos/Forewarning/ModifyTimelinessRequest.cs
+++ b/src/SJZY.Track.Domain/Dtos/Forewarning/ModifyTimelinessRequest.cs
@@ -2,6 +2,9 @@ namespace SJZY.Track.Domain.Dtos.Forewarning;
public class ModifyTimelinessRequest
{
+ ///
+ /// 规则详情中的时效相关信息
+ ///
public List Items { get; set; }
///
@@ -10,6 +13,9 @@ public class ModifyTimelinessRequest
public int RuleId { get; set; }
}
+///
+/// 规则详情时效
+///
public class TimelinessDto
{
///
@@ -28,7 +34,7 @@ public class TimelinessDto
public int Count { get; set; }
///
- /// 规则id
+ /// 规则详情id
///
public int Id { get; set; }
}
\ No newline at end of file
diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/QueryAreaInfoRequest.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/QueryAreaInfoRequest.cs
index 196a65bf..896f47a7 100644
--- a/src/SJZY.Track.Domain/Dtos/Forewarning/QueryAreaInfoRequest.cs
+++ b/src/SJZY.Track.Domain/Dtos/Forewarning/QueryAreaInfoRequest.cs
@@ -2,5 +2,8 @@ namespace SJZY.Track.Domain.Dtos.Forewarning;
public class QueryAreaInfoRequest: PageInfoInput
{
+ ///
+ /// 区域id
+ ///
public int AreaId { get; set; }
}
\ No newline at end of file
diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaInfoRequest.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaInfoRequest.cs
index c6f52158..29a25f7f 100644
--- a/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaInfoRequest.cs
+++ b/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaInfoRequest.cs
@@ -2,21 +2,39 @@ using System.ComponentModel.DataAnnotations;
namespace SJZY.Track.Domain.Dtos.Forewarning;
+///
+/// 更新规则区域信息请求
+///
public class UpdateRuleAreaInfoRequest
{
///
- /// 分区信息id
+ /// 区域信息ID
///
public int Id { get; set; }
+ ///
+ /// 国家名称,必填项。
+ ///
[Required]
public string Country { get; set; }
+ ///
+ /// 省份名称,可为空。
+ ///
public string? Province { get; set; }
+ ///
+ /// 城市名称,可为空。
+ ///
public string? City { get; set; }
+ ///
+ /// 左侧邮政编码,可为空。
+ ///
public string? LeftPostCode { get; set; }
+ ///
+ /// 右侧邮政编码,可为空。
+ ///
public string? RightPostCode { get; set; }
}
\ No newline at end of file
diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaRequest.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaRequest.cs
index f0bac318..74ca3538 100644
--- a/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaRequest.cs
+++ b/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaRequest.cs
@@ -11,7 +11,7 @@ public class UpdateRuleAreaRequest
public string Name { get; set; }
///
- /// 分区id
+ /// 区域id
///
public int Id { get; set; }
}
\ No newline at end of file