Merge branch 'S07' into test

src/SJZY.Track.Application.Contract/Dtos/TrackContents/TrackContentOutput.cs

@@ -0,0 +1,79 @@
+namespace SJZY.Track.Application.Contract.Dtos.TrackContents;
+
+public sealed class TrackContentOutput
+{
+    /// <summary>
+    /// 子系统Id
+    /// </summary>
+    public int SubSystemId { get; set; }
+
+    /// <summary>
+    /// 子系统代码
+    /// </summary>
+    public string SubSystemCode { get; set; }
+
+    /// <summary>
+    /// 轨迹状态Id
+    /// </summary>
+    public int TrackStatusId { get; set; }
+
+    /// <summary>
+    /// 轨迹状态
+    /// </summary>
+    public string TrackStatus { get; set; } = null!;
+
+    /// <summary>
+    /// 轨迹内容Id
+    /// </summary>
+    public int TrackContentId { get; set; }
+
+    /// <summary>
+    /// 轨迹内容
+    /// </summary>
+    public string TrackContent { get; set; } = null!;
+
+    /// <summary>
+    /// 轨迹内容英文
+    /// </summary>
+    public string TrackEnContent { get; set; } = null!;
+
+    /// <summary>
+    /// 是否完成态
+    /// </summary>
+    public bool IsCompleted { get; set; }
+
+    /// <summary>
+    /// 轨迹状态代码
+    /// </summary>
+    public string TrackStatusCode { get; set; }
+
+    /// <summary>
+    /// 是否可重复
+    /// </summary>
+    public bool IsRepeatable { get; set; }
+
+    /// <summary>
+    /// 是否允许手动修改
+    /// </summary>
+    public bool IsAllowManuallyUpdate { get; set; }
+
+    /// <summary>
+    /// 是否允许手动创建
+    /// </summary>
+    public bool IsAllowManuallyCreate { get; set; }
+
+    /// <summary>
+    /// 是否广播
+    /// </summary>
+    public bool IsToMq { get; set; }
+
+    /// <summary>
+    /// 是否对外
+    /// </summary>
+    public bool IsExternal { get; set; }
+
+    /// <summary>
+    /// 轨迹内容code
+    /// </summary>
+    public string TrackContentCode { get; set; }
+}

src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj

@@ -5,7 +5,7 @@
 	<PropertyGroup>
 		<TargetFramework>net7.0</TargetFramework>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
-		<Version>7.0.14</Version>
+		<Version>7.0.15</Version>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 	</PropertyGroup>
 	<ItemGroup>

src/SJZY.Track.Application.Contract/Services/ITrackContentService.cs

@@ -1,5 +1,8 @@
+using SJZY.Track.Application.Contract.Dtos.TrackContents;
+
 namespace SJZY.Track.Application.Contract.Services;
 
 public interface ITrackContentService
 {
+    Task<List<TrackContentOutput>> GetTrackContentsAsync(int subSystemId);
 }

src/SJZY.Track.Application/AutoMapper/TrackContentAutoMapperProfile.cs

@@ -17,9 +17,9 @@ public class TrackContentAutoMapperProfile : Profile
         CreateMap<UnifyPageResultDto<GetTrackContentListVO>, UnifyPageResultDto<GetTrackContentListDto>>(
             MemberList.None);
         CreateMap<EditTrackContentMapInput, TrackContentMapEntity>(MemberList.None);
+        CreateMap<TrackContentVO, TrackContentOutput>(MemberList.None);
 
         CreateMap<TrackDetailsIndex, GetContentDetailOutput>(MemberList.None).ReverseMap();
-        CreateMap< SJZY.Track.Domain.Aggregates.TrackDetailsAggregate.FileItem,  SJZY.Track.Application.Contract.Dtos.TrackContents.FileItem>(MemberList.None).ReverseMap();
-
+        CreateMap<SJZY.Track.Domain.Aggregates.TrackDetailsAggregate.FileItem, SJZY.Track.Application.Contract.Dtos.TrackContents.FileItem>(MemberList.None).ReverseMap();
     }
 }

src/SJZY.Track.Application/Services/ProvideServices/TrackContentService.cs

@@ -0,0 +1,34 @@
+using SJZY.Track.Application.Contract.Dtos.TrackContents;
+using SJZY.Track.Application.Contract.Services;
+using SJZY.Track.Domain.Aggregates.TrackContentAggregate;
+using SJZY.Track.Domain.Dtos.TrackContents;
+
+namespace SJZY.Track.Application.Services.ProvideServices;
+
+/// <summary>
+/// 轨迹内容服务
+/// </summary>
+[ApiExplorerSettings(GroupName = "提供接口")]
+[Route("/ProviderService")]
+public class TrackContentService : ApplicationService, ITrackContentService
+{
+    private readonly ITrackContentRepository _trackContentRepository;
+
+    public TrackContentService(ITrackContentRepository trackContentRepository)
+    {
+        _trackContentRepository = trackContentRepository;
+    }
+
+    /// <summary>
+    /// 根据子系统id获取轨迹内容列表
+    /// </summary>
+    /// <param name="subSystemId"></param>
+    /// <returns></returns>
+    [HttpPost("Track/GetTrackContents")]
+    public async Task<List<TrackContentOutput>> GetTrackContentsAsync(int subSystemId)
+    {
+        var res = await _trackContentRepository.GetTrackContentBySyetemIdAsync(subSystemId);
+        var result = ObjectMapper.Map<List<TrackContentVO>, List<TrackContentOutput>>(res);
+        return result;
+    }
+}

src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs

@@ -198,7 +198,7 @@ public class OrderEntity : IFullAuditedBasicEntitys, IAggregateRoot
     /// 冗余订单第三方订单号（创建订单，更新订单时维护）
     /// </summary>
     [SugarColumn(ColumnName = "ThirdPartyOrderNumber")]
-    public string? ThirdPartyOrderNumber { get; set; } //
+    public string? ThirdPartyOrderNumber { get; set; }
 
     [SugarColumn(IsIgnore = true)]
     public List<OrderFlightEntity> OrderFlights { get; set; }

src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs

@@ -257,6 +257,7 @@ public class TrackContentRepository : BasicRepository<TrackContentEntity>, ITrac
             .Where(x => x.SubSystemId == subSystemId)
             .Select((x, y, z) => new TrackContentVO
             {
+                SubSystemId = x.SubSystemId,
                 SubSystemCode = z.Key,
                 TrackStatusId = x.TrackStatusId,
                 TrackStatus = y.Status,