ideship/track
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
李鹏军 2024-02-28 11:49:18 +08:00
parent 95ff38efd3
commit 05637db671
9 changed files with 184 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs
View File

@ -1,6 +1,6 @@
using SJZY.Track.Application.Dtos.TrackStatus; using SJZY.Track.Application.Dtos.TrackStatus;
using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; using SJZY.Track.Domain.Aggregates.TrackStatusAggregate;
using Volo.Abp.DependencyInjection; using SJZY.Track.Domain.Dtos.TrackStatus;
namespace SJZY.Track.Application.Services.TrackStatus; namespace SJZY.Track.Application.Services.TrackStatus;
@ -9,7 +9,7 @@ namespace SJZY.Track.Application.Services.TrackStatus;
/// </summary> /// </summary>
[ApiExplorerSettings(GroupName = "轨迹状态")] [ApiExplorerSettings(GroupName = "轨迹状态")]
[Route("/Track/Status")] [Route("/Track/Status")]
public class TrackStatusService : ApplicationService, ITransientDependency public class TrackStatusService : ApplicationService
{ {
private readonly ITrackStatusRepository _trackStatusRepository; private readonly ITrackStatusRepository _trackStatusRepository;
@ -36,46 +36,47 @@ public class TrackStatusService : ApplicationService, ITransientDependency
}; };
} }
/// <summary> /// <summary>
/// 根据状态id获取轨迹状态 /// 根据状态id获取轨迹状态
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("GetDetail")] [HttpGet("GetDetail")]
public async Task<UnifyResultDto<GetTrackStatusDetailDto>> GetDetailAsync(int id) public async Task<UnifyResultDto<GetTrackStatusDetailDto>> GetDetailAsync(int id)
{
var detailInfo = await _trackStatusRepository.GetDetailAsync(id);
if (detailInfo == null)
{ {
var detailInfo = await _trackStatusRepository.GetDetailAsync(id); return new UnifyResultDto<GetTrackStatusDetailDto>(false, null, "未查询到轨迹状态");
if (detailInfo == null)
{
return new UnifyResultDto<GetTrackStatusDetailDto>(false, null, "未查询到轨迹状态");
}
var dto = ObjectMapper.Map<GetTrackStatusDetailVO, GetTrackStatusDetailDto>(detailInfo);
return new UnifyResultDto<GetTrackStatusDetailDto>("200", "", dto);
} }
/// <summary> var dto = ObjectMapper.Map<GetTrackStatusDetailVO, GetTrackStatusDetailDto>(detailInfo);
/// 获取分页轨迹状态 return new UnifyResultDto<GetTrackStatusDetailDto>("200", "", dto);
/// </summary> }
/// <param name="input"></param>
/// <returns></returns>
[HttpPost("GetList")]
public async Task<UnifyPageResultDto<GetTrackStatusListDto>> GetPageTrackStatus(GetPageTrackStatusInput input)
{
var vo = ObjectMapper.Map<GetPageTrackStatusInput, GetPageTrackStatusVO>(input);
var resultDto = await _trackStatusRepository.GetPageTrackStatus(vo);
var pageResultDto =
ObjectMapper.Map<UnifyPageResultDto<GetTrackStatusListVO>, UnifyPageResultDto<GetTrackStatusListDto>>(
resultDto);
return pageResultDto; /// <summary>
} /// 获取分页轨迹状态
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost("GetList")]
public async Task<UnifyPageResultDto<GetTrackStatusListDto>> GetPageTrackStatus(GetPageTrackStatusInput input)
{
var vo = ObjectMapper.Map<GetPageTrackStatusInput, GetPageTrackStatusVO>(input);
var resultDto = await _trackStatusRepository.GetPageTrackStatus(vo);
var pageResultDto =
ObjectMapper.Map<UnifyPageResultDto<GetTrackStatusListVO>, UnifyPageResultDto<GetTrackStatusListDto>>(
resultDto);
#region 私有方法 return pageResultDto;
private async Task<UnifyResultDto> AddAsync(EditTrackStatusInput input) }
{
var entity = ObjectMapper.Map<EditTrackStatusInput, TrackStatusEntity>(input); #region 私有方法
var isTrue = await _trackStatusRepository.InsertAsync(entity);
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); return new UnifyResultDto("200", "新增成功", isTrue);
} }

2
src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/ITrackStatusRepository.cs
View File

@ -1,3 +1,5 @@
using SJZY.Track.Domain.Dtos.TrackStatus;
namespace SJZY.Track.Domain.Aggregates.TrackStatusAggregate; namespace SJZY.Track.Domain.Aggregates.TrackStatusAggregate;
public interface ITrackStatusRepository : IBasicRepository<TrackStatusEntity> public interface ITrackStatusRepository : IBasicRepository<TrackStatusEntity>

14
src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs Normal file
View File

@ -0,0 +1,14 @@
namespace SJZY.Track.Domain.Dtos.TrackStatus;
public class GetPageTrackStatusVO : PageInfoInput
{
/// <summary>
/// 子系统id
/// </summary>
public int SubSystemId { get; set; }
/// <summary>
/// 关键字
/// </summary>
public string Keywords { get; set; }
}

39
src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs Normal file
View File

@ -0,0 +1,39 @@
namespace SJZY.Track.Domain.Dtos.TrackStatus;
public class GetTrackStatusDetailVO
{
/// <summary>
/// Id
/// </summary>
public int Id { get; set; }
/// <summary>
/// 子系统id
/// </summary>
public int SubSystemId { get; set; }
/// <summary>
/// 子系统
/// </summary>
public string SubSystem { get; set; }
/// <summary>
/// 节点id
/// </summary>
public int NodeId { get; set; }
/// <summary>
/// 所属轨迹状态
/// </summary>
public string TrackStatus { get; set; }
/// <summary>
/// 轨迹状态代码
/// </summary>
public string Code { get; set; }
/// <summary>
/// 轨迹内容英文
/// </summary>
public string EntrackStatus { get; set; }
}

54
src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs Normal file
View File

@ -0,0 +1,54 @@
namespace SJZY.Track.Domain.Dtos.TrackStatus;
public class GetTrackStatusListVO
{
/// <summary>
/// Id
/// </summary>
public int Id { get; set; }
/// <summary>
/// 子系统
/// </summary>
public string SubSystem { get; set; }
/// <summary>
/// 所属节点
/// </summary>
public string Node { get; set; }
/// <summary>
/// 所属轨迹状态
/// </summary>
public string TrackStatus { get; set; }
/// <summary>
/// 轨迹状态代码
/// </summary>
public string Code { get; set; }
/// <summary>
/// 轨迹内容英文
/// </summary>
public string EntrackStatus { get; set; }
/// <summary>
/// 创建人
/// </summary>
public string CreateUser { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime? CreateTime { get; set; }
/// <summary>
/// 修改人
/// </summary>
public string UpdateUser { get; set; }
/// <summary>
/// 修改时间
/// </summary>
public DateTime? UpdateTime { get; set; }
}

21
src/SJZY.Track.Domain/TrackStatusAggregate/Dtos/GetPageTrackStatusVO.cs
View File

@ -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
{
/// <summary>
/// 子系统id
/// </summary>
public int SubSystemId { get; set; }
/// <summary>
/// 关键字
/// </summary>
public string Keywords { get; set; }
}
}

46
src/SJZY.Track.Domain/TrackStatusAggregate/Dtos/GetTrackStatusDetailVO.cs
View File

@ -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
{
/// <summary>
/// Id
/// </summary>
public int Id { get; set; }
/// <summary>
/// 子系统id
/// </summary>
public int SubSystemId { get; set; }
/// <summary>
/// 子系统
/// </summary>
public string SubSystem { get; set; }
/// <summary>
/// 节点id
/// </summary>
public int NodeId { get; set; }
/// <summary>
/// 所属轨迹状态
/// </summary>
public string TrackStatus { get; set; }
/// <summary>
/// 轨迹状态代码
/// </summary>
public string Code { get; set; }
/// <summary>
/// 轨迹内容英文
/// </summary>
public string EntrackStatus { get; set; }
}
}

61
src/SJZY.Track.Domain/TrackStatusAggregate/Dtos/GetTrackStatusListVO.cs
View File

@ -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
{
/// <summary>
/// Id
/// </summary>
public int Id { get; set; }
/// <summary>
/// 子系统
/// </summary>
public string SubSystem { get; set; }
/// <summary>
/// 所属节点
/// </summary>
public string Node { get; set; }
/// <summary>
/// 所属轨迹状态
/// </summary>
public string TrackStatus { get; set; }
/// <summary>
/// 轨迹状态代码
/// </summary>
public string Code { get; set; }
/// <summary>
/// 轨迹内容英文
/// </summary>
public string EntrackStatus { get; set; }
/// <summary>
/// 创建人
/// </summary>
public string CreateUser { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime? CreateTime { get; set; }
/// <summary>
/// 修改人
/// </summary>
public string UpdateUser { get; set; }
/// <summary>
/// 修改时间
/// </summary>
public DateTime? UpdateTime { get; set; }
}
}

70
src/SJZY.Track.Repository/TrackStatusRepository.cs
View File

@ -1,5 +1,5 @@
using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; using SJZY.Track.Domain.Aggregates.TrackStatusAggregate;
using SJZY.Track.Domain.TrackStatusAggregate.Dtos; using SJZY.Track.Domain.Dtos.TrackStatus;
using SJZY.Track.Domain.VEntities; using SJZY.Track.Domain.VEntities;
namespace SJZY.Track.Repository; namespace SJZY.Track.Repository;
@ -17,19 +17,20 @@ public class TrackStatusRepository : BasicRepository<TrackStatusEntity>, ITrackS
/// <returns></returns> /// <returns></returns>
public async Task<GetTrackStatusDetailVO?> GetDetailAsync(int id) public async Task<GetTrackStatusDetailVO?> GetDetailAsync(int id)
{ {
var detail = await Context.Queryable<TrackStatusEntity>().LeftJoin<VSystemEntity>((a, b) => a.SubSystemId==b.Id) var detail = await Context.Queryable<TrackStatusEntity>()
.Where((a, b) => a.Id==id) .LeftJoin<VSystemEntity>((a, b) => a.SubSystemId == b.Id)
.Select((a, b) => new GetTrackStatusDetailVO .Where((a, b) => a.Id == id)
{ .Select((a, b) => new GetTrackStatusDetailVO
Id = a.Id, {
SubSystemId = a.SubSystemId, Id = a.Id,
SubSystem= b.CnName, SubSystemId = a.SubSystemId,
Code=a.Code, SubSystem = b.CnName,
EntrackStatus=a.EnStatus, Code = a.Code,
NodeId=a.Node, EntrackStatus = a.EnStatus,
TrackStatus=a.Status NodeId = a.Node,
}) TrackStatus = a.Status
.FirstAsync(); })
.FirstAsync();
return detail; return detail;
} }
@ -41,25 +42,28 @@ public class TrackStatusRepository : BasicRepository<TrackStatusEntity>, ITrackS
public async Task<UnifyPageResultDto<GetTrackStatusListVO>> GetPageTrackStatus(GetPageTrackStatusVO input) public async Task<UnifyPageResultDto<GetTrackStatusListVO>> GetPageTrackStatus(GetPageTrackStatusVO input)
{ {
UnifyPageResultDto<GetTrackStatusListVO> pagedList = new UnifyPageResultDto<GetTrackStatusListVO>(); UnifyPageResultDto<GetTrackStatusListVO> pagedList = new UnifyPageResultDto<GetTrackStatusListVO>();
pagedList = await Context.Queryable<TrackStatusEntity>().LeftJoin<VSystemEntity>((a, b) => a.SubSystemId == b.Id) pagedList = await Context.Queryable<TrackStatusEntity>()
.LeftJoin<VUserEntity>((a, b, c) => a.CreateUserId==c.Id) .LeftJoin<VSystemEntity>((a, b) => a.SubSystemId == b.Id)
.LeftJoin<VUserEntity>((a, b, c, d) => a.UpdateUserId== d.Id) .LeftJoin<VUserEntity>((a, b, c) => a.CreateUserId == c.Id)
.WhereIF(input.SubSystemId > 0, (a, b, c, d) => a.SubSystemId == input.SubSystemId) .LeftJoin<VUserEntity>((a, b, c, d) => a.UpdateUserId == d.Id)
.WhereIF(!input.Keywords.IsNullOrWhiteSpace(), (a, b, c, d) => a.Status.Contains(input.Keywords) || a.EnStatus.Contains(input.Keywords) || a.Code.Contains(input.Keywords)) .WhereIF(input.SubSystemId > 0, (a, b, c, d) => a.SubSystemId == input.SubSystemId)
.Select((a, b, c, d) => new GetTrackStatusListVO .WhereIF(!input.Keywords.IsNullOrWhiteSpace(),
{ (a, b, c, d) => a.Status.Contains(input.Keywords) || a.EnStatus.Contains(input.Keywords) ||
Id = a.Id, a.Code.Contains(input.Keywords))
Code = a.Code, .Select((a, b, c, d) => new GetTrackStatusListVO
EntrackStatus = a.EnStatus, {
TrackStatus=a.Status, Id = a.Id,
Node="", Code = a.Code,
CreateTime = a.CreateTime, EntrackStatus = a.EnStatus,
CreateUser = c.Name, TrackStatus = a.Status,
UpdateTime = a.UpdateTime, Node = "",
UpdateUser = d.Name, CreateTime = a.CreateTime,
SubSystem = b.CnName CreateUser = c.Name,
}) UpdateTime = a.UpdateTime,
.ToPagedListAsync(input.PageIndex, input.PageSize); UpdateUser = d.Name,
SubSystem = b.CnName
})
.ToPagedListAsync(input.PageIndex, input.PageSize);
return pagedList; return pagedList;
} }