From 05637db671fcb97b0932cb2de0e45b3a0795c10e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com> Date: Wed, 28 Feb 2024 11:49:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrackStatus/TrackStatusService.cs | 75 ++++++++++--------- .../ITrackStatusRepository.cs | 2 + .../Dtos/TrackStatus/GetPageTrackStatusVO.cs | 14 ++++ .../TrackStatus/GetTrackStatusDetailVO.cs | 39 ++++++++++ .../Dtos/TrackStatus/GetTrackStatusListVO.cs | 54 +++++++++++++ .../Dtos/GetPageTrackStatusVO.cs | 21 ------ .../Dtos/GetTrackStatusDetailVO.cs | 46 ------------ .../Dtos/GetTrackStatusListVO.cs | 61 --------------- .../TrackStatusRepository.cs | 70 +++++++++-------- 9 files changed, 184 insertions(+), 198 deletions(-) create mode 100644 src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs create mode 100644 src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs create mode 100644 src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs delete mode 100644 src/SJZY.Track.Domain/TrackStatusAggregate/Dtos/GetPageTrackStatusVO.cs delete mode 100644 src/SJZY.Track.Domain/TrackStatusAggregate/Dtos/GetTrackStatusDetailVO.cs delete mode 100644 src/SJZY.Track.Domain/TrackStatusAggregate/Dtos/GetTrackStatusListVO.cs diff --git a/src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs b/src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs index 84f93e92..acf14311 100644 --- a/src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs +++ b/src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs @@ -1,6 +1,6 @@ using SJZY.Track.Application.Dtos.TrackStatus; using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; -using Volo.Abp.DependencyInjection; +using SJZY.Track.Domain.Dtos.TrackStatus; namespace SJZY.Track.Application.Services.TrackStatus; @@ -9,7 +9,7 @@ namespace SJZY.Track.Application.Services.TrackStatus; /// [ApiExplorerSettings(GroupName = "轨迹状态")] [Route("/Track/Status")] -public class TrackStatusService : ApplicationService, ITransientDependency +public class TrackStatusService : ApplicationService { private readonly ITrackStatusRepository _trackStatusRepository; @@ -36,46 +36,47 @@ public class TrackStatusService : ApplicationService, ITransientDependency }; } - /// - /// 根据状态id获取轨迹状态 - /// - /// - /// - [HttpGet("GetDetail")] - public async Task> GetDetailAsync(int id) + /// + /// 根据状态id获取轨迹状态 + /// + /// + /// + [HttpGet("GetDetail")] + public async Task> GetDetailAsync(int id) + { + var detailInfo = await _trackStatusRepository.GetDetailAsync(id); + if (detailInfo == null) { - var detailInfo = await _trackStatusRepository.GetDetailAsync(id); - if (detailInfo == null) - { - return new UnifyResultDto(false, null, "未查询到轨迹状态"); - } - - var dto = ObjectMapper.Map(detailInfo); - return new UnifyResultDto("200", "", dto); + return new UnifyResultDto(false, null, "未查询到轨迹状态"); } - /// - /// 获取分页轨迹状态 - /// - /// - /// - [HttpPost("GetList")] - public async Task> GetPageTrackStatus(GetPageTrackStatusInput input) - { - var vo = ObjectMapper.Map(input); - var resultDto = await _trackStatusRepository.GetPageTrackStatus(vo); - var pageResultDto = - ObjectMapper.Map, UnifyPageResultDto>( - resultDto); + var dto = ObjectMapper.Map(detailInfo); + return new UnifyResultDto("200", "", dto); + } - return pageResultDto; - } + /// + /// 获取分页轨迹状态 + /// + /// + /// + [HttpPost("GetList")] + public async Task> GetPageTrackStatus(GetPageTrackStatusInput input) + { + var vo = ObjectMapper.Map(input); + var resultDto = await _trackStatusRepository.GetPageTrackStatus(vo); + var pageResultDto = + ObjectMapper.Map, UnifyPageResultDto>( + resultDto); - #region 私有方法 - private async Task AddAsync(EditTrackStatusInput input) - { - var entity = ObjectMapper.Map(input); - var isTrue = await _trackStatusRepository.InsertAsync(entity); + return pageResultDto; + } + + #region 私有方法 + + private async Task AddAsync(EditTrackStatusInput input) + { + var entity = ObjectMapper.Map(input); + var isTrue = await _trackStatusRepository.InsertAsync(entity); return new UnifyResultDto("200", "新增成功", isTrue); } diff --git a/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/ITrackStatusRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/ITrackStatusRepository.cs index 4bcc5677..5123bd2b 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/ITrackStatusRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/ITrackStatusRepository.cs @@ -1,3 +1,5 @@ +using SJZY.Track.Domain.Dtos.TrackStatus; + namespace SJZY.Track.Domain.Aggregates.TrackStatusAggregate; public interface ITrackStatusRepository : IBasicRepository diff --git a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs new file mode 100644 index 00000000..6c5d3b46 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs @@ -0,0 +1,14 @@ +namespace SJZY.Track.Domain.Dtos.TrackStatus; + +public class GetPageTrackStatusVO : PageInfoInput +{ + /// + /// 子系统id + /// + public int SubSystemId { get; set; } + + /// + /// 关键字 + /// + public string Keywords { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs new file mode 100644 index 00000000..66de23a9 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs @@ -0,0 +1,39 @@ +namespace SJZY.Track.Domain.Dtos.TrackStatus; + +public class GetTrackStatusDetailVO +{ + /// + /// Id + /// + public int Id { get; set; } + + /// + /// 子系统id + /// + public int SubSystemId { get; set; } + + /// + /// 子系统 + /// + public string SubSystem { get; set; } + + /// + /// 节点id + /// + public int NodeId { get; set; } + + /// + /// 所属轨迹状态 + /// + public string TrackStatus { get; set; } + + /// + /// 轨迹状态代码 + /// + public string Code { get; set; } + + /// + /// 轨迹内容英文 + /// + public string EntrackStatus { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs new file mode 100644 index 00000000..38a75ed0 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs @@ -0,0 +1,54 @@ +namespace SJZY.Track.Domain.Dtos.TrackStatus; + +public class GetTrackStatusListVO +{ + /// + /// Id + /// + public int Id { get; set; } + + /// + /// 子系统 + /// + public string SubSystem { get; set; } + + /// + /// 所属节点 + /// + public string Node { get; set; } + + /// + /// 所属轨迹状态 + /// + public string TrackStatus { get; set; } + + /// + /// 轨迹状态代码 + /// + public string Code { get; set; } + + /// + /// 轨迹内容英文 + /// + public string EntrackStatus { get; set; } + + /// + /// 创建人 + /// + public string CreateUser { get; set; } + + /// + /// 创建时间 + /// + public DateTime? CreateTime { get; set; } + + /// + /// 修改人 + /// + public string UpdateUser { get; set; } + + /// + /// 修改时间 + /// + public DateTime? UpdateTime { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/TrackStatusAggregate/Dtos/GetPageTrackStatusVO.cs b/src/SJZY.Track.Domain/TrackStatusAggregate/Dtos/GetPageTrackStatusVO.cs deleted file mode 100644 index 217e5e0f..00000000 --- a/src/SJZY.Track.Domain/TrackStatusAggregate/Dtos/GetPageTrackStatusVO.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SJZY.Track.Domain.TrackStatusAggregate.Dtos -{ - public class GetPageTrackStatusVO : PageInfoInput - { - /// - /// 子系统id - /// - public int SubSystemId { get; set; } - - /// - /// 关键字 - /// - public string Keywords { get; set; } - } -} diff --git a/src/SJZY.Track.Domain/TrackStatusAggregate/Dtos/GetTrackStatusDetailVO.cs b/src/SJZY.Track.Domain/TrackStatusAggregate/Dtos/GetTrackStatusDetailVO.cs deleted file mode 100644 index c99bfbc3..00000000 --- a/src/SJZY.Track.Domain/TrackStatusAggregate/Dtos/GetTrackStatusDetailVO.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SJZY.Track.Domain.TrackStatusAggregate.Dtos -{ - public class GetTrackStatusDetailVO - { - /// - /// Id - /// - public int Id { get; set; } - - /// - /// 子系统id - /// - public int SubSystemId { get; set; } - - /// - /// 子系统 - /// - public string SubSystem { get; set; } - - /// - /// 节点id - /// - public int NodeId { get; set; } - - /// - /// 所属轨迹状态 - /// - public string TrackStatus { get; set; } - - /// - /// 轨迹状态代码 - /// - public string Code { get; set; } - - /// - /// 轨迹内容英文 - /// - public string EntrackStatus { get; set; } - } -} diff --git a/src/SJZY.Track.Domain/TrackStatusAggregate/Dtos/GetTrackStatusListVO.cs b/src/SJZY.Track.Domain/TrackStatusAggregate/Dtos/GetTrackStatusListVO.cs deleted file mode 100644 index bf0f622d..00000000 --- a/src/SJZY.Track.Domain/TrackStatusAggregate/Dtos/GetTrackStatusListVO.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SJZY.Track.Domain.TrackStatusAggregate.Dtos -{ - public class GetTrackStatusListVO - { - /// - /// Id - /// - public int Id { get; set; } - - /// - /// 子系统 - /// - public string SubSystem { get; set; } - - /// - /// 所属节点 - /// - public string Node { get; set; } - - /// - /// 所属轨迹状态 - /// - public string TrackStatus { get; set; } - - /// - /// 轨迹状态代码 - /// - public string Code { get; set; } - - /// - /// 轨迹内容英文 - /// - public string EntrackStatus { get; set; } - - /// - /// 创建人 - /// - public string CreateUser { get; set; } - - /// - /// 创建时间 - /// - public DateTime? CreateTime { get; set; } - - /// - /// 修改人 - /// - public string UpdateUser { get; set; } - - /// - /// 修改时间 - /// - public DateTime? UpdateTime { get; set; } - } -} diff --git a/src/SJZY.Track.Repository/TrackStatusRepository.cs b/src/SJZY.Track.Repository/TrackStatusRepository.cs index 38f7d3b7..7f5d88b7 100644 --- a/src/SJZY.Track.Repository/TrackStatusRepository.cs +++ b/src/SJZY.Track.Repository/TrackStatusRepository.cs @@ -1,5 +1,5 @@ using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; -using SJZY.Track.Domain.TrackStatusAggregate.Dtos; +using SJZY.Track.Domain.Dtos.TrackStatus; using SJZY.Track.Domain.VEntities; namespace SJZY.Track.Repository; @@ -17,19 +17,20 @@ public class TrackStatusRepository : BasicRepository, ITrackS /// public async Task GetDetailAsync(int id) { - var detail = await Context.Queryable().LeftJoin((a, b) => a.SubSystemId==b.Id) - .Where((a, b) => a.Id==id) - .Select((a, b) => new GetTrackStatusDetailVO - { - Id = a.Id, - SubSystemId = a.SubSystemId, - SubSystem= b.CnName, - Code=a.Code, - EntrackStatus=a.EnStatus, - NodeId=a.Node, - TrackStatus=a.Status - }) - .FirstAsync(); + var detail = await Context.Queryable() + .LeftJoin((a, b) => a.SubSystemId == b.Id) + .Where((a, b) => a.Id == id) + .Select((a, b) => new GetTrackStatusDetailVO + { + Id = a.Id, + SubSystemId = a.SubSystemId, + SubSystem = b.CnName, + Code = a.Code, + EntrackStatus = a.EnStatus, + NodeId = a.Node, + TrackStatus = a.Status + }) + .FirstAsync(); return detail; } @@ -41,25 +42,28 @@ public class TrackStatusRepository : BasicRepository, ITrackS public async Task> GetPageTrackStatus(GetPageTrackStatusVO input) { UnifyPageResultDto pagedList = new UnifyPageResultDto(); - pagedList = await Context.Queryable().LeftJoin((a, b) => a.SubSystemId == b.Id) - .LeftJoin((a, b, c) => a.CreateUserId==c.Id) - .LeftJoin((a, b, c, d) => a.UpdateUserId== d.Id) - .WhereIF(input.SubSystemId > 0, (a, b, c, d) => a.SubSystemId == input.SubSystemId) - .WhereIF(!input.Keywords.IsNullOrWhiteSpace(), (a, b, c, d) => a.Status.Contains(input.Keywords) || a.EnStatus.Contains(input.Keywords) || a.Code.Contains(input.Keywords)) - .Select((a, b, c, d) => new GetTrackStatusListVO - { - Id = a.Id, - Code = a.Code, - EntrackStatus = a.EnStatus, - TrackStatus=a.Status, - Node="", - CreateTime = a.CreateTime, - CreateUser = c.Name, - UpdateTime = a.UpdateTime, - UpdateUser = d.Name, - SubSystem = b.CnName - }) - .ToPagedListAsync(input.PageIndex, input.PageSize); + pagedList = await Context.Queryable() + .LeftJoin((a, b) => a.SubSystemId == b.Id) + .LeftJoin((a, b, c) => a.CreateUserId == c.Id) + .LeftJoin((a, b, c, d) => a.UpdateUserId == d.Id) + .WhereIF(input.SubSystemId > 0, (a, b, c, d) => a.SubSystemId == input.SubSystemId) + .WhereIF(!input.Keywords.IsNullOrWhiteSpace(), + (a, b, c, d) => a.Status.Contains(input.Keywords) || a.EnStatus.Contains(input.Keywords) || + a.Code.Contains(input.Keywords)) + .Select((a, b, c, d) => new GetTrackStatusListVO + { + Id = a.Id, + Code = a.Code, + EntrackStatus = a.EnStatus, + TrackStatus = a.Status, + Node = "", + CreateTime = a.CreateTime, + CreateUser = c.Name, + UpdateTime = a.UpdateTime, + UpdateUser = d.Name, + SubSystem = b.CnName + }) + .ToPagedListAsync(input.PageIndex, input.PageSize); return pagedList; }