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

Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台

Browse Source
This commit is contained in:
dingenwen 2024-02-29 16:14:05 +08:00
commit 9426568fb0
40 changed files with 876 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SJZY.Track.Api/appsettings.Development.json
View File

@ -2,7 +2,7 @@
"Environment": "Dev",
"Logging": {
"LogLevel": {
"Default": "Information",
"Default": "Debug",
"Microsoft.AspNetCore": "Warning"
}
},

19
src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs Normal file
View File

@ -0,0 +1,19 @@
using AutoMapper;
using SJZY.Track.Application.Dtos.ProvideServices;
using SJZY.Track.Domain.Aggregates.OrderAggregate;
namespace SJZY.Track.Application.AutoMapper;
public class OrderAutoMapperProfile : Profile
{
public OrderAutoMapperProfile()
{
CreateMap<CreateOrderInput, OrderEntity>(MemberList.None);
CreateMap<UpdateOrderInput, OrderEntity>(MemberList.None);
CreateMap<OrderTemplateInfo, OrderTemplateEntity>(MemberList.None)
.ForMember(dest => dest.ServiceProviderId, opt => opt.MapFrom(m => m.ServiceProviderId ?? 0))
.ForMember(dest => dest.TrackTemplateId, opt => opt.MapFrom(m => m.TemplateId));
CreateMap<OrderFligthInfo, OrderFlightEntity>(MemberList.None);
}
}

35
src/SJZY.Track.Application/AutoMapper/TrackFlagAutoMapperProfile.cs Normal file
View File

@ -0,0 +1,35 @@
using AutoMapper;
using AutoMapper.Internal.Mappers;
using SJZY.Track.Application.Dtos.TrackFlags;
using SJZY.Track.Application.Dtos.TrackStatus;
using SJZY.Track.Domain.Aggregates.TrackFlagAggregate;
using SJZY.Track.Domain.Dtos.TrackFlags;
using SJZY.Track.Domain.Dtos.TrackStatus;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.ObjectMapping;
namespace SJZY.Track.Application.AutoMapper
{
public class TrackFlagAutoMapperProfile : Profile
{
public TrackFlagAutoMapperProfile()
{
CreateMap<EditTrackFlagInput, TrackFlagEntity>(MemberList.None)
.ForMember(dest => dest.Name, opt => opt.MapFrom(source => source.Flag))
.ForMember(dest => dest.IsCompleted, opt => opt.MapFrom(source => source.IsFinish));
CreateMap<GetTrackFlagDetailVO, GetTrackFlagDetailDto>(MemberList.None);
CreateMap<GetTrackFlagListVO, GetTrackFlagListDto>(MemberList.None);
CreateMap<UnifyPageResultDto<GetTrackFlagListVO>, UnifyPageResultDto<GetTrackFlagListDto>>(MemberList.None);
CreateMap<GetPageTrackFlagInput, GetPageTrackFlagVO>(MemberList.None);
//var pageResultDto =
// ObjectMapper.Map<UnifyPageResultDto<GetTrackFlagListVO>, UnifyPageResultDto<GetTrackFlagListDto>>(
// resultDto);
}
}
}

4
src/SJZY.Track.Application/Dtos/ProvideServices/CreateOrderInput.cs
View File

@ -7,7 +7,7 @@ public class CreateOrderInput : UpdateOrderInput
/// <summary>
/// 客户id
/// </summary>
public int ClientId { get; set; }
public int CustomId { get; set; }
}
public class OrderTemplateInfo
@ -24,7 +24,7 @@ public class OrderTemplateInfo
public int? ServiceProviderId { get; set; }
}
public class FligthInfo
public class OrderFligthInfo
{
/// <summary>
/// 航班号

23
src/SJZY.Track.Application/Dtos/ProvideServices/DeleteOrderInput.cs Normal file
View File

@ -0,0 +1,23 @@
using System.ComponentModel.DataAnnotations;
namespace SJZY.Track.Application.Dtos.ProvideServices;
public class DeleteOrderInput : OrderNoInfo
{
}
public class OrderNoInfo
{
/// <summary>
/// 订单类型，必填
/// </summary>
[Required]
public int OrderType { get; set; }
/// <summary>
/// 订单号，必填
/// </summary>
[Required]
[MaxLength(100)]
public string OrderNo { get; set; } = null!;
}

54
src/SJZY.Track.Application/Dtos/ProvideServices/GetOrderDetailsInput.cs Normal file
View File

@ -0,0 +1,54 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SJZY.Track.Application.Dtos.ProvideServices
{
public class GetOrderDetailsInput
{
/// <summary>
/// 轨迹订单id
/// </summary>
public int OrderId { get; set; }
}
public class TrackOrderDetailDto
{
/// <summary>
/// 轨迹订单id
/// </summary>
public int Id { get; set; }
/// <summary>
/// 轨迹代码
/// </summary>
public string Code { get; set; }
/// <summary>
/// 轨迹内容
/// </summary>
public string Content { get; set; }
/// <summary>
/// 轨迹内容英文
/// </summary>
public string EnContent { get; set; }
/// <summary>
/// 轨迹发生地
/// </summary>
public string TrackPlace { get; set; }
/// <summary>
/// 轨迹发生时间
/// </summary>
public DateTime? TrackTime { get; set; }
/// <summary>
/// 轨迹发生时区
/// </summary>
public string TrackTimeZone { get; set; }
}
}

21
src/SJZY.Track.Application/Dtos/ProvideServices/GetPageTrackOrderInput.cs Normal file
View File

@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SJZY.Track.Application.Dtos.ProvideServices
{
public class GetPageTrackOrderInput : PageInfoInput
{
}
/// <summary>
/// 轨迹订单Dto
/// </summary>
public class TrackOrderDto
{
}
}

5
src/SJZY.Track.Application/Dtos/ProvideServices/GetTrackInput.cs
View File

@ -2,6 +2,11 @@ namespace SJZY.Track.Application.Dtos.ProvideServices;
public class GetTrackInput
{
/// <summary>
/// 订单类型
/// </summary>
public int OrderType { get; set; }
/// <summary>
/// 订单号
/// </summary>

2
src/SJZY.Track.Application/Dtos/ProvideServices/GetTrackOutput.cs
View File

@ -16,6 +16,6 @@ public class TrackDetail
public string Status { get; set; }
public string Content { get; set; }
public string Location { get; set; }
public DateTime Date { get; set; }
public DateTime Time { get; set; }
public float TimeZone { get; set; }
}

31
src/SJZY.Track.Application/Dtos/ProvideServices/UpdateOrderInput.cs
View File

@ -1,27 +1,7 @@
using System.ComponentModel.DataAnnotations;
namespace SJZY.Track.Application.Dtos.ProvideServices;
namespace SJZY.Track.Application.Dtos.ProvideServices;
public class UpdateOrderInput
public class UpdateOrderInput : OrderNoInfo
{
/// <summary>
/// 订单类型，必填
/// </summary>
[Required]
public int OrderType { get; set; }
/// <summary>
/// 订单号，必填
/// </summary>
[Required]
[MaxLength(100)]
public string OrderNo { get; set; }
/// <summary>
/// 订单模板（传全量）
/// </summary>
public List<OrderTemplateInfo> Templates { get; set; } = new();
/// <summary>
/// 目的港口
/// </summary>
@ -52,8 +32,13 @@ public class UpdateOrderInput
/// </summary>
public string LeaveCity { get; set; }
/// <summary>
/// 订单模板（传全量）
/// </summary>
public List<OrderTemplateInfo> Templates { get; set; } = new();
/// <summary>
/// 订单航班信息
/// </summary>
public List<FligthInfo> FlightInfos { get; set; } = new();
public List<OrderFligthInfo> FlightInfos { get; set; } = new();
}

74
src/SJZY.Track.Application/Dtos/TrackFlags/EditTrackFlagInput.cs Normal file
View File

@ -0,0 +1,74 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SJZY.Track.Application.Dtos.TrackFlags
{
public class EditTrackFlagInput
{
/// <summary>
/// 操作类型
/// </summary>
public OptionType Options { get; set; }
/// <summary>
/// Id
/// </summary>
public int Id { get; set; }
/// <summary>
/// 子系统id
/// </summary>
public int SubSystemId { get; set; }
/// <summary>
/// 标记
/// </summary>
public string Flag { get; set; }
/// <summary>
/// 代码
/// </summary>
public string Code { get; set; }
/// <summary>
/// 是否完结
/// </summary>
public bool IsFinish { get; set; }
}
public class GetTrackFlagDetailDto
{
/// <summary>
/// Id
/// </summary>
public int Id { get; set; }
/// <summary>
/// 子系统id
/// </summary>
public int SubSystemId { get; set; }
/// <summary>
/// 子系统
/// </summary>
public string SubSystem { get; set; }
/// <summary>
/// 代码
/// </summary>
public string Code { get; set; }
/// <summary>
///
/// </summary>
public string Flag { get; set; }
/// <summary>
/// 是否完结
/// </summary>
public bool IsFinish { get; set; }
}
}

69
src/SJZY.Track.Application/Dtos/TrackFlags/GetTrackFlagListDto.cs Normal file
View File

@ -0,0 +1,69 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SJZY.Track.Application.Dtos.TrackFlags
{
public class GetTrackFlagListDto
{
/// <summary>
/// Id
/// </summary>
public int Id { get; set; }
/// <summary>
/// 子系统
/// </summary>
public string SubSystem { get; set; }
/// <summary>
/// 代码
/// </summary>
public string Code { get; set; }
/// <summary>
/// 标记
/// </summary>
public string Flag { get; set; }
/// <summary>
/// 是否完结
/// </summary>
public bool IsFinish { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime? CreateTime { get; set; }
/// <summary>
/// 创建人
/// </summary>
public string CreateUser { get; set; }
/// <summary>
/// 修改时间
/// </summary>
public DateTime? UpdateTime { get; set; }
/// <summary>
/// 修改人
/// </summary>
public string UpdateUser { get; set; }
}
public class GetPageTrackFlagInput : PageInfoInput
{
/// <summary>
/// 子系统id
/// </summary>
public int SubSystemId { get; set; }
///// <summary>
///// 关键字
///// </summary>
//public string Keywords { get; set; }
}
}

3
src/SJZY.Track.Application/Localization/Resources/en.json
View File

@ -6,6 +6,7 @@
"ParameterDemo1": "{0} in {1} to do {2}",
"TemplateExist": "The template code already exists under the currently selected subsystem",
"TrackContentExist": "The trace code or trace content or trace content in the current subsystem is repeated in English",
"TrackStatusExist": "The trajectory status code or trajectory status or trajectory status in English is repeated under the current subsystem"
"TrackStatusExist": "The trajectory status code or trajectory status or trajectory status in English is repeated under the current subsystem",
"TrackFlagExist": "Duplicate code or flag in the current subsystem"
}
}

3
src/SJZY.Track.Application/Localization/Resources/zh.json
View File

@ -6,6 +6,7 @@
"ParameterDemo1": "{0}在{1}地方做了{2}动作",
"TemplateExist": "模板代码已存在于当前选择的子系统下",
"TrackContentExist": "当前子系统下轨迹代码或轨迹内容或轨迹内容英文重复",
"TrackStatusExist": "当前子系统下轨迹状态代码或轨迹状态或轨迹状态英文重复"
"TrackStatusExist": "当前子系统下轨迹状态代码或轨迹状态或轨迹状态英文重复",
"TrackFlagExist": "当前子系统下代码或标记重复"
}
}

2
src/SJZY.Track.Application/Services/ProvideServices/OrderLinkService.cs
View File

@ -7,7 +7,7 @@ namespace SJZY.Track.Application.Services.ProvideServices;
/// 订单关联服务
/// </summary>
[ApiExplorerSettings(GroupName = "提供接口")]
public class OrderLinkService
public class OrderLinkService : ApplicationService
{
private readonly IOrderRepository _orderRepository;
private readonly IBasicQuery<OrderLinkEntity> _orderLinkQuery;

101
src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs
View File

@ -1,6 +1,5 @@
using SJZY.Track.Application.Dtos.ProvideServices;
using SJZY.Track.Domain.Aggregates.OrderAggregate;
using SJZY.UserCenter.HttpApi.Services;
namespace SJZY.Track.Application.Services.ProvideServices;
@ -18,56 +17,84 @@ public class OrderService : ApplicationService
}
/// <summary>
/// 创建订单
/// 创建订单，订单已存在则视为更新
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="BusinessException"></exception>
[HttpPost("Order/Create")]
public async Task<bool> CreateOrderAsync(CreateOrderInput input)
[HttpPost("Order/CreateOrUpdate")]
public async Task<string> CreateOrUpdateOrderAsync(CreateOrderInput input)
{
if (await _orderRepository.IsAnyAsync(x =>
x.OrderType == input.OrderType && x.OrderNo == input.OrderNo))
var order = await _orderRepository.GetFirstAsync(x =>
x.OrderType == input.OrderType && x.OrderNo == input.OrderNo);
if (order != default)
{
throw new BusinessException(message: $"单号：{input.OrderNo}已存在");
// 订单已存在则视为更新
await UpdateOrderAsync(input, order);
return "更新成功";
}
var order = new OrderEntity
order = ObjectMapper.Map<CreateOrderInput, OrderEntity>(input);
order.SubSystemId = 1;
order.OrderTemplates = ObjectMapper.Map<List<OrderTemplateInfo>, List<OrderTemplateEntity>>(input.Templates);
order.OrderFlights = ObjectMapper.Map<List<OrderFligthInfo>, List<OrderFlightEntity>>(input.FlightInfos);
await _orderRepository.CreateOrderAsync(order);
return "创建成功";
}
/// <summary>
/// 删除订单
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="BusinessException"></exception>
[HttpPost("Order/Delete")]
public async Task<bool> DeleteOrderAsync(DeleteOrderInput input)
{
var orderId = await _orderRepository.GetFirstAsync(x =>
x.OrderType == input.OrderType && x.OrderNo == input.OrderNo, x => x.Id);
if (orderId == default)
{
CustomId = input.ClientId,
OrderNo = input.OrderNo,
OrderType = input.OrderType,
SubSystemId = CurrentUserRequest.SubSystemId,
IsCompleted = false,
LatestTraceContent = null,
LatestTraceEnContent = null,
LatestTraceTime = null,
OrderDetails = null,
};
throw new BusinessException(message: $"订单：{input.OrderNo}不存在");
}
using var tran = TransactionHelper.GetReadCommitted();
// 创建订单
var orderId = await _orderRepository.InsertReturnIdentityAsync(order);
var templates = input.Templates.Select(x => new OrderTemplateEntity
{
OrderId = orderId,
ServiceProviderId = x.ServiceProviderId ?? 0,
TrackTemplateId = x.TemplateId
}).ToList();
// 创建订单模板
await _orderRepository.CreateOrderTemplatesAsync(templates);
tran.Complete();
await _orderRepository.SoftDeleteAsync(x => x.Id == orderId);
return true;
}
[HttpPost("Order/Update")]
public async Task<bool> UpdateOrderAsync(UpdateOrderInput input)
#region 轨迹订单明细
/// <summary>
/// 根据轨迹订单id获取轨迹订单明细列表
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost("/Order/GetDetails")]
public async Task<List<TrackOrderDetailDto>> GetOrderDetails(GetOrderDetailsInput input)
{
return true;
return null;
}
#endregion
#region 轨迹订单列表
/// <summary>
///
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost("/Order/GetTrackOrderList")]
public async Task<UnifyPageResultDto<TrackOrderDto>> GetPageTrackOrder(GetPageTrackOrderInput input)
{
return null;
}
#endregion
private async Task UpdateOrderAsync(UpdateOrderInput input, OrderEntity order)
{
order = ObjectMapper.Map(input, order);
order.OrderTemplates = ObjectMapper.Map<List<OrderTemplateInfo>, List<OrderTemplateEntity>>(input.Templates);
order.OrderFlights = ObjectMapper.Map<List<OrderFligthInfo>, List<OrderFlightEntity>>(input.FlightInfos);
await _orderRepository.UpdateOrderAsync(order);
}
}

43
src/SJZY.Track.Application/Services/ProvideServices/TrackQueryService.cs
View File

@ -38,12 +38,10 @@ public class TrackQueryService : ApplicationService
}
var res = new List<GetTrackOutput>();
var distinctOrderNos = input.OrderNos.Distinct().ToList();
var details = await _trackDetailsRepository.GetListAsync(distinctOrderNos);
var orderTemplates = await _orderRepository.GetOrderTemplatesAsync(distinctOrderNos);
var distinctTemplateIds = orderTemplates.Select(x => x.TrackTemplateId).Distinct().ToList();
var templateContents = await _trackTemplateRepository.GetTemplateContentsAsync(distinctTemplateIds);
input.OrderNos = input.OrderNos.Distinct().ToList();
var details = await _trackDetailsRepository.GetListAsync(input.OrderNos);
var isTurn = input.TimeZone != 0;
foreach (var group in details.GroupBy(x => x.OrderId))
{
var item = new GetTrackOutput();
@ -56,33 +54,50 @@ public class TrackQueryService : ApplicationService
Status = x.TrackStatus,
Content = x.TrackContent,
Location = x.TrackPlace,
Date = x.TrackTime.AddHours(input.TimeZone - x.TraceTimeZone),
TimeZone = x.TraceTimeZone
Time = isTurn ? x.TrackTime.AddHours(input.TimeZone - x.TraceTimeZone) : x.TrackTime,
TimeZone = isTurn ? input.TimeZone : x.TraceTimeZone
}).ToList();
TrackDetailSort(item, input.SortMethod);
res.Add(item);
}
await TrackDetailSort(res, input);
return res;
}
private void TrackDetailSort(GetTrackOutput item, SortMethod sortMethod)
private async Task TrackDetailSort(List<GetTrackOutput> list, GetTrackInput input)
{
switch (sortMethod)
switch (input.SortMethod)
{
case SortMethod.ByTrackTime:
// tips：quick-sort 直接修改原list
item.TrackDetails.Sort((a, b) => a.Date.CompareTo(b.Date));
list.ForEach(item => item.TrackDetails.Sort((a, b) => a.Time.CompareTo(b.Time)));
break;
case SortMethod.ByTrackTimeDesc:
item.TrackDetails.Sort((a, b) => b.Date.CompareTo(a.Date));
list.ForEach(item => item.TrackDetails.Sort((a, b) => b.Time.CompareTo(a.Time)));
break;
case SortMethod.ByTemplate:
var orderTemplates = await _orderRepository.GetOrderTemplatesAsync(input.OrderType, input.OrderNos);
var distinctTemplateIds = orderTemplates.Select(x => x.TemplateId).Distinct().ToList();
var templateContent =
await _trackTemplateRepository.GetTemplateContentOrderlyAsync(distinctTemplateIds);
list.ForEach(item =>
{
var template = orderTemplates.FirstOrDefault(x => x.OrderNo == item.OrderNo);
if (template == default) return;
var codes = templateContent
.Where(x => x.TemplateId == template.TemplateId)
.Select(x => x.Code)
.ToList();
item.TrackDetails = item.TrackDetails
.Where(x => codes.Contains(x.Code)) // 剔除不在模板内容中的元素
.OrderBy(x => codes.IndexOf(x.Code)) // 按照在模板内容的位置排序
.ToList();
});
break;
default:
throw new ArgumentOutOfRangeException(nameof(sortMethod), sortMethod, "不支持的排序方式");
throw new ArgumentOutOfRangeException(nameof(input.SortMethod), input.SortMethod, "不支持的排序方式");
}
}
}

5
src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs Normal file
View File

@ -0,0 +1,5 @@
namespace SJZY.Track.Application.Services.ProvideServices;
public class TrackService
{
}

111
src/SJZY.Track.Application/Services/TrackFlags/TrackFlagService.cs
View File

@ -1,5 +1,10 @@
using SJZY.Track.Application.Dtos.TrackStatus;
using Microsoft.Extensions.Localization;
using SJZY.Track.Application.Dtos.TrackFlags;
using SJZY.Track.Application.Dtos.TrackStatus;
using SJZY.Track.Application.Localization;
using SJZY.Track.Domain.Aggregates.TrackFlagAggregate;
using SJZY.Track.Domain.Aggregates.TrackStatusAggregate;
using SJZY.Track.Domain.Dtos.TrackFlags;
using SJZY.Track.Domain.Dtos.TrackStatus;
using System;
using System.Collections.Generic;
@ -17,10 +22,110 @@ namespace SJZY.Track.Application.Services.TrackFlags
[Route("/Track/Flag")]
public class TrackFlagService : ApplicationService, ITransientDependency
{
public TrackFlagService()
private readonly IStringLocalizer<TrackLocalizationResource> _stringLocalizer;
private readonly ITrackFlagRepository _trackFlagRepository;
public TrackFlagService(
IStringLocalizer<TrackLocalizationResource> stringLocalizer,
ITrackFlagRepository trackFlagRepository
)
{
this._stringLocalizer=stringLocalizer;
this._trackFlagRepository=trackFlagRepository;
}
/// <summary>
/// 轨迹标记编辑
/// </summary>
/// <returns></returns>
[HttpPost("Edit")]
public async Task<UnifyResultDto> EditAsync(EditTrackFlagInput input)
{
return input.Options switch
{
OptionType.新增 => await AddAsync(input),
OptionType.修改 => await UpdateAsync(input),
OptionType.删除 => await DeleteAsync(input),
_ => throw new BusinessException(message: "当前操作动作不合法")
};
}
/// <summary>
/// 根据标记id获取轨迹标记
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpGet("GetDetail")]
public async Task<UnifyResultDto<GetTrackFlagDetailDto>> GetDetailAsync(int id)
{
var detailInfo = await _trackFlagRepository.GetDetailAsync(id);
if (detailInfo == null)
{
return new UnifyResultDto<GetTrackFlagDetailDto>(false, null, "未查询到轨迹状态");
}
var dto = ObjectMapper.Map<GetTrackFlagDetailVO, GetTrackFlagDetailDto>(detailInfo);
return new UnifyResultDto<GetTrackFlagDetailDto>("200", "", dto);
}
/// <summary>
/// 获取分页轨迹标记
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost("GetList")]
public async Task<UnifyPageResultDto<GetTrackFlagListDto>> GetPageTrackFlag(GetPageTrackFlagInput input)
{
var vo = ObjectMapper.Map<GetPageTrackFlagInput, GetPageTrackFlagVO>(input);
var resultDto = await _trackFlagRepository.GetPageTrackFlag(vo);
var pageResultDto =
ObjectMapper.Map<UnifyPageResultDto<GetTrackFlagListVO>, UnifyPageResultDto<GetTrackFlagListDto>>(
resultDto);
return pageResultDto;
}
#region 私有方法
private async Task<UnifyResultDto> AddAsync(EditTrackFlagInput input)
{
#region 业务校验
var trackStatusEntity = await _trackFlagRepository.GetFirstAsync(a => a.SubSystemId==input.SubSystemId&& (a.Code==input.Code || a.Name==input.Flag));
if (trackStatusEntity!=null)
{
throw new BusinessException(message: _stringLocalizer["TrackFlagExist"]);
}
#endregion
var entity = ObjectMapper.Map<EditTrackFlagInput, TrackFlagEntity>(input);
var isTrue = await _trackFlagRepository.InsertAsync(entity);
return new UnifyResultDto("200", "新增成功", isTrue);
}
private async Task<UnifyResultDto> UpdateAsync(EditTrackFlagInput input)
{
#region 业务校验
var trackStatusEntity = await _trackFlagRepository.GetFirstAsync(a => a.Id !=input.Id && a.SubSystemId==input.SubSystemId&& (a.Code==input.Code ||
a.Name ==input.Flag));
if (trackStatusEntity!=null)
{
throw new BusinessException(message: _stringLocalizer["TrackFlagExist"]);
}
#endregion
var templateEntity = await _trackFlagRepository.GetFirstAsync(a => a.Id == input.Id);
ObjectMapper.Map(input, templateEntity);
var isTrue = await _trackFlagRepository.UpdateAsync(templateEntity);
return new UnifyResultDto("200", "修改成功", isTrue);
}
private async Task<UnifyResultDto> DeleteAsync(EditTrackFlagInput input)
{
var isTrue = await _trackFlagRepository.SoftDeleteAsync(x => x.Id == input.Id);
return new UnifyResultDto("200", "删除成功", isTrue);
}
#endregion
}
}

35
src/SJZY.Track.Application/Validations/TrackFlags/EditTrackFlagInputValidation.cs Normal file
View File

@ -0,0 +1,35 @@
using FluentValidation;
using SJZY.Track.Application.Dtos.TrackFlags;
using SJZY.Track.Application.Dtos.TrackStatus;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SJZY.Track.Application.Validations.TrackFlags
{
public class EditTrackFlagInputValidation : AbstractValidator<EditTrackFlagInput>, IValidationEnabled
{
public EditTrackFlagInputValidation()
{
//条件分支
When(x => x.Options == OptionType.修改 || x.Options == OptionType.删除, () =>
{
RuleFor(x => x.Id).GreaterThan(0).WithMessage("修改或删除时Id必须大于0!");
});
When(x => x.Options == OptionType.新增, () =>
{
RuleFor(x => x.Id).Equal(0).WithMessage("新增时Id必须等于0!");
});
When(x => x.Options == OptionType.修改 || x.Options == OptionType.新增, () =>
{
RuleFor(x => x.SubSystemId).GreaterThan(0).WithMessage("子系统的id必须大于0!");
RuleFor(x => x.Code).NotNull().WithMessage("轨迹标记代码必填！").NotEmpty().WithMessage("轨迹标记代码不能为空！");
RuleFor(x => x.Flag).NotNull().WithMessage("轨迹标记必填！").NotEmpty().WithMessage("轨迹标记不能为空！");
});
}
}
}

20
src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs
View File

@ -5,18 +5,19 @@ namespace SJZY.Track.Domain.Aggregates.OrderAggregate;
public interface IOrderRepository : IBasicRepository<OrderEntity>
{
/// <summary>
/// 根据订单号，获取订单模板
/// 创建订单
/// </summary>
/// <param name="distinctOrderNumbers"></param>
/// <param name="order"></param>
/// <returns></returns>
Task<List<OrderTemplateDto>> GetOrderTemplatesAsync(List<string> distinctOrderNumbers);
Task<bool> CreateOrderAsync(OrderEntity order);
/// <summary>
/// 创建订单模板
/// 根据订单号，获取订单模板
/// </summary>
/// <param name="templateEntities"></param>
/// <param name="orderType">订单类型</param>
/// <param name="distinctOrderNumbers"></param>
/// <returns></returns>
Task CreateOrderTemplatesAsync(List<OrderTemplateEntity> templateEntities);
Task<List<OrderTemplateDto>> GetOrderTemplatesAsync(int orderType, List<string> distinctOrderNumbers);
/// <summary>
/// 关联订单
@ -31,4 +32,11 @@ public interface IOrderRepository : IBasicRepository<OrderEntity>
/// <param name="linkIds"></param>
/// <returns></returns>
Task UnLinkByIdsAsync(List<int> linkIds);
/// <summary>
/// 更新订单
/// </summary>
/// <param name="order"></param>
/// <returns></returns>
Task UpdateOrderAsync(OrderEntity order);
}

72
src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs
View File

@ -12,6 +12,24 @@ public class OrderEntity : IFullAuditedBasicEntitys, IAggregateRoot
[SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
public int Id { get; set; }
/// <summary>
/// 订单号
/// </summary>
[SugarColumn(ColumnName = "OrderNo")]
public string OrderNo { get; set; } = null!;
/// <summary>
/// 订单类型（主数据枚举TrackOrderType）
/// </summary>
[SugarColumn(ColumnName = "OrderType")]
public int OrderType { get; set; }
/// <summary>
/// 子系统id
/// </summary>
[SugarColumn(ColumnName = "SubSystemId")]
public int SubSystemId { get; set; }
/// <summary>
/// 客户id（外部主体id）
/// </summary>
@ -27,78 +45,66 @@ public class OrderEntity : IFullAuditedBasicEntitys, IAggregateRoot
/// <summary>
/// 最新轨迹内容（异步维护）
/// </summary>
[SugarColumn(ColumnName = "LatestTraceContent")]
public string LatestTraceContent { get; set; }
[SugarColumn(ColumnName = "LatestTrackContent")]
public string? LatestTrackContent { get; set; }
/// <summary>
/// 最新轨迹内容英文（异步维护）
/// </summary>
[SugarColumn(ColumnName = "LatestTraceEnContent")]
public string LatestTraceEnContent { get; set; }
[SugarColumn(ColumnName = "LatestTrackEnContent")]
public string? LatestTrackEnContent { get; set; }
/// <summary>
/// 最新轨迹时间（异步维护）
/// </summary>
[SugarColumn(ColumnName = "LatestTraceTime")]
public DateTime? LatestTraceTime { get; set; }
[SugarColumn(ColumnName = "LatestTrackTime")]
public DateTime? LatestTrackTime { get; set; }
/// <summary>
/// 订单明细（json字符串）
/// 最新轨迹发生地（异步维护）
/// </summary>
[SugarColumn(ColumnName = "OrderDetails")]
public string OrderDetails { get; set; }
/// <summary>
/// 订单号
/// </summary>
[SugarColumn(ColumnName = "OrderNo")]
public string OrderNo { get; set; }
/// <summary>
/// 订单类型（主数据枚举TrackOrderType）
/// </summary>
[SugarColumn(ColumnName = "OrderType")]
public int OrderType { get; set; }
/// <summary>
/// 子系统id
/// </summary>
[SugarColumn(ColumnName = "SubSystemId")]
public int SubSystemId { get; set; }
[SugarColumn(ColumnName = "LatestTrackPlace")]
public string? LatestTrackPlace { get; set; }
/// <summary>
/// 目的城市
/// </summary>
[SugarColumn(ColumnName = "ArrivalCity")]
public string ArrivalCity { get; set; }
public string ArrivalCity { get; set; } = null!;
/// <summary>
/// 目的国家
/// </summary>
[SugarColumn(ColumnName = "ArrivalCountry")]
public string ArrivalCountry { get; set; }
public string ArrivalCountry { get; set; } = null!;
/// <summary>
/// 目的港口
/// </summary>
[SugarColumn(ColumnName = "ArrivalPort")]
public string ArrivalPort { get; set; }
public string? ArrivalPort { get; set; }
/// <summary>
/// 起运城市
/// </summary>
[SugarColumn(ColumnName = "LeaveCity")]
public string LeaveCity { get; set; }
public string LeaveCity { get; set; } = null!;
/// <summary>
/// 起运国家
/// </summary>
[SugarColumn(ColumnName = "LeaveCountry")]
public string LeaveCountry { get; set; }
public string LeaveCountry { get; set; } = null!;
/// <summary>
/// 起运港口
/// </summary>
[SugarColumn(ColumnName = "LeavePort")]
public string LeavePort { get; set; }
public string? LeavePort { get; set; }
[Navigate(NavigateType.OneToMany, nameof(OrderFlightEntity.OrderId))]
public List<OrderFlightEntity> OrderFlights { get; set; }
[Navigate(NavigateType.OneToMany, nameof(OrderFlightEntity.OrderId))]
public List<OrderTemplateEntity> OrderTemplates { get; set; }
}

6
src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs
View File

@ -1,5 +1,9 @@
namespace SJZY.Track.Domain.Aggregates.OrderAggregate;
/// <summary>
/// 订单航班表（1：N）
/// </summary>
[SugarTable("t_order_flight")]
public class OrderFlightEntity : ICreateBaicEntity, IEntity
{
/// <summary>
@ -18,7 +22,7 @@ public class OrderFlightEntity : ICreateBaicEntity, IEntity
/// 航班号
/// </summary>
[SugarColumn(ColumnName = "FlightNo")]
public string FlightNo { get; set; }
public string FlightNo { get; set; } = null!;
/// <summary>
/// 订单id

4
src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs
View File

@ -22,7 +22,7 @@ public class OrderLinkEntity : ICreateBaicEntity, IEntity
/// 订单号
/// </summary>
[SugarColumn(ColumnName = "OrderNo")]
public string OrderNo { get; set; }
public string OrderNo { get; set; } = null!;
/// <summary>
/// 关联的订单类型
@ -34,7 +34,7 @@ public class OrderLinkEntity : ICreateBaicEntity, IEntity
/// 关联的订单号
/// </summary>
[SugarColumn(ColumnName = "LinkOrderNo")]
public string LinkOrderNo { get; set; }
public string LinkOrderNo { get; set; } = null!;
/// <summary>
/// 创建人

6
src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/ITrackFlagRepository.cs
View File

@ -1,5 +1,9 @@
namespace SJZY.Track.Domain.Aggregates.TrackFlagAggregate;
using SJZY.Track.Domain.Dtos.TrackFlags;
namespace SJZY.Track.Domain.Aggregates.TrackFlagAggregate;
public interface ITrackFlagRepository : IBasicRepository<TrackFlagEntity>
{
Task<GetTrackFlagDetailVO?> GetDetailAsync(int id);
Task<UnifyPageResultDto<GetTrackFlagListVO>> GetPageTrackFlag(GetPageTrackFlagVO input);
}

6
src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs
View File

@ -29,4 +29,10 @@ public class TrackFlagEntity : IFullAuditedBasicEntitys, IAggregateRoot
/// </summary>
[SugarColumn(ColumnName = "SubSystemId")]
public int SubSystemId { get; set; }
/// <summary>
/// 是否完结
/// </summary>
[SugarColumn(ColumnName = "IsCompleted")]
public bool IsCompleted { get; set; }
}

2
src/SJZY.Track.Domain/Aggregates/TrackTemplateAggregate/ITrackTemplateRepository.cs
View File

@ -4,7 +4,7 @@ namespace SJZY.Track.Domain.Aggregates.TrackTemplateAggregate;
public interface ITrackTemplateRepository : IBasicRepository<TrackTemplateEntity>
{
Task<TemplateContentDto> GetTemplateContentsAsync(List<int> distinctTemplateIds);
Task<List<TemplateContentOrderlyDto>> GetTemplateContentOrderlyAsync(List<int> distinctTemplateIds);
Task<GetTrackTemplateDetailVO?> GetDetailAsync(int id);

6
src/SJZY.Track.Domain/Dtos/Order/OrderTemplateDto.cs
View File

@ -3,12 +3,12 @@ namespace SJZY.Track.Domain.Dtos.Order;
public class OrderTemplateDto
{
/// <summary>
/// 订单id
/// 订单号
/// </summary>
public int OrderId { get; set; }
public string OrderNo { get; set; }
/// <summary>
/// 模板id
/// </summary>
public int TrackTemplateId { get; set; }
public int TemplateId { get; set; }
}

69
src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs Normal file
View File

@ -0,0 +1,69 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SJZY.Track.Domain.Dtos.TrackFlags
{
public class GetPageTrackFlagVO : PageInfoInput
{
/// <summary>
/// 子系统id
/// </summary>
public int SubSystemId { get; set; }
///// <summary>
///// 关键字
///// </summary>
//public string Keywords { get; set; }
}
public class GetTrackFlagListVO
{
/// <summary>
/// Id
/// </summary>
public int Id { get; set; }
/// <summary>
/// 子系统
/// </summary>
public string SubSystem { get; set; }
/// <summary>
/// 代码
/// </summary>
public string Code { get; set; }
/// <summary>
/// 标记
/// </summary>
public string Flag { get; set; }
/// <summary>
/// 是否完结
/// </summary>
public bool IsFinish { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime? CreateTime { get; set; }
/// <summary>
/// 创建人
/// </summary>
public string CreateUser { get; set; }
/// <summary>
/// 修改时间
/// </summary>
public DateTime? UpdateTime { get; set; }
/// <summary>
/// 修改人
/// </summary>
public string UpdateUser { get; set; }
}
}

41
src/SJZY.Track.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs Normal file
View File

@ -0,0 +1,41 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SJZY.Track.Domain.Dtos.TrackFlags
{
public class GetTrackFlagDetailVO
{
/// <summary>
/// Id
/// </summary>
public int Id { get; set; }
/// <summary>
/// 子系统id
/// </summary>
public int SubSystemId { get; set; }
/// <summary>
/// 子系统
/// </summary>
public string SubSystem { get; set; }
/// <summary>
/// 代码
/// </summary>
public string Code { get; set; }
/// <summary>
///
/// </summary>
public string Flag { get; set; }
/// <summary>
/// 是否完结
/// </summary>
public bool IsFinish { get; set; }
}
}

5
src/SJZY.Track.Domain/Dtos/TrackTemplate/TemplateContentDto.cs
View File

@ -1,5 +0,0 @@
namespace SJZY.Track.Domain.Dtos.TrackTemplate;
public class TemplateContentDto
{
}

14
src/SJZY.Track.Domain/Dtos/TrackTemplate/TemplateContentOrderlyDto.cs Normal file
View File

@ -0,0 +1,14 @@
namespace SJZY.Track.Domain.Dtos.TrackTemplate;
public class TemplateContentOrderlyDto
{
/// <summary>
/// 模板id
/// </summary>
public int TemplateId { get; set; }
/// <summary>
/// 轨迹内容代码
/// </summary>
public string Code { get; set; }
}

2
src/SJZY.Track.Domain/IBasicQuery.cs
View File

@ -7,7 +7,7 @@ public interface IBasicQuery<T> where T : IEntity
/// </summary>
/// <param name="whereExpression"></param>
/// <returns></returns>
Task<T> GetFirstAsync(Expression<Func<T, bool>> whereExpression);
Task<T?> GetFirstAsync(Expression<Func<T, bool>> whereExpression);
Task<TResult> GetFirstAsync<TResult>(Expression<Func<T, bool>> whereExpression,
Expression<Func<T, TResult>> resultExpression);

2
src/SJZY.Track.Domain/SJZY.Track.Domain.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../common.props" />

2
src/SJZY.Track.Repository/BasicQuery.cs
View File

@ -4,7 +4,9 @@ using SJZY.Track.Domain.SeedWork;
namespace SJZY.Track.Repository;
#pragma warning disable CS8613
public class BasicQuery<T> : SimpleClient<T>, IBasicQuery<T> where T : class, IEntity, new()
#pragma warning restore CS8613
{
public BasicQuery()
{

47
src/SJZY.Track.Repository/OrderRepository.cs
View File

@ -1,24 +1,33 @@
using SJZY.Track.Domain.Aggregates.OrderAggregate;
using SJZY.Track.Domain;
using SJZY.Track.Domain.Aggregates.OrderAggregate;
using SJZY.Track.Domain.Dtos.Order;
namespace SJZY.Track.Repository;
public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, ITransientDependency
{
public async Task<List<OrderTemplateDto>> GetOrderTemplatesAsync(List<string> distinctOrderNumbers)
public async Task<bool> CreateOrderAsync(OrderEntity order)
{
return await Context.InsertNav(order)
.Include(x => x.OrderFlights)
.Include(x => x.OrderTemplates)
.ExecuteCommandAsync();
}
public async Task<List<OrderTemplateDto>> GetOrderTemplatesAsync(int orderType,
List<string> distinctOrderNumbers)
{
return await AsQueryable()
.LeftJoin<OrderTemplateEntity>((a, b) => a.Id == b.OrderId)
.Where(a => distinctOrderNumbers.Contains(a.OrderNo))
.Select<OrderTemplateDto>()
.Where(a => a.OrderType == orderType && distinctOrderNumbers.Contains(a.OrderNo))
.Select((a, b) => new OrderTemplateDto
{
OrderNo = a.OrderNo,
TemplateId = b.TrackTemplateId
})
.ToListAsync();
}
public async Task CreateOrderTemplatesAsync(List<OrderTemplateEntity> templateEntities)
{
await Context.Insertable(templateEntities).ExecuteCommandAsync();
}
public async Task LinkOrderAsync(List<OrderLinkEntity> orderLinkEntities)
{
await Context.Insertable(orderLinkEntities).ExecuteCommandAsync();
@ -28,4 +37,24 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
{
await Context.Deleteable(linkIds).ExecuteCommandAsync();
}
public async Task UpdateOrderAsync(OrderEntity order)
{
using var tran = TransactionHelper.GetReadCommitted();
// 更新订单主表
await UpdateAsync(order, x => new { x.CustomId, x.SubSystemId });
// 更新订单模板
await Context.Deleteable<OrderTemplateEntity>().Where(x => x.OrderId == order.Id).ExecuteCommandAsync();
order.OrderTemplates.ForEach(x => x.OrderId = order.Id);
await Context.Insertable(order.OrderTemplates).ExecuteCommandAsync();
// 更新订单航班
await Context.Deleteable<OrderFlightEntity>().Where(x => x.OrderId == order.Id).ExecuteCommandAsync();
order.OrderFlights.ForEach(x => x.OrderId = order.Id);
await Context.Insertable(order.OrderFlights).ExecuteCommandAsync();
tran.Complete();
}
}

3
src/SJZY.Track.Repository/SJZY.Track.Repository.csproj
View File

@ -1,8 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../common.props"/>
<Import Project="../../common.props" />
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<LangVersion>preview</LangVersion>
</PropertyGroup>
<ItemGroup>

4
src/SJZY.Track.Repository/SJZYTrackRepositoryModule.cs
View File

@ -28,11 +28,11 @@ public class SJZYTrackRepositoryModule : AbpModule
ConnectionString = configuration["ConnectionStrings:DefaultConnection"],
DbType = DbType.MySql,
IsAutoCloseConnection = true,
ConfigId = "default"
ConfigId = "default", OpenSqlLog = true
}
}
);
}, DataBaseContext.OnExcutingAction, "SJZY.Track.Repository");
}, DataBaseContext.OnExcutingAction, "SJZY.Track.Domain");
context.Services.AddElasticSearch(options =>
{

61
src/SJZY.Track.Repository/TrackFlagRepository.cs
View File

@ -1,7 +1,68 @@
using SJZY.Track.Domain.Aggregates.TrackFlagAggregate;
using SJZY.Track.Domain.Aggregates.TrackStatusAggregate;
using SJZY.Track.Domain.Dtos.TrackFlags;
using SJZY.Track.Domain.Dtos.TrackStatus;
using SJZY.Track.Domain.VEntities;
namespace SJZY.Track.Repository;
public class TrackFlagRepository : BasicRepository<TrackFlagEntity>, ITrackFlagRepository, IScopedDependency
{
public TrackFlagRepository()
{
}
/// <summary>
/// 获取轨迹标记明细
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public async Task<GetTrackFlagDetailVO?> GetDetailAsync(int id)
{
var detail = await Context.Queryable<TrackFlagEntity>()
.LeftJoin<VSystemEntity>((a, b) => a.SubSystemId == b.Id)
.Where((a, b) => a.Id == id)
.Select((a, b) => new GetTrackFlagDetailVO
{
Id = a.Id,
SubSystemId = a.SubSystemId,
SubSystem = b.CnName,
Code = a.Code,
Flag = a.Name,
IsFinish=a.IsCompleted
})
.FirstAsync();
return detail;
}
/// <summary>
/// 分页获取轨迹标记
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public async Task<UnifyPageResultDto<GetTrackFlagListVO>> GetPageTrackFlag(GetPageTrackFlagVO input)
{
UnifyPageResultDto<GetTrackFlagListVO> pagedList = new UnifyPageResultDto<GetTrackFlagListVO>();
pagedList = await Context.Queryable<TrackFlagEntity>()
.LeftJoin<VSystemEntity>((a, b) => a.SubSystemId == b.Id)
.LeftJoin<VUserEntity>((a, b, c) => a.CreateUserId == c.Id)
.LeftJoin<VUserEntity>((a, b, c, d) => a.UpdateUserId == d.Id)
.WhereIF(input.SubSystemId > 0, (a, b, c, d) => a.SubSystemId == input.SubSystemId)
.Select((a, b, c, d) => new GetTrackFlagListVO
{
Id = a.Id,
SubSystem = b.CnName,
Code = a.Code,
Flag = a.Name,
IsFinish=a.IsCompleted,
CreateTime = a.CreateTime,
CreateUser = c.Name,
UpdateTime = a.UpdateTime,
UpdateUser = d.Name,
})
.ToPagedListAsync(input.PageIndex, input.PageSize);
return pagedList;
}
}

14
src/SJZY.Track.Repository/TrackTemplateRepository.cs
View File

@ -13,9 +13,19 @@ namespace SJZY.Track.Repository;
/// <inheritdoc/>
public class TrackTemplateRepository : BasicRepository<TrackTemplateEntity>, ITrackTemplateRepository, IScopedDependency
{
public Task<TemplateContentDto> GetTemplateContentsAsync(List<int> distinctTemplateIds)
public async Task<List<TemplateContentOrderlyDto>> GetTemplateContentOrderlyAsync(List<int> distinctTemplateIds)
{
throw new NotImplementedException();
return await Context.Queryable<TrackTemplateEntity>()
.LeftJoin<TrackTemplateContentEntity>((a, b) => a.Id == b.TrackTemplateId)
.LeftJoin<TrackContentEntity>((a, b, c) => b.TrackContentId == c.Id)
.Where(a => distinctTemplateIds.Contains(a.Id))
.OrderBy((a, b) => b.Sort)
.Select((a, b, c) => new TemplateContentOrderlyDto
{
TemplateId = a.Id,
Code = c.Code
})
.ToListAsync();
}
/// <summary>