From ced9b2144b423bac62f12ecccfd80e6b41681407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=B3=E6=96=87=E7=BF=94?= <878130837@qq.com> Date: Tue, 27 Feb 2024 18:41:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=A2=86=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApplicationModule.cs | 4 +- .../AutoMapper/AutoMapperProfile.cs | 2 +- .../Dtos/ProvideServices/GetTrackInput.cs | 4 +- .../GetPageTrackTemplateInput.cs | 12 +-- .../Dtos/TrackTemplates/GetTrackDetailDto.cs | 13 +-- src/SJZY.Track.Application/GlobalUsing.cs | 1 - .../Services/Demo/InterFaceDemoService.cs | 6 +- .../ProvideServices/TrackQueryService.cs | 4 +- .../TrackTemplates/ITrackTemplateService.cs | 8 +- .../TrackTemplates/TrackTemplateService.cs | 22 +++-- .../EditTrackTemplateInputValidation.cs | 6 -- src/SJZY.Track.Domain/GlobalUsings.cs | 6 +- src/SJZY.Track.Domain/IBasicRepository.cs | 22 ++--- .../SJZY.Track.Domain.csproj | 8 ++ .../SJZYTrackDomainModule.cs | 2 +- .../ITrackContentRepository.cs | 6 ++ .../TrackContentEntity.cs | 50 +++++++++++ .../TrackContentMapEntity.cs | 26 ++++++ .../TrackDetailsIndex.cs | 2 +- .../ITrackFlagRepository.cs | 5 ++ .../TrackFlagAggregate/TrackFlagEntity.cs | 32 +++++++ .../TrackPushPullParamsConfigEntity.cs | 80 ++++++++++++++++++ .../ITrackPushConfigRepository.cs | 5 ++ .../TrackPushConfigEntity.cs | 44 ++++++++++ .../TrackPushContentConfigEntity.cs | 74 +++++++++++++++++ .../ITrackStatusRepository.cs | 5 ++ .../TrackStatusAggregate/TrackStatusEntity.cs | 44 ++++++++++ .../Dtos/GetContentPageInputVO.cs | 9 ++ .../Dtos/GetContentPageOutputVO.cs | 71 ++++++++++++++++ .../ITrackTemplateRepository.cs | 4 +- .../TrackTemplateContentEntity.cs | 2 - .../VEntities/VSystemEntity.cs | 4 +- src/SJZY.Track.Repository/BasicRepository.cs | 8 +- src/SJZY.Track.Repository/DemoRepository.cs | 4 +- .../SJZY.Track.Repository.csproj | 7 -- .../SJZYTrackRepositoryModule.cs | 4 +- .../Entitys/TrackContentEntity.cs | 53 ------------ .../Services/ITrackContentRepository.cs | 9 -- .../Services/TrackContentRepository.cs | 9 -- .../Entitys/TrackContentMapEntity.cs | 29 ------- .../Services/ITrackContentMapRepository.cs | 9 -- .../Services/TrackContentMapRepository.cs | 9 -- .../TrackContentRepository.cs | 7 ++ .../TrackDetailsRepository.cs | 4 +- .../TrackFlag/Entitys/TrackFlagEntity.cs | 35 -------- .../Services/ITrackFlagRepository.cs | 9 -- .../TrackFlag/Services/TrackFlagRepository.cs | 9 -- .../TrackFlagRepository.cs | 7 ++ .../TrackPullConfigRepository.cs | 10 +-- .../Entitys/TrackPushConfigEntity.cs | 47 ----------- .../Services/ITrackPushConfigRepository.cs | 9 -- .../Services/TrackPushConfigRepository.cs | 9 -- .../TrackPushConfigRepository.cs | 7 ++ .../Entitys/TrackPushContentConfigEntity.cs | 77 ----------------- .../ITrackPushContentConfigRepository.cs | 9 -- .../TrackPushContentConfigRepository.cs | 9 -- .../TrackPushPullParamsConfigEntity.cs | 83 ------------------- .../ITrackPushPullParamsConfigRepository.cs | 9 -- .../TrackPushPullParamsConfigRepository.cs | 14 ---- .../TrackStatus/Entitys/TrackStatusEntity.cs | 47 ----------- .../Services/ITrackStatusRepository.cs | 9 -- .../Services/TrackStatusRepository.cs | 9 -- .../TrackStatusRepository.cs | 7 ++ .../TrackTemplateRepository.cs | 48 +++++++---- 64 files changed, 586 insertions(+), 612 deletions(-) create mode 100644 src/SJZY.Track.Domain/TrackContentAggregate/ITrackContentRepository.cs create mode 100644 src/SJZY.Track.Domain/TrackContentAggregate/TrackContentEntity.cs create mode 100644 src/SJZY.Track.Domain/TrackContentAggregate/TrackContentMapEntity.cs create mode 100644 src/SJZY.Track.Domain/TrackFlagAggregate/ITrackFlagRepository.cs create mode 100644 src/SJZY.Track.Domain/TrackFlagAggregate/TrackFlagEntity.cs create mode 100644 src/SJZY.Track.Domain/TrackPullAggregate/TrackPushPullParamsConfigEntity.cs create mode 100644 src/SJZY.Track.Domain/TrackPushAggregate/ITrackPushConfigRepository.cs create mode 100644 src/SJZY.Track.Domain/TrackPushAggregate/TrackPushConfigEntity.cs create mode 100644 src/SJZY.Track.Domain/TrackPushAggregate/TrackPushContentConfigEntity.cs create mode 100644 src/SJZY.Track.Domain/TrackStatusAggregate/ITrackStatusRepository.cs create mode 100644 src/SJZY.Track.Domain/TrackStatusAggregate/TrackStatusEntity.cs create mode 100644 src/SJZY.Track.Domain/TrackTemplateAggregate/Dtos/GetContentPageInputVO.cs create mode 100644 src/SJZY.Track.Domain/TrackTemplateAggregate/Dtos/GetContentPageOutputVO.cs delete mode 100644 src/SJZY.Track.Repository/TrackContent/Entitys/TrackContentEntity.cs delete mode 100644 src/SJZY.Track.Repository/TrackContent/Services/ITrackContentRepository.cs delete mode 100644 src/SJZY.Track.Repository/TrackContent/Services/TrackContentRepository.cs delete mode 100644 src/SJZY.Track.Repository/TrackContentMap/Entitys/TrackContentMapEntity.cs delete mode 100644 src/SJZY.Track.Repository/TrackContentMap/Services/ITrackContentMapRepository.cs delete mode 100644 src/SJZY.Track.Repository/TrackContentMap/Services/TrackContentMapRepository.cs create mode 100644 src/SJZY.Track.Repository/TrackContentRepository.cs delete mode 100644 src/SJZY.Track.Repository/TrackFlag/Entitys/TrackFlagEntity.cs delete mode 100644 src/SJZY.Track.Repository/TrackFlag/Services/ITrackFlagRepository.cs delete mode 100644 src/SJZY.Track.Repository/TrackFlag/Services/TrackFlagRepository.cs create mode 100644 src/SJZY.Track.Repository/TrackFlagRepository.cs delete mode 100644 src/SJZY.Track.Repository/TrackPushConfig/Entitys/TrackPushConfigEntity.cs delete mode 100644 src/SJZY.Track.Repository/TrackPushConfig/Services/ITrackPushConfigRepository.cs delete mode 100644 src/SJZY.Track.Repository/TrackPushConfig/Services/TrackPushConfigRepository.cs create mode 100644 src/SJZY.Track.Repository/TrackPushConfigRepository.cs delete mode 100644 src/SJZY.Track.Repository/TrackPushContentConfig/Entitys/TrackPushContentConfigEntity.cs delete mode 100644 src/SJZY.Track.Repository/TrackPushContentConfig/Services/ITrackPushContentConfigRepository.cs delete mode 100644 src/SJZY.Track.Repository/TrackPushContentConfig/Services/TrackPushContentConfigRepository.cs delete mode 100644 src/SJZY.Track.Repository/TrackPushPullParamsConfig/Entitys/TrackPushPullParamsConfigEntity.cs delete mode 100644 src/SJZY.Track.Repository/TrackPushPullParamsConfig/Services/ITrackPushPullParamsConfigRepository.cs delete mode 100644 src/SJZY.Track.Repository/TrackPushPullParamsConfig/Services/TrackPushPullParamsConfigRepository.cs delete mode 100644 src/SJZY.Track.Repository/TrackStatus/Entitys/TrackStatusEntity.cs delete mode 100644 src/SJZY.Track.Repository/TrackStatus/Services/ITrackStatusRepository.cs delete mode 100644 src/SJZY.Track.Repository/TrackStatus/Services/TrackStatusRepository.cs create mode 100644 src/SJZY.Track.Repository/TrackStatusRepository.cs diff --git a/src/SJZY.Track.Application/ApplicationModule.cs b/src/SJZY.Track.Application/ApplicationModule.cs index 286821bf..899bceee 100644 --- a/src/SJZY.Track.Application/ApplicationModule.cs +++ b/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; diff --git a/src/SJZY.Track.Application/AutoMapper/AutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/AutoMapperProfile.cs index 59910582..e2f97051 100644 --- a/src/SJZY.Track.Application/AutoMapper/AutoMapperProfile.cs +++ b/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; diff --git a/src/SJZY.Track.Application/Dtos/ProvideServices/GetTrackInput.cs b/src/SJZY.Track.Application/Dtos/ProvideServices/GetTrackInput.cs index c1e68789..2dc3c39a 100644 --- a/src/SJZY.Track.Application/Dtos/ProvideServices/GetTrackInput.cs +++ b/src/SJZY.Track.Application/Dtos/ProvideServices/GetTrackInput.cs @@ -24,12 +24,12 @@ public enum SortMethod /// 按轨迹发生时间排序 /// ByTrackTime, - + /// /// 按轨迹发生时间降序 /// ByTrackTimeDesc, - + /// /// 按订单模板排序 /// diff --git a/src/SJZY.Track.Application/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs b/src/SJZY.Track.Application/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs index c118b36b..1c98499d 100644 --- a/src/SJZY.Track.Application/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs +++ b/src/SJZY.Track.Application/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SJZY.Track.Application.Dtos.TrackTemplates +namespace SJZY.Track.Application.Dtos.TrackTemplates { /// /// 获取轨迹模版分页输入 @@ -14,11 +8,11 @@ namespace SJZY.Track.Application.Dtos.TrackTemplates /// /// 子系统id /// - public int SubSystemId { get; set; } + public int SubSystemId { get; set; } /// /// 关键字 /// - public string Keywords { get; set; } + public string Keywords { get; set; } } } diff --git a/src/SJZY.Track.Application/Dtos/TrackTemplates/GetTrackDetailDto.cs b/src/SJZY.Track.Application/Dtos/TrackTemplates/GetTrackDetailDto.cs index ca928b8c..03b4f535 100644 --- a/src/SJZY.Track.Application/Dtos/TrackTemplates/GetTrackDetailDto.cs +++ b/src/SJZY.Track.Application/Dtos/TrackTemplates/GetTrackDetailDto.cs @@ -1,11 +1,4 @@ -using Microsoft.OpenApi.Writers; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SJZY.Track.Application.Dtos.TrackTemplates +namespace SJZY.Track.Application.Dtos.TrackTemplates { /// /// 获取轨迹模版详情 @@ -77,12 +70,12 @@ namespace SJZY.Track.Application.Dtos.TrackTemplates /// /// Id /// - public int Id { set; get; } + public int Id { set; get; } /// /// 操作类型 /// - public OptionType Options { get; set; } + public OptionType Options { get; set; } /// /// 子系统id diff --git a/src/SJZY.Track.Application/GlobalUsing.cs b/src/SJZY.Track.Application/GlobalUsing.cs index 3ee457cc..e21f1746 100644 --- a/src/SJZY.Track.Application/GlobalUsing.cs +++ b/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; diff --git a/src/SJZY.Track.Application/Services/Demo/InterFaceDemoService.cs b/src/SJZY.Track.Application/Services/Demo/InterFaceDemoService.cs index e7781daf..f8170079 100644 --- a/src/SJZY.Track.Application/Services/Demo/InterFaceDemoService.cs +++ b/src/SJZY.Track.Application/Services/Demo/InterFaceDemoService.cs @@ -1,7 +1,7 @@ -using SJZY.Track.Domain.DemoAggregate; -using SJZY.Track.Domain.DemoAggregate.Dtos; -using SJZY.Expand.ABP.Core.Common; +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 { diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackQueryService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackQueryService.cs index 66803064..0cafaeb6 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackQueryService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackQueryService.cs @@ -1,7 +1,7 @@ -using SJZY.Track.Domain.OrderAggregate; -using SJZY.Track.Domain.TrackTemplateAggregate; using SJZY.Track.Application.Dtos.ProvideServices; using SJZY.Track.Domain; +using SJZY.Track.Domain.OrderAggregate; +using SJZY.Track.Domain.TrackTemplateAggregate; using SJZY.Track.Repository.TrackDetails; namespace SJZY.Track.Application.Services.ProvideServices; diff --git a/src/SJZY.Track.Application/Services/TrackTemplates/ITrackTemplateService.cs b/src/SJZY.Track.Application/Services/TrackTemplates/ITrackTemplateService.cs index b082a1ff..f6e29107 100644 --- a/src/SJZY.Track.Application/Services/TrackTemplates/ITrackTemplateService.cs +++ b/src/SJZY.Track.Application/Services/TrackTemplates/ITrackTemplateService.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SJZY.Track.Application.Services.TrackTemplates +namespace SJZY.Track.Application.Services.TrackTemplates { public interface ITrackTemplateService { diff --git a/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs b/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs index 3421669c..acd21ae5 100644 --- a/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs +++ b/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs @@ -9,11 +9,12 @@ namespace SJZY.Track.Application.Services.TrackTemplates; /// 轨迹模版 /// [ApiExplorerSettings(GroupName = "轨迹模版")] -[Route("/Track")] +[Route("/Track/Template")] public class TrackTemplateService : ApplicationService, ITrackTemplateService, IScopedDependency { private readonly ITrackTemplateRepository _trackTemplateRepository; + /// public TrackTemplateService( ITrackTemplateRepository trackTemplateRepository ) @@ -25,7 +26,7 @@ public class TrackTemplateService : ApplicationService, ITrackTemplateService, I /// 轨迹模版编辑 /// /// - [HttpPost("/Template/Edit")] + [HttpPost("Edit")] public async Task EditAsync(EditTrackTemplateInput input) { return input.Options switch @@ -42,7 +43,7 @@ public class TrackTemplateService : ApplicationService, ITrackTemplateService, I /// /// /// - [HttpGet("/Template/GetDetail")] + [HttpGet("GetDetail")] public async Task> GetDetailAsync(int id) { var detailInfo = await _trackTemplateRepository.GetDetailAsync(id); @@ -60,7 +61,7 @@ public class TrackTemplateService : ApplicationService, ITrackTemplateService, I /// /// /// - [HttpPost("/Template/GetList")] + [HttpPost("GetList")] public async Task> GetPageTrackTemplate(GetPageTrackTemplateInput input) { var vo = ObjectMapper.Map(input); @@ -98,5 +99,16 @@ public class TrackTemplateService : ApplicationService, ITrackTemplateService, I return new UnifyResultDto("200", "删除成功", isTrue); } - #endregion + #endregion 私有方法 + + /// + /// 轨迹模板内容列表 + /// + /// + /// + [HttpPost("GetContentPage")] + public async Task> GetContentPageAsync([FromBody] GetContentPageInputVO input) + { + return await _trackTemplateRepository.GetContentPageAsync(input); + } } \ No newline at end of file diff --git a/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateInputValidation.cs b/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateInputValidation.cs index da2ac89b..412e5ef9 100644 --- a/src/SJZY.Track.Application/Validations/TrackTemplates/EditTrackTemplateInputValidation.cs +++ b/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 { diff --git a/src/SJZY.Track.Domain/GlobalUsings.cs b/src/SJZY.Track.Domain/GlobalUsings.cs index e12a965a..439aa8ea 100644 --- a/src/SJZY.Track.Domain/GlobalUsings.cs +++ b/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; \ No newline at end of file diff --git a/src/SJZY.Track.Domain/IBasicRepository.cs b/src/SJZY.Track.Domain/IBasicRepository.cs index 3daf3e9d..05560f86 100644 --- a/src/SJZY.Track.Domain/IBasicRepository.cs +++ b/src/SJZY.Track.Domain/IBasicRepository.cs @@ -8,8 +8,8 @@ public interface IBasicRepository /// /// Task GetFirstAsync(Expression> whereExpression); - - Task GetFirstAsync(Expression> whereExpression,Expression> resultExpression); + + Task GetFirstAsync(Expression> whereExpression, Expression> resultExpression); /// /// get list @@ -17,8 +17,8 @@ public interface IBasicRepository /// /// Task> GetListAsync(Expression> whereExpression); - - Task> GetListAsync(Expression> whereExpression,Expression> resultExpression); + + Task> GetListAsync(Expression> whereExpression, Expression> resultExpression); /// /// count @@ -33,7 +33,7 @@ public interface IBasicRepository /// /// Task IsAnyAsync(Expression> exp); - + /// /// update /// @@ -41,7 +41,7 @@ public interface IBasicRepository /// 要忽略更新的列 /// Task UpdateAsync(T entity, Expression> ignoreColumns); - + /// /// update /// @@ -58,7 +58,7 @@ public interface IBasicRepository /// 不更新默认值列 /// Task UpdateAsync(T entity, bool ignoreAllNullColumns = false, bool ignoreAllDefaultValue = false); - + /// /// 批量更新 /// @@ -66,28 +66,28 @@ public interface IBasicRepository /// 要更新的列 /// Task UpdateRangeAsync(List entities, Expression> updateColumns = null); - + /// /// 软删 /// /// /// Task SoftDeleteAsync(Expression> where); - + /// /// insert /// /// /// Task InsertAsync(T insertObj); - + /// /// 新增返回id /// /// /// Task InsertReturnIdentityAsync(T insertObj); - + /// /// 批量insert /// diff --git a/src/SJZY.Track.Domain/SJZY.Track.Domain.csproj b/src/SJZY.Track.Domain/SJZY.Track.Domain.csproj index 811cfbce..43e82900 100644 --- a/src/SJZY.Track.Domain/SJZY.Track.Domain.csproj +++ b/src/SJZY.Track.Domain/SJZY.Track.Domain.csproj @@ -10,5 +10,13 @@ + + + + + + + + diff --git a/src/SJZY.Track.Domain/SJZYTrackDomainModule.cs b/src/SJZY.Track.Domain/SJZYTrackDomainModule.cs index 09ae6214..e9c743d8 100644 --- a/src/SJZY.Track.Domain/SJZYTrackDomainModule.cs +++ b/src/SJZY.Track.Domain/SJZYTrackDomainModule.cs @@ -2,6 +2,6 @@ namespace SJZY.Track.Domain; -public class SJZYTrackDomainModule:AbpModule +public class SJZYTrackDomainModule : AbpModule { } \ No newline at end of file diff --git a/src/SJZY.Track.Domain/TrackContentAggregate/ITrackContentRepository.cs b/src/SJZY.Track.Domain/TrackContentAggregate/ITrackContentRepository.cs new file mode 100644 index 00000000..110f297e --- /dev/null +++ b/src/SJZY.Track.Domain/TrackContentAggregate/ITrackContentRepository.cs @@ -0,0 +1,6 @@ +namespace SJZY.Track.Domain.TrackContentAggregate +{ + public interface ITrackContentRepository : IBasicRepository + { + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/TrackContentAggregate/TrackContentEntity.cs b/src/SJZY.Track.Domain/TrackContentAggregate/TrackContentEntity.cs new file mode 100644 index 00000000..baaa22de --- /dev/null +++ b/src/SJZY.Track.Domain/TrackContentAggregate/TrackContentEntity.cs @@ -0,0 +1,50 @@ +namespace SJZY.Track.Domain.TrackContentAggregate; + +/// +/// 轨迹内容 +/// +[SugarTable("t_track_content")] +public class TrackContentEntity : IFullAuditedBasicEntitys +{ + /// + /// 自增主键 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 轨迹内容代码 + /// + [SugarColumn(ColumnName = "Code")] + public string Code { get; set; } + + /// + /// 轨迹内容 + /// + [SugarColumn(ColumnName = "Content")] + public string Content { get; set; } + + /// + /// 轨迹内容英文 + /// + [SugarColumn(ColumnName = "EnContent")] + public string EnContent { get; set; } + + /// + /// 子系统id + /// + [SugarColumn(ColumnName = "SubSystemId")] + public int SubSystemId { get; set; } + + /// + /// 轨迹标记id + /// + [SugarColumn(ColumnName = "TrackFlagId")] + public int TrackFlagId { get; set; } + + /// + /// 所属轨迹状态id + /// + [SugarColumn(ColumnName = "TrackStatusId")] + public int TrackStatusId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/TrackContentAggregate/TrackContentMapEntity.cs b/src/SJZY.Track.Domain/TrackContentAggregate/TrackContentMapEntity.cs new file mode 100644 index 00000000..d09351b9 --- /dev/null +++ b/src/SJZY.Track.Domain/TrackContentAggregate/TrackContentMapEntity.cs @@ -0,0 +1,26 @@ +namespace SJZY.Track.Domain.TrackContentAggregate; + +/// +/// 轨迹内容映射表 +/// +[SugarTable("t_track_content_map")] +public class TrackContentMapEntity : IFullAuditedBasicEntitys +{ + /// + /// 自增主键 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 映射轨迹内容id + /// + [SugarColumn(ColumnName = "MapTrackContentId")] + public int MapTrackContentId { get; set; } + + /// + /// 源轨迹内容id + /// + [SugarColumn(ColumnName = "TrackContentId")] + public int TrackContentId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/TrackDetailsAggregate/TrackDetailsIndex.cs b/src/SJZY.Track.Domain/TrackDetailsAggregate/TrackDetailsIndex.cs index b81817ef..d82c1cfc 100644 --- a/src/SJZY.Track.Domain/TrackDetailsAggregate/TrackDetailsIndex.cs +++ b/src/SJZY.Track.Domain/TrackDetailsAggregate/TrackDetailsIndex.cs @@ -47,7 +47,7 @@ public class TrackDetailsIndex : IdBaseIndex /// 原轨迹内容 /// public string OriginTrackContent { get; set; } - + /// /// 原轨迹报文 /// diff --git a/src/SJZY.Track.Domain/TrackFlagAggregate/ITrackFlagRepository.cs b/src/SJZY.Track.Domain/TrackFlagAggregate/ITrackFlagRepository.cs new file mode 100644 index 00000000..1242e908 --- /dev/null +++ b/src/SJZY.Track.Domain/TrackFlagAggregate/ITrackFlagRepository.cs @@ -0,0 +1,5 @@ +namespace SJZY.Track.Domain.TrackFlagAggregate; + +public interface ITrackFlagRepository : IBasicRepository +{ +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/TrackFlagAggregate/TrackFlagEntity.cs b/src/SJZY.Track.Domain/TrackFlagAggregate/TrackFlagEntity.cs new file mode 100644 index 00000000..5a74c55e --- /dev/null +++ b/src/SJZY.Track.Domain/TrackFlagAggregate/TrackFlagEntity.cs @@ -0,0 +1,32 @@ +namespace SJZY.Track.Domain.TrackFlagAggregate; + +/// +/// 轨迹标记表 +/// +[SugarTable("t_track_flag")] +public class TrackFlagEntity : IFullAuditedBasicEntitys +{ + /// + /// 自增主键 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 标记代码 + /// + [SugarColumn(ColumnName = "Code")] + public string Code { get; set; } + + /// + /// 标记名称 + /// + [SugarColumn(ColumnName = "Name")] + public string Name { get; set; } + + /// + /// 子系统id + /// + [SugarColumn(ColumnName = "SubSystemId")] + public int SubSystemId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/TrackPullAggregate/TrackPushPullParamsConfigEntity.cs b/src/SJZY.Track.Domain/TrackPullAggregate/TrackPushPullParamsConfigEntity.cs new file mode 100644 index 00000000..7473bf76 --- /dev/null +++ b/src/SJZY.Track.Domain/TrackPullAggregate/TrackPushPullParamsConfigEntity.cs @@ -0,0 +1,80 @@ +namespace SJZY.Track.Domain.TrackPullAggregate; + +/// +/// 轨迹拉取/推送参数配置 +/// +[SugarTable("t_track_push_pull_params_config")] +public class TrackPushPullParamsConfigEntity : IFullAuditedBasicEntitys +{ + /// + /// 自增主键 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 扩展字段参数名 + /// + [SugarColumn(ColumnName = "ExpandFieldsName")] + public string ExpandFieldsName { get; set; } + + /// + /// 推拉模式，0拉取，1推送 + /// + [SugarColumn(ColumnName = "IsPush")] + public bool IsPush { get; set; } + + /// + /// 单号参数名 + /// + [SugarColumn(ColumnName = "OrderNoName")] + public string OrderNoName { get; set; } + + /// + /// 推拉配置id + /// + [SugarColumn(ColumnName = "PullOrPushConfigId")] + public int PullOrPushConfigId { get; set; } + + /// + /// 轨迹时区参数名 + /// + [SugarColumn(ColumnName = "TackTimeZoneName")] + public string TackTimeZoneName { get; set; } + + /// + /// 轨迹代码参数名 + /// + [SugarColumn(ColumnName = "TrackContentCodeName")] + public string TrackContentCodeName { get; set; } + + /// + /// 轨迹内容参数名 + /// + [SugarColumn(ColumnName = "TrackContentName")] + public string TrackContentName { get; set; } + + /// + /// 轨迹内容英文参数名 + /// + [SugarColumn(ColumnName = "TrackEnContentName")] + public string TrackEnContentName { get; set; } + + /// + /// 轨迹发生地参数名 + /// + [SugarColumn(ColumnName = "TrackPlaceName")] + public string TrackPlaceName { get; set; } + + /// + /// 轨迹状态参数名 + /// + [SugarColumn(ColumnName = "TrackStatusName")] + public string TrackStatusName { get; set; } + + /// + /// 轨迹发生时间参数名 + /// + [SugarColumn(ColumnName = "TrackTimeName")] + public string TrackTimeName { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/TrackPushAggregate/ITrackPushConfigRepository.cs b/src/SJZY.Track.Domain/TrackPushAggregate/ITrackPushConfigRepository.cs new file mode 100644 index 00000000..6f3474b0 --- /dev/null +++ b/src/SJZY.Track.Domain/TrackPushAggregate/ITrackPushConfigRepository.cs @@ -0,0 +1,5 @@ +namespace SJZY.Track.Domain.TrackPushAggregate; + +public interface ITrackPushConfigRepository : IBasicRepository +{ +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/TrackPushAggregate/TrackPushConfigEntity.cs b/src/SJZY.Track.Domain/TrackPushAggregate/TrackPushConfigEntity.cs new file mode 100644 index 00000000..334b93c1 --- /dev/null +++ b/src/SJZY.Track.Domain/TrackPushAggregate/TrackPushConfigEntity.cs @@ -0,0 +1,44 @@ +namespace SJZY.Track.Domain.TrackPushAggregate; + +/// +/// 轨迹推送配置表 +/// +[SugarTable("t_track_push_config")] +public class TrackPushConfigEntity : IFullAuditedBasicEntitys +{ + /// + /// 自增主键 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 客户id（外部主体id） + /// + [SugarColumn(ColumnName = "CustomId")] + public int CustomId { get; set; } + + /// + /// 是否自动推送 + /// + [SugarColumn(ColumnName = "IsAutoPush")] + public bool IsAutoPush { get; set; } + + /// + /// 服务商id（客户:服务商 1:1） + /// + [SugarColumn(ColumnName = "ServiceProviderId")] + public int ServiceProviderId { get; set; } + + /// + /// 子系统id + /// + [SugarColumn(ColumnName = "SubSystemId")] + public int SubSystemId { get; set; } + + /// + /// 模板id（多个之间英文逗号分隔） + /// + [SugarColumn(ColumnName = "TrackTemplateId")] + public string TrackTemplateId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/TrackPushAggregate/TrackPushContentConfigEntity.cs b/src/SJZY.Track.Domain/TrackPushAggregate/TrackPushContentConfigEntity.cs new file mode 100644 index 00000000..db2e408b --- /dev/null +++ b/src/SJZY.Track.Domain/TrackPushAggregate/TrackPushContentConfigEntity.cs @@ -0,0 +1,74 @@ +namespace SJZY.Track.Domain.TrackPushAggregate; + +/// +/// 轨迹推送内容配置表 +/// +[SugarTable("t_track_push_content_config")] +public class TrackPushContentConfigEntity : IFullAuditedBasicEntitys +{ + /// + /// 自增主键 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 扩展字段参数值 + /// + [SugarColumn(ColumnName = "ExpandFieldsValue")] + public string ExpandFieldsValue { get; set; } + + /// + /// 推送单号类型(主数据枚举TrackOrderType) + /// + [SugarColumn(ColumnName = "OrderNoType")] + public int OrderNoType { get; set; } + + /// + /// 推送轨迹排序 + /// + [SugarColumn(ColumnName = "Sort")] + public int Sort { get; set; } + + /// + /// 轨迹代码参数值 + /// + [SugarColumn(ColumnName = "TrackContentCodeValue")] + public string TrackContentCodeValue { get; set; } + + /// + /// 轨迹内容id + /// + [SugarColumn(ColumnName = "TrackContentId")] + public int TrackContentId { get; set; } + + /// + /// 轨迹内容参数值 + /// + [SugarColumn(ColumnName = "TrackContentValue")] + public string TrackContentValue { get; set; } + + /// + /// 轨迹内容英文参数值 + /// + [SugarColumn(ColumnName = "TrackEnContentValue")] + public string TrackEnContentValue { get; set; } + + /// + /// 轨迹推送配置id + /// + [SugarColumn(ColumnName = "TrackPushConfigId")] + public int TrackPushConfigId { get; set; } + + /// + /// 轨迹状态参数值 + /// + [SugarColumn(ColumnName = "TrackStatusValue")] + public string TrackStatusValue { get; set; } + + /// + /// 轨迹时区GMT + /// + [SugarColumn(ColumnName = "TrackTimeZone")] + public string TrackTimeZone { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/TrackStatusAggregate/ITrackStatusRepository.cs b/src/SJZY.Track.Domain/TrackStatusAggregate/ITrackStatusRepository.cs new file mode 100644 index 00000000..bdb5a17d --- /dev/null +++ b/src/SJZY.Track.Domain/TrackStatusAggregate/ITrackStatusRepository.cs @@ -0,0 +1,5 @@ +namespace SJZY.Track.Domain.TrackStatusAggregate; + +public interface ITrackStatusRepository : IBasicRepository +{ +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/TrackStatusAggregate/TrackStatusEntity.cs b/src/SJZY.Track.Domain/TrackStatusAggregate/TrackStatusEntity.cs new file mode 100644 index 00000000..f23c8340 --- /dev/null +++ b/src/SJZY.Track.Domain/TrackStatusAggregate/TrackStatusEntity.cs @@ -0,0 +1,44 @@ +namespace SJZY.Track.Domain.TrackStatusAggregate; + +/// +/// 轨迹状态表 +/// +[SugarTable("t_track_status")] +public class TrackStatusEntity : IFullAuditedBasicEntitys +{ + /// + /// 自增主键 + /// + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 轨迹状态代码 + /// + [SugarColumn(ColumnName = "Code")] + public string Code { get; set; } + + /// + /// 轨迹状态英文 + /// + [SugarColumn(ColumnName = "EnStatus")] + public string EnStatus { get; set; } + + /// + /// 所属节点（主数据枚举ServiceNode） + /// + [SugarColumn(ColumnName = "Node")] + public int Node { get; set; } + + /// + /// 轨迹状态 + /// + [SugarColumn(ColumnName = "Status")] + public string Status { get; set; } + + /// + /// 子系统id + /// + [SugarColumn(ColumnName = "SubSystemId")] + public int SubSystemId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/TrackTemplateAggregate/Dtos/GetContentPageInputVO.cs b/src/SJZY.Track.Domain/TrackTemplateAggregate/Dtos/GetContentPageInputVO.cs new file mode 100644 index 00000000..396fe85b --- /dev/null +++ b/src/SJZY.Track.Domain/TrackTemplateAggregate/Dtos/GetContentPageInputVO.cs @@ -0,0 +1,9 @@ +namespace SJZY.Track.Domain.TrackTemplateAggregate.Dtos; + +public class GetContentPageInputVO : PageInfoInput +{ + /// + /// 轨迹模板id + /// + public int TrackTemplateId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/TrackTemplateAggregate/Dtos/GetContentPageOutputVO.cs b/src/SJZY.Track.Domain/TrackTemplateAggregate/Dtos/GetContentPageOutputVO.cs new file mode 100644 index 00000000..945a4978 --- /dev/null +++ b/src/SJZY.Track.Domain/TrackTemplateAggregate/Dtos/GetContentPageOutputVO.cs @@ -0,0 +1,71 @@ +namespace SJZY.Track.Domain.TrackTemplateAggregate.Dtos; + +public class GetContentPageOutputVO +{ + /// + /// 轨迹内容代码 + /// + public string Code { get; set; } + + /// + /// 轨迹内容 + /// + public string Content { get; set; } + + /// + /// 创建时间 + /// + public string CreateTime { get; set; } + + /// + /// 创建人 + /// + public string CreateUser { get; set; } + + /// + /// 轨迹内容英文 + /// + public string EnContent { get; set; } + + public long? Id { get; set; } + + /// + /// 是否可删 + /// + public bool? IsCanDelete { get; set; } + + /// + /// 是否对外 + /// + public bool? IsExternal { get; set; } + + /// + /// 所属节点 + /// + public string Node { get; set; } + + /// + /// 排序 + /// + public long? Sort { get; set; } + + /// + /// 轨迹标记 + /// + public string TrackFlag { get; set; } + + /// + /// 所属状态 + /// + public string TrackStatus { get; set; } + + /// + /// 修改时间 + /// + public string UpdateTime { get; set; } + + /// + /// 修改人 + /// + public string UpdateUser { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/TrackTemplateAggregate/ITrackTemplateRepository.cs b/src/SJZY.Track.Domain/TrackTemplateAggregate/ITrackTemplateRepository.cs index 4a27aa53..241f85ca 100644 --- a/src/SJZY.Track.Domain/TrackTemplateAggregate/ITrackTemplateRepository.cs +++ b/src/SJZY.Track.Domain/TrackTemplateAggregate/ITrackTemplateRepository.cs @@ -5,8 +5,10 @@ namespace SJZY.Track.Domain.TrackTemplateAggregate; public interface ITrackTemplateRepository : IBasicRepository { Task GetTemplateContentsAsync(List distinctTemplateIds); - + Task GetDetailAsync(int id); Task> GetPageTrackTemplate(GetPageTrackTemplateVO input); + + Task> GetContentPageAsync(GetContentPageInputVO input); } \ No newline at end of file diff --git a/src/SJZY.Track.Domain/TrackTemplateAggregate/TrackTemplateContentEntity.cs b/src/SJZY.Track.Domain/TrackTemplateAggregate/TrackTemplateContentEntity.cs index 4263d227..95f666ae 100644 --- a/src/SJZY.Track.Domain/TrackTemplateAggregate/TrackTemplateContentEntity.cs +++ b/src/SJZY.Track.Domain/TrackTemplateAggregate/TrackTemplateContentEntity.cs @@ -6,7 +6,6 @@ [SugarTable("t_track_template_content")] public class TrackTemplateContentEntity : IFullAuditedBasicEntitys { - /// /// 自增主键 /// @@ -42,5 +41,4 @@ public class TrackTemplateContentEntity : IFullAuditedBasicEntitys /// [SugarColumn(ColumnName = "TrackTemplateId")] public int TrackTemplateId { get; set; } - } \ No newline at end of file diff --git a/src/SJZY.Track.Domain/VEntities/VSystemEntity.cs b/src/SJZY.Track.Domain/VEntities/VSystemEntity.cs index a7166a5b..e1ba1115 100644 --- a/src/SJZY.Track.Domain/VEntities/VSystemEntity.cs +++ b/src/SJZY.Track.Domain/VEntities/VSystemEntity.cs @@ -125,8 +125,8 @@ public class VSystemEntity : IFullAuditedBasicEntitys /// 排序值 /// [SugarColumn(ColumnName = "Sort")] - public int? Sort { get; set; } - + public int? Sort { get; set; } + /// /// 跨境电商物流1 干线物流2 国内代理贸易3 非业务类4 /// diff --git a/src/SJZY.Track.Repository/BasicRepository.cs b/src/SJZY.Track.Repository/BasicRepository.cs index fa2ed22b..d6ed5564 100644 --- a/src/SJZY.Track.Repository/BasicRepository.cs +++ b/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; @@ -8,7 +8,7 @@ namespace SJZY.Track.Repository; /// 仓储基类实现 /// /// -public class BasicRepository : SimpleClient,IBasicRepository where T : class, new() +public class BasicRepository : SimpleClient, IBasicRepository where T : class, new() { public BasicRepository() { @@ -63,7 +63,7 @@ public class BasicRepository : SimpleClient,IBasicRepository where T : // tips: required where if (where == default) return false; - + return await Context.Updateable() .Where(where) .SetColumns(nameof(ISoftDeleteBasicEntity.IsDeleted), 1) diff --git a/src/SJZY.Track.Repository/DemoRepository.cs b/src/SJZY.Track.Repository/DemoRepository.cs index 6cdfe78b..3d8135f9 100644 --- a/src/SJZY.Track.Repository/DemoRepository.cs +++ b/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 { diff --git a/src/SJZY.Track.Repository/SJZY.Track.Repository.csproj b/src/SJZY.Track.Repository/SJZY.Track.Repository.csproj index 8752942a..e4341712 100644 --- a/src/SJZY.Track.Repository/SJZY.Track.Repository.csproj +++ b/src/SJZY.Track.Repository/SJZY.Track.Repository.csproj @@ -24,15 +24,8 @@ - - - - - - - diff --git a/src/SJZY.Track.Repository/SJZYTrackRepositoryModule.cs b/src/SJZY.Track.Repository/SJZYTrackRepositoryModule.cs index 61701b13..2d26e40d 100644 --- a/src/SJZY.Track.Repository/SJZYTrackRepositoryModule.cs +++ b/src/SJZY.Track.Repository/SJZYTrackRepositoryModule.cs @@ -32,8 +32,8 @@ public class SJZYTrackRepositoryModule : AbpModule } ); }, DataBaseContext.OnExcutingAction, "SJZY.Track.Repository"); - - + + context.Services.AddScoped(typeof(IBasicRepository<>), typeof(BasicRepository<>)); diff --git a/src/SJZY.Track.Repository/TrackContent/Entitys/TrackContentEntity.cs b/src/SJZY.Track.Repository/TrackContent/Entitys/TrackContentEntity.cs deleted file mode 100644 index 29ef777a..00000000 --- a/src/SJZY.Track.Repository/TrackContent/Entitys/TrackContentEntity.cs +++ /dev/null @@ -1,53 +0,0 @@ -namespace SJZY.Track.Repository.TrackContent.Entitys -{ - /// - /// 轨迹内容 - /// - [SugarTable("t_track_content")] - public class TrackContentEntity : IFullAuditedBasicEntitys - { - - /// - /// 自增主键 - /// - [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] - public int Id { get; set; } - - /// - /// 轨迹内容代码 - /// - [SugarColumn(ColumnName = "Code")] - public string Code { get; set; } - - /// - /// 轨迹内容 - /// - [SugarColumn(ColumnName = "Content")] - public string Content { get; set; } - - /// - /// 轨迹内容英文 - /// - [SugarColumn(ColumnName = "EnContent")] - public string EnContent { get; set; } - - /// - /// 子系统id - /// - [SugarColumn(ColumnName = "SubSystemId")] - public int SubSystemId { get; set; } - - /// - /// 轨迹标记id - /// - [SugarColumn(ColumnName = "TrackFlagId")] - public int TrackFlagId { get; set; } - - /// - /// 所属轨迹状态id - /// - [SugarColumn(ColumnName = "TrackStatusId")] - public int TrackStatusId { get; set; } - - } -} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/TrackContent/Services/ITrackContentRepository.cs b/src/SJZY.Track.Repository/TrackContent/Services/ITrackContentRepository.cs deleted file mode 100644 index e07a950a..00000000 --- a/src/SJZY.Track.Repository/TrackContent/Services/ITrackContentRepository.cs +++ /dev/null @@ -1,9 +0,0 @@ -using SJZY.Track.Repository.TrackContent.Entitys; - -namespace SJZY.Track.Repository.TrackContent.Services -{ - public interface ITrackContentRepository : ISimpleClient - { - - } -} diff --git a/src/SJZY.Track.Repository/TrackContent/Services/TrackContentRepository.cs b/src/SJZY.Track.Repository/TrackContent/Services/TrackContentRepository.cs deleted file mode 100644 index 28163046..00000000 --- a/src/SJZY.Track.Repository/TrackContent/Services/TrackContentRepository.cs +++ /dev/null @@ -1,9 +0,0 @@ -using SJZY.Track.Repository.TrackContent.Entitys; - -namespace SJZY.Track.Repository.TrackContent.Services -{ - public class TrackContentRepository : BasicRepository, ITrackContentRepository, IScopedDependency - { - - } -} diff --git a/src/SJZY.Track.Repository/TrackContentMap/Entitys/TrackContentMapEntity.cs b/src/SJZY.Track.Repository/TrackContentMap/Entitys/TrackContentMapEntity.cs deleted file mode 100644 index b8b5f757..00000000 --- a/src/SJZY.Track.Repository/TrackContentMap/Entitys/TrackContentMapEntity.cs +++ /dev/null @@ -1,29 +0,0 @@ -namespace SJZY.Track.Repository.TrackContentMap.Entitys -{ - /// - /// 轨迹内容映射表 - /// - [SugarTable("t_track_content_map")] - public class TrackContentMapEntity : IFullAuditedBasicEntitys - { - - /// - /// 自增主键 - /// - [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] - public int Id { get; set; } - - /// - /// 映射轨迹内容id - /// - [SugarColumn(ColumnName = "MapTrackContentId")] - public int MapTrackContentId { get; set; } - - /// - /// 源轨迹内容id - /// - [SugarColumn(ColumnName = "TrackContentId")] - public int TrackContentId { get; set; } - - } -} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/TrackContentMap/Services/ITrackContentMapRepository.cs b/src/SJZY.Track.Repository/TrackContentMap/Services/ITrackContentMapRepository.cs deleted file mode 100644 index 9aab5da6..00000000 --- a/src/SJZY.Track.Repository/TrackContentMap/Services/ITrackContentMapRepository.cs +++ /dev/null @@ -1,9 +0,0 @@ -using SJZY.Track.Repository.TrackContentMap.Entitys; - -namespace SJZY.Track.Repository.TrackContentMap.Services -{ - public interface ITrackContentMapRepository : ISimpleClient - { - - } -} diff --git a/src/SJZY.Track.Repository/TrackContentMap/Services/TrackContentMapRepository.cs b/src/SJZY.Track.Repository/TrackContentMap/Services/TrackContentMapRepository.cs deleted file mode 100644 index 4e6783c4..00000000 --- a/src/SJZY.Track.Repository/TrackContentMap/Services/TrackContentMapRepository.cs +++ /dev/null @@ -1,9 +0,0 @@ -using SJZY.Track.Repository.TrackContentMap.Entitys; - -namespace SJZY.Track.Repository.TrackContentMap.Services -{ - public class TrackContentMapRepository : BasicRepository, ITrackContentMapRepository, IScopedDependency - { - - } -} diff --git a/src/SJZY.Track.Repository/TrackContentRepository.cs b/src/SJZY.Track.Repository/TrackContentRepository.cs new file mode 100644 index 00000000..8214de10 --- /dev/null +++ b/src/SJZY.Track.Repository/TrackContentRepository.cs @@ -0,0 +1,7 @@ +using SJZY.Track.Domain.TrackContentAggregate; + +namespace SJZY.Track.Repository; + +public class TrackContentRepository : BasicRepository, ITrackContentRepository, IScopedDependency +{ +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/TrackDetailsRepository.cs b/src/SJZY.Track.Repository/TrackDetailsRepository.cs index 3431bd6b..2b16dde8 100644 --- a/src/SJZY.Track.Repository/TrackDetailsRepository.cs +++ b/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; @@ -33,7 +33,7 @@ internal class TrackDetailsRepository : ElasticSearchContextAbstract> GetListAsync(List orderNos) { if (orderNos.Count < 1) return new List(); - + var data = await Context.SearchAsync(x => x .Source(s => s.Includes(fd => fd .Field(f => f.TrackStatus) diff --git a/src/SJZY.Track.Repository/TrackFlag/Entitys/TrackFlagEntity.cs b/src/SJZY.Track.Repository/TrackFlag/Entitys/TrackFlagEntity.cs deleted file mode 100644 index 11b86c26..00000000 --- a/src/SJZY.Track.Repository/TrackFlag/Entitys/TrackFlagEntity.cs +++ /dev/null @@ -1,35 +0,0 @@ -namespace SJZY.Track.Repository.TrackFlag.Entitys -{ - /// - /// 轨迹标记表 - /// - [SugarTable("t_track_flag")] - public class TrackFlagEntity : IFullAuditedBasicEntitys - { - - /// - /// 自增主键 - /// - [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] - public int Id { get; set; } - - /// - /// 标记代码 - /// - [SugarColumn(ColumnName = "Code")] - public string Code { get; set; } - - /// - /// 标记名称 - /// - [SugarColumn(ColumnName = "Name")] - public string Name { get; set; } - - /// - /// 子系统id - /// - [SugarColumn(ColumnName = "SubSystemId")] - public int SubSystemId { get; set; } - - } -} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/TrackFlag/Services/ITrackFlagRepository.cs b/src/SJZY.Track.Repository/TrackFlag/Services/ITrackFlagRepository.cs deleted file mode 100644 index 709655e5..00000000 --- a/src/SJZY.Track.Repository/TrackFlag/Services/ITrackFlagRepository.cs +++ /dev/null @@ -1,9 +0,0 @@ -using SJZY.Track.Repository.TrackFlag.Entitys; - -namespace SJZY.Track.Repository.TrackFlag.Services -{ - public interface ITrackFlagRepository : ISimpleClient - { - - } -} diff --git a/src/SJZY.Track.Repository/TrackFlag/Services/TrackFlagRepository.cs b/src/SJZY.Track.Repository/TrackFlag/Services/TrackFlagRepository.cs deleted file mode 100644 index 2a6977fc..00000000 --- a/src/SJZY.Track.Repository/TrackFlag/Services/TrackFlagRepository.cs +++ /dev/null @@ -1,9 +0,0 @@ -using SJZY.Track.Repository.TrackFlag.Entitys; - -namespace SJZY.Track.Repository.TrackFlag.Services -{ - public class TrackFlagRepository : BasicRepository, ITrackFlagRepository, IScopedDependency - { - - } -} diff --git a/src/SJZY.Track.Repository/TrackFlagRepository.cs b/src/SJZY.Track.Repository/TrackFlagRepository.cs new file mode 100644 index 00000000..360c71fd --- /dev/null +++ b/src/SJZY.Track.Repository/TrackFlagRepository.cs @@ -0,0 +1,7 @@ +using SJZY.Track.Domain.TrackFlagAggregate; + +namespace SJZY.Track.Repository; + +public class TrackFlagRepository : BasicRepository, ITrackFlagRepository, IScopedDependency +{ +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/TrackPullConfigRepository.cs b/src/SJZY.Track.Repository/TrackPullConfigRepository.cs index c67087b4..85723f1e 100644 --- a/src/SJZY.Track.Repository/TrackPullConfigRepository.cs +++ b/src/SJZY.Track.Repository/TrackPullConfigRepository.cs @@ -1,9 +1,7 @@ using SJZY.Track.Domain.TrackPullAggregate; -namespace SJZY.Track.Repository -{ - public class TrackPullConfigRepository : BasicRepository, ITrackPullConfigRepository, IScopedDependency - { +namespace SJZY.Track.Repository; - } -} +public class TrackPullConfigRepository : BasicRepository, ITrackPullConfigRepository, IScopedDependency +{ +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/TrackPushConfig/Entitys/TrackPushConfigEntity.cs b/src/SJZY.Track.Repository/TrackPushConfig/Entitys/TrackPushConfigEntity.cs deleted file mode 100644 index 5c99ec50..00000000 --- a/src/SJZY.Track.Repository/TrackPushConfig/Entitys/TrackPushConfigEntity.cs +++ /dev/null @@ -1,47 +0,0 @@ -namespace SJZY.Track.Repository.TrackPushConfig.Entitys -{ - /// - /// 轨迹推送配置表 - /// - [SugarTable("t_track_push_config")] - public class TrackPushConfigEntity : IFullAuditedBasicEntitys - { - - /// - /// 自增主键 - /// - [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] - public int Id { get; set; } - - /// - /// 客户id（外部主体id） - /// - [SugarColumn(ColumnName = "CustomId")] - public int CustomId { get; set; } - - /// - /// 是否自动推送 - /// - [SugarColumn(ColumnName = "IsAutoPush")] - public bool IsAutoPush { get; set; } - - /// - /// 服务商id（客户:服务商 1:1） - /// - [SugarColumn(ColumnName = "ServiceProviderId")] - public int ServiceProviderId { get; set; } - - /// - /// 子系统id - /// - [SugarColumn(ColumnName = "SubSystemId")] - public int SubSystemId { get; set; } - - /// - /// 模板id（多个之间英文逗号分隔） - /// - [SugarColumn(ColumnName = "TrackTemplateId")] - public string TrackTemplateId { get; set; } - - } -} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/TrackPushConfig/Services/ITrackPushConfigRepository.cs b/src/SJZY.Track.Repository/TrackPushConfig/Services/ITrackPushConfigRepository.cs deleted file mode 100644 index 72f31a32..00000000 --- a/src/SJZY.Track.Repository/TrackPushConfig/Services/ITrackPushConfigRepository.cs +++ /dev/null @@ -1,9 +0,0 @@ -using SJZY.Track.Repository.TrackPushConfig.Entitys; - -namespace SJZY.Track.Repository.TrackPushConfig.Services -{ - public interface ITrackPushConfigRepository : ISimpleClient - { - - } -} diff --git a/src/SJZY.Track.Repository/TrackPushConfig/Services/TrackPushConfigRepository.cs b/src/SJZY.Track.Repository/TrackPushConfig/Services/TrackPushConfigRepository.cs deleted file mode 100644 index 529fef74..00000000 --- a/src/SJZY.Track.Repository/TrackPushConfig/Services/TrackPushConfigRepository.cs +++ /dev/null @@ -1,9 +0,0 @@ -using SJZY.Track.Repository.TrackPushConfig.Entitys; - -namespace SJZY.Track.Repository.TrackPushConfig.Services -{ - public class TrackPushConfigRepository : BasicRepository, ITrackPushConfigRepository, IScopedDependency - { - - } -} diff --git a/src/SJZY.Track.Repository/TrackPushConfigRepository.cs b/src/SJZY.Track.Repository/TrackPushConfigRepository.cs new file mode 100644 index 00000000..b47db5ee --- /dev/null +++ b/src/SJZY.Track.Repository/TrackPushConfigRepository.cs @@ -0,0 +1,7 @@ +using SJZY.Track.Domain.TrackPushAggregate; + +namespace SJZY.Track.Repository; + +public class TrackPushConfigRepository : BasicRepository, ITrackPushConfigRepository, IScopedDependency +{ +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/TrackPushContentConfig/Entitys/TrackPushContentConfigEntity.cs b/src/SJZY.Track.Repository/TrackPushContentConfig/Entitys/TrackPushContentConfigEntity.cs deleted file mode 100644 index 7caefd7a..00000000 --- a/src/SJZY.Track.Repository/TrackPushContentConfig/Entitys/TrackPushContentConfigEntity.cs +++ /dev/null @@ -1,77 +0,0 @@ -namespace SJZY.Track.Repository.TrackPushContentConfig.Entitys -{ - /// - /// 轨迹推送内容配置表 - /// - [SugarTable("t_track_push_content_config")] - public class TrackPushContentConfigEntity : IFullAuditedBasicEntitys - { - - /// - /// 自增主键 - /// - [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] - public int Id { get; set; } - - /// - /// 扩展字段参数值 - /// - [SugarColumn(ColumnName = "ExpandFieldsValue")] - public string ExpandFieldsValue { get; set; } - - /// - /// 推送单号类型(主数据枚举TrackOrderType) - /// - [SugarColumn(ColumnName = "OrderNoType")] - public int OrderNoType { get; set; } - - /// - /// 推送轨迹排序 - /// - [SugarColumn(ColumnName = "Sort")] - public int Sort { get; set; } - - /// - /// 轨迹代码参数值 - /// - [SugarColumn(ColumnName = "TrackContentCodeValue")] - public string TrackContentCodeValue { get; set; } - - /// - /// 轨迹内容id - /// - [SugarColumn(ColumnName = "TrackContentId")] - public int TrackContentId { get; set; } - - /// - /// 轨迹内容参数值 - /// - [SugarColumn(ColumnName = "TrackContentValue")] - public string TrackContentValue { get; set; } - - /// - /// 轨迹内容英文参数值 - /// - [SugarColumn(ColumnName = "TrackEnContentValue")] - public string TrackEnContentValue { get; set; } - - /// - /// 轨迹推送配置id - /// - [SugarColumn(ColumnName = "TrackPushConfigId")] - public int TrackPushConfigId { get; set; } - - /// - /// 轨迹状态参数值 - /// - [SugarColumn(ColumnName = "TrackStatusValue")] - public string TrackStatusValue { get; set; } - - /// - /// 轨迹时区GMT - /// - [SugarColumn(ColumnName = "TrackTimeZone")] - public string TrackTimeZone { get; set; } - - } -} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/TrackPushContentConfig/Services/ITrackPushContentConfigRepository.cs b/src/SJZY.Track.Repository/TrackPushContentConfig/Services/ITrackPushContentConfigRepository.cs deleted file mode 100644 index aac710d9..00000000 --- a/src/SJZY.Track.Repository/TrackPushContentConfig/Services/ITrackPushContentConfigRepository.cs +++ /dev/null @@ -1,9 +0,0 @@ -using SJZY.Track.Repository.TrackPushContentConfig.Entitys; - -namespace SJZY.Track.Repository.TrackPushContentConfig.Services -{ - public interface ITrackPushContentConfigRepository : ISimpleClient - { - - } -} diff --git a/src/SJZY.Track.Repository/TrackPushContentConfig/Services/TrackPushContentConfigRepository.cs b/src/SJZY.Track.Repository/TrackPushContentConfig/Services/TrackPushContentConfigRepository.cs deleted file mode 100644 index 0c2eb86e..00000000 --- a/src/SJZY.Track.Repository/TrackPushContentConfig/Services/TrackPushContentConfigRepository.cs +++ /dev/null @@ -1,9 +0,0 @@ -using SJZY.Track.Repository.TrackPushContentConfig.Entitys; - -namespace SJZY.Track.Repository.TrackPushContentConfig.Services -{ - public class TrackPushContentConfigRepository : BasicRepository, ITrackPushContentConfigRepository, IScopedDependency - { - - } -} diff --git a/src/SJZY.Track.Repository/TrackPushPullParamsConfig/Entitys/TrackPushPullParamsConfigEntity.cs b/src/SJZY.Track.Repository/TrackPushPullParamsConfig/Entitys/TrackPushPullParamsConfigEntity.cs deleted file mode 100644 index 3f0ca590..00000000 --- a/src/SJZY.Track.Repository/TrackPushPullParamsConfig/Entitys/TrackPushPullParamsConfigEntity.cs +++ /dev/null @@ -1,83 +0,0 @@ -namespace SJZY.Track.Repository.TrackPushPullParamsConfig.Entitys -{ - /// - /// 轨迹拉取/推送参数配置 - /// - [SugarTable("t_track_push_pull_params_config")] - public class TrackPushPullParamsConfigEntity : IFullAuditedBasicEntitys - { - - /// - /// 自增主键 - /// - [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] - public int Id { get; set; } - - /// - /// 扩展字段参数名 - /// - [SugarColumn(ColumnName = "ExpandFieldsName")] - public string ExpandFieldsName { get; set; } - - /// - /// 推拉模式，0拉取，1推送 - /// - [SugarColumn(ColumnName = "IsPush")] - public bool IsPush { get; set; } - - /// - /// 单号参数名 - /// - [SugarColumn(ColumnName = "OrderNoName")] - public string OrderNoName { get; set; } - - /// - /// 推拉配置id - /// - [SugarColumn(ColumnName = "PullOrPushConfigId")] - public int PullOrPushConfigId { get; set; } - - /// - /// 轨迹时区参数名 - /// - [SugarColumn(ColumnName = "TackTimeZoneName")] - public string TackTimeZoneName { get; set; } - - /// - /// 轨迹代码参数名 - /// - [SugarColumn(ColumnName = "TrackContentCodeName")] - public string TrackContentCodeName { get; set; } - - /// - /// 轨迹内容参数名 - /// - [SugarColumn(ColumnName = "TrackContentName")] - public string TrackContentName { get; set; } - - /// - /// 轨迹内容英文参数名 - /// - [SugarColumn(ColumnName = "TrackEnContentName")] - public string TrackEnContentName { get; set; } - - /// - /// 轨迹发生地参数名 - /// - [SugarColumn(ColumnName = "TrackPlaceName")] - public string TrackPlaceName { get; set; } - - /// - /// 轨迹状态参数名 - /// - [SugarColumn(ColumnName = "TrackStatusName")] - public string TrackStatusName { get; set; } - - /// - /// 轨迹发生时间参数名 - /// - [SugarColumn(ColumnName = "TrackTimeName")] - public string TrackTimeName { get; set; } - - } -} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/TrackPushPullParamsConfig/Services/ITrackPushPullParamsConfigRepository.cs b/src/SJZY.Track.Repository/TrackPushPullParamsConfig/Services/ITrackPushPullParamsConfigRepository.cs deleted file mode 100644 index 4098b145..00000000 --- a/src/SJZY.Track.Repository/TrackPushPullParamsConfig/Services/ITrackPushPullParamsConfigRepository.cs +++ /dev/null @@ -1,9 +0,0 @@ -using SJZY.Track.Repository.TrackPushPullParamsConfig.Entitys; - -namespace SJZY.Track.Repository.TrackPushPullParamsConfig.Services -{ - public interface ITrackPushPullParamsConfigRepository : ISimpleClient - { - - } -} diff --git a/src/SJZY.Track.Repository/TrackPushPullParamsConfig/Services/TrackPushPullParamsConfigRepository.cs b/src/SJZY.Track.Repository/TrackPushPullParamsConfig/Services/TrackPushPullParamsConfigRepository.cs deleted file mode 100644 index a24556d1..00000000 --- a/src/SJZY.Track.Repository/TrackPushPullParamsConfig/Services/TrackPushPullParamsConfigRepository.cs +++ /dev/null @@ -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, ITrackPushPullParamsConfigRepository, IScopedDependency - { - - } -} diff --git a/src/SJZY.Track.Repository/TrackStatus/Entitys/TrackStatusEntity.cs b/src/SJZY.Track.Repository/TrackStatus/Entitys/TrackStatusEntity.cs deleted file mode 100644 index f0d60726..00000000 --- a/src/SJZY.Track.Repository/TrackStatus/Entitys/TrackStatusEntity.cs +++ /dev/null @@ -1,47 +0,0 @@ -namespace SJZY.Track.Repository.TrackStatus.Entitys -{ - /// - /// 轨迹状态表 - /// - [SugarTable("t_track_status")] - public class TrackStatusEntity : IFullAuditedBasicEntitys - { - - /// - /// 自增主键 - /// - [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] - public int Id { get; set; } - - /// - /// 轨迹状态代码 - /// - [SugarColumn(ColumnName = "Code")] - public string Code { get; set; } - - /// - /// 轨迹状态英文 - /// - [SugarColumn(ColumnName = "EnStatus")] - public string EnStatus { get; set; } - - /// - /// 所属节点（主数据枚举ServiceNode） - /// - [SugarColumn(ColumnName = "Node")] - public int Node { get; set; } - - /// - /// 轨迹状态 - /// - [SugarColumn(ColumnName = "Status")] - public string Status { get; set; } - - /// - /// 子系统id - /// - [SugarColumn(ColumnName = "SubSystemId")] - public int SubSystemId { get; set; } - - } -} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/TrackStatus/Services/ITrackStatusRepository.cs b/src/SJZY.Track.Repository/TrackStatus/Services/ITrackStatusRepository.cs deleted file mode 100644 index aeed1fbf..00000000 --- a/src/SJZY.Track.Repository/TrackStatus/Services/ITrackStatusRepository.cs +++ /dev/null @@ -1,9 +0,0 @@ -using SJZY.Track.Repository.TrackStatus.Entitys; - -namespace SJZY.Track.Repository.TrackStatus.Services -{ - public interface ITrackStatusRepository : ISimpleClient - { - - } -} diff --git a/src/SJZY.Track.Repository/TrackStatus/Services/TrackStatusRepository.cs b/src/SJZY.Track.Repository/TrackStatus/Services/TrackStatusRepository.cs deleted file mode 100644 index 67425dff..00000000 --- a/src/SJZY.Track.Repository/TrackStatus/Services/TrackStatusRepository.cs +++ /dev/null @@ -1,9 +0,0 @@ -using SJZY.Track.Repository.TrackStatus.Entitys; - -namespace SJZY.Track.Repository.TrackStatus.Services -{ - public class TrackStatusRepository : BasicRepository, ITrackStatusRepository, IScopedDependency - { - - } -} diff --git a/src/SJZY.Track.Repository/TrackStatusRepository.cs b/src/SJZY.Track.Repository/TrackStatusRepository.cs new file mode 100644 index 00000000..6ac8f9cc --- /dev/null +++ b/src/SJZY.Track.Repository/TrackStatusRepository.cs @@ -0,0 +1,7 @@ +using SJZY.Track.Domain.TrackStatusAggregate; + +namespace SJZY.Track.Repository; + +public class TrackStatusRepository : BasicRepository, ITrackStatusRepository, IScopedDependency +{ +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/TrackTemplateRepository.cs b/src/SJZY.Track.Repository/TrackTemplateRepository.cs index 6ac4ef56..9d71866a 100644 --- a/src/SJZY.Track.Repository/TrackTemplateRepository.cs +++ b/src/SJZY.Track.Repository/TrackTemplateRepository.cs @@ -1,4 +1,5 @@ -using SJZY.Track.Domain.TrackTemplateAggregate; +using SJZY.Track.Domain.TrackContentAggregate; +using SJZY.Track.Domain.TrackTemplateAggregate; using SJZY.Track.Domain.TrackTemplateAggregate.Dtos; using SJZY.Track.Domain.VEntities; @@ -10,7 +11,7 @@ public class TrackTemplateRepository : BasicRepository, ITr { throw new NotImplementedException(); } - + /// /// 获取轨迹模版明细 /// @@ -18,22 +19,21 @@ public class TrackTemplateRepository : BasicRepository, ITr /// public async Task GetDetailAsync(int id) { - var detail = await Context.Queryable().LeftJoin((a, b) => a.SubSystemId==b.Id) - .Where((a, b) => a.Id==id) + var detail = await Context.Queryable().LeftJoin((a, b) => a.SubSystemId == b.Id) + .Where((a, b) => a.Id == id) .Select((a, b) => new GetTrackTemplateDetailVO - { - Id = a.Id, - Code = a.Code, - Name = a.Name, - SubSystemId = a.SubSystemId, - SubSystem=b.CnName - }).FirstAsync(); + { + Id = a.Id, + Code = a.Code, + Name = a.Name, + SubSystemId = a.SubSystemId, + SubSystem = b.CnName + }).FirstAsync(); return detail; } - /// /// 分页获取轨迹模版 /// @@ -41,18 +41,30 @@ public class TrackTemplateRepository : BasicRepository, ITr /// public async Task> GetPageTrackTemplate(GetPageTrackTemplateVO input) { - var pagedList = await Context.Queryable().LeftJoin((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)) + var pagedList = await Context.Queryable().LeftJoin((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 { - Id=a.Id, - Code=a.Code, - CreateTime= a.CreateTime, + Id = a.Id, + Code = a.Code, + CreateTime = a.CreateTime, Name = a.Name, SubSystem = b.CnName }) .ToPagedListAsync(input.PageIndex, input.PageSize); return pagedList; } + + public async Task> GetContentPageAsync(GetContentPageInputVO input) + { + return await AsSugarClient().Queryable() + .InnerJoin((templateContent, trackContent) => templateContent.TrackContentId == trackContent.Id) + .Where(templateContent => templateContent.TrackTemplateId == input.TrackTemplateId) + .Select((templateContent, trackContent) => new GetContentPageOutputVO + { + Id = templateContent.Id + }, true) + .ToPagedListAsync(input.PageIndex, input.PageSize); + } } \ No newline at end of file