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

fix：rem轨迹节点

Browse Source
This commit is contained in:
xiaolipro 2025-08-25 09:20:20 +08:00
parent a3beab9438
commit 82e90da953
22 changed files with 4 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/TrackCenter.Application/AutoMapper/TrackNodeMapperProfile.cs
View File

@ -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));
}
}

3
src/TrackCenter.Application/AutoMapper/TrackStatusAutoMapperProfile.cs
View File

@ -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.Node, opt => opt.MapFrom(source => source.NodeId));
.ForMember(dest => dest.EnStatus, opt => opt.MapFrom(source => source.EnTrackStatus));
CreateMap<GetTrackStatusDetailVO, GetTrackStatusDetailDto>(MemberList.None);
CreateMap<GetPagedTrackStatusInput, GetPagedTrackStatusVO>(MemberList.None);
CreateMap<GetTrackStatusListVO, GetTrackStatusListDto>(MemberList.None);

5
src/TrackCenter.Application/Dtos/ProvideServices/TrackTemplateContentDto.cs
View File

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

5
src/TrackCenter.Application/Dtos/TrackContents/GetPageTrackContentInput.cs
View File

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

29
src/TrackCenter.Application/Dtos/TrackNode/TrackNodeInput.cs
View File

@ -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; }
}

5
src/TrackCenter.Application/Dtos/TrackStatus/EditTrackStatusInput.cs
View File

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

10
src/TrackCenter.Application/Dtos/TrackStatus/GetTrackStatusDetailDto.cs
View File

@ -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>

5
src/TrackCenter.Application/Dtos/TrackStatus/GetTrackStatusListDto.cs
View File

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

14
src/TrackCenter.Application/Dtos/TrackStatus/QueryTrackNodeRequest.cs
View File

@ -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; }
}

35
src/TrackCenter.Domain/Aggregates/TrackNodeAggregate/ITrackNodeRepository.cs
View File

@ -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);
}

35
src/TrackCenter.Domain/Aggregates/TrackNodeAggregate/TrackNodeEntity.cs
View File

@ -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; }
}

6
src/TrackCenter.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs
View File

@ -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>

5
src/TrackCenter.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs
View File

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

19
src/TrackCenter.Domain/Dtos/TrackNode/TrackNodeDicDto.cs
View File

@ -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; }
}

46
src/TrackCenter.Domain/Dtos/TrackNode/TrackNodeDto.cs
View File

@ -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; }
}

14
src/TrackCenter.Domain/Dtos/TrackNode/TrackNodePageDto.cs
View File

@ -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; }
}

15
src/TrackCenter.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs
View File

@ -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>

10
src/TrackCenter.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs
View File

@ -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>

5
src/TrackCenter.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageOutputVO.cs
View File

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

5
src/TrackCenter.Domain/Dtos/TrackTemplate/TrackTemplateOutputVo.cs
View File

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

4
src/TrackCenter.Repository/Repositories/TrackContentRepository.cs
View File

@ -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, ","),

13
src/TrackCenter.Repository/Repositories/TrackStatusRepository.cs
View File

@ -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, 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<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,