make
This commit is contained in:
parent
3c25b38fb8
commit
23223d6fc8
|
|
@ -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 li = l.Where(it => it.RowNumber == g.Key).OrderBy(it => it.PortNumber).Select(it =>
|
||||||
{
|
{
|
||||||
var tips = "";
|
var tips = "";
|
||||||
if (it.Status == 1)
|
if (it.Status == 0)
|
||||||
{
|
{
|
||||||
tips = it.OpticalAttenuation;
|
tips = it.OpticalAttenuation;
|
||||||
}
|
}
|
||||||
|
|
@ -305,13 +305,26 @@ namespace ZR.Admin.WebApi.Controllers.Business
|
||||||
[HttpPost]
|
[HttpPost]
|
||||||
[ActionPermissionFilter(Permission = "odfports:add")]
|
[ActionPermissionFilter(Permission = "odfports:add")]
|
||||||
[Log(Title = "端口", BusinessType = BusinessType.INSERT)]
|
[Log(Title = "端口", BusinessType = BusinessType.INSERT)]
|
||||||
public IActionResult AddOdfPorts([FromBody] OdfPortsDto parm)
|
public async Task<IActionResult> AddOdfPorts([FromBody] OdfPortsDto parm)
|
||||||
{
|
{
|
||||||
var modal = parm.Adapt<OdfPorts>().ToCreate(HttpContext);
|
var modal = parm.Adapt<OdfPorts>().ToCreate(HttpContext);
|
||||||
modal.CreatedAt = DateTime.Now;
|
modal.CreatedAt = DateTime.Now;
|
||||||
modal.UpdatedAt = DateTime.Now;
|
modal.UpdatedAt = DateTime.Now;
|
||||||
var response = _OdfPortsService.AddOdfPorts(modal);
|
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);
|
return SUCCESS(response);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -322,12 +335,30 @@ namespace ZR.Admin.WebApi.Controllers.Business
|
||||||
[HttpPut]
|
[HttpPut]
|
||||||
[ActionPermissionFilter(Permission = "odfports:edit")]
|
[ActionPermissionFilter(Permission = "odfports:edit")]
|
||||||
[Log(Title = "端口", BusinessType = BusinessType.UPDATE)]
|
[Log(Title = "端口", BusinessType = BusinessType.UPDATE)]
|
||||||
public IActionResult UpdateOdfPorts([FromBody] OdfPortsDto parm)
|
public async Task<IActionResult> UpdateOdfPorts([FromBody] OdfPortsDto parm)
|
||||||
{
|
{
|
||||||
var modal = parm.Adapt<OdfPorts>().ToUpdate(HttpContext);
|
var modal = parm.Adapt<OdfPorts>().ToUpdate(HttpContext);
|
||||||
modal.UpdatedAt = DateTime.Now;
|
modal.UpdatedAt = DateTime.Now;
|
||||||
var response = _OdfPortsService.UpdateOdfPorts(modal);
|
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);
|
return ToResponse(response);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,7 @@ namespace ZR.Model.Business
|
||||||
public int PortNumber { get; set; }
|
public int PortNumber { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 连接状态,0正常,1断开
|
/// 连接状态,1正常,0断开
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int Status { get; set; }
|
public int Status { get; set; }
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user