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

Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警

Browse Source 
# Conflicts:
#	src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs

feat: 调整轨迹区域添加了国家名称字段
This commit is contained in:
钟喜旺 2024-07-29 10:31:57 +08:00
parent 1513bb4964
commit 769ba9e07b
8 changed files with 70 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/SJZY.Track.Application/AutoMapper/ForewarningMapperProfile.cs
View File

@ -14,10 +14,10 @@ public class ForewarningMapperProfile :Profile
CreateMap<CreateWarningInput, WarningEntity>(MemberList.None)
.Ignore(x => x.WarningFactors);
CreateMap<WarningTimeSpanDto, WarningRuleEntity>(MemberList.None);
CreateMap<RuleAreaEntity, AreaDto>();
CreateMap<UpdateRuleAreaRequest, RuleAreaEntity>(MemberList.None);
CreateMap<AddRuleAreaInfoRequest, RuleAreaInfoEntity>(MemberList.None)
.ForMember(dest => dest.Country, opt => opt.MapFrom(src => src.Country))
.ForMember(dest => dest.CountryCode, opt => opt.MapFrom(src => src.CountryCode))
.ForMember(dest => dest.CountryName, opt => opt.MapFrom(src => src.CountryName))
.ForMember(dest => dest.Province, opt => opt.MapFrom(src => src.Province))
.ForMember(dest => dest.City, opt => opt.MapFrom(src => src.City))
.ForMember(dest => dest.LeftPostcode, opt => opt.MapFrom(src => src.LeftPostCode))
@ -29,7 +29,8 @@ public class ForewarningMapperProfile :Profile
.ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.Name));
CreateMap<UpdateRuleAreaInfoRequest, RuleAreaInfoEntity>(MemberList.None)
.ForMember(dest => dest.Country, opt => opt.MapFrom(src => src.Country))
.ForMember(dest => dest.CountryCode, opt => opt.MapFrom(src => src.CountryCode))
.ForMember(dest => dest.CountryName, opt => opt.MapFrom(src => src.CountryName))
.ForMember(dest => dest.Province, opt => opt.MapFrom(src => src.Province))
.ForMember(dest => dest.City, opt => opt.MapFrom(src => src.City))
.ForMember(dest => dest.LeftPostcode, opt => opt.MapFrom(src => src.LeftPostCode))

12
src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs
View File

@ -16,10 +16,16 @@ public class RuleAreaInfoEntity : IEntity
public int AreaId { get; set; }
/// <summary>
/// 国家或地区
/// 国家或地区二字码
/// </summary>
[SugarColumn(ColumnName = "Country", Length = 128, ColumnDescription = "国家或地区")]
public string Country { get; set; }
[SugarColumn(ColumnName = "CountryCode", Length = 128, ColumnDescription = "国家或地区二字码")]
public string CountryCode { get; set; }
/// <summary>
/// 国家或地区名称
/// </summary>
[SugarColumn(ColumnName = "CountryName", Length = 128, ColumnDescription = "国家或地区名称")]
public string CountryName { get; set; }
/// <summary>
/// 州或者省份

10
src/SJZY.Track.Domain/Dtos/Forewarning/AddRuleAreaInfoRequest.cs
View File

@ -5,10 +5,16 @@ namespace SJZY.Track.Domain.Dtos.Forewarning;
public class AddRuleAreaInfoRequest
{
/// <summary>
/// 国家名称，必填项。
/// 国家二字码，必填项。
/// </summary>
[Required]
public string Country { get; set; }
public string CountryCode { get; set; }
/// <summary>
/// 国家名称
/// </summary>
[Required]
public string CountryName { get; set; }
/// <summary>
/// 省份名称，可为空。

20
src/SJZY.Track.Domain/Dtos/Forewarning/AreaDto.cs
View File

@ -2,8 +2,28 @@ namespace SJZY.Track.Domain.Dtos.Forewarning;
public class AreaDto
{
/// <summary>
/// 区域id
/// </summary>
public int Id { get; set; }
/// <summary>
/// 子系统id
/// </summary>
public int SubSystemId { get; set; }
/// <summary>
/// 系统名称
/// </summary>
public string SystemName { get; set; }
/// <summary>
/// 区域名称
/// </summary>
public string Name { get; set; }
/// <summary>
/// 更新时间
/// </summary>
public DateTime UpdateTime { get; set; }
}

9
src/SJZY.Track.Domain/Dtos/Forewarning/AreaInfoDto.cs
View File

@ -13,9 +13,14 @@ public class RuleAreaInfoDto
public int AreaId { get; set; }
/// <summary>
/// 国家或地区
/// 国家或地区 二字码
/// </summary>
public string Country { get; set; }
public string CountryCode { get; set; }
/// <summary>
/// 国家名称
/// </summary>
public string CountryName { get; set; }
/// <summary>
/// 省份

8
src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaInfoRequest.cs
View File

@ -12,11 +12,17 @@ public class UpdateRuleAreaInfoRequest
/// </summary>
public int Id { get; set; }
/// <summary>
/// 国家二字码，必填项。
/// </summary>
[Required]
public string CountryCode { get; set; }
/// <summary>
/// 国家名称，必填项。
/// </summary>
[Required]
public string Country { get; set; }
public string CountryName { get; set; }
/// <summary>
/// 省份名称，可为空。

32
src/SJZY.Track.Repository/Repositories/KpiAreaRepository.cs
View File

@ -1,6 +1,7 @@
using SJZY.Track.Domain;
using SJZY.Track.Domain.Aggregates.KPIAreaAggregate;
using SJZY.Track.Domain.Dtos.Forewarning;
using SJZY.Track.Domain.VEntities;
namespace SJZY.Track.Repository.Repositories;
@ -41,24 +42,18 @@ public class KpiAreaRepository : BasicRepository<RuleAreaEntity>, IKpiAreaReposi
/// <returns></returns>
public async Task<UnifyPageResultDto<AreaDto>> GetAreas(QueryAreaRequest query)
{
var queryable = Context.Queryable<RuleAreaEntity>();
if (!string.IsNullOrEmpty(query.Name))
return await Context.Queryable<RuleAreaEntity>()
.InnerJoin<VSystemEntity>((area,sys)=>area.SubSystemId==sys.Id)
.WhereIF(!string.IsNullOrEmpty(query.Name),(area,sys)=>area.Name.Contains(query.Name))
.WhereIF(query.SystemId.HasValue,(area,sys)=>area.SubSystemId == query.SystemId.Value)
.OrderBy((area,sys) => area.UpdateTime, OrderByType.Desc)
.Select<AreaDto>((area,sys) => new AreaDto()
{
queryable = queryable.Where(x => x.Name.Contains(query.Name));
}
if (query.SystemId.HasValue)
{
queryable = queryable.Where(x => x.SubSystemId == query.SystemId.Value);
}
return await queryable.OrderBy(x => x.Id, OrderByType.Desc)
.Select<AreaDto>(val => new AreaDto()
{
Id = val.Id,
Name = val.Name,
SubSystemId = val.SubSystemId,
UpdateTime = val.CreateTime
Id = area.Id,
Name = area.Name,
SystemName = sys.CnName,
SubSystemId = area.SubSystemId,
UpdateTime = area.CreateTime
})
.ToPagedListAsync(query.PageIndex, query.PageSize);
}
@ -78,7 +73,8 @@ public class KpiAreaRepository : BasicRepository<RuleAreaEntity>, IKpiAreaReposi
Id = val.Id,
AreaId = val.AreaId,
City = val.City,
Country = val.Country,
CountryCode = val.CountryCode,
CountryName = val.CountryName,
LeftPostcode = val.LeftPostcode,
RightPostcode = val.RightPostcode,
Province = val.Province

2
src/SJZY.Track.Repository/Repositories/TrackNodeRepository.cs
View File

@ -59,7 +59,7 @@ public class TrackNodeRepository: BasicRepository<TrackNodeEntity>,ITrackNodeRep
.LeftJoin<VUserEntity>((t, u1) => t.CreateUserId == u1.Id)
.LeftJoin<VUserEntity>((t, u1, u2) => t.UpdateUserId == u2.Id)
.LeftJoin<VSystemEntity>((t, u1, u2, u3) => t.SubSystemId == u3.Id)
.Where((t, u1, u2) => !t.IsDeleted && !u1.IsDeleted && !u2.IsDeleted)
.Where((t, u1, u2) => !t.IsDeleted && !u1.IsDeleted && !u2.IsDeleted&& t.Id==id)
.Select((t, u1, u2, u3) => new TrackNodeDto()
{
Id = t.Id,