Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台

src/SJZY.Track.Application/ApplicationModule.cs

@@ -1,6 +1,6 @@
-using SJZY.Track.Domain;
+using SJZY.Expand.ABP.Core.Localization;
-using SJZY.Expand.ABP.Core.Localization;
 using SJZY.Track.Application.Localization;
+using SJZY.Track.Domain;
 using SJZY.UserCenter.Contracts;
 using SJZY.UserCenter.SharedModel;
 using Volo.Abp.AspNetCore.Mvc;

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

@@ -1,7 +1,7 @@
 using AutoMapper;
+using SJZY.Track.Application.Dtos.Demo;
 using SJZY.Track.Domain.DemoAggregate;
 using SJZY.Track.Domain.DemoAggregate.Dtos;
-using SJZY.Track.Application.Dtos.Demo;
 
 namespace SJZY.Track.Application.AutoMapper;
 

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

@@ -1,5 +1,6 @@
 using AutoMapper;
 using SJZY.Track.Application.Dtos.TrackTemplates;
+using SJZY.Track.Domain.TrackTemplateAggregate;
 using SJZY.Track.Domain.TrackTemplateAggregate.Dtos;
 
 namespace SJZY.Track.Application.AutoMapper
@@ -14,6 +15,8 @@ namespace SJZY.Track.Application.AutoMapper
             CreateMap<GetTrackTemplateDetailVO, GetTrackTemplateDetailDto>(MemberList.None);
 
             //CreateMap<UnifyResultDto<GetTrackTemplateDetailVO>, UnifyResultDto<GetTrackTemplateDetailDto>>(MemberList.None);
+
+            CreateMap<EditTrackTemplateContentInput, TrackTemplateContentEntity>(MemberList.None);
         }
     }
 }

src/SJZY.Track.Application/Dtos/TrackStatus/EditTrackStatusInput.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SJZY.Track.Application.Dtos.TrackStatus
+{
+    public class EditTrackStatusInput
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 操作类型
+        /// </summary>
+        public OptionType Options { get; set; }
+
+        /// <summary>
+        /// 子系统id
+        /// </summary>
+        public int SubSystemId { get; set; }
+
+        /// <summary>
+        /// 所属节点id
+        /// </summary>
+        public int NodeId { get; set; }
+
+        /// <summary>
+        /// 轨迹状态代码
+        /// </summary>
+        public string Code { get; set; }
+
+        /// <summary>
+        /// 轨迹状态
+        /// </summary>
+        public string TrackStatus { get; set; }
+
+        /// <summary>
+        /// 轨迹状态英文
+        /// </summary>
+        public string EntrackStatus { get; set; }
+    }
+}

src/SJZY.Track.Application/Dtos/TrackTemplates/EditTrackTemplateContentInput.cs

@@ -0,0 +1,38 @@
+namespace SJZY.Track.Application.Dtos.TrackTemplates;
+
+/// <inheritdoc/>
+public class EditTrackTemplateContentInput
+{
+    /// <summary>
+    /// 操作类型
+    /// </summary>
+    public OptionTypeNoNull Options { get; set; }
+
+    /// <inheritdoc/>
+    public int? Id { get; set; }
+
+    /// <summary>
+    /// 是否可删
+    /// </summary>
+    public bool IsCanDelete { get; set; }
+
+    /// <summary>
+    /// 是否对外
+    /// </summary>
+    public bool IsExternal { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int Sort { get; set; }
+
+    /// <summary>
+    /// 轨迹内容id
+    /// </summary>
+    public int TrackContentId { get; set; }
+
+    /// <summary>
+    /// 轨迹模板id
+    /// </summary>
+    public int TrackTemplateId { get; set; }
+}

src/SJZY.Track.Application/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs

@@ -1,10 +1,4 @@
-using System;
+namespace SJZY.Track.Application.Dtos.TrackTemplates
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SJZY.Track.Application.Dtos.TrackTemplates
 {
     /// <summary>
     /// 获取轨迹模版分页输入
@@ -20,5 +14,10 @@ namespace SJZY.Track.Application.Dtos.TrackTemplates
         /// 关键字
         /// </summary>
         public string Keywords { get; set; }
+        
+        /// <summary>
+        /// 轨迹模版id，轨迹映射的查询使用
+        /// </summary>
+        public int TrackTemplateId { get; set; }
     }
 }

src/SJZY.Track.Application/Dtos/TrackTemplates/GetTrackDetailDto.cs

@@ -1,11 +1,4 @@
-using Microsoft.OpenApi.Writers;
+namespace SJZY.Track.Application.Dtos.TrackTemplates
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SJZY.Track.Application.Dtos.TrackTemplates
 {
     /// <summary>
     /// 获取轨迹模版详情

src/SJZY.Track.Application/GlobalUsing.cs

@@ -2,7 +2,6 @@
 global using Microsoft.Extensions.DependencyInjection;
 global using SJZY.Expand.ABP.Common.Enums;
 global using SJZY.Expand.ABP.Core.Common.Dto;
-global using SJZY.Track.Repository;
 global using Volo.Abp;
 global using Volo.Abp.Application.Services;
 global using Volo.Abp.Validation;

src/SJZY.Track.Application/Services/Demo/InterFaceDemoService.cs

@@ -1,7 +1,7 @@
-using SJZY.Track.Domain.DemoAggregate;
+using SJZY.Expand.ABP.Core.Common;
-using SJZY.Track.Domain.DemoAggregate.Dtos;
-using SJZY.Expand.ABP.Core.Common;
 using SJZY.Track.Application.Dtos.Demo;
+using SJZY.Track.Domain.DemoAggregate;
+using SJZY.Track.Domain.DemoAggregate.Dtos;
 
 namespace SJZY.Track.Application.Services.Demo
 {

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

@@ -1,3 +1,5 @@
+using SJZY.Track.Application.Dtos.ProvideServices;
+using SJZY.Track.Domain;
 using SJZY.Track.Domain.OrderAggregate;
 using SJZY.Track.Domain.TrackTemplateAggregate;
 using SJZY.Track.Application.Dtos.ProvideServices;

src/SJZY.Track.Application/Services/TrackStatus/ITrackStatusService.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SJZY.Track.Application.Services.TrackStatus
+{
+    public interface ITrackStatusService
+    {
+    }
+}

src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs

@@ -0,0 +1,72 @@
+using SJZY.Track.Application.Dtos.TrackStatus;
+using SJZY.Track.Application.Dtos.TrackTemplates;
+using SJZY.Track.Domain.TrackStatusAggregate;
+using SJZY.Track.Domain.TrackTemplateAggregate;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+
+namespace SJZY.Track.Application.Services.TrackStatus
+{
+    /// <summary>
+    /// 轨迹状态
+    /// </summary>
+    [ApiExplorerSettings(GroupName = "轨迹状态")]
+    [Route("/Track/Status")]
+    public class TrackStatusService : ApplicationService, ITransientDependency
+    {
+        private readonly ITrackStatusRepository _trackStatusRepository;
+
+        public TrackStatusService(
+            ITrackStatusRepository trackStatusRepository
+            )
+        {
+            this._trackStatusRepository=trackStatusRepository;
+        }
+
+        /// <summary>
+        /// 轨迹状态编辑
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("Edit")]
+        public async Task<UnifyResultDto> EditAsync(EditTrackStatusInput input)
+        {
+            return input.Options switch
+            {
+                OptionType.新增 => await AddAsync(input),
+                OptionType.修改 => await UpdateAsync(input),
+                OptionType.删除 => await DeleteAsync(input),
+                _ => throw new BusinessException(message: "当前操作动作不合法")
+            };
+        }
+
+        #region 私有方法
+        private async Task<UnifyResultDto> AddAsync(EditTrackStatusInput input)
+        {
+            var entity = ObjectMapper.Map<EditTrackStatusInput, TrackStatusEntity>(input);
+            var isTrue = await _trackStatusRepository.InsertAsync(entity);
+
+            return new UnifyResultDto("200", "新增成功", isTrue);
+        }
+
+        private async Task<UnifyResultDto> UpdateAsync(EditTrackStatusInput input)
+        {
+            var templateEntity = await _trackStatusRepository.GetFirstAsync(a => a.Id == input.Id);
+            ObjectMapper.Map(input, templateEntity);
+            var isTrue = await _trackStatusRepository.UpdateAsync(templateEntity);
+
+            return new UnifyResultDto("200", "修改成功", isTrue);
+        }
+
+        private async Task<UnifyResultDto> DeleteAsync(EditTrackStatusInput input)
+        {
+            var isTrue = await _trackStatusRepository.SoftDeleteAsync(x => x.Id == input.Id);
+
+            return new UnifyResultDto("200", "删除成功", isTrue);
+        }
+        #endregion
+    }
+}

src/SJZY.Track.Application/Services/TrackTemplates/ITrackTemplateService.cs

@@ -1,10 +1,4 @@
-using System;
+namespace SJZY.Track.Application.Services.TrackTemplates
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SJZY.Track.Application.Services.TrackTemplates
 {
     public interface ITrackTemplateService
     {

src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs

@@ -1,6 +1,10 @@
-using SJZY.Track.Application.Dtos.TrackTemplates;
+using Microsoft.Extensions.Localization;
+using SJZY.Expand.ABP.Core.Localization;
+using SJZY.Track.Application.Dtos.TrackTemplates;
+using SJZY.Track.Application.Localization;
 using SJZY.Track.Domain.TrackTemplateAggregate;
 using SJZY.Track.Domain.TrackTemplateAggregate.Dtos;
+using System.Linq.Expressions;
 using Volo.Abp.DependencyInjection;
 
 namespace SJZY.Track.Application.Services.TrackTemplates;
@@ -9,15 +13,18 @@ namespace SJZY.Track.Application.Services.TrackTemplates;
 /// 轨迹模版
 /// </summary>
 [ApiExplorerSettings(GroupName = "轨迹模版")]
-[Route("/Track")]
+[Route("/Track/Template")]
-public class TrackTemplateService : ApplicationService, ITrackTemplateService, IScopedDependency
+public class TrackTemplateService : ApplicationService, ITransientDependency
 {
+    private readonly IStringLocalizer<TrackLocalizationResource> _stringLocalizer;
     private readonly ITrackTemplateRepository _trackTemplateRepository;
 
+    /// <inheritdoc/>
     public TrackTemplateService(
-        ITrackTemplateRepository trackTemplateRepository
+        IStringLocalizer<TrackLocalizationResource> stringLocalizer,
-    )
+        ITrackTemplateRepository trackTemplateRepository)
     {
+        _stringLocalizer = stringLocalizer;
         _trackTemplateRepository = trackTemplateRepository;
     }
 
@@ -25,7 +32,7 @@ public class TrackTemplateService : ApplicationService, ITrackTemplateService, I
     /// 轨迹模版编辑
     /// </summary>
     /// <returns></returns>
-    [HttpPost("/Template/Edit")]
+    [HttpPost("Edit")]
     public async Task<UnifyResultDto> EditAsync(EditTrackTemplateInput input)
     {
         return input.Options switch
@@ -42,7 +49,7 @@ public class TrackTemplateService : ApplicationService, ITrackTemplateService, I
     /// </summary>
     /// <param name="id"></param>
     /// <returns></returns>
-    [HttpGet("/Template/GetDetail")]
+    [HttpGet("GetDetail")]
     public async Task<UnifyResultDto<GetTrackTemplateDetailDto>> GetDetailAsync(int id)
     {
         var detailInfo = await _trackTemplateRepository.GetDetailAsync(id);
@@ -60,7 +67,7 @@ public class TrackTemplateService : ApplicationService, ITrackTemplateService, I
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    [HttpPost("/Template/GetList")]
+    [HttpPost("GetList")]
     public async Task<UnifyPageResultDto<GetTrackTemplateListDto>> GetPageTrackTemplate(GetPageTrackTemplateInput input)
     {
         var vo = ObjectMapper.Map<GetPageTrackTemplateInput, GetPageTrackTemplateVO>(input);
@@ -98,5 +105,78 @@ public class TrackTemplateService : ApplicationService, ITrackTemplateService, I
         return new UnifyResultDto("200", "删除成功", isTrue);
     }
 
-    #endregion
+    #endregion 私有方法
+
+    /// <summary>
+    /// 轨迹模板内容列表
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpPost("GetContentPage")]
+    public async Task<UnifyPageResultDto<GetTrackTemplateContentPageOutputVO>> GetContentPageAsync([FromBody] GetTrackTemplateContentPageInputVO input)
+    {
+        return await _trackTemplateRepository.GetContentPageAsync(input);
+    }
+
+    /// <summary>
+    /// 轨迹模板内容详情
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpGet("GetContentDetail")]
+    public async Task<GetTrackTemplateContentDetailOutputVO> GetContentDetailAsync(int id)
+    {
+        return await _trackTemplateRepository.GetContentDetailAsync(id);
+    }
+
+    /// <summary>
+    /// 轨迹模板内容编辑
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpPost("EditContent")]
+    public async Task<bool> EditContentAsync([FromBody] EditTrackTemplateContentInput input)
+    {
+        if (input.Options != OptionTypeNoNull.删除)
+        {
+            Expression<Func<TrackTemplateContentEntity, bool>> isAnyExp = x =>
+                    x.TrackTemplateId == input.TrackTemplateId && x.TrackContentId == input.TrackContentId;
+            if (input.Options == OptionTypeNoNull.修改) isAnyExp.And(x => x.Id != input.Id);
+
+            if (await _trackTemplateRepository.IsAnyAsync(isAnyExp))
+                throw new BusinessException(message: _stringLocalizer["IsTrackTemplateContentAny"]);
+        }
+
+        switch (input.Options)
+        {
+            case OptionTypeNoNull.新增:
+
+                var entity = ObjectMapper.Map<EditTrackTemplateContentInput, TrackTemplateContentEntity>(input);
+
+                await _trackTemplateRepository.InsertAsync(entity);
+
+                break;
+
+            case OptionTypeNoNull.修改:
+
+                var oldEntity = await _trackTemplateRepository.GetByIdAsync(input.Id!.Value) ?? throw new BusinessException(message: _stringLocalizer["NotFindData"]);
+
+                ObjectMapper.Map(input, oldEntity);
+
+                await _trackTemplateRepository.UpdateAsync(oldEntity);
+
+                break;
+
+            case OptionTypeNoNull.删除:
+
+                await _trackTemplateRepository.SoftDeleteContentAsync(input.Id!.Value);
+
+                break;
+
+            default:
+                throw new BusinessException(message: _stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum, nameof(EditTrackTemplateContentInput.Options)]);
+        }
+
+        return true;
+    }
 }

src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateInputValidation.cs

@@ -1,11 +1,5 @@
 using FluentValidation;
-using SJZY.Track.Application.Dtos.Demo;
 using SJZY.Track.Application.Dtos.TrackTemplates;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SJZY.Track.Application.Validations.TrackTemplates
 {

src/SJZY.Track.Domain/GlobalUsings.cs

@@ -1,9 +1,9 @@
 // Global using directives
 
+global using SJZY.Expand.ABP.Core.Common.Dto;
+global using SJZY.Expand.ABP.Core.SqlSugar.Entitys;
+global using SqlSugar;
 global using System;
 global using System.Collections.Generic;
 global using System.Linq.Expressions;
 global using System.Threading.Tasks;
-global using SJZY.Expand.ABP.Core.Common.Dto;
-global using SJZY.Expand.ABP.Core.SqlSugar.Entitys;
-global using SqlSugar;

src/SJZY.Track.Domain/SJZY.Track.Domain.csproj

@@ -11,4 +11,13 @@
         <PackageReference Include="SJZY.Expand.ElasticSearch" Version="7.0.17" />
     </ItemGroup>
     
+    <ItemGroup>
+      <Folder Include="TrackContentAggregate\Dtos\" />
+      <Folder Include="TrackFlagAggregate\Dtos\" />
+      <Folder Include="TrackPullAggregate\Dtos\" />
+      <Folder Include="TrackPushAggregate\Dtos\" />
+      <Folder Include="TrackStatusAggregate\Dtos\" />
+      <Folder Include="TrackStatusAggregate\Dtos\" />
+    </ItemGroup>
+
 </Project>

src/SJZY.Track.Domain/TrackContentAggregate/ITrackContentRepository.cs

@@ -0,0 +1,6 @@
+namespace SJZY.Track.Domain.TrackContentAggregate
+{
+    public interface ITrackContentRepository : IBasicRepository<TrackContentEntity>
+    {
+    }
+}

src/SJZY.Track.Domain/TrackContentAggregate/TrackContentEntity.cs

@@ -0,0 +1,50 @@
+namespace SJZY.Track.Domain.TrackContentAggregate;
+
+/// <summary>
+/// 轨迹内容
+/// </summary>
+[SugarTable("t_track_content")]
+public class TrackContentEntity : IFullAuditedBasicEntitys
+{
+    /// <summary>
+    /// 自增主键
+    /// </summary>
+    [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
+    public int Id { get; set; }
+
+    /// <summary>
+    /// 轨迹内容代码
+    /// </summary>
+    [SugarColumn(ColumnName = "Code")]
+    public string Code { get; set; }
+
+    /// <summary>
+    /// 轨迹内容
+    /// </summary>
+    [SugarColumn(ColumnName = "Content")]
+    public string Content { get; set; }
+
+    /// <summary>
+    /// 轨迹内容英文
+    /// </summary>
+    [SugarColumn(ColumnName = "EnContent")]
+    public string EnContent { get; set; }
+
+    /// <summary>
+    /// 子系统id
+    /// </summary>
+    [SugarColumn(ColumnName = "SubSystemId")]
+    public int SubSystemId { get; set; }
+
+    /// <summary>
+    /// 轨迹标记id
+    /// </summary>
+    [SugarColumn(ColumnName = "TrackFlagId")]
+    public int TrackFlagId { get; set; }
+
+    /// <summary>
+    /// 所属轨迹状态id
+    /// </summary>
+    [SugarColumn(ColumnName = "TrackStatusId")]
+    public int TrackStatusId { get; set; }
+}

src/SJZY.Track.Domain/TrackContentAggregate/TrackContentMapEntity.cs

@@ -0,0 +1,26 @@
+namespace SJZY.Track.Domain.TrackContentAggregate;
+
+/// <summary>
+/// 轨迹内容映射表
+/// </summary>
+[SugarTable("t_track_content_map")]
+public class TrackContentMapEntity : IFullAuditedBasicEntitys
+{
+    /// <summary>
+    /// 自增主键
+    /// </summary>
+    [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
+    public int Id { get; set; }
+
+    /// <summary>
+    /// 映射轨迹内容id
+    /// </summary>
+    [SugarColumn(ColumnName = "MapTrackContentId")]
+    public int MapTrackContentId { get; set; }
+
+    /// <summary>
+    /// 源轨迹内容id
+    /// </summary>
+    [SugarColumn(ColumnName = "TrackContentId")]
+    public int TrackContentId { get; set; }
+}

src/SJZY.Track.Domain/TrackFlagAggregate/ITrackFlagRepository.cs

@@ -0,0 +1,5 @@
+namespace SJZY.Track.Domain.TrackFlagAggregate;
+
+public interface ITrackFlagRepository : IBasicRepository<TrackFlagEntity>
+{
+}

src/SJZY.Track.Domain/TrackFlagAggregate/TrackFlagEntity.cs

@@ -0,0 +1,32 @@
+namespace SJZY.Track.Domain.TrackFlagAggregate;
+
+/// <summary>
+/// 轨迹标记表
+/// </summary>
+[SugarTable("t_track_flag")]
+public class TrackFlagEntity : IFullAuditedBasicEntitys
+{
+    /// <summary>
+    /// 自增主键
+    /// </summary>
+    [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
+    public int Id { get; set; }
+
+    /// <summary>
+    /// 标记代码
+    /// </summary>
+    [SugarColumn(ColumnName = "Code")]
+    public string Code { get; set; }
+
+    /// <summary>
+    /// 标记名称
+    /// </summary>
+    [SugarColumn(ColumnName = "Name")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 子系统id
+    /// </summary>
+    [SugarColumn(ColumnName = "SubSystemId")]
+    public int SubSystemId { get; set; }
+}

src/SJZY.Track.Domain/TrackPullAggregate/TrackPushPullParamsConfigEntity.cs

@@ -0,0 +1,80 @@
+namespace SJZY.Track.Domain.TrackPullAggregate;
+
+/// <summary>
+/// 轨迹拉取/推送参数配置
+/// </summary>
+[SugarTable("t_track_push_pull_params_config")]
+public class TrackPushPullParamsConfigEntity : IFullAuditedBasicEntitys
+{
+    /// <summary>
+    /// 自增主键
+    /// </summary>
+    [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
+    public int Id { get; set; }
+
+    /// <summary>
+    /// 扩展字段参数名
+    /// </summary>
+    [SugarColumn(ColumnName = "ExpandFieldsName")]
+    public string ExpandFieldsName { get; set; }
+
+    /// <summary>
+    /// 推拉模式，0拉取，1推送
+    /// </summary>
+    [SugarColumn(ColumnName = "IsPush")]
+    public bool IsPush { get; set; }
+
+    /// <summary>
+    /// 单号参数名
+    /// </summary>
+    [SugarColumn(ColumnName = "OrderNoName")]
+    public string OrderNoName { get; set; }
+
+    /// <summary>
+    /// 推拉配置id
+    /// </summary>
+    [SugarColumn(ColumnName = "PullOrPushConfigId")]
+    public int PullOrPushConfigId { get; set; }
+
+    /// <summary>
+    /// 轨迹时区参数名
+    /// </summary>
+    [SugarColumn(ColumnName = "TackTimeZoneName")]
+    public string TackTimeZoneName { get; set; }
+
+    /// <summary>
+    /// 轨迹代码参数名
+    /// </summary>
+    [SugarColumn(ColumnName = "TrackContentCodeName")]
+    public string TrackContentCodeName { get; set; }
+
+    /// <summary>
+    /// 轨迹内容参数名
+    /// </summary>
+    [SugarColumn(ColumnName = "TrackContentName")]
+    public string TrackContentName { get; set; }
+
+    /// <summary>
+    /// 轨迹内容英文参数名
+    /// </summary>
+    [SugarColumn(ColumnName = "TrackEnContentName")]
+    public string TrackEnContentName { get; set; }
+
+    /// <summary>
+    /// 轨迹发生地参数名
+    /// </summary>
+    [SugarColumn(ColumnName = "TrackPlaceName")]
+    public string TrackPlaceName { get; set; }
+
+    /// <summary>
+    /// 轨迹状态参数名
+    /// </summary>
+    [SugarColumn(ColumnName = "TrackStatusName")]
+    public string TrackStatusName { get; set; }
+
+    /// <summary>
+    /// 轨迹发生时间参数名
+    /// </summary>
+    [SugarColumn(ColumnName = "TrackTimeName")]
+    public string TrackTimeName { get; set; }
+}

src/SJZY.Track.Domain/TrackPushAggregate/ITrackPushConfigRepository.cs

@@ -0,0 +1,5 @@
+namespace SJZY.Track.Domain.TrackPushAggregate;
+
+public interface ITrackPushConfigRepository : IBasicRepository<TrackPushConfigEntity>
+{
+}

src/SJZY.Track.Domain/TrackPushAggregate/TrackPushConfigEntity.cs

@@ -0,0 +1,44 @@
+namespace SJZY.Track.Domain.TrackPushAggregate;
+
+/// <summary>
+/// 轨迹推送配置表
+/// </summary>
+[SugarTable("t_track_push_config")]
+public class TrackPushConfigEntity : IFullAuditedBasicEntitys
+{
+    /// <summary>
+    /// 自增主键
+    /// </summary>
+    [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
+    public int Id { get; set; }
+
+    /// <summary>
+    /// 客户id（外部主体id）
+    /// </summary>
+    [SugarColumn(ColumnName = "CustomId")]
+    public int CustomId { get; set; }
+
+    /// <summary>
+    /// 是否自动推送
+    /// </summary>
+    [SugarColumn(ColumnName = "IsAutoPush")]
+    public bool IsAutoPush { get; set; }
+
+    /// <summary>
+    /// 服务商id（客户:服务商 1:1）
+    /// </summary>
+    [SugarColumn(ColumnName = "ServiceProviderId")]
+    public int ServiceProviderId { get; set; }
+
+    /// <summary>
+    /// 子系统id
+    /// </summary>
+    [SugarColumn(ColumnName = "SubSystemId")]
+    public int SubSystemId { get; set; }
+
+    /// <summary>
+    /// 模板id（多个之间英文逗号分隔）
+    /// </summary>
+    [SugarColumn(ColumnName = "TrackTemplateId")]
+    public string TrackTemplateId { get; set; }
+}

src/SJZY.Track.Domain/TrackPushAggregate/TrackPushContentConfigEntity.cs

@@ -0,0 +1,74 @@
+namespace SJZY.Track.Domain.TrackPushAggregate;
+
+/// <summary>
+/// 轨迹推送内容配置表
+/// </summary>
+[SugarTable("t_track_push_content_config")]
+public class TrackPushContentConfigEntity : IFullAuditedBasicEntitys
+{
+    /// <summary>
+    /// 自增主键
+    /// </summary>
+    [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
+    public int Id { get; set; }
+
+    /// <summary>
+    /// 扩展字段参数值
+    /// </summary>
+    [SugarColumn(ColumnName = "ExpandFieldsValue")]
+    public string ExpandFieldsValue { get; set; }
+
+    /// <summary>
+    /// 推送单号类型(主数据枚举TrackOrderType)
+    /// </summary>
+    [SugarColumn(ColumnName = "OrderNoType")]
+    public int OrderNoType { get; set; }
+
+    /// <summary>
+    /// 推送轨迹排序
+    /// </summary>
+    [SugarColumn(ColumnName = "Sort")]
+    public int Sort { get; set; }
+
+    /// <summary>
+    /// 轨迹代码参数值
+    /// </summary>
+    [SugarColumn(ColumnName = "TrackContentCodeValue")]
+    public string TrackContentCodeValue { get; set; }
+
+    /// <summary>
+    /// 轨迹内容id
+    /// </summary>
+    [SugarColumn(ColumnName = "TrackContentId")]
+    public int TrackContentId { get; set; }
+
+    /// <summary>
+    /// 轨迹内容参数值
+    /// </summary>
+    [SugarColumn(ColumnName = "TrackContentValue")]
+    public string TrackContentValue { get; set; }
+
+    /// <summary>
+    /// 轨迹内容英文参数值
+    /// </summary>
+    [SugarColumn(ColumnName = "TrackEnContentValue")]
+    public string TrackEnContentValue { get; set; }
+
+    /// <summary>
+    /// 轨迹推送配置id
+    /// </summary>
+    [SugarColumn(ColumnName = "TrackPushConfigId")]
+    public int TrackPushConfigId { get; set; }
+
+    /// <summary>
+    /// 轨迹状态参数值
+    /// </summary>
+    [SugarColumn(ColumnName = "TrackStatusValue")]
+    public string TrackStatusValue { get; set; }
+
+    /// <summary>
+    /// 轨迹时区GMT
+    /// </summary>
+    [SugarColumn(ColumnName = "TrackTimeZone")]
+    public string TrackTimeZone { get; set; }
+}

src/SJZY.Track.Domain/TrackStatusAggregate/ITrackStatusRepository.cs

@@ -0,0 +1,6 @@
+namespace SJZY.Track.Domain.TrackStatusAggregate;
+
+public interface ITrackStatusRepository : IBasicRepository<TrackStatusEntity>
+{
+
+}

src/SJZY.Track.Domain/TrackStatusAggregate/TrackStatusEntity.cs

@@ -0,0 +1,44 @@
+namespace SJZY.Track.Domain.TrackStatusAggregate;
+
+/// <summary>
+/// 轨迹状态表
+/// </summary>
+[SugarTable("t_track_status")]
+public class TrackStatusEntity : IFullAuditedBasicEntitys
+{
+    /// <summary>
+    /// 自增主键
+    /// </summary>
+    [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
+    public int Id { get; set; }
+
+    /// <summary>
+    /// 轨迹状态代码
+    /// </summary>
+    [SugarColumn(ColumnName = "Code")]
+    public string Code { get; set; }
+
+    /// <summary>
+    /// 轨迹状态英文
+    /// </summary>
+    [SugarColumn(ColumnName = "EnStatus")]
+    public string EnStatus { get; set; }
+
+    /// <summary>
+    /// 所属节点（主数据枚举ServiceNode）
+    /// </summary>
+    [SugarColumn(ColumnName = "Node")]
+    public int Node { get; set; }
+
+    /// <summary>
+    /// 轨迹状态
+    /// </summary>
+    [SugarColumn(ColumnName = "Status")]
+    public string Status { get; set; }
+
+    /// <summary>
+    /// 子系统id
+    /// </summary>
+    [SugarColumn(ColumnName = "SubSystemId")]
+    public int SubSystemId { get; set; }
+}

src/SJZY.Track.Domain/TrackTemplateAggregate/Dtos/GetPageTrackTemplateVO.cs

@@ -11,4 +11,14 @@ public class GetPageTrackTemplateVO : PageInfoInput
     /// 关键字
     /// </summary>
     public string Keywords { get; set; }
+
+    ///// <summary>
+    ///// 是否置顶
+    ///// </summary>
+    //public bool IsTop { get; set; }=false;
+
+    /// <summary>
+    /// 轨迹模版id
+    /// </summary>
+    public int TrackTemplateId { get; set; }
 }

src/SJZY.Track.Domain/TrackTemplateAggregate/Dtos/GetTrackTemplateContentDetailOutputVO.cs

@@ -0,0 +1,42 @@
+namespace SJZY.Track.Domain.TrackTemplateAggregate.Dtos
+{
+    public class GetTrackTemplateContentDetailOutputVO
+    {
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 是否可删
+        /// </summary>
+        public bool IsCanDelete { get; set; }
+
+        /// <summary>
+        /// 是否对外
+        /// </summary>
+        public bool IsExternal { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int Sort { get; set; }
+
+        /// <summary>
+        /// 轨迹内容
+        /// </summary>
+        public string TrackContent { get; set; }
+
+        /// <summary>
+        /// 轨迹内容id
+        /// </summary>
+        public int TrackContentId { get; set; }
+
+        /// <summary>
+        /// 轨迹状态
+        /// </summary>
+        public string TrackStatus { get; set; }
+
+        /// <summary>
+        /// 轨迹状态id
+        /// </summary>
+        public int TrackStatusId { get; set; }
+    }
+}

src/SJZY.Track.Domain/TrackTemplateAggregate/Dtos/GetTrackTemplateContentPageInputVO.cs

@@ -0,0 +1,9 @@
+namespace SJZY.Track.Domain.TrackTemplateAggregate.Dtos;
+
+public class GetTrackTemplateContentPageInputVO : PageInfoInput
+{
+    /// <summary>
+    /// 轨迹模板id
+    /// </summary>
+    public int TrackTemplateId { get; set; }
+}

src/SJZY.Track.Domain/TrackTemplateAggregate/Dtos/GetTrackTemplateContentPageOutputVO.cs

@@ -0,0 +1,71 @@
+namespace SJZY.Track.Domain.TrackTemplateAggregate.Dtos;
+
+public class GetTrackTemplateContentPageOutputVO
+{
+    /// <summary>
+    /// 轨迹内容代码
+    /// </summary>
+    public string Code { get; set; }
+
+    /// <summary>
+    /// 轨迹内容
+    /// </summary>
+    public string Content { get; set; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime? CreateTime { get; set; }
+
+    /// <summary>
+    /// 创建人
+    /// </summary>
+    public string CreateUser { get; set; }
+
+    /// <summary>
+    /// 轨迹内容英文
+    /// </summary>
+    public string EnContent { get; set; }
+
+    public int Id { get; set; }
+
+    /// <summary>
+    /// 是否可删
+    /// </summary>
+    public bool IsCanDelete { get; set; }
+
+    /// <summary>
+    /// 是否对外
+    /// </summary>
+    public bool IsExternal { get; set; }
+
+    /// <summary>
+    /// 所属节点
+    /// </summary>
+    public string Node { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public long Sort { get; set; }
+
+    /// <summary>
+    /// 轨迹标记
+    /// </summary>
+    public string TrackFlag { get; set; }
+
+    /// <summary>
+    /// 所属状态
+    /// </summary>
+    public string TrackStatus { get; set; }
+
+    /// <summary>
+    /// 修改时间
+    /// </summary>
+    public DateTime? UpdateTime { get; set; }
+
+    /// <summary>
+    /// 修改人
+    /// </summary>
+    public string UpdateUser { get; set; }
+}

src/SJZY.Track.Domain/TrackTemplateAggregate/ITrackTemplateRepository.cs

@@ -9,4 +9,28 @@ public interface ITrackTemplateRepository : IBasicRepository<TrackTemplateEntity
     Task<GetTrackTemplateDetailVO?> GetDetailAsync(int id);
 
     Task<UnifyPageResultDto<GetTrackTemplateListVO>> GetPageTrackTemplate(GetPageTrackTemplateVO input);
+
+    /// <summary>
+    /// 轨迹模板内容列表
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    Task<UnifyPageResultDto<GetTrackTemplateContentPageOutputVO>> GetContentPageAsync(GetTrackTemplateContentPageInputVO input);
+
+    /// <summary>
+    /// 轨迹模板内容详情
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    Task<GetTrackTemplateContentDetailOutputVO> GetContentDetailAsync(int id);
+
+    Task<bool> IsAnyAsync(Expression<Func<TrackTemplateContentEntity, bool>> whereExpression);
+
+    Task<bool> InsertAsync(TrackTemplateContentEntity insertObj);
+
+    Task<TrackTemplateContentEntity> GetByIdAsync(int id);
+
+    Task<bool> UpdateAsync(TrackTemplateContentEntity updateObj);
+
+    Task<bool> SoftDeleteContentAsync(int id);
 }

src/SJZY.Track.Domain/TrackTemplateAggregate/TrackTemplateContentEntity.cs

@@ -6,7 +6,6 @@
 [SugarTable("t_track_template_content")]
 public class TrackTemplateContentEntity : IFullAuditedBasicEntitys
 {
-
     /// <summary>
     /// 自增主键
     /// </summary>
@@ -42,5 +41,4 @@ public class TrackTemplateContentEntity : IFullAuditedBasicEntitys
     /// </summary>
     [SugarColumn(ColumnName = "TrackTemplateId")]
     public int TrackTemplateId { get; set; }
-
 }

src/SJZY.Track.Domain/VEntities/VEnumValueInfo.cs

@@ -0,0 +1,50 @@
+namespace SJZY.Track.Domain.VEntities;
+
+/// <summary>
+/// 主数据枚举
+/// </summary>
+[SugarTable("v_enum_value_info")]
+public class VEnumValueInfoEntity : IFullAuditedBasicEntitys
+{
+    /// <summary>
+    ///
+    /// </summary>
+    [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
+    public int Id { get; set; }
+
+    /// <summary>
+    /// '属性 开发人员设定，禁止用户修改'
+    /// </summary>
+    [SugarColumn(ColumnName = "Property")]
+    public string Property { get; set; }
+
+    /// <summary>
+    /// '关键字；外部使用：系统自动生成 同一个Property的Enumkey 自动排序递增   内部使用：开发人员设定'
+    /// </summary>
+    [SugarColumn(ColumnName = "Enumkey")]
+    public int Enumkey { get; set; }
+
+    /// <summary>
+    /// 描述
+    /// </summary>
+    [SugarColumn(ColumnName = "Disp")]
+    public string Disp { get; set; }
+
+    /// <summary>
+    /// 描述英文名
+    /// </summary>
+    [SugarColumn(ColumnName = "EnDisp")]
+    public string EnDisp { get; set; }
+
+    /// <summary>
+    /// 是否内部使用,  1是  0不是,外部使用,无需设置此值.
+    /// </summary>
+    [SugarColumn(ColumnName = "IsInside")]
+    public int IsInside { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [SugarColumn(ColumnName = "Remark")]
+    public string Remark { get; set; }
+}

src/SJZY.Track.Domain/VEntities/VExternalSubjectEntity.cs

@@ -1,12 +1,11 @@
-namespace SJZY.Track.Repository.VData.Entitys
+namespace SJZY.Track.Repository.VData.Entitys;
-{
+
 /// <summary>
 /// 外部主体
 /// </summary>
 [SugarTable("v_external_subject")]
 public class VExternalSubjectEntity : IFullAuditedBasicEntitys
 {
-
     /// <summary>
     ///
     /// </summary>
@@ -126,6 +125,4 @@
     /// </summary>
     [SugarColumn(ColumnName = "VerifiedName")]
     public string VerifiedName { get; set; }
-
-    }
 }

src/SJZY.Track.Domain/VEntities/VServiceProviderEntity.cs

@@ -6,7 +6,6 @@
 [SugarTable("v_service_provider")]
 public class VServiceProviderEntity : IFullAuditedBasicEntitys
 {
-
     /// <summary>
     /// 自增主键
     /// </summary>
@@ -72,5 +71,4 @@ public class VServiceProviderEntity : IFullAuditedBasicEntitys
     /// </summary>
     [SugarColumn(ColumnName = "Types")]
     public string Types { get; set; }
-
 }

src/SJZY.Track.Domain/VEntities/VSystemEntity.cs

@@ -6,7 +6,6 @@
 [SugarTable("v_system")]
 public class VSystemEntity : IFullAuditedBasicEntitys
 {
-
     /// <summary>
     /// 子系统id
     /// </summary>
@@ -150,5 +149,4 @@ public class VSystemEntity : IFullAuditedBasicEntitys
     /// </summary>
     [SugarColumn(ColumnName = "Token")]
     public string Token { get; set; }
-
 }

src/SJZY.Track.Domain/VEntities/VUserEntity.cs

@@ -6,7 +6,6 @@
 [SugarTable("v_user")]
 public class VUserEntity : IFullAuditedBasicEntitys
 {
-
     /// <summary>
     /// 用户id
     /// </summary>
@@ -102,5 +101,4 @@ public class VUserEntity : IFullAuditedBasicEntitys
     /// </summary>
     [SugarColumn(ColumnName = "UserOrigin")]
     public bool? UserOrigin { get; set; }
-
 }

src/SJZY.Track.Repository/BasicRepository.cs

@@ -1,5 +1,5 @@
-using System.Linq.Expressions;
+using SJZY.Track.Domain;
-using SJZY.Track.Domain;
+using System.Linq.Expressions;
 using Volo.Abp;
 
 namespace SJZY.Track.Repository;

src/SJZY.Track.Repository/DemoRepository.cs

@@ -1,6 +1,6 @@
-using System.Transactions;
+using SJZY.Track.Domain.DemoAggregate;
-using SJZY.Track.Domain.DemoAggregate;
 using SJZY.Track.Domain.DemoAggregate.Dtos;
+using System.Transactions;
 
 namespace SJZY.Track.Repository
 {

src/SJZY.Track.Repository/Enum/Enums.cs

@@ -0,0 +1,15 @@
+using System.ComponentModel;
+
+namespace SJZY.Track.Repository.Enum;
+
+/// <summary>
+/// 枚举属性
+/// </summary>
+public enum EnumPropertyEnums
+{
+    /// <summary>
+    /// 节点
+    /// </summary>
+    [Description("ServiceNode")]
+    节点,
+}

src/SJZY.Track.Repository/SJZY.Track.Repository.csproj

@@ -24,15 +24,8 @@
 
 
 	<ItemGroup>
-	  <Folder Include="TrackContentMap\ValueObjects\" />
-	  <Folder Include="TrackContent\ValueObjects\" />
-	  <Folder Include="TrackFlag\ValueObjects\" />
-	  <Folder Include="TrackPushConfig\ValueObjects\" />
-	  <Folder Include="TrackPushContentConfig\ValueObjects\" />
-	  <Folder Include="TrackPushPullParamsConfig\ValueObjects\" />
 	  <Folder Include="TrackPushRecordDetails\ValueObjects\" />
 	  <Folder Include="TrackPushRecord\ValueObjects\" />
-	  <Folder Include="TrackStatus\ValueObjects\" />
 	</ItemGroup>
 
 

src/SJZY.Track.Repository/TrackContent/Entitys/TrackContentEntity.cs

@@ -1,53 +0,0 @@
-namespace SJZY.Track.Repository.TrackContent.Entitys
-{
-    /// <summary>
-    /// 轨迹内容
-    /// </summary>
-    [SugarTable("t_track_content")]
-    public class TrackContentEntity : IFullAuditedBasicEntitys
-    {
-
-        /// <summary>
-        /// 自增主键
-        /// </summary>
-        [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
-        public int Id { get; set; }
-
-        /// <summary>
-        /// 轨迹内容代码
-        /// </summary>
-        [SugarColumn(ColumnName = "Code")]
-        public string Code { get; set; }
-
-        /// <summary>
-        /// 轨迹内容
-        /// </summary>
-        [SugarColumn(ColumnName = "Content")]
-        public string Content { get; set; }
-
-        /// <summary>
-        /// 轨迹内容英文
-        /// </summary>
-        [SugarColumn(ColumnName = "EnContent")]
-        public string EnContent { get; set; }
-
-        /// <summary>
-        /// 子系统id
-        /// </summary>
-        [SugarColumn(ColumnName = "SubSystemId")]
-        public int SubSystemId { get; set; }
-
-        /// <summary>
-        /// 轨迹标记id
-        /// </summary>
-        [SugarColumn(ColumnName = "TrackFlagId")]
-        public int TrackFlagId { get; set; }
-
-        /// <summary>
-        /// 所属轨迹状态id
-        /// </summary>
-        [SugarColumn(ColumnName = "TrackStatusId")]
-        public int TrackStatusId { get; set; }
-
-    }
-}

src/SJZY.Track.Repository/TrackContent/Services/ITrackContentRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.TrackContent.Entitys;
-
-namespace SJZY.Track.Repository.TrackContent.Services
-{
-    public interface ITrackContentRepository : ISimpleClient<TrackContentEntity>
-    {
-
-    }
-}

src/SJZY.Track.Repository/TrackContent/Services/TrackContentRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.TrackContent.Entitys;
-
-namespace SJZY.Track.Repository.TrackContent.Services
-{
-    public class TrackContentRepository : BasicRepository<TrackContentEntity>, ITrackContentRepository, IScopedDependency
-    {
-
-    }
-}

src/SJZY.Track.Repository/TrackContentMap/Entitys/TrackContentMapEntity.cs

@@ -1,29 +0,0 @@
-namespace SJZY.Track.Repository.TrackContentMap.Entitys
-{
-    /// <summary>
-    /// 轨迹内容映射表
-    /// </summary>
-    [SugarTable("t_track_content_map")]
-    public class TrackContentMapEntity : IFullAuditedBasicEntitys
-    {
-
-        /// <summary>
-        /// 自增主键
-        /// </summary>
-        [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
-        public int Id { get; set; }
-
-        /// <summary>
-        /// 映射轨迹内容id
-        /// </summary>
-        [SugarColumn(ColumnName = "MapTrackContentId")]
-        public int MapTrackContentId { get; set; }
-
-        /// <summary>
-        /// 源轨迹内容id
-        /// </summary>
-        [SugarColumn(ColumnName = "TrackContentId")]
-        public int TrackContentId { get; set; }
-
-    }
-}

src/SJZY.Track.Repository/TrackContentMap/Services/ITrackContentMapRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.TrackContentMap.Entitys;
-
-namespace SJZY.Track.Repository.TrackContentMap.Services
-{
-    public interface ITrackContentMapRepository : ISimpleClient<TrackContentMapEntity>
-    {
-
-    }
-}

src/SJZY.Track.Repository/TrackContentMap/Services/TrackContentMapRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.TrackContentMap.Entitys;
-
-namespace SJZY.Track.Repository.TrackContentMap.Services
-{
-    public class TrackContentMapRepository : BasicRepository<TrackContentMapEntity>, ITrackContentMapRepository, IScopedDependency
-    {
-
-    }
-}

src/SJZY.Track.Repository/TrackContentRepository.cs

@@ -0,0 +1,7 @@
+using SJZY.Track.Domain.TrackContentAggregate;
+
+namespace SJZY.Track.Repository;
+
+public class TrackContentRepository : BasicRepository<TrackContentEntity>, ITrackContentRepository, IScopedDependency
+{
+}

src/SJZY.Track.Repository/TrackDetailsRepository.cs

@@ -1,8 +1,8 @@
 using Nest;
-using SJZY.Track.Domain.TrackDetailsAggregate;
 using SJZY.Expand.ABP.Core.Logger;
 using SJZY.Expand.ABP.Core.PublicMethords;
 using SJZY.Expand.ElasticSearch.Services;
+using SJZY.Track.Domain.TrackDetailsAggregate;
 using SJZY.Track.Repository.TrackDetails;
 using SJZY.Track.Repository.TrackDetails.Dtos;
 

src/SJZY.Track.Repository/TrackFlag/Entitys/TrackFlagEntity.cs

@@ -1,35 +0,0 @@
-namespace SJZY.Track.Repository.TrackFlag.Entitys
-{
-    /// <summary>
-    /// 轨迹标记表
-    /// </summary>
-    [SugarTable("t_track_flag")]
-    public class TrackFlagEntity : IFullAuditedBasicEntitys
-    {
-
-        /// <summary>
-        /// 自增主键
-        /// </summary>
-        [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
-        public int Id { get; set; }
-
-        /// <summary>
-        /// 标记代码
-        /// </summary>
-        [SugarColumn(ColumnName = "Code")]
-        public string Code { get; set; }
-
-        /// <summary>
-        /// 标记名称
-        /// </summary>
-        [SugarColumn(ColumnName = "Name")]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// 子系统id
-        /// </summary>
-        [SugarColumn(ColumnName = "SubSystemId")]
-        public int SubSystemId { get; set; }
-
-    }
-}

src/SJZY.Track.Repository/TrackFlag/Services/ITrackFlagRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.TrackFlag.Entitys;
-
-namespace SJZY.Track.Repository.TrackFlag.Services
-{
-    public interface ITrackFlagRepository : ISimpleClient<TrackFlagEntity>
-    {
-
-    }
-}

src/SJZY.Track.Repository/TrackFlag/Services/TrackFlagRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.TrackFlag.Entitys;
-
-namespace SJZY.Track.Repository.TrackFlag.Services
-{
-    public class TrackFlagRepository : BasicRepository<TrackFlagEntity>, ITrackFlagRepository, IScopedDependency
-    {
-
-    }
-}

src/SJZY.Track.Repository/TrackFlagRepository.cs

@@ -0,0 +1,7 @@
+using SJZY.Track.Domain.TrackFlagAggregate;
+
+namespace SJZY.Track.Repository;
+
+public class TrackFlagRepository : BasicRepository<TrackFlagEntity>, ITrackFlagRepository, IScopedDependency
+{
+}

src/SJZY.Track.Repository/TrackPullConfigRepository.cs

@@ -1,9 +1,7 @@
 using SJZY.Track.Domain.TrackPullAggregate;
 
-namespace SJZY.Track.Repository
+namespace SJZY.Track.Repository;
-{
+
 public class TrackPullConfigRepository : BasicRepository<TrackPullConfigEntity>, ITrackPullConfigRepository, IScopedDependency
 {
-
-    }
 }

src/SJZY.Track.Repository/TrackPushConfig/Entitys/TrackPushConfigEntity.cs

@@ -1,47 +0,0 @@
-namespace SJZY.Track.Repository.TrackPushConfig.Entitys
-{
-    /// <summary>
-    /// 轨迹推送配置表
-    /// </summary>
-    [SugarTable("t_track_push_config")]
-    public class TrackPushConfigEntity : IFullAuditedBasicEntitys
-    {
-
-        /// <summary>
-        /// 自增主键
-        /// </summary>
-        [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
-        public int Id { get; set; }
-
-        /// <summary>
-        /// 客户id（外部主体id）
-        /// </summary>
-        [SugarColumn(ColumnName = "CustomId")]
-        public int CustomId { get; set; }
-
-        /// <summary>
-        /// 是否自动推送
-        /// </summary>
-        [SugarColumn(ColumnName = "IsAutoPush")]
-        public bool IsAutoPush { get; set; }
-
-        /// <summary>
-        /// 服务商id（客户:服务商 1:1）
-        /// </summary>
-        [SugarColumn(ColumnName = "ServiceProviderId")]
-        public int ServiceProviderId { get; set; }
-
-        /// <summary>
-        /// 子系统id
-        /// </summary>
-        [SugarColumn(ColumnName = "SubSystemId")]
-        public int SubSystemId { get; set; }
-
-        /// <summary>
-        /// 模板id（多个之间英文逗号分隔）
-        /// </summary>
-        [SugarColumn(ColumnName = "TrackTemplateId")]
-        public string TrackTemplateId { get; set; }
-
-    }
-}

src/SJZY.Track.Repository/TrackPushConfig/Services/ITrackPushConfigRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.TrackPushConfig.Entitys;
-
-namespace SJZY.Track.Repository.TrackPushConfig.Services
-{
-    public interface ITrackPushConfigRepository : ISimpleClient<TrackPushConfigEntity>
-    {
-
-    }
-}

src/SJZY.Track.Repository/TrackPushConfig/Services/TrackPushConfigRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.TrackPushConfig.Entitys;
-
-namespace SJZY.Track.Repository.TrackPushConfig.Services
-{
-    public class TrackPushConfigRepository : BasicRepository<TrackPushConfigEntity>, ITrackPushConfigRepository, IScopedDependency
-    {
-
-    }
-}

src/SJZY.Track.Repository/TrackPushConfigRepository.cs

@@ -0,0 +1,7 @@
+using SJZY.Track.Domain.TrackPushAggregate;
+
+namespace SJZY.Track.Repository;
+
+public class TrackPushConfigRepository : BasicRepository<TrackPushConfigEntity>, ITrackPushConfigRepository, IScopedDependency
+{
+}

src/SJZY.Track.Repository/TrackPushContentConfig/Entitys/TrackPushContentConfigEntity.cs

@@ -1,77 +0,0 @@
-namespace SJZY.Track.Repository.TrackPushContentConfig.Entitys
-{
-    /// <summary>
-    /// 轨迹推送内容配置表
-    /// </summary>
-    [SugarTable("t_track_push_content_config")]
-    public class TrackPushContentConfigEntity : IFullAuditedBasicEntitys
-    {
-
-        /// <summary>
-        /// 自增主键
-        /// </summary>
-        [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
-        public int Id { get; set; }
-
-        /// <summary>
-        /// 扩展字段参数值
-        /// </summary>
-        [SugarColumn(ColumnName = "ExpandFieldsValue")]
-        public string ExpandFieldsValue { get; set; }
-
-        /// <summary>
-        /// 推送单号类型(主数据枚举TrackOrderType)
-        /// </summary>
-        [SugarColumn(ColumnName = "OrderNoType")]
-        public int OrderNoType { get; set; }
-
-        /// <summary>
-        /// 推送轨迹排序
-        /// </summary>
-        [SugarColumn(ColumnName = "Sort")]
-        public int Sort { get; set; }
-
-        /// <summary>
-        /// 轨迹代码参数值
-        /// </summary>
-        [SugarColumn(ColumnName = "TrackContentCodeValue")]
-        public string TrackContentCodeValue { get; set; }
-
-        /// <summary>
-        /// 轨迹内容id
-        /// </summary>
-        [SugarColumn(ColumnName = "TrackContentId")]
-        public int TrackContentId { get; set; }
-
-        /// <summary>
-        /// 轨迹内容参数值
-        /// </summary>
-        [SugarColumn(ColumnName = "TrackContentValue")]
-        public string TrackContentValue { get; set; }
-
-        /// <summary>
-        /// 轨迹内容英文参数值
-        /// </summary>
-        [SugarColumn(ColumnName = "TrackEnContentValue")]
-        public string TrackEnContentValue { get; set; }
-
-        /// <summary>
-        /// 轨迹推送配置id
-        /// </summary>
-        [SugarColumn(ColumnName = "TrackPushConfigId")]
-        public int TrackPushConfigId { get; set; }
-
-        /// <summary>
-        /// 轨迹状态参数值
-        /// </summary>
-        [SugarColumn(ColumnName = "TrackStatusValue")]
-        public string TrackStatusValue { get; set; }
-
-        /// <summary>
-        /// 轨迹时区GMT
-        /// </summary>
-        [SugarColumn(ColumnName = "TrackTimeZone")]
-        public string TrackTimeZone { get; set; }
-
-    }
-}

src/SJZY.Track.Repository/TrackPushContentConfig/Services/ITrackPushContentConfigRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.TrackPushContentConfig.Entitys;
-
-namespace SJZY.Track.Repository.TrackPushContentConfig.Services
-{
-    public interface ITrackPushContentConfigRepository : ISimpleClient<TrackPushContentConfigEntity>
-    {
-
-    }
-}

src/SJZY.Track.Repository/TrackPushContentConfig/Services/TrackPushContentConfigRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.TrackPushContentConfig.Entitys;
-
-namespace SJZY.Track.Repository.TrackPushContentConfig.Services
-{
-    public class TrackPushContentConfigRepository : BasicRepository<TrackPushContentConfigEntity>, ITrackPushContentConfigRepository, IScopedDependency
-    {
-
-    }
-}

src/SJZY.Track.Repository/TrackPushPullParamsConfig/Entitys/TrackPushPullParamsConfigEntity.cs

@@ -1,83 +0,0 @@
-namespace SJZY.Track.Repository.TrackPushPullParamsConfig.Entitys
-{
-    /// <summary>
-    /// 轨迹拉取/推送参数配置
-    /// </summary>
-    [SugarTable("t_track_push_pull_params_config")]
-    public class TrackPushPullParamsConfigEntity : IFullAuditedBasicEntitys
-    {
-
-        /// <summary>
-        /// 自增主键
-        /// </summary>
-        [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
-        public int Id { get; set; }
-
-        /// <summary>
-        /// 扩展字段参数名
-        /// </summary>
-        [SugarColumn(ColumnName = "ExpandFieldsName")]
-        public string ExpandFieldsName { get; set; }
-
-        /// <summary>
-        /// 推拉模式，0拉取，1推送
-        /// </summary>
-        [SugarColumn(ColumnName = "IsPush")]
-        public bool IsPush { get; set; }
-
-        /// <summary>
-        /// 单号参数名
-        /// </summary>
-        [SugarColumn(ColumnName = "OrderNoName")]
-        public string OrderNoName { get; set; }
-
-        /// <summary>
-        /// 推拉配置id
-        /// </summary>
-        [SugarColumn(ColumnName = "PullOrPushConfigId")]
-        public int PullOrPushConfigId { get; set; }
-
-        /// <summary>
-        /// 轨迹时区参数名
-        /// </summary>
-        [SugarColumn(ColumnName = "TackTimeZoneName")]
-        public string TackTimeZoneName { get; set; }
-
-        /// <summary>
-        /// 轨迹代码参数名
-        /// </summary>
-        [SugarColumn(ColumnName = "TrackContentCodeName")]
-        public string TrackContentCodeName { get; set; }
-
-        /// <summary>
-        /// 轨迹内容参数名
-        /// </summary>
-        [SugarColumn(ColumnName = "TrackContentName")]
-        public string TrackContentName { get; set; }
-
-        /// <summary>
-        /// 轨迹内容英文参数名
-        /// </summary>
-        [SugarColumn(ColumnName = "TrackEnContentName")]
-        public string TrackEnContentName { get; set; }
-
-        /// <summary>
-        /// 轨迹发生地参数名
-        /// </summary>
-        [SugarColumn(ColumnName = "TrackPlaceName")]
-        public string TrackPlaceName { get; set; }
-
-        /// <summary>
-        /// 轨迹状态参数名
-        /// </summary>
-        [SugarColumn(ColumnName = "TrackStatusName")]
-        public string TrackStatusName { get; set; }
-
-        /// <summary>
-        /// 轨迹发生时间参数名
-        /// </summary>
-        [SugarColumn(ColumnName = "TrackTimeName")]
-        public string TrackTimeName { get; set; }
-
-    }
-}

src/SJZY.Track.Repository/TrackPushPullParamsConfig/Services/ITrackPushPullParamsConfigRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.TrackPushPullParamsConfig.Entitys;
-
-namespace SJZY.Track.Repository.TrackPushPullParamsConfig.Services
-{
-    public interface ITrackPushPullParamsConfigRepository : ISimpleClient<TrackPushPullParamsConfigEntity>
-    {
-
-    }
-}

src/SJZY.Track.Repository/TrackPushPullParamsConfig/Services/TrackPushPullParamsConfigRepository.cs

@@ -1,14 +0,0 @@
-using SJZY.Track.Repository.TrackPushPullParamsConfig.Entitys;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SJZY.Track.Repository.TrackPushPullParamsConfig.Services
-{
-    public class TrackPushPullParamsConfigRepository : BasicRepository<TrackPushPullParamsConfigEntity>, ITrackPushPullParamsConfigRepository, IScopedDependency
-    {
-
-    }
-}

src/SJZY.Track.Repository/TrackStatus/Entitys/TrackStatusEntity.cs

@@ -1,47 +0,0 @@
-namespace SJZY.Track.Repository.TrackStatus.Entitys
-{
-    /// <summary>
-    /// 轨迹状态表
-    /// </summary>
-    [SugarTable("t_track_status")]
-    public class TrackStatusEntity : IFullAuditedBasicEntitys
-    {
-
-        /// <summary>
-        /// 自增主键
-        /// </summary>
-        [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
-        public int Id { get; set; }
-
-        /// <summary>
-        /// 轨迹状态代码
-        /// </summary>
-        [SugarColumn(ColumnName = "Code")]
-        public string Code { get; set; }
-
-        /// <summary>
-        /// 轨迹状态英文
-        /// </summary>
-        [SugarColumn(ColumnName = "EnStatus")]
-        public string EnStatus { get; set; }
-
-        /// <summary>
-        /// 所属节点（主数据枚举ServiceNode）
-        /// </summary>
-        [SugarColumn(ColumnName = "Node")]
-        public int Node { get; set; }
-
-        /// <summary>
-        /// 轨迹状态
-        /// </summary>
-        [SugarColumn(ColumnName = "Status")]
-        public string Status { get; set; }
-
-        /// <summary>
-        /// 子系统id
-        /// </summary>
-        [SugarColumn(ColumnName = "SubSystemId")]
-        public int SubSystemId { get; set; }
-
-    }
-}

src/SJZY.Track.Repository/TrackStatus/Services/ITrackStatusRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.TrackStatus.Entitys;
-
-namespace SJZY.Track.Repository.TrackStatus.Services
-{
-    public interface ITrackStatusRepository : ISimpleClient<TrackStatusEntity>
-    {
-
-    }
-}

src/SJZY.Track.Repository/TrackStatus/Services/TrackStatusRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.TrackStatus.Entitys;
-
-namespace SJZY.Track.Repository.TrackStatus.Services
-{
-    public class TrackStatusRepository : BasicRepository<TrackStatusEntity>, ITrackStatusRepository, IScopedDependency
-    {
-
-    }
-}

src/SJZY.Track.Repository/TrackStatusRepository.cs

@@ -0,0 +1,12 @@
+using SJZY.Track.Domain.TrackStatusAggregate;
+
+namespace SJZY.Track.Repository;
+
+public class TrackStatusRepository : BasicRepository<TrackStatusEntity>, ITrackStatusRepository, IScopedDependency
+{
+    public TrackStatusRepository()
+    {
+    }
+
+
+}

src/SJZY.Track.Repository/TrackTemplateRepository.cs

@@ -1,9 +1,17 @@
-using SJZY.Track.Domain.TrackTemplateAggregate;
+using SJZY.Expand.ABP.Core.Common.Dto;
+using SJZY.Expand.ABP.Core.PublicMethords;
+using SJZY.Track.Domain.TrackContentAggregate;
+using SJZY.Track.Domain.TrackFlagAggregate;
+using SJZY.Track.Domain.TrackStatusAggregate;
+using SJZY.Track.Domain.TrackTemplateAggregate;
 using SJZY.Track.Domain.TrackTemplateAggregate.Dtos;
 using SJZY.Track.Domain.VEntities;
+using SJZY.Track.Repository.Enum;
+using System.Linq.Expressions;
 
 namespace SJZY.Track.Repository;
 
+/// <inheritdoc/>
 public class TrackTemplateRepository : BasicRepository<TrackTemplateEntity>, ITrackTemplateRepository, IScopedDependency
 {
     public Task<TemplateContentDto> GetTemplateContentsAsync(List<int> distinctTemplateIds)
@@ -33,7 +41,6 @@ public class TrackTemplateRepository : BasicRepository<TrackTemplateEntity>, ITr
         return detail;
     }
 
-
     /// <summary>
     /// 分页获取轨迹模版
     /// </summary>
@@ -41,7 +48,8 @@ public class TrackTemplateRepository : BasicRepository<TrackTemplateEntity>, ITr
     /// <returns></returns>
     public async Task<UnifyPageResultDto<GetTrackTemplateListVO>> GetPageTrackTemplate(GetPageTrackTemplateVO input)
     {
-        var pagedList = await Context.Queryable<TrackTemplateEntity>().LeftJoin<VSystemEntity>((a, b) => a.SubSystemId==b.Id)
+        UnifyPageResultDto<GetTrackTemplateListVO> pagedList = new UnifyPageResultDto<GetTrackTemplateListVO>();
+        pagedList = await Context.Queryable<TrackTemplateEntity>().LeftJoin<VSystemEntity>((a, b) => a.SubSystemId == b.Id)
         .WhereIF(input.SubSystemId > 0, (a, b) => a.SubSystemId == input.SubSystemId)
         .WhereIF(!input.Keywords.IsNullOrWhiteSpace(), (a, b) => a.Name.Contains(input.Keywords) || a.Code.Contains(input.Keywords))
         .Select((a, b) => new GetTrackTemplateListVO
@@ -53,6 +61,117 @@ public class TrackTemplateRepository : BasicRepository<TrackTemplateEntity>, ITr
             SubSystem = b.CnName
         })
         .ToPagedListAsync(input.PageIndex, input.PageSize);
+        //如果轨迹模版id传值了，就置顶在第一条
+        if (input.TrackTemplateId>0&& (!pagedList.List.IsNullOrEmpty()))
+        {
+            if (input.PageIndex==1)
+            {
+                bool existCurrent = pagedList.List.Any(x => x.Id==input.TrackTemplateId);
+                if (existCurrent)
+                {
+                    var item = pagedList.List.FirstOrDefault(x => x.Id==input.TrackTemplateId);
+                    pagedList.List.Remove(item);
+                    pagedList.List.Insert(0, item);
+                }
+                else
+                {
+                    var item = await Context.Queryable<TrackTemplateEntity>().LeftJoin<VSystemEntity>((a, b) => a.SubSystemId == b.Id)
+                          .Where((a, b) => a.Id==input.TrackTemplateId)
+                          .Select((a, b) => new GetTrackTemplateListVO
+                          {
+                              Id = a.Id,
+                              Code = a.Code,
+                              CreateTime = a.CreateTime,
+                              Name = a.Name,
+                              SubSystem = b.CnName
+                          })
+                          .FirstAsync();
+                    if (item!=null)
+                    {
+                        var removeItem = pagedList.List.LastOrDefault();
+                        pagedList.List.Remove(removeItem);
+                        pagedList.List.Insert(0, item);
+                    }
+                }
+            }
+        }
+
         return pagedList;
     }
+
+    /// <inheritdoc/>
+    public async Task<UnifyPageResultDto<GetTrackTemplateContentPageOutputVO>> GetContentPageAsync(GetTrackTemplateContentPageInputVO input)
+    {
+        return await Context.Queryable<TrackTemplateContentEntity>()
+            .InnerJoin<TrackContentEntity>((templateContent, trackContent) => templateContent.TrackContentId == trackContent.Id && !trackContent.IsDeleted)
+            .LeftJoin<TrackStatusEntity>((templateContent, trackContent, trackStatus) => trackContent.TrackStatusId == trackStatus.Id && !trackStatus.IsDeleted)
+            .LeftJoin<VEnumValueInfoEntity>((templateContent, trackContent, trackStatus, enumValue) => enumValue.Property == EnumPropertyEnums.节点.GetDescription() && trackStatus.Node == enumValue.Enumkey && !enumValue.IsDeleted)
+            .LeftJoin<TrackFlagEntity>((templateContent, trackContent, trackStatus, enumValue, trackFlag) => trackContent.TrackFlagId == trackFlag.Id && !trackFlag.IsDeleted)
+            .LeftJoin<VUserEntity>((templateContent, trackContent, trackStatus, enumValue, trackFlag, createUser) => templateContent.CreateUserId == createUser.Id && !createUser.IsDeleted)
+            .LeftJoin<VUserEntity>((templateContent, trackContent, trackStatus, enumValue, trackFlag, createUser, updateUser) => templateContent.UpdateUserId == updateUser.Id && !updateUser.IsDeleted)
+            .Filter(null, true)
+            .Where(templateContent => templateContent.TrackTemplateId == input.TrackTemplateId && !templateContent.IsDeleted)
+            .Select((templateContent, trackContent, trackStatus, enumValue, trackFlag, createUser, updateUser) => new GetTrackTemplateContentPageOutputVO
+            {
+                Id = templateContent.Id,
+                TrackStatus = trackStatus.Status,
+                Node = enumValue.Disp,
+                TrackFlag = trackFlag.Name,
+                CreateTime = templateContent.CreateTime,
+                CreateUser = createUser.Name,
+                UpdateTime = templateContent.UpdateTime,
+                UpdateUser = updateUser.Name
+            }, true)
+            .ToPagedListAsync(input.PageIndex, input.PageSize);
+    }
+
+    /// <inheritdoc/>
+    public async Task<GetTrackTemplateContentDetailOutputVO> GetContentDetailAsync(int id)
+    {
+        return await Context.Queryable<TrackTemplateContentEntity>()
+            .InnerJoin<TrackContentEntity>((templateContent, trackContent) => templateContent.TrackContentId == trackContent.Id && !trackContent.IsDeleted)
+            .LeftJoin<TrackStatusEntity>((templateContent, trackContent, trackStatus) => trackContent.TrackStatusId == trackStatus.Id && !trackStatus.IsDeleted)
+            .Filter(null, true)
+            .Where(templateContent => templateContent.Id == id && !templateContent.IsDeleted)
+            .Select((templateContent, trackContent, trackStatus) => new GetTrackTemplateContentDetailOutputVO
+            {
+                Id = templateContent.Id,
+                TrackContent = trackContent.Code + "-" + trackContent.Content,
+                TrackStatus = trackStatus.Status
+            }, true)
+            .SingleAsync();
+    }
+
+    /// <inheritdoc/>
+    public async Task<bool> IsAnyAsync(Expression<Func<TrackTemplateContentEntity, bool>> whereExpression)
+    {
+        return await Context.Queryable<TrackTemplateContentEntity>().Where(whereExpression).AnyAsync();
+    }
+
+    /// <inheritdoc/>
+    public async Task<bool> InsertAsync(TrackTemplateContentEntity insertObj)
+    {
+        return await Context.Insertable(insertObj).ExecuteCommandAsync() > 0;
+    }
+
+    /// <inheritdoc/>
+    public async Task<TrackTemplateContentEntity> GetByIdAsync(int id)
+    {
+        return await Context.Queryable<TrackTemplateContentEntity>().InSingleAsync(id);
+    }
+
+    /// <inheritdoc/>
+    public async Task<bool> UpdateAsync(TrackTemplateContentEntity updateObj)
+    {
+        return await Context.Updateable(updateObj).ExecuteCommandHasChangeAsync();
+    }
+
+    /// <inheritdoc/>
+    public async Task<bool> SoftDeleteContentAsync(int id)
+    {
+        return await Context.Updateable<TrackTemplateContentEntity>()
+            .Where(x => x.Id == id)
+            .SetColumns(nameof(ISoftDeleteBasicEntity.IsDeleted), true)
+            .ExecuteCommandHasChangeAsync();
+    }
 }