From 3036cfbab4925c7e42523e66156f37e17bf1d356 Mon Sep 17 00:00:00 2001 From: moyongzhen <2534173414@qq.com> Date: Tue, 27 Feb 2024 10:05:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E6=A8=A1=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrackTemplates/ITrackTemplateService.cs | 13 ++++++++++++ .../TrackTemplates/TrackTemplateService.cs | 20 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 src/SJZY.Track.Application/Services/TrackTemplates/ITrackTemplateService.cs create mode 100644 src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs diff --git a/src/SJZY.Track.Application/Services/TrackTemplates/ITrackTemplateService.cs b/src/SJZY.Track.Application/Services/TrackTemplates/ITrackTemplateService.cs new file mode 100644 index 00000000..b082a1ff --- /dev/null +++ b/src/SJZY.Track.Application/Services/TrackTemplates/ITrackTemplateService.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +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 new file mode 100644 index 00000000..e671231d --- /dev/null +++ b/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs @@ -0,0 +1,20 @@ +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.TrackTemplates +{ + [ApiExplorerSettings(GroupName = "轨迹模版")] + public class TrackTemplateService : ApplicationService, ITrackTemplateService, IScopedDependency + { + public TrackTemplateService() + { + + } + + + } +} From cbabe27185b270be70e277b7d2c90324a17d3e70 Mon Sep 17 00:00:00 2001 From: moyongzhen <2534173414@qq.com> Date: Tue, 27 Feb 2024 14:33:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E6=A8=A1=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrackTemplateAutoMapperProfile.cs | 25 +++++ .../GetPageTrackTemplateInput.cs | 24 +++++ .../Dtos/TrackTemplates/GetTrackDetailDto.cs | 102 ++++++++++++++++++ .../TrackTemplates/TrackTemplateService.cs | 86 ++++++++++++++- .../SJZY.Track.Repository.csproj | 1 - .../Services/ITrackTemplateRepository.cs | 3 + .../Services/TrackTemplateRepository.cs | 27 +++++ .../ValueObjects/GetPageTrackTemplateVO.cs | 21 ++++ .../ValueObjects/GetTrackTemplateDetailVO.cs | 70 ++++++++++++ 9 files changed, 355 insertions(+), 4 deletions(-) create mode 100644 src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs create mode 100644 src/SJZY.Track.Application/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs create mode 100644 src/SJZY.Track.Application/Dtos/TrackTemplates/GetTrackDetailDto.cs create mode 100644 src/SJZY.Track.Repository/TrackTemplate/ValueObjects/GetPageTrackTemplateVO.cs create mode 100644 src/SJZY.Track.Repository/TrackTemplate/ValueObjects/GetTrackTemplateDetailVO.cs diff --git a/src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs new file mode 100644 index 00000000..f715d0cf --- /dev/null +++ b/src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs @@ -0,0 +1,25 @@ +using AutoMapper; +using SJZY.Track.Application.Dtos.Demo; +using SJZY.Track.Application.Dtos.TrackTemplates; +using SJZY.Track.Repository.TrackTemplate.ValueObjects; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SJZY.Track.Application.AutoMapper +{ + /// + /// 轨迹模版自动映射 + /// + public class TrackTemplateAutoMapperProfile : Profile + { + public TrackTemplateAutoMapperProfile() + { + CreateMap(MemberList.None); + + //CreateMap, UnifyResultDto>(MemberList.None); + } + } +} diff --git a/src/SJZY.Track.Application/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs b/src/SJZY.Track.Application/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs new file mode 100644 index 00000000..c118b36b --- /dev/null +++ b/src/SJZY.Track.Application/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SJZY.Track.Application.Dtos.TrackTemplates +{ + /// + /// 获取轨迹模版分页输入 + /// + public class GetPageTrackTemplateInput : PageInfoInput + { + /// + /// 子系统id + /// + public int SubSystemId { 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 new file mode 100644 index 00000000..ca928b8c --- /dev/null +++ b/src/SJZY.Track.Application/Dtos/TrackTemplates/GetTrackDetailDto.cs @@ -0,0 +1,102 @@ +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 +{ + /// + /// 获取轨迹模版详情 + /// + public class GetTrackTemplateDetailDto + { + /// + /// Id + /// + public int Id { get; set; } + + /// + /// 子系统id + /// + public int SubSystemId { get; set; } + + /// + /// 子系统 + /// + public string SubSystem { get; set; } + + /// + /// 模版名称 + /// + public string Name { get; set; } + + /// + /// 模版代码 + /// + public string Code { get; set; } + } + + /// + /// 获取轨迹模版列表 + /// + public class GetTrackTemplateListDto + { + /// + /// 轨迹模版id + /// + public int Id { get; set; } + + /// + /// 模板名称 + /// + public string Name { set; get; } + + /// + /// 模版代码 + /// + public string Code { get; set; } + + /// + /// 所属子系统 + /// + public string SubSystem { set; get; } + + /// + /// 创建时间 + /// + public DateTime CreateTime { get; set; } + } + + /// + /// 编辑轨迹模版 + /// + public class EditTrackTemplateInput + { + /// + /// Id + /// + public int Id { set; get; } + + /// + /// 操作类型 + /// + public OptionType Options { get; set; } + + /// + /// 子系统id + /// + public int SubSystemId { set; get; } + + /// + /// 模板名称 + /// + public int Name { set; get; } + + /// + /// 模板代码 + /// + public int Code { set; get; } + } +} diff --git a/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs b/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs index e671231d..30ccccfa 100644 --- a/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs +++ b/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs @@ -1,20 +1,100 @@ -using System; +using SJZY.Expand.ABP.Core.Common.Dto; +using SJZY.Track.Application.Dtos.TrackTemplates; +using SJZY.Track.Repository.TrackTemplate.Entitys; +using SJZY.Track.Repository.TrackTemplate.Services; +using SJZY.Track.Repository.TrackTemplate.ValueObjects; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using Volo.Abp.DependencyInjection; +using Volo.Abp.ObjectMapping; namespace SJZY.Track.Application.Services.TrackTemplates { [ApiExplorerSettings(GroupName = "轨迹模版")] + [Route("/Track")] public class TrackTemplateService : ApplicationService, ITrackTemplateService, IScopedDependency { - public TrackTemplateService() - { + private readonly ITrackTemplateRepository _trackTemplateRepository; + public TrackTemplateService( + ITrackTemplateRepository trackTemplateRepository + ) + { + this._trackTemplateRepository=trackTemplateRepository; } + /// + /// 轨迹模版编辑 + /// + /// + [HttpPost("/Template/Edit")] + public async Task EditAsync(EditTrackTemplateInput input) + { + return input.Options switch + { + OptionType.新增 => await AddAsync(input), + OptionType.修改 => await UpdateAsync(input), + OptionType.删除 => await DeleteAsync(input), + _ => throw new BusinessException(message: "当前操作动作不合法") + }; + } + /// + /// 根据模版id获取轨迹模版 + /// + /// + /// + [HttpGet("/Template/GetDetail")] + public async Task> GetDetailAsync(int id) + { + //var detailInfo = await _trackTemplateRepository.GetFirstAsync(a => a.Id== id); + var detailInfo = await _trackTemplateRepository.GetDetailAsync(id); + if (detailInfo==null) + { + return new UnifyResultDto(false, null, "未查询到轨迹模版"); + } + var dto = ObjectMapper.Map(detailInfo); + return new UnifyResultDto("200", "", dto); + } + + /// + /// 获取分页轨迹模版 + /// + /// + /// + [HttpPost("/Template/GetList")] + public async Task> GetPageTrackTemplate(GetPageTrackTemplateInput input) + { + var vo = ObjectMapper.Map(input); + var resultDto = await _trackTemplateRepository.GetPageTrackTemplate(vo); + var pageResultDto = ObjectMapper.Map, UnifyPageResultDto>(resultDto); + + return pageResultDto; + } + + #region 私有方法 + private async Task AddAsync(EditTrackTemplateInput input) + { + + return null; + } + + private async Task UpdateAsync(EditTrackTemplateInput input) + { + + + return null; + } + + private async Task DeleteAsync(EditTrackTemplateInput input) + { + + + return null; + } + #endregion } } diff --git a/src/SJZY.Track.Repository/SJZY.Track.Repository.csproj b/src/SJZY.Track.Repository/SJZY.Track.Repository.csproj index 1583dea7..64fa00cd 100644 --- a/src/SJZY.Track.Repository/SJZY.Track.Repository.csproj +++ b/src/SJZY.Track.Repository/SJZY.Track.Repository.csproj @@ -37,7 +37,6 @@ - diff --git a/src/SJZY.Track.Repository/TrackTemplate/Services/ITrackTemplateRepository.cs b/src/SJZY.Track.Repository/TrackTemplate/Services/ITrackTemplateRepository.cs index 240aadaa..5036bb72 100644 --- a/src/SJZY.Track.Repository/TrackTemplate/Services/ITrackTemplateRepository.cs +++ b/src/SJZY.Track.Repository/TrackTemplate/Services/ITrackTemplateRepository.cs @@ -1,9 +1,12 @@ using SJZY.Track.Repository.TrackTemplate.Entitys; +using SJZY.Track.Repository.TrackTemplate.ValueObjects; namespace SJZY.Track.Repository.TrackTemplate.Services { public interface ITrackTemplateRepository : ISimpleClient { + Task GetDetailAsync(int id); + Task> GetPageTrackTemplate(GetPageTrackTemplateVO input); } } diff --git a/src/SJZY.Track.Repository/TrackTemplate/Services/TrackTemplateRepository.cs b/src/SJZY.Track.Repository/TrackTemplate/Services/TrackTemplateRepository.cs index e3347eac..7b3432a6 100644 --- a/src/SJZY.Track.Repository/TrackTemplate/Services/TrackTemplateRepository.cs +++ b/src/SJZY.Track.Repository/TrackTemplate/Services/TrackTemplateRepository.cs @@ -1,9 +1,36 @@ using SJZY.Track.Repository.TrackTemplate.Entitys; +using SJZY.Track.Repository.TrackTemplate.ValueObjects; namespace SJZY.Track.Repository.TrackTemplate.Services { public class TrackTemplateRepository : BasicRepository, ITrackTemplateRepository, IScopedDependency { + public TrackTemplateRepository() + { + } + /// + /// 获取轨迹模版明细 + /// + /// + /// + public async Task GetDetailAsync(int id) + { + //await Context.Queryable().LeftJoin<> + + return new GetTrackTemplateDetailVO(); + } + + + /// + /// 分页获取轨迹模版 + /// + /// + /// + public async Task> GetPageTrackTemplate(GetPageTrackTemplateVO input) + { + + return null; + } } } diff --git a/src/SJZY.Track.Repository/TrackTemplate/ValueObjects/GetPageTrackTemplateVO.cs b/src/SJZY.Track.Repository/TrackTemplate/ValueObjects/GetPageTrackTemplateVO.cs new file mode 100644 index 00000000..50c343e8 --- /dev/null +++ b/src/SJZY.Track.Repository/TrackTemplate/ValueObjects/GetPageTrackTemplateVO.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SJZY.Track.Repository.TrackTemplate.ValueObjects +{ + public class GetPageTrackTemplateVO : PageInfoInput + { + /// + /// 子系统id + /// + public int SubSystemId { get; set; } + + /// + /// 关键字 + /// + public string Keywords { get; set; } + } +} diff --git a/src/SJZY.Track.Repository/TrackTemplate/ValueObjects/GetTrackTemplateDetailVO.cs b/src/SJZY.Track.Repository/TrackTemplate/ValueObjects/GetTrackTemplateDetailVO.cs new file mode 100644 index 00000000..1ec9565f --- /dev/null +++ b/src/SJZY.Track.Repository/TrackTemplate/ValueObjects/GetTrackTemplateDetailVO.cs @@ -0,0 +1,70 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SJZY.Track.Repository.TrackTemplate.ValueObjects +{ + /// + /// 获取轨迹模版明细 + /// + public class GetTrackTemplateDetailVO + { + /// + /// Id + /// + public int Id { get; set; } + + /// + /// 子系统id + /// + public int SubSystemId { get; set; } + + /// + /// 子系统 + /// + public string SubSystem { get; set; } + + /// + /// 模版名称 + /// + public string Name { get; set; } + + /// + /// 模版代码 + /// + public string Code { get; set; } + } + + /// + /// 获取轨迹模版列表 + /// + public class GetTrackTemplateListVO + { + /// + /// 轨迹模版id + /// + public int Id { get; set; } + + /// + /// 模板名称 + /// + public string Name { set; get; } + + /// + /// 模版代码 + /// + public string Code { get; set; } + + /// + /// 所属子系统 + /// + public string SubSystem { set; get; } + + /// + /// 创建时间 + /// + public DateTime CreateTime { get; set; } + } +}