fix: 调整dto映射
This commit is contained in:
parent
3df894d20b
commit
e312792472
@ -15,15 +15,15 @@ public class EditTrackNodeInput
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 系统id
|
/// 系统id
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int SystemId { get; set; }
|
public int? SubSystemId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 节点名称
|
/// 节点名称
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Name { get; set; }
|
public string? NodeName { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 节点英文名称
|
/// 节点英文名称
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string EnName { get; set; }
|
public string? NodeEnName { get; set; }
|
||||||
}
|
}
|
||||||
|
|||||||
@ -12,9 +12,9 @@ public class TrackNodeMapperProfile :Profile
|
|||||||
{
|
{
|
||||||
CreateMap<QueryTrackNodeRequest, TrackNodePageDto>();
|
CreateMap<QueryTrackNodeRequest, TrackNodePageDto>();
|
||||||
CreateMap<EditTrackNodeInput, TrackNodeEntity>(MemberList.None)
|
CreateMap<EditTrackNodeInput, TrackNodeEntity>(MemberList.None)
|
||||||
.ForMember(val => val.NodeName, opt => opt.MapFrom(src => src.Name))
|
.ForMember(val => val.NodeName, opt => opt.MapFrom(src => src.NodeName))
|
||||||
.ForMember(val => val.NodeEnName, opt => opt.MapFrom(src => src.EnName))
|
.ForMember(val => val.NodeEnName, opt => opt.MapFrom(src => src.NodeEnName))
|
||||||
.ForMember(val => val.SubSystemId, opt => opt.MapFrom(src => src.SystemId));
|
.ForMember(val => val.SubSystemId, opt => opt.MapFrom(src => src.SubSystemId));
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -86,15 +86,15 @@ namespace SJZY.Track.Application.Services.TrackNodeServices
|
|||||||
{
|
{
|
||||||
#region 业务校验
|
#region 业务校验
|
||||||
var trackNodesEntitys = await _trackNodeRepository.GetListAsync(a =>
|
var trackNodesEntitys = await _trackNodeRepository.GetListAsync(a =>
|
||||||
a.SubSystemId == input.SystemId && (a.NodeName == input.Name || a.NodeEnName == input.EnName));
|
a.SubSystemId == input.SubSystemId && (a.NodeName == input.NodeName || a.NodeEnName == input.NodeEnName));
|
||||||
if (trackNodesEntitys.Any())
|
if (trackNodesEntitys.Any())
|
||||||
{
|
{
|
||||||
var trackNodeName = trackNodesEntitys.FirstOrDefault(a => a.NodeName == input.Name);
|
var trackNodeName = trackNodesEntitys.FirstOrDefault(a => a.NodeName == input.NodeName);
|
||||||
if (trackNodeName != null)
|
if (trackNodeName != null)
|
||||||
{
|
{
|
||||||
throw new BusinessException(message: "该子系统下节点名称已存在");
|
throw new BusinessException(message: "该子系统下节点名称已存在");
|
||||||
}
|
}
|
||||||
var trackNodeEnName = trackNodesEntitys.FirstOrDefault(a => a.NodeEnName == input.EnName);
|
var trackNodeEnName = trackNodesEntitys.FirstOrDefault(a => a.NodeEnName == input.NodeEnName);
|
||||||
if (trackNodeEnName != null)
|
if (trackNodeEnName != null)
|
||||||
{
|
{
|
||||||
throw new BusinessException(message: "该子系统下节点英文名称已存在");
|
throw new BusinessException(message: "该子系统下节点英文名称已存在");
|
||||||
@ -120,8 +120,8 @@ namespace SJZY.Track.Application.Services.TrackNodeServices
|
|||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
trackNodesEntitys.NodeEnName = input.EnName;
|
trackNodesEntitys.NodeEnName = input.NodeEnName;
|
||||||
trackNodesEntitys.NodeName = input.Name;
|
trackNodesEntitys.NodeName = input.NodeName;
|
||||||
var isTrue = await _trackNodeRepository.UpdateAsync(trackNodesEntitys);
|
var isTrue = await _trackNodeRepository.UpdateAsync(trackNodesEntitys);
|
||||||
|
|
||||||
return new UnifyResultDto("200", "修改成功", isTrue);
|
return new UnifyResultDto("200", "修改成功", isTrue);
|
||||||
@ -129,7 +129,7 @@ namespace SJZY.Track.Application.Services.TrackNodeServices
|
|||||||
|
|
||||||
private async Task<UnifyResultDto> DeleteAsync(EditTrackNodeInput input)
|
private async Task<UnifyResultDto> DeleteAsync(EditTrackNodeInput input)
|
||||||
{
|
{
|
||||||
var trackStatus = await _trackStatusRepository.GetFirstAsync(val => val.Node == input.Id && val.SubSystemId == input.SystemId);
|
var trackStatus = await _trackStatusRepository.GetFirstAsync(val => val.Node == input.Id && val.SubSystemId == input.SubSystemId);
|
||||||
if(trackStatus!=null)
|
if(trackStatus!=null)
|
||||||
{
|
{
|
||||||
return new UnifyResultDto("200", "删除失败,该节点已被使用", false);
|
return new UnifyResultDto("200", "删除失败,该节点已被使用", false);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user