From 769ba9e07b8ccda23d850279c7f6f47e73aaf611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=9F=E5=96=9C=E6=97=BA?= Date: Mon, 29 Jul 2024 10:31:57 +0800 Subject: [PATCH] =?UTF-8?q?Merge=20remote-tracking=20branch=20'origin/S04?= =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E9=A2=84=E8=AD=A6'=20into=20S04=E8=BD=A8?= =?UTF-8?q?=E8=BF=B9=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs feat: 调整轨迹区域添加了国家名称字段 --- .../AutoMapper/ForewarningMapperProfile.cs | 7 ++-- .../KPIAreaAggregate/RuleAreaInfoEntity.cs | 12 +++++-- .../Forewarning/AddRuleAreaInfoRequest.cs | 10 ++++-- .../Dtos/Forewarning/AreaDto.cs | 20 ++++++++++++ .../Dtos/Forewarning/AreaInfoDto.cs | 9 ++++-- .../Forewarning/UpdateRuleAreaInfoRequest.cs | 8 ++++- .../Repositories/KpiAreaRepository.cs | 32 ++++++++----------- .../Repositories/TrackNodeRepository.cs | 2 +- 8 files changed, 70 insertions(+), 30 deletions(-) diff --git a/src/SJZY.Track.Application/AutoMapper/ForewarningMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/ForewarningMapperProfile.cs index 2498dccb..6a48362a 100644 --- a/src/SJZY.Track.Application/AutoMapper/ForewarningMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/ForewarningMapperProfile.cs @@ -14,10 +14,10 @@ public class ForewarningMapperProfile :Profile CreateMap(MemberList.None) .Ignore(x => x.WarningFactors); CreateMap(MemberList.None); - CreateMap(); CreateMap(MemberList.None); CreateMap(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(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)) diff --git a/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs b/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs index 5a1b97c7..b1afa3c6 100644 --- a/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs @@ -16,10 +16,16 @@ public class RuleAreaInfoEntity : IEntity public int AreaId { get; set; } /// - /// 国家或地区 + /// 国家或地区二字码 /// - [SugarColumn(ColumnName = "Country", Length = 128, ColumnDescription = "国家或地区")] - public string Country { get; set; } + [SugarColumn(ColumnName = "CountryCode", Length = 128, ColumnDescription = "国家或地区二字码")] + public string CountryCode { get; set; } + + /// + /// 国家或地区名称 + /// + [SugarColumn(ColumnName = "CountryName", Length = 128, ColumnDescription = "国家或地区名称")] + public string CountryName { get; set; } /// /// 州或者省份 diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/AddRuleAreaInfoRequest.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/AddRuleAreaInfoRequest.cs index 08616063..2ce1878c 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/AddRuleAreaInfoRequest.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/AddRuleAreaInfoRequest.cs @@ -5,10 +5,16 @@ namespace SJZY.Track.Domain.Dtos.Forewarning; public class AddRuleAreaInfoRequest { /// - /// 国家名称，必填项。 + /// 国家二字码，必填项。 /// [Required] - public string Country { get; set; } + public string CountryCode { get; set; } + + /// + /// 国家名称 + /// + [Required] + public string CountryName { get; set; } /// /// 省份名称，可为空。 diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/AreaDto.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/AreaDto.cs index d0703d4a..2ed7cc9f 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/AreaDto.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/AreaDto.cs @@ -2,8 +2,28 @@ namespace SJZY.Track.Domain.Dtos.Forewarning; public class AreaDto { + /// + /// 区域id + /// public int Id { get; set; } + + /// + /// 子系统id + /// public int SubSystemId { get; set; } + + /// + /// 系统名称 + /// + public string SystemName { get; set; } + + /// + /// 区域名称 + /// public string Name { get; set; } + + /// + /// 更新时间 + /// public DateTime UpdateTime { get; set; } } \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/AreaInfoDto.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/AreaInfoDto.cs index 9ac65e86..75e24e5e 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/AreaInfoDto.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/AreaInfoDto.cs @@ -13,9 +13,14 @@ public class RuleAreaInfoDto public int AreaId { get; set; } /// - /// 国家或地区 + /// 国家或地区 二字码 /// - public string Country { get; set; } + public string CountryCode { get; set; } + + /// + /// 国家名称 + /// + public string CountryName { get; set; } /// /// 省份 diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaInfoRequest.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaInfoRequest.cs index 29a25f7f..8b1d4978 100644 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaInfoRequest.cs +++ b/src/SJZY.Track.Domain/Dtos/Forewarning/UpdateRuleAreaInfoRequest.cs @@ -12,11 +12,17 @@ public class UpdateRuleAreaInfoRequest /// public int Id { get; set; } + /// + /// 国家二字码，必填项。 + /// + [Required] + public string CountryCode { get; set; } + /// /// 国家名称，必填项。 /// [Required] - public string Country { get; set; } + public string CountryName { get; set; } /// /// 省份名称，可为空。 diff --git a/src/SJZY.Track.Repository/Repositories/KpiAreaRepository.cs b/src/SJZY.Track.Repository/Repositories/KpiAreaRepository.cs index 9717997a..c1a7d22a 100644 --- a/src/SJZY.Track.Repository/Repositories/KpiAreaRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/KpiAreaRepository.cs @@ -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, IKpiAreaReposi /// public async Task> GetAreas(QueryAreaRequest query) { - var queryable = Context.Queryable(); - if (!string.IsNullOrEmpty(query.Name)) - { - 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(val => new AreaDto() + return await Context.Queryable() + .InnerJoin((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((area,sys) => 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, 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 diff --git a/src/SJZY.Track.Repository/Repositories/TrackNodeRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackNodeRepository.cs index 9f767780..cd6d8003 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackNodeRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackNodeRepository.cs @@ -59,7 +59,7 @@ public class TrackNodeRepository: BasicRepository,ITrackNodeRep .LeftJoin((t, u1) => t.CreateUserId == u1.Id) .LeftJoin((t, u1, u2) => t.UpdateUserId == u2.Id) .LeftJoin((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,