server/.NETAdmin
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

312

Browse Source
This commit is contained in:
zpc 2025-09-22 19:40:11 +08:00
parent 2717fbb3ba
commit c07aacc08e
3 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs
View File

@ -616,6 +616,7 @@ namespace ZR.Admin.WebApi.Controllers.Business
}
//添加端口
var port = _OdfPortsService.AsQueryable().Where(it => it.FrameId == frame.Id && it.RowNumber == excelItem.RowNumber && it.PortNumber == excelItem.PortNumber).First();
string remarks = $"{excelItem.YeWuMingCheng.Trim()} {excelItem.EquipmentModel.Trim()} {excelItem.BusinessType.Trim()} {excelItem.one}/{excelItem.two.Trim()}/{excelItem.three.Trim()}";
if (port == null)
{
port = new OdfPorts()
@ -634,7 +635,7 @@ namespace ZR.Admin.WebApi.Controllers.Business
RowNumber = excelItem.RowNumber,
PortNumber = excelItem.PortNumber,
Status = excelItem.Status,
Remarks = excelItem.Remarks?.Trim(),
Remarks = remarks,
OpticalAttenuation = excelItem.OpticalAttenuation?.Trim(),
HistoryRemarks = excelItem.HistoryRemarks?.Trim(),
OpticalCableOffRemarks = excelItem.OpticalCableOffRemarks,
@ -647,8 +648,7 @@ namespace ZR.Admin.WebApi.Controllers.Business
else
{
port.HistoryRemarks = excelItem.HistoryRemarks?.Trim();
port.Remarks = excelItem.Remarks?.Trim();
port.Remarks = remarks;
port.OpticalAttenuation = excelItem.OpticalAttenuation?.Trim();
port.Status = excelItem.Status;
port.OpticalCableOffRemarks = excelItem.OpticalCableOffRemarks;

BIN
ZR.Admin.WebApi/wwwroot/ImportTemplate/OdfPorts.xlsx
View File

Binary file not shown.

38
ZR.Model/Business/Dto/OdfPortsDto.cs
View File

@ -100,12 +100,12 @@ namespace ZR.Model.Business.Dto
/// <summary>
/// 设备型号
/// </summary>
public string EquipmentModel { get; set; }
/// <summary>
/// 业务类型
/// </summary>
public string BusinessType { get; set; }
}
public class OdfPortsMDtoc : OdfPortsMDto
@ -417,9 +417,9 @@ namespace ZR.Model.Business.Dto
[ExcelColumnName("连接状态，0断开，1连接")]
public int Status { get; set; }
[ExcelColumn(Name = "备注")]
[ExcelColumnName("备注")]
public string Remarks { get; set; }
//[ExcelColumn(Name = "备注")]
//[ExcelColumnName("备注")]
//public string Remarks { get; set; }
[ExcelColumn(Name = "光衰值（dB）")]
[ExcelColumnName("光衰值（dB）")]
@ -454,6 +454,34 @@ namespace ZR.Model.Business.Dto
[ExcelColumn(Name = "业务类型")]
[ExcelColumnName("业务类型")]
public string BusinessType { get; set; }
/// <summary>
/// 业务名称
/// </summary>
[ExcelColumn(Name = "业务名称")]
[ExcelColumnName("业务名称")]
public string YeWuMingCheng { get; set; }
/// <summary>
/// 1号端口
/// </summary>
[ExcelColumn(Name = "1号端口")]
[ExcelColumnName("1号端口")]
public string one { get; set; }
/// <summary>
/// 2号端口
/// </summary>
[ExcelColumn(Name = "2号端口")]
[ExcelColumnName("2号端口")]
public string two { get; set; }
/// <summary>
/// 3号端口
/// </summary>
[ExcelColumn(Name = "3号端口")]
[ExcelColumnName("3号端口")]
public string three { get; set; }
}