diff --git a/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs b/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs index 0a5fa63..dd57f71 100644 --- a/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs +++ b/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs @@ -135,7 +135,7 @@ namespace ZR.Admin.WebApi.Controllers.Business var li = l.Where(it => it.RowNumber == g.Key).OrderBy(it => it.PortNumber).Select(it => { var tips = ""; - if (it.Status == 1) + if (it.Status == 0) { tips = it.OpticalAttenuation; } @@ -305,13 +305,26 @@ namespace ZR.Admin.WebApi.Controllers.Business [HttpPost] [ActionPermissionFilter(Permission = "odfports:add")] [Log(Title = "端口", BusinessType = BusinessType.INSERT)] - public IActionResult AddOdfPorts([FromBody] OdfPortsDto parm) + public async Task AddOdfPorts([FromBody] OdfPortsDto parm) { var modal = parm.Adapt().ToCreate(HttpContext); modal.CreatedAt = DateTime.Now; modal.UpdatedAt = DateTime.Now; var response = _OdfPortsService.AddOdfPorts(modal); - + if (parm.HistoryFault != null && parm.HistoryFault.Count > 0) + { + foreach (var item in parm.HistoryFault) + { + var o = new OdfPortFault() + { + CreateTime = DateTime.Now, + FaultReason = item.FaultReason, + FaultTime = item.FaultTime, + PortId = response.Id, + }; + await _OdfPortFaultService.InsertAsync(o); + } + } return SUCCESS(response); } @@ -322,12 +335,30 @@ namespace ZR.Admin.WebApi.Controllers.Business [HttpPut] [ActionPermissionFilter(Permission = "odfports:edit")] [Log(Title = "端口", BusinessType = BusinessType.UPDATE)] - public IActionResult UpdateOdfPorts([FromBody] OdfPortsDto parm) + public async Task UpdateOdfPorts([FromBody] OdfPortsDto parm) { var modal = parm.Adapt().ToUpdate(HttpContext); modal.UpdatedAt = DateTime.Now; var response = _OdfPortsService.UpdateOdfPorts(modal); - + var count = await _OdfPortFaultService.CountAsync(it => it.PortId == modal.Id); + if (count > 0) + { + await _OdfPortFaultService.DeleteAsync(it => it.PortId == modal.Id); + } + if (parm.HistoryFault != null && parm.HistoryFault.Count > 0) + { + foreach (var item in parm.HistoryFault) + { + var o = new OdfPortFault() + { + CreateTime = DateTime.Now, + FaultReason = item.FaultReason, + FaultTime = item.FaultTime, + PortId = modal.Id, + }; + await _OdfPortFaultService.InsertAsync(o); + } + } return ToResponse(response); } diff --git a/ZR.Model/Business/OdfPorts.cs b/ZR.Model/Business/OdfPorts.cs index 7064046..1ba710c 100644 --- a/ZR.Model/Business/OdfPorts.cs +++ b/ZR.Model/Business/OdfPorts.cs @@ -69,7 +69,7 @@ namespace ZR.Model.Business public int PortNumber { get; set; } /// - /// 连接状态,0正常,1断开 + /// 连接状态,1正常,0断开 /// public int Status { get; set; }