diff --git a/src/TrackCenter.Application/AutoMapper/TrackNodeMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/TrackNodeMapperProfile.cs deleted file mode 100644 index e8199397..00000000 --- a/src/TrackCenter.Application/AutoMapper/TrackNodeMapperProfile.cs +++ /dev/null @@ -1,19 +0,0 @@ -using AutoMapper; -using TrackCenter.Application.Dtos.TrackNode; -using TrackCenter.Application.Dtos.TrackStatus; -using TrackCenter.Domain.Aggregates.TrackNodeAggregate; -using TrackCenter.Domain.Dtos.TrackNode; - -namespace TrackCenter.Application.AutoMapper; - -public class TrackNodeMapperProfile : Profile -{ - public TrackNodeMapperProfile() - { - CreateMap(); - CreateMap(MemberList.None) - .ForMember(val => val.NodeName, opt => opt.MapFrom(src => src.NodeName)) - .ForMember(val => val.NodeEnName, opt => opt.MapFrom(src => src.NodeEnName)) - .ForMember(val => val.AppKey, opt => opt.MapFrom(src => src.AppKey)); - } -} diff --git a/src/TrackCenter.Application/AutoMapper/TrackStatusAutoMapperProfile.cs b/src/TrackCenter.Application/AutoMapper/TrackStatusAutoMapperProfile.cs index b98d0922..33bf1025 100644 --- a/src/TrackCenter.Application/AutoMapper/TrackStatusAutoMapperProfile.cs +++ b/src/TrackCenter.Application/AutoMapper/TrackStatusAutoMapperProfile.cs @@ -13,8 +13,7 @@ public class TrackStatusAutoMapperProfile : Profile CreateMap(MemberList.None) //层级不一致的场景 .ForMember(dest => dest.Status, opt => opt.MapFrom(source => source.TrackStatus)) - .ForMember(dest => dest.EnStatus, opt => opt.MapFrom(source => source.EnTrackStatus)) - .ForMember(dest => dest.Node, opt => opt.MapFrom(source => source.NodeId)); + .ForMember(dest => dest.EnStatus, opt => opt.MapFrom(source => source.EnTrackStatus)); CreateMap(MemberList.None); CreateMap(MemberList.None); CreateMap(MemberList.None); diff --git a/src/TrackCenter.Application/Dtos/ProvideServices/TrackTemplateContentDto.cs b/src/TrackCenter.Application/Dtos/ProvideServices/TrackTemplateContentDto.cs index 014634dd..e9654735 100644 --- a/src/TrackCenter.Application/Dtos/ProvideServices/TrackTemplateContentDto.cs +++ b/src/TrackCenter.Application/Dtos/ProvideServices/TrackTemplateContentDto.cs @@ -40,11 +40,6 @@ public class TemplateContentDto /// public string Status { get; set; } - /// - /// 轨迹节点 - /// - public string Node { get; set; } - /// /// 排序键和模板顺序一致 /// diff --git a/src/TrackCenter.Application/Dtos/TrackContents/GetPageTrackContentInput.cs b/src/TrackCenter.Application/Dtos/TrackContents/GetPageTrackContentInput.cs index f86b2b16..5e6583e2 100644 --- a/src/TrackCenter.Application/Dtos/TrackContents/GetPageTrackContentInput.cs +++ b/src/TrackCenter.Application/Dtos/TrackContents/GetPageTrackContentInput.cs @@ -55,11 +55,6 @@ public class GetTrackContentListDto /// public string TrackStatus { get; set; } - /// - /// 所属节点 - /// - public string Node { get; set; } - /// /// 轨迹标记 /// diff --git a/src/TrackCenter.Application/Dtos/TrackNode/TrackNodeInput.cs b/src/TrackCenter.Application/Dtos/TrackNode/TrackNodeInput.cs deleted file mode 100644 index c950e7c8..00000000 --- a/src/TrackCenter.Application/Dtos/TrackNode/TrackNodeInput.cs +++ /dev/null @@ -1,29 +0,0 @@ -namespace TrackCenter.Application.Dtos.TrackNode; - -public class EditTrackNodeInput -{ - /// - /// 操作类型 - /// - public OptionType Options { get; set; } - - /// - /// 轨迹节点id,创建不用填 - /// - public long Id { get; set; } - - /// - /// 系统id - /// - public int? AppKey { get; set; } - - /// - /// 节点名称 - /// - public string? NodeName { get; set; } - - /// - /// 节点英文名称 - /// - public string? NodeEnName { get; set; } -} diff --git a/src/TrackCenter.Application/Dtos/TrackStatus/EditTrackStatusInput.cs b/src/TrackCenter.Application/Dtos/TrackStatus/EditTrackStatusInput.cs index d7e53b99..6f73b4ca 100644 --- a/src/TrackCenter.Application/Dtos/TrackStatus/EditTrackStatusInput.cs +++ b/src/TrackCenter.Application/Dtos/TrackStatus/EditTrackStatusInput.cs @@ -17,11 +17,6 @@ public class EditTrackStatusInput /// public string AppKey { get; set; } - /// - /// 所属节点id - /// - public int NodeId { get; set; } - /// /// 轨迹状态代码 /// diff --git a/src/TrackCenter.Application/Dtos/TrackStatus/GetTrackStatusDetailDto.cs b/src/TrackCenter.Application/Dtos/TrackStatus/GetTrackStatusDetailDto.cs index 5670eac7..756c7969 100644 --- a/src/TrackCenter.Application/Dtos/TrackStatus/GetTrackStatusDetailDto.cs +++ b/src/TrackCenter.Application/Dtos/TrackStatus/GetTrackStatusDetailDto.cs @@ -17,11 +17,6 @@ public class GetTrackStatusDetailDto /// public string App { get; set; } - /// - /// 节点id - /// - public int NodeId { get; set; } - /// /// 所属轨迹状态 /// @@ -37,11 +32,6 @@ public class GetTrackStatusDetailDto /// public string EnTrackStatus { get; set; } - /// - /// 节点名称 - /// - public string? NodeName { get; set; } - /// /// 是否完结 /// diff --git a/src/TrackCenter.Application/Dtos/TrackStatus/GetTrackStatusListDto.cs b/src/TrackCenter.Application/Dtos/TrackStatus/GetTrackStatusListDto.cs index e95db44c..8fcac624 100644 --- a/src/TrackCenter.Application/Dtos/TrackStatus/GetTrackStatusListDto.cs +++ b/src/TrackCenter.Application/Dtos/TrackStatus/GetTrackStatusListDto.cs @@ -12,11 +12,6 @@ public class GetTrackStatusListDto /// public string App { get; set; } - /// - /// 所属节点 - /// - public string Node { get; set; } - /// /// 所属轨迹状态 /// diff --git a/src/TrackCenter.Application/Dtos/TrackStatus/QueryTrackNodeRequest.cs b/src/TrackCenter.Application/Dtos/TrackStatus/QueryTrackNodeRequest.cs deleted file mode 100644 index a6bc2c98..00000000 --- a/src/TrackCenter.Application/Dtos/TrackStatus/QueryTrackNodeRequest.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace TrackCenter.Application.Dtos.TrackStatus; - -public class QueryTrackNodeRequest : PageInfoInput -{ - /// - /// 关键字,节点中文和英文 - /// - public string? KeyWord { get; set; } - - /// - /// 应用 - /// - public long? AppKey { get; set; } -} diff --git a/src/TrackCenter.Domain/Aggregates/TrackNodeAggregate/ITrackNodeRepository.cs b/src/TrackCenter.Domain/Aggregates/TrackNodeAggregate/ITrackNodeRepository.cs deleted file mode 100644 index cc55596b..00000000 --- a/src/TrackCenter.Domain/Aggregates/TrackNodeAggregate/ITrackNodeRepository.cs +++ /dev/null @@ -1,35 +0,0 @@ -using Fake.Application.Dtos; -using TrackCenter.Domain.Dtos.TrackNode; - -namespace TrackCenter.Domain.Aggregates.TrackNodeAggregate; - -public interface ITrackNodeRepository : IBasicRepository -{ - /// - /// 分页查询 - /// - /// - /// - Task> GetPageList(TrackNodePageDto queryParam); - - /// - /// 分页查询字典 - /// - /// - /// - Task> GetPageDicList(TrackNodePageDto queryParam); - - /// - /// 删除 - /// - /// - /// - Task DeleteById(long inputId); - - /// - /// 获取详情 - /// - /// - /// - Task GetDetail(long id); -} diff --git a/src/TrackCenter.Domain/Aggregates/TrackNodeAggregate/TrackNodeEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackNodeAggregate/TrackNodeEntity.cs deleted file mode 100644 index 6ae80d1e..00000000 --- a/src/TrackCenter.Domain/Aggregates/TrackNodeAggregate/TrackNodeEntity.cs +++ /dev/null @@ -1,35 +0,0 @@ -using Fake.Domain.Entities.Auditing; -using TrackCenter.Domain.SeedWork; - -namespace TrackCenter.Domain.Aggregates.TrackNodeAggregate; - -/// -/// 轨迹节点主表 -/// -[SugarTable("t_track_node", TableDescription = "轨迹节点主表")] -public class TrackNodeEntity : FullAuditedAggregateRoot -{ - /// - /// 自增主键 - /// - [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "自增主键")] - public long Id { get; set; } - - /// - /// 应用 - /// - [SugarColumn(ColumnName = "AppKey", ColumnDescription = "应用")] - public string AppKey { get; set; } - - /// - /// 节点名称 - /// - [SugarColumn(ColumnName = "NodeName", Length = 32, ColumnDescription = "节点名称")] - public string NodeName { get; set; } - - /// - /// 节点英文名称 - /// - [SugarColumn(ColumnName = "NodeEnName", Length = 32, ColumnDescription = "节点英文名称")] - public string NodeEnName { get; set; } -} diff --git a/src/TrackCenter.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs index fa23f5f1..3cedf5a7 100644 --- a/src/TrackCenter.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs @@ -21,12 +21,6 @@ public class TrackStatusEntity : FullAuditedAggregateRoot [SugarColumn(ColumnName = "AppKey")] public string AppKey { get; set; } - /// - /// 所属节点(来自表 t_track_node) 之前是枚举,后续调整为表 - /// - [SugarColumn(ColumnName = "Node")] - public int Node { get; set; } - /// /// 轨迹状态代码 /// diff --git a/src/TrackCenter.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs b/src/TrackCenter.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs index d37d16d5..06173d50 100644 --- a/src/TrackCenter.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs @@ -55,11 +55,6 @@ public class GetTrackContentListVO /// public string TrackStatus { get; set; } - /// - /// 所属节点 - /// - public string Node { get; set; } - /// /// 轨迹标记 /// diff --git a/src/TrackCenter.Domain/Dtos/TrackNode/TrackNodeDicDto.cs b/src/TrackCenter.Domain/Dtos/TrackNode/TrackNodeDicDto.cs deleted file mode 100644 index a34f24f8..00000000 --- a/src/TrackCenter.Domain/Dtos/TrackNode/TrackNodeDicDto.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace TrackCenter.Domain.Dtos.TrackNode; - -public class TrackNodeDicDto -{ - /// - /// 节点id - /// - public long Id { get; set; } - - /// - /// 名称 - /// - public string NodeName { get; set; } - - /// - /// 名称 - /// - public string EnName { get; set; } -} diff --git a/src/TrackCenter.Domain/Dtos/TrackNode/TrackNodeDto.cs b/src/TrackCenter.Domain/Dtos/TrackNode/TrackNodeDto.cs deleted file mode 100644 index fa32cb12..00000000 --- a/src/TrackCenter.Domain/Dtos/TrackNode/TrackNodeDto.cs +++ /dev/null @@ -1,46 +0,0 @@ -namespace TrackCenter.Domain.Dtos.TrackNode; - -/// -/// 轨迹节点主表 DTO -/// -public class TrackNodeDto -{ - /// - /// 自增主键 - /// - public long Id { get; set; } - - /// - /// 应用 - /// - public string AppKey { get; set; } - - /// - /// 系统名称 - /// - public string? SystemName { get; set; } - - /// - /// 节点名称 - /// - public string? NodeName { get; set; } - - /// - /// 节点英文名称 - /// - public string? NodeEnName { get; set; } - - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - - /// - /// 更新时间 - /// - public DateTime? UpdateTime { get; set; } - - public string? CreateUserName { get; set; } - - public string? UpdateUserName { get; set; } -} diff --git a/src/TrackCenter.Domain/Dtos/TrackNode/TrackNodePageDto.cs b/src/TrackCenter.Domain/Dtos/TrackNode/TrackNodePageDto.cs deleted file mode 100644 index 05d635b2..00000000 --- a/src/TrackCenter.Domain/Dtos/TrackNode/TrackNodePageDto.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace TrackCenter.Domain.Dtos.TrackNode; - -public class TrackNodePageDto : PageInfoInput -{ - /// - /// 关键字,节点中文和英文 - /// - public string? KeyWord { get; set; } - - /// - /// 应用 - /// - public long? AppKey { get; set; } -} diff --git a/src/TrackCenter.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs b/src/TrackCenter.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs index 5cad1ffd..51341d0f 100644 --- a/src/TrackCenter.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs @@ -12,16 +12,6 @@ public class GetTrackStatusDetailVO /// public string AppKey { get; set; } - /// - /// 应用 - /// - public string App { get; set; } - - /// - /// 节点id - /// - public int NodeId { get; set; } - /// /// 所属轨迹状态 /// @@ -37,11 +27,6 @@ public class GetTrackStatusDetailVO /// public string EnTrackStatus { get; set; } - /// - /// 节点名称 - /// - public string? NodeName { get; set; } - /// /// 是否完结 /// diff --git a/src/TrackCenter.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs b/src/TrackCenter.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs index 8e1cb33d..c8bbe5bc 100644 --- a/src/TrackCenter.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs @@ -12,16 +12,6 @@ public class GetTrackStatusListVO /// public string App { get; set; } - /// - /// 节点id - /// - public int NodeId { get; set; } - - /// - /// 所属节点 - /// - public string Node { get; set; } - /// /// 轨迹状态 /// diff --git a/src/TrackCenter.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs b/src/TrackCenter.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs index 9d7c1c7e..4630d0e1 100644 --- a/src/TrackCenter.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs @@ -39,11 +39,6 @@ public class GetTrackTemplateContentPageOutputVO /// public bool IsExternal { get; set; } - /// - /// 所属节点 - /// - public string Node { get; set; } - /// /// 排序 /// diff --git a/src/TrackCenter.Domain/Dtos/TrackTemplate/TrackTemplateOutputVo.cs b/src/TrackCenter.Domain/Dtos/TrackTemplate/TrackTemplateOutputVo.cs index c1064d82..1d3abedd 100644 --- a/src/TrackCenter.Domain/Dtos/TrackTemplate/TrackTemplateOutputVo.cs +++ b/src/TrackCenter.Domain/Dtos/TrackTemplate/TrackTemplateOutputVo.cs @@ -50,11 +50,6 @@ public class TemplateContentDtoVo /// public string Status { get; set; } - /// - /// 轨迹节点 - /// - public string Node { get; set; } - /// /// 排序键和模板顺序一致 /// diff --git a/src/TrackCenter.Repository/Repositories/TrackContentRepository.cs b/src/TrackCenter.Repository/Repositories/TrackContentRepository.cs index 1000f635..58710a29 100644 --- a/src/TrackCenter.Repository/Repositories/TrackContentRepository.cs +++ b/src/TrackCenter.Repository/Repositories/TrackContentRepository.cs @@ -68,10 +68,6 @@ public class TrackContentRepository : BasicRepository, ITrac EnContent = a.EnContent, TrackStatus = b.Status, IsExternal = a.IsExternal, - Node = SqlFunc.IF(b.Node == 1).Return("揽收").ElseIF(b.Node == 2).Return("清关").ElseIF(b.Node == 3) - .Return("干线") - .ElseIF(b.Node == 4).Return("派送").ElseIF(b.Node == 5).Return("其他") - .End(""), TrackFlag = SqlFunc.Subqueryable() .Where(x => SqlFunc.SplitIn(a.TrackFlagId, x.Id.ToString())) .SelectStringJoin(x => x.Name, ","), diff --git a/src/TrackCenter.Repository/Repositories/TrackStatusRepository.cs b/src/TrackCenter.Repository/Repositories/TrackStatusRepository.cs index afea278b..e9cff1ee 100644 --- a/src/TrackCenter.Repository/Repositories/TrackStatusRepository.cs +++ b/src/TrackCenter.Repository/Repositories/TrackStatusRepository.cs @@ -1,4 +1,3 @@ -using TrackCenter.Domain.Aggregates.TrackNodeAggregate; using TrackCenter.Domain.Aggregates.TrackStatusAggregate; using TrackCenter.Domain.Dtos.TrackStatus; using TrackCenter.Domain.VEntities; @@ -15,17 +14,14 @@ public class TrackStatusRepository : BasicRepository, ITrackS public async Task GetDetailAsync(int id) { var detail = await Context.Queryable() - .InnerJoin((a, t) => a.Node == t.Id) - .Where((a, t) => a.Id == id) - .Select((a, t) => new GetTrackStatusDetailVO + .Where(a => a.Id == id) + .Select(a => new GetTrackStatusDetailVO { Id = a.Id, AppKey = a.AppKey, Code = a.Code, EnTrackStatus = a.EnStatus, - NodeId = a.Node, TrackStatus = a.Status, - NodeName = t.NodeName, IsCompleted = a.IsCompleted, IsToMq = a.IsToMq }) @@ -43,7 +39,6 @@ public class TrackStatusRepository : BasicRepository, ITrackS var pagedList = await Context.Queryable() .LeftJoin((a, b) => a.CreateUserId == b.UserId && b.IsDelete == false) .LeftJoin((a, b, d) => a.UpdateUserId == d.UserId && d.IsDelete == false) - .InnerJoin((a, b, d, e) => a.Node == e.Id && a.AppKey == e.AppKey) .WhereIF(!input.AppKey.IsNullOrWhiteSpace(), (a, b, d) => a.AppKey == input.AppKey) .WhereIF(!input.Keywords.IsNullOrWhiteSpace(), (a, b, d) => a.Status.Contains(input.Keywords!) || a.EnStatus.Contains(input.Keywords!) || @@ -52,14 +47,12 @@ public class TrackStatusRepository : BasicRepository, ITrackS .OrderByIF(!input.SelectIds.IsNullOrEmpty(), (a, b, d) => SqlFunc.IIF(input.SelectIds!.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), a.CreateTime), OrderByType.Desc) - .Select((a, b, d, e) => new GetTrackStatusListVO + .Select((a, b, d) => new GetTrackStatusListVO { Id = a.Id, Code = a.Code, EnTrackStatus = a.EnStatus, TrackStatus = a.Status, - NodeId = a.Node, - Node = e.NodeName!, CreateTime = a.CreateTime, CreateUser = b.Name, UpdateTime = a.UpdateTime,