fix：rem轨迹节点

src/TrackCenter.Application/AutoMapper/TrackNodeMapperProfile.cs

@@ -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<QueryTrackNodeRequest, TrackNodePageDto>();
-        CreateMap<EditTrackNodeInput, TrackNodeEntity>(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));
-    }
-}

src/TrackCenter.Application/AutoMapper/TrackStatusAutoMapperProfile.cs

@@ -13,8 +13,7 @@ public class TrackStatusAutoMapperProfile : Profile
         CreateMap<EditTrackStatusInput, TrackStatusEntity>(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.EnStatus, opt => opt.MapFrom(source => source.EnTrackStatus));
-            .ForMember(dest => dest.Node, opt => opt.MapFrom(source => source.NodeId));
         CreateMap<GetTrackStatusDetailVO, GetTrackStatusDetailDto>(MemberList.None);
         CreateMap<GetPagedTrackStatusInput, GetPagedTrackStatusVO>(MemberList.None);
         CreateMap<GetTrackStatusListVO, GetTrackStatusListDto>(MemberList.None);

src/TrackCenter.Application/Dtos/ProvideServices/TrackTemplateContentDto.cs

@@ -40,11 +40,6 @@ public class TemplateContentDto
     /// </summary>
     public string Status { get; set; }
 
-    /// <summary>
-    /// 轨迹节点
-    /// </summary>
-    public string Node { get; set; }
-
     /// <summary>
     /// 排序键和模板顺序一致
     /// </summary>

src/TrackCenter.Application/Dtos/TrackContents/GetPageTrackContentInput.cs

@@ -55,11 +55,6 @@ public class GetTrackContentListDto
     /// </summary>
     public string TrackStatus { get; set; }
 
-    /// <summary>
-    /// 所属节点
-    /// </summary>
-    public string Node { get; set; }
-
     /// <summary>
     /// 轨迹标记
     /// </summary>

src/TrackCenter.Application/Dtos/TrackNode/TrackNodeInput.cs

@@ -1,29 +0,0 @@
-namespace TrackCenter.Application.Dtos.TrackNode;
-
-public class EditTrackNodeInput
-{
-    /// <summary>
-    /// 操作类型
-    /// </summary>
-    public OptionType Options { get; set; }
-
-    /// <summary>
-    /// 轨迹节点id，创建不用填
-    /// </summary>
-    public long Id { get; set; }
-
-    /// <summary>
-    /// 系统id
-    /// </summary>
-    public int? AppKey { get; set; }
-
-    /// <summary>
-    /// 节点名称
-    /// </summary>
-    public string? NodeName { get; set; }
-
-    /// <summary>
-    /// 节点英文名称
-    /// </summary>
-    public string? NodeEnName { get; set; }
-}

src/TrackCenter.Application/Dtos/TrackStatus/EditTrackStatusInput.cs

@@ -17,11 +17,6 @@ public class EditTrackStatusInput
     /// </summary>
     public string AppKey { get; set; }
 
-    /// <summary>
-    /// 所属节点id
-    /// </summary>
-    public int NodeId { get; set; }
-
     /// <summary>
     /// 轨迹状态代码
     /// </summary>

src/TrackCenter.Application/Dtos/TrackStatus/GetTrackStatusDetailDto.cs

@@ -17,11 +17,6 @@ public class GetTrackStatusDetailDto
     /// </summary>
     public string App { get; set; }
 
-    /// <summary>
-    /// 节点id
-    /// </summary>
-    public int NodeId { get; set; }
-
     /// <summary>
     /// 所属轨迹状态
     /// </summary>
@@ -37,11 +32,6 @@ public class GetTrackStatusDetailDto
     /// </summary>
     public string EnTrackStatus { get; set; }
 
-    /// <summary>
-    /// 节点名称
-    /// </summary>
-    public string? NodeName { get; set; }
-
     /// <summary>
     /// 是否完结
     /// </summary>

src/TrackCenter.Application/Dtos/TrackStatus/GetTrackStatusListDto.cs

@@ -12,11 +12,6 @@ public class GetTrackStatusListDto
     /// </summary>
     public string App { get; set; }
 
-    /// <summary>
-    /// 所属节点
-    /// </summary>
-    public string Node { get; set; }
-
     /// <summary>
     /// 所属轨迹状态
     /// </summary>

src/TrackCenter.Application/Dtos/TrackStatus/QueryTrackNodeRequest.cs

@@ -1,14 +0,0 @@
-namespace TrackCenter.Application.Dtos.TrackStatus;
-
-public class QueryTrackNodeRequest : PageInfoInput
-{
-    /// <summary>
-    /// 关键字，节点中文和英文
-    /// </summary>
-    public string? KeyWord { get; set; }
-
-    /// <summary>
-    /// 应用
-    /// </summary>
-    public long? AppKey { get; set; }
-}

src/TrackCenter.Domain/Aggregates/TrackNodeAggregate/ITrackNodeRepository.cs

@@ -1,35 +0,0 @@
-using Fake.Application.Dtos;
-using TrackCenter.Domain.Dtos.TrackNode;
-
-namespace TrackCenter.Domain.Aggregates.TrackNodeAggregate;
-
-public interface ITrackNodeRepository : IBasicRepository<TrackNodeEntity>
-{
-    /// <summary>
-    /// 分页查询
-    /// </summary>
-    /// <param name="queryParam"></param>
-    /// <returns></returns>
-    Task<PagedResult<TrackNodeDto>> GetPageList(TrackNodePageDto queryParam);
-
-    /// <summary>
-    /// 分页查询字典
-    /// </summary>
-    /// <param name="queryParam"></param>
-    /// <returns></returns>
-    Task<PagedResult<TrackNodeDicDto>> GetPageDicList(TrackNodePageDto queryParam);
-
-    /// <summary>
-    /// 删除
-    /// </summary>
-    /// <param name="inputId"></param>
-    /// <returns></returns>
-    Task<int> DeleteById(long inputId);
-
-    /// <summary>
-    /// 获取详情
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    Task<TrackNodeDto> GetDetail(long id);
-}

src/TrackCenter.Domain/Aggregates/TrackNodeAggregate/TrackNodeEntity.cs

@@ -1,35 +0,0 @@
-using Fake.Domain.Entities.Auditing;
-using TrackCenter.Domain.SeedWork;
-
-namespace TrackCenter.Domain.Aggregates.TrackNodeAggregate;
-
-/// <summary>
-/// 轨迹节点主表
-/// </summary>
-[SugarTable("t_track_node", TableDescription = "轨迹节点主表")]
-public class TrackNodeEntity : FullAuditedAggregateRoot<int, int>
-{
-    /// <summary>
-    /// 自增主键
-    /// </summary>
-    [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "自增主键")]
-    public long Id { get; set; }
-
-    /// <summary>
-    /// 应用
-    /// </summary>
-    [SugarColumn(ColumnName = "AppKey", ColumnDescription = "应用")]
-    public string AppKey { get; set; }
-
-    /// <summary>
-    /// 节点名称
-    /// </summary>
-    [SugarColumn(ColumnName = "NodeName", Length = 32, ColumnDescription = "节点名称")]
-    public string NodeName { get; set; }
-
-    /// <summary>
-    /// 节点英文名称
-    /// </summary>
-    [SugarColumn(ColumnName = "NodeEnName", Length = 32, ColumnDescription = "节点英文名称")]
-    public string NodeEnName { get; set; }
-}

src/TrackCenter.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs

@@ -21,12 +21,6 @@ public class TrackStatusEntity : FullAuditedAggregateRoot<int, int>
     [SugarColumn(ColumnName = "AppKey")]
     public string AppKey { get; set; }
 
-    /// <summary>
-    /// 所属节点（来自表 t_track_node） 之前是枚举，后续调整为表
-    /// </summary>
-    [SugarColumn(ColumnName = "Node")]
-    public int Node { get; set; }
-
     /// <summary>
     /// 轨迹状态代码
     /// </summary>

src/TrackCenter.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs

@@ -55,11 +55,6 @@ public class GetTrackContentListVO
     /// </summary>
     public string TrackStatus { get; set; }
 
-    /// <summary>
-    /// 所属节点
-    /// </summary>
-    public string Node { get; set; }
-
     /// <summary>
     /// 轨迹标记
     /// </summary>

src/TrackCenter.Domain/Dtos/TrackNode/TrackNodeDicDto.cs

@@ -1,19 +0,0 @@
-namespace TrackCenter.Domain.Dtos.TrackNode;
-
-public class TrackNodeDicDto
-{
-    /// <summary>
-    /// 节点id
-    /// </summary>
-    public long Id { get; set; }
-
-    /// <summary>
-    /// 名称
-    /// </summary>
-    public string NodeName { get; set; }
-
-    /// <summary>
-    /// 名称
-    /// </summary>
-    public string EnName { get; set; }
-}

src/TrackCenter.Domain/Dtos/TrackNode/TrackNodeDto.cs

@@ -1,46 +0,0 @@
-namespace TrackCenter.Domain.Dtos.TrackNode;
-
-/// <summary>
-/// 轨迹节点主表 DTO
-/// </summary>
-public class TrackNodeDto
-{
-    /// <summary>
-    /// 自增主键
-    /// </summary>
-    public long Id { get; set; }
-
-    /// <summary>
-    /// 应用
-    /// </summary>
-    public string AppKey { get; set; }
-
-    /// <summary>
-    /// 系统名称
-    /// </summary>
-    public string? SystemName { get; set; }
-
-    /// <summary>
-    /// 节点名称
-    /// </summary>
-    public string? NodeName { get; set; }
-
-    /// <summary>
-    /// 节点英文名称
-    /// </summary>
-    public string? NodeEnName { get; set; }
-
-    /// <summary>
-    /// 创建时间
-    /// </summary>
-    public DateTime CreateTime { get; set; }
-
-    /// <summary>
-    /// 更新时间
-    /// </summary>
-    public DateTime? UpdateTime { get; set; }
-
-    public string? CreateUserName { get; set; }
-
-    public string? UpdateUserName { get; set; }
-}

src/TrackCenter.Domain/Dtos/TrackNode/TrackNodePageDto.cs

@@ -1,14 +0,0 @@
-namespace TrackCenter.Domain.Dtos.TrackNode;
-
-public class TrackNodePageDto : PageInfoInput
-{
-    /// <summary>
-    /// 关键字，节点中文和英文
-    /// </summary>
-    public string? KeyWord { get; set; }
-
-    /// <summary>
-    /// 应用
-    /// </summary>
-    public long? AppKey { get; set; }
-}

src/TrackCenter.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs

@@ -12,16 +12,6 @@ public class GetTrackStatusDetailVO
     /// </summary>
     public string AppKey { get; set; }
 
-    /// <summary>
-    /// 应用
-    /// </summary>
-    public string App { get; set; }
-
-    /// <summary>
-    /// 节点id
-    /// </summary>
-    public int NodeId { get; set; }
-
     /// <summary>
     /// 所属轨迹状态
     /// </summary>
@@ -37,11 +27,6 @@ public class GetTrackStatusDetailVO
     /// </summary>
     public string EnTrackStatus { get; set; }
 
-    /// <summary>
-    /// 节点名称
-    /// </summary>
-    public string? NodeName { get; set; }
-
     /// <summary>
     /// 是否完结
     /// </summary>

src/TrackCenter.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs

@@ -12,16 +12,6 @@ public class GetTrackStatusListVO
     /// </summary>
     public string App { get; set; }
 
-    /// <summary>
-    /// 节点id
-    /// </summary>
-    public int NodeId { get; set; }
-
-    /// <summary>
-    /// 所属节点
-    /// </summary>
-    public string Node { get; set; }
-
     /// <summary>
     /// 轨迹状态
     /// </summary>

src/TrackCenter.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs

@@ -39,11 +39,6 @@ public class GetTrackTemplateContentPageOutputVO
     /// </summary>
     public bool IsExternal { get; set; }
 
-    /// <summary>
-    /// 所属节点
-    /// </summary>
-    public string Node { get; set; }
-
     /// <summary>
     /// 排序
     /// </summary>

src/TrackCenter.Domain/Dtos/TrackTemplate/TrackTemplateOutputVo.cs

@@ -50,11 +50,6 @@ public class TemplateContentDtoVo
     /// </summary>
     public string Status { get; set; }
 
-    /// <summary>
-    /// 轨迹节点
-    /// </summary>
-    public string Node { get; set; }
-
     /// <summary>
     /// 排序键和模板顺序一致
     /// </summary>

src/TrackCenter.Repository/Repositories/TrackContentRepository.cs

@@ -68,10 +68,6 @@ public class TrackContentRepository : BasicRepository<TrackContentEntity>, 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<TrackFlagEntity>()
                     .Where(x => SqlFunc.SplitIn(a.TrackFlagId, x.Id.ToString()))
                     .SelectStringJoin(x => x.Name, ","),

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<TrackStatusEntity>, ITrackS
     public async Task<GetTrackStatusDetailVO?> GetDetailAsync(int id)
     {
         var detail = await Context.Queryable<TrackStatusEntity>()
-            .InnerJoin<TrackNodeEntity>((a, t) => a.Node == t.Id)
+            .Where(a => a.Id == id)
-            .Where((a, t) => a.Id == id)
+            .Select(a => new GetTrackStatusDetailVO
-            .Select((a, t) => 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<TrackStatusEntity>, ITrackS
         var pagedList = await Context.Queryable<TrackStatusEntity>()
             .LeftJoin<VUserEntity>((a, b) => a.CreateUserId == b.UserId && b.IsDelete == false)
             .LeftJoin<VUserEntity>((a, b, d) => a.UpdateUserId == d.UserId && d.IsDelete == false)
-            .InnerJoin<TrackNodeEntity>((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<TrackStatusEntity>, 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,